优化

src/views/customerManagement/numberManagement/addCustomer.vue

@@ -154,9 +154,9 @@ export default {
     },
     methods: {
         initData(data) {
-            if(data.isView){
+            if (data.isView) {
                 this.isView = true
-            }else {
+            } else {
                 this.isView = false
             }
             this.initDict(this.dc_key).then(res => {
@@ -170,7 +170,7 @@ export default {
             this.baseRequest('getById', { id: val }).then(res => {
                 this.form = res.data
                 this.form.findids = [res.data.groupId, res.data.discId]
-                this.form.dynamicItem = []
+                this.$set(this.form, 'dynamicItem', [])
                 const json = JSON.parse(res.data.buyerJson)
                 if (json) {
                     json.forEach(item => {

src/views/customerManagement/numberManagement/index.vue

@@ -89,7 +89,7 @@
           <el-table-column label="选房日期" prop="roomSelectionDate" width="180" />
           <el-table-column label="购房状态" prop="statusStr" />
           <el-table-column label="意向房屋" prop="houseName" width="180" />
-          <el-table-column label="操作" width="300">
+          <el-table-column label="操作" width="600">
             <template scope="scope">
               <el-button
                 size="mini"
@@ -100,12 +100,14 @@
               <el-button
                 size="mini"
                 type="text"
+                :disabled="scope.row.statusStr === '已退房' || scope.row.statusStr === '放弃资格'"
                 @click="handleHouse(scope.row)"
               >选房
               </el-button>
               <el-button
                 size="mini"
                 type="text"
+                :disabled="scope.row.statusStr === '已退房' || scope.row.statusStr === '放弃资格'"
                 @click="handleSubscribe(scope.row)"
               >认购
               </el-button>
@@ -150,7 +152,7 @@
       :visible.sync="dialogAddVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
-      title="新增"
+      :title="dialogAddTitle"
       width="90%"
       top="20px"
       class="statistic_base"
@@ -260,7 +262,8 @@ export default {
             dialogIntentionalVisible: false,
             dialogAbandonVisible: false,
             groupOption: [],
-            discOption: []
+            discOption: [],
+            dialogAddTitle: ''
         }
     },
     mounted() {
@@ -309,6 +312,7 @@ export default {
         },
         handleAdd() {
             this.dialogAddVisible = true
+            this.dialogAddTitle = '新增'
             // 新vue时调用的方法
             this.$nextTick(() => {
                 this.$refs.addCustomer.initData()
@@ -358,6 +362,7 @@ export default {
         /* 编辑*/
         handleEdit: function(val) {
             this.dialogAddVisible = true
+            this.dialogAddTitle = '修改'
             // 新vue时调用的方法
             this.$nextTick(() => {
                 this.$refs.addCustomer.initData(val)

src/views/customerManagement/roomChose/addHouse.vue

@@ -33,6 +33,8 @@
             <el-table-column label="套内面积（㎡)" prop="actualInternalArea" />
             <el-table-column label="建筑面积（㎡)" prop="actualBuildArea" />
             <el-table-column label="装修情况" prop="decorationSituationStr" />
+            <el-table-column label="经办人" prop="createdName" />
+            <el-table-column label="经办时间" prop="createdAt" />
             <el-table-column label="操作" width="180">
               <template scope="scope">
                 <el-button
@@ -52,12 +54,12 @@
           </el-table>
         </el-col>
       </el-row>
-      <el-row class="handle-box">
-        <span>经办时间&nbsp;{{ dataStr }}</span>
-      </el-row>
-      <el-row class="handle-box">
-        <span>经办人&nbsp;{{ username }}</span>
-      </el-row>
+      <!--      <el-row class="handle-box">-->
+      <!--        <span>经办时间&nbsp;{{ dataStr }}</span>-->
+      <!--      </el-row>-->
+      <!--      <el-row class="handle-box">-->
+      <!--        <span>经办人&nbsp;{{ username }}</span>-->
+      <!--      </el-row>-->
     </div>
     <div style="text-align: right;margin-top: 50px">
       <el-button @click="cancel">取 消</el-button>
@@ -99,10 +101,13 @@ export default {
             dialogRoomVisible: false,
             customerManagementId: '',
             dataStr: '',
-            username: ''
+            username: '',
+            groupId: '',
+            discId: ''
         }
     },
     mounted() {
+        console.log('this.$common.currUser()', this.$common.currUser())
         const myDate = new Date()
         const dateStr = myDate.getFullYear() + '-' + (myDate.getMonth() + 1) + '-' + myDate.getDate()
         const username = this.$common.currUser().username
@@ -113,14 +118,20 @@ export default {
         initData(data) {
             this.initDict(this.dc_key).then(res => {
                 this.customerManagementId = data.id
+                this.groupId = data.groupId
+                this.discId = data.discId
                 this.getData(data.id)
             })
         },
         handleAdd() {
             this.dialogRoomVisible = true
+            const data = {
+                level: 2,
+                nodeId: this.discId
+            }
             // 新vue时调用的方法
             this.$nextTick(() => {
-                this.$refs.parkRoom.initData()
+                this.$refs.parkRoom.initData(data)
             })
         },
         getData: function(val) {
@@ -153,7 +164,7 @@ export default {
                 })
             }
             const data = {
-                houseIds: this.AllData.map(obj => { return obj.id }).join(','),
+                houseIds: this.AllData.map(obj => { return obj.houseId }).join(','),
                 customerManagementId: this.customerManagementId
             }
             this.baseRequest('submit', data).then(res => {
@@ -184,6 +195,10 @@ export default {
         },
         getChildrenData(data) {
             if (data) {
+                data.forEach(item => {
+                    item.createdName = this.username
+                    item.createdAt = this.dataStr
+                })
                 this.AllData = data
             }
             this.dialogRoomVisible = false

src/views/customerManagement/roomChose/roomIndex.vue

@@ -122,9 +122,9 @@
           </el-row>
           <el-row class="lineheight20">
 
-            <el-col :span="24">
-              <el-button size="small" class="ch-button" style="float: right;margin-top: 4px" @click="handleSearch()"><i class="el-icon-menu" />&nbsp;查询</el-button>
-              <el-button size="small" class="ch-button-warning" style="float: right;margin-top: 4px" @click="handleReset()"><i class="el-icon-menu" />&nbsp;重置</el-button>
+            <el-col :span="24" style="text-align: right">
+              <el-button size="small" class="ch-button-warning" @click="handleReset()"><i class="el-icon-menu" />&nbsp;重置</el-button>
+              <el-button size="small" class="ch-button" @click="handleSearch()"><i class="el-icon-menu" />&nbsp;查询</el-button>
             </el-col>
           </el-row>
         </div>
@@ -521,7 +521,8 @@ export default {
             importTitle: '',
             uploadTitle: [],
             loadingFlag: false,
-            selectList: []
+            selectList: [],
+            expandedDeptKey: []
         }
     },
     mounted() {
@@ -532,6 +533,9 @@ export default {
             this.roomUse = ['1']
             this.saleStatus = ['1']
             this.soldStatus = ['1']
+            this.queryParam.nodeId = data.nodeId
+            this.queryParam.level = data.level
+            this.expandedDeptKey = [data.nodeId]
             this.initDict(this.dc_key).then((res) => {
                 this.getData()
             })
@@ -898,9 +902,9 @@ export default {
                 return true
             })
             val.forEach(element => {
+                element.houseId = element.id
                 this.selectList.push(element)
             })
-            console.log('共有:', this.selectList)
         },
         // 请求封装，继承类中调用，必须存在
         baseRequest: function(opUrl, postData) {

src/views/customerManagement/subscribe/subscribeIndex.vue

@@ -30,7 +30,7 @@
             <el-table-column label="认购金金额（元）" prop="receivableMoney" />
             <el-table-column label="收取状态" prop="statusStr" />
             <el-table-column label="收据流水号" prop="serialNumber" />
-            <el-table-column label="经办人" prop="createdId" />
+            <el-table-column label="经办人" prop="collectionName" />
             <el-table-column label="经办时间" prop="collectionTime" />
             <el-table-column label="操作" width="180">
               <template scope="scope">
@@ -99,7 +99,7 @@ export default {
             loading: false,
             AllData: [],
             customerManagementId: '',
-            dataStr: '',
+            dateStr: '',
             username: '',
             dialogAddVisible: false
         }
@@ -108,7 +108,7 @@ export default {
         const myDate = new Date()
         const dateStr = myDate.getFullYear() + '-' + (myDate.getMonth() + 1) + '-' + myDate.getDate()
         const username = this.$common.currUser().username
-        this.dataStr = dateStr
+        this.dateStr = dateStr
         this.username = username
     },
     methods: {
@@ -152,6 +152,8 @@ export default {
         },
         getItemJson: function(item) {
             item.statusStr = item.status === 1 ? '未收取' : '已收取'
+            item.collectionName = item.collectionName == null ? this.username : item.collectionName
+            item.collectionTime = item.collectionTime == null ? this.dateStr : item.collectionTime
             return item
         },
         confirmSubmit: function() {

src/views/signingManagement/contractManagement/contractAdd.vue

@@ -35,6 +35,7 @@
                   <el-input
                     v-model="item.name"
                     placeholder="请填写姓名"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
@@ -43,6 +44,7 @@
                   <el-input
                     v-model="item.identityCard"
                     placeholder="请填写身份证号"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
@@ -51,6 +53,7 @@
                   <el-input
                     v-model="item.phone"
                     placeholder="请填写手机号"
+                    disabled
                   />
                 </el-form-item>
               </el-col>
@@ -62,6 +65,7 @@
                     filterable
                     :popper-append-to-body="false"
                     popper-class="statistic_base"
+                    disabled
                   >
                     <el-option
                       v-for="relationship in dc_data.RELATIONSHIP"
@@ -82,9 +86,9 @@
                   <el-cascader
                     v-model="form.houseId"
                     :append-to-body="false"
-                    :disabled="isView"
                     style="width: 100%;"
                     :options="TreeData"
+                    disabled
                     @change="houseChange"
                   />
                 </el-form-item>
@@ -266,7 +270,7 @@
               <el-col :span="5" class="col-txt"><span>住宅专项维修资金（元/㎡）</span></el-col>
               <el-col :span="18" class="col-input">
                 <el-form-item>
-                  <el-input v-model="form.maintenanceFunds" @input="maintenanceFundsChange"/>
+                  <el-input v-model="form.maintenanceFunds" @input="maintenanceFundsChange" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -328,8 +332,8 @@
     </el-form>
     <div slot="footer" style="text-align: right">
       <el-button @click="cancel()">关 闭</el-button>
-      <el-button type="primary" @click="confirmSubmit()">暂 存</el-button>
-      <el-button type="primary" @click="confirmSubmit('signing')">签 约</el-button>
+      <el-button v-if="!isView" type="primary" @click="confirmSubmit()">暂 存</el-button>
+      <el-button v-if="!isView" type="primary" @click="confirmSubmit('signing')">签 约</el-button>
     </div>
   </div>
 </template>
@@ -395,7 +399,6 @@ export default {
     },
     methods: {
         initData(val) {
-            console.log('111')
             const _this = this
             // 查看或编辑
             if (val.id) {

src/views/signingManagement/contractManagement/index.vue

@@ -46,11 +46,19 @@
           <el-table-column label="付款方式" prop="paymentMethod" />
           <el-table-column label="应收房款（元）" prop="totalPrice" />
           <el-table-column label="应收专项维修资金（元）" prop="maintenanceFunds" />
-          <el-table-column label="合同状态" prop="contractStatusStr" width="110" />
+          <el-table-column label="合同状态" prop="contractStatusStr" width="110">
+            <template scope="scope">
+              <span
+                :style="{'color':scope.row.contractStatusStr==='已退房'?'red':scope.row.contractStatusStr==='已签约'?'green':'gray'}"
+              >
+                {{ scope.row.contractStatusStr }}
+              </span>
+            </template>
+          </el-table-column>
           <el-table-column label="签约日期" prop="signingDate" />
           <el-table-column header-align="center" label="操作" width="180">
             <template scope="scope">
-              <el-button size="mini" type="text" @click="handleEdit(scope.row)">签约</el-button>
+              <el-button :disabled="scope.row.contractStatusStr !== '认购待签约'" size="mini" type="text" @click="handleEdit(scope.row)">签约</el-button>
               <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
               <!--              <el-button size="mini" type="danger" @click="handleDel(scope.row)">删除</el-button>-->
             </template>
@@ -161,6 +169,7 @@ export default {
         handleEdit: function(val) {
             this.dialogVisible = true
             this.dialogTitle = '签约'
+            val.isView = false
             // 新vue时调用的方法
             this.$nextTick(() => {
                 this.$refs.contractAdd.initData(val)
@@ -169,6 +178,7 @@ export default {
         handleView(val) {
             this.dialogVisible = true
             this.dialogTitle = '查看'
+            val.isView = true
             // 新vue时调用的方法
             this.$nextTick(() => {
                 this.$refs.contractAdd.initData(val)