1

src/views/customerManagement/numberManagement/index.vue

@@ -410,6 +410,7 @@ export default {
         /* 选房*/
         handleHouse: function(val) {
             this.dialogHouseVisible = true
+            val.customerManagementId = val.id
             // 新vue时调用的方法
             this.$nextTick(() => {
                 this.$refs.addHouse.initData(val)

src/views/customerManagement/roomChose/addHouse.vue

@@ -156,12 +156,13 @@ export default {
     },
     methods: {
         initData(data) {
-            this.getByCustomerManagementId(data.id)
+            console.log('data', data)
+            this.getByCustomerManagementId(data.customerManagementId)
             this.initDict(this.dc_key).then(res => {
-                this.customerManagementId = data.id
+                this.customerManagementId = data.customerManagementId
                 this.groupId = data.groupId
                 this.discId = data.discId
-                this.getData(data.id)
+                this.getData(data)
             })
         },
         handleAdd() {
@@ -179,10 +180,20 @@ export default {
             const _this = this
             _this.loading = true
             _this.AllData = []
-            const data = {
-                customerManagementId: val
+            const postData = {
+                customerManagementId: val.customerManagementId
             }
-            this.baseRequest('listAll', data).then((res) => {
+            // let postData
+            // if (val.roomSelectionInfoId) {
+            //     postData = {
+            //         id: val.roomSelectionInfoId
+            //     }
+            // } else if (val.customerManagementId) {
+            //     postData = {
+            //         customerManagementId: val.customerManagementId
+            //     }
+            // }
+            this.baseRequest('listAll', postData).then((res) => {
                 if (res.data) {
                     res.data.forEach(function(item) {
                         const json = _this.getItemJson(item)
@@ -262,7 +273,6 @@ export default {
             window.open(url, '_blank')
         },
         getChildrenData(data) {
-            console.log('data', data)
             if (data) {
                 data.forEach(item => {
                     item.createdName = this.username

src/views/receiveRefundsManagement/intentionalDepositManagement/toDeposit.vue

@@ -37,7 +37,7 @@
               <el-col :span="3" class="col-txt"><span><span class="red-asterisk">*</span>认购房屋</span></el-col>
               <el-col :span="9" class="col-input">
                 <el-form-item>
-                  <el-input v-model="form.houseName" />
+                  <el-input v-model="form.houseName" readonly />
                 </el-form-item>
               </el-col>
               <el-col :span="3" class="col-txt">
@@ -166,6 +166,7 @@ export default {
             this.baseRequest('getById', data).then(res => {
                 this.form = res.data
                 this.form.buyerName = data.buyerName
+                console.log('this.form', this.form)
                 if (this.form.paperReceipts) {
                     this.fileList = JSON.parse(this.form.paperReceipts)
                 }
@@ -230,7 +231,6 @@ export default {
             this.$emit('cancel')
         },
         handleRoomCancel(data) {
-            console.log('data', data)
             if (data) {
                 this.form.houseName = data.buildName + '-' + data.roomNo
                 this.form.houseId = data.houseId
@@ -247,11 +247,11 @@ export default {
         handleHouse: function() {
             this.dialogHouseVisible = true
             const data = {
-                id: this.form.customerManagementId,
+                customerManagementId: this.form.customerManagementId,
                 groupId: this.form.groupId,
-                discId: this.form.discId
+                discId: this.form.discId,
+                roomSelectionInfoId: this.form.roomSelectionInfoId
             }
-            console.log('data', data)
             // 新vue时调用的方法
             this.$nextTick(() => {
                 this.$refs.addHouse.initData(data)

src/views/receiveRefundsManagement/paymentManagement/paymentRegistration.vue

@@ -34,18 +34,18 @@
               </el-col>
             </el-row>
             <el-row>
-<!--              <el-col :span="3" class="col-txt"><span>付款截止日</span></el-col>-->
-<!--              <el-col :span="9" class="col-input">-->
-<!--                <el-form-item>-->
-<!--                  <el-date-picker-->
-<!--                    v-model="form.deadline"-->
-<!--                    popper-class="statistic_base"-->
-<!--                    type="date"-->
-<!--                    placeholder="年月日"-->
-<!--                    value-format="yyyy-MM-dd"-->
-<!--                  />-->
-<!--                </el-form-item>-->
-<!--              </el-col>-->
+              <!--              <el-col :span="3" class="col-txt"><span>付款截止日</span></el-col>-->
+              <!--              <el-col :span="9" class="col-input">-->
+              <!--                <el-form-item>-->
+              <!--                  <el-date-picker-->
+              <!--                    v-model="form.deadline"-->
+              <!--                    popper-class="statistic_base"-->
+              <!--                    type="date"-->
+              <!--                    placeholder="年月日"-->
+              <!--                    value-format="yyyy-MM-dd"-->
+              <!--                  />-->
+              <!--                </el-form-item>-->
+              <!--              </el-col>-->
               <el-col :span="3" class="col-txt"><span>应收房款（元）</span></el-col>
               <el-col :span="9" class="col-input">
                 <el-form-item>
@@ -88,11 +88,14 @@
                 <el-table-column label="到账日期" prop="payTime" width="200" />
                 <el-table-column label="到账银行账号" prop="bankFullName" width="200" />
                 <el-table-column label="到账金额" prop="payMoney" width="110" />
+                <el-table-column label="状态" prop="paymentStatusStr" width="200" />
                 <el-table-column header-align="center" label="操作" width="180">
                   <template scope="scope">
                     <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
                     <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>
                     <el-button size="mini" type="text" @click="downLoad(scope.row)">电子收据</el-button>
+                    <el-button v-if="scope.row.contentType == '1'" size="mini" type="text" @click="handleConvert(scope.row,1)">转首款</el-button>
+                    <el-button v-if="scope.row.contentType == '1'" size="mini" type="text" @click="handleConvert(scope.row,2)">转房款</el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -138,7 +141,7 @@ export default {
     mixins: [Base, BaseData],
     data() {
         return {
-            dc_key: ['PAYMENT_METHODS', 'CONTENT_TYPE', 'COLLECTION_METHODS'],
+            dc_key: ['PAYMENT_METHODS', 'CONTENT_TYPE', 'COLLECTION_METHODS', 'PAYMENT_STATUS'],
             form: {
 
             },
@@ -212,6 +215,7 @@ export default {
             item.paymentMethodStr = this.dc_map.COLLECTION_METHODS[item.paymentMethod]
             item.contentTypeStr = this.dc_map.CONTENT_TYPE[item.contentType]
             item.bankFullName = item.bankName + item.bankBranchName + item.bankNumber
+            item.paymentStatusStr = this.dc_map.PAYMENT_STATUS[item.paymentStatus]
             return item
         },
         cancel() {
@@ -279,6 +283,42 @@ export default {
                 })
             })
         },
+        handleConvert(row, type) {
+            this.$confirm('确认转换吗？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                const postData = {
+                    id: row.id,
+                    type: type
+                }
+                this.baseRequest('convertType', postData).then(res => {
+                    if (res.data.code == 200) {
+                        this.getData()
+                        this.$message({
+                            type: 'success',
+                            message: '转换成功!'
+                        })
+                    } else {
+                        this.$message({
+                            type: 'error',
+                            message: res.data.msg
+                        })
+                    }
+                }).catch((err) => {
+                    this.$message({
+                        type: 'error',
+                        message: err
+                    })
+                })
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '已取消'
+                })
+            })
+        },
         baseRequest(opUrl, postData) {
             return this.$channel.globeRequest('PayLogController', opUrl, postData, 'project')
         }

src/views/workflow/components/myProcess/changeClient.vue

@@ -70,7 +70,7 @@ export default {
                 { name: '事假(剩余x小时)', type: 'affair' },
                 { name: '病假', type: 'illness' }
             ],
-            dialogTitle: '请假申请'
+            dialogTitle: '委托办理'
         }
     },
     methods: {