LAPTOP-FO2T5SIU\35838 8 月之前
父节点
当前提交
c7829cf8ae

+ 2 - 1
src/views/customerManagement/numberManagement/index.vue

@@ -72,7 +72,8 @@
           :data="AllData"
           stripe
           row-class-name="g_table_row"
-          :header-cell-style="{textAlign: 'center'}"
+          border
+          :header-cell-style="{background:'#f2f2f2'}"
           :cell-style="{ textAlign: 'center' }"
           @selection-change="handleSelectionChange"
         >

+ 0 - 1
src/views/receiveRefundsManagement/depositManagement/index.vue

@@ -18,7 +18,6 @@
           v-loading="loading"
           :data="AllData"
           row-class-name="g_table_row"
-          stripe
           border
           :header-cell-style="{background:'#f2f2f2'}"
         >

+ 0 - 1
src/views/receiveRefundsManagement/intentionalDepositManagement/index.vue

@@ -18,7 +18,6 @@
           v-loading="loading"
           :data="AllData"
           row-class-name="g_table_row"
-          stripe
           border
           :header-cell-style="{background:'#f2f2f2'}"
         >

+ 7 - 1
src/views/receiveRefundsManagement/maintenanceFundsManagement/index.vue

@@ -52,7 +52,13 @@
     </el-row>
     <el-row class="handle-box">
       <el-col :span="24">
-        <el-table v-loading="loading" :data="AllData" row-class-name="g_table_row" stripe>
+        <el-table
+          v-loading="loading"
+          :data="AllData"
+          row-class-name="g_table_row"
+          border
+          :header-cell-style="{background:'#f2f2f2'}"
+        >
           <el-table-column type="index" width="60" />
           <el-table-column label="合同编号" prop="contractNumber" />
           <el-table-column label="买受人" prop="buyerName" width="200" />

+ 7 - 1
src/views/receiveRefundsManagement/paymentManagement/index.vue

@@ -52,7 +52,13 @@
     </el-row>
     <el-row class="handle-box">
       <el-col :span="24">
-        <el-table v-loading="loading" :data="AllData" row-class-name="g_table_row" stripe>
+        <el-table
+          v-loading="loading"
+          :data="AllData"
+          row-class-name="g_table_row"
+          border
+          :header-cell-style="{background:'#f2f2f2'}"
+        >
           <el-table-column type="index" width="60" />
           <el-table-column label="合同编号" prop="contractNumber" />
           <el-table-column label="买受人" prop="buyerName" width="200" />

+ 19 - 7
src/views/receiveRefundsManagement/refundManagement/addRefund.vue

@@ -259,7 +259,8 @@ export default {
             fileList: [],
             dateStr: '',
             username: '',
-            paymentOptions: []
+            paymentOptions: [],
+            url: ''
         }
     },
     computed: {
@@ -274,11 +275,13 @@ export default {
     },
     methods: {
         initData(data) {
+            this.url = 'add'
             this.isView = data.isView
-            this.contractId = data.contractId
+            // this.contractId = data.contractId
             this.initDict(this.dc_key).then(res => {
                 this.getIdentityCardList()
                 if (data.id) {
+                    this.url = 'edit'
                     this.getById(data)
                 }
             })
@@ -324,6 +327,7 @@ export default {
             const _this = this
             _this.houseOption = []
             _this.form.houseId = ''
+            _this.form.contractId = ''
             _this.form.customerManagementId = ''
             _this.form.buyerName = ''
             _this.getHouseList()
@@ -339,7 +343,8 @@ export default {
                         const obj = {
                             label: item.groupName + '-' + item.discName + '-' + item.buildName + '-' + item.roomNo,
                             value: item.id,
-                            customerManagementId: item.customerManagementId
+                            customerManagementId: item.customerManagementId,
+                            contractId: item.contractId
                         }
                         _this.houseOption.push(obj)
                     })
@@ -352,8 +357,10 @@ export default {
             const obj = this.houseOption.find(x => x.value === val)
             if (obj) {
                 this.form.customerManagementId = obj.customerManagementId
+                this.form.contractId = obj.contractId
             } else {
                 this.form.customerManagementId = ''
+                this.form.contractId = ''
             }
             this.getBuyerName()
             this.getPaymentList()
@@ -402,6 +409,13 @@ export default {
                         const json = _this.getItemJson(item)
                         _this.AllData.push(json)
                     })
+                    // 回显
+                    _this.paymentOptions = res.data
+                    _this.paymentOptions.forEach(element => {
+                        this.$nextTick(() => {
+                            this.$refs.eltable.toggleRowSelection(element, true)
+                        })
+                    })
                 }
                 _this.loading = false
             }).catch((e) => {
@@ -427,11 +441,10 @@ export default {
                     const extraData = {
                         // 退款详情
                         refundDetailInfoStr: JSON.stringify(_this.paymentOptions),
-                        fileList: JSON.stringify(_this.fileList),
-                        contractId: this.contractId
+                        fileList: JSON.stringify(_this.fileList)
                     }
                     const postData = Object.assign({}, _this.form, extraData)
-                    this.baseRequest('add', postData).then(res => {
+                    this.baseRequest(this.url, postData).then(res => {
                         const data = res.data
                         if (data.code == 200) {
                             this.$notify({
@@ -504,7 +517,6 @@ export default {
                     totalReceivedAmount += Number(item.receivedAmount)
                 }
             })
-            console.log('totalReceivedAmount', totalReceivedAmount)
             _this.form.refundAmount = totalReceivedAmount
         },
         baseRequest(opUrl, postData) {

+ 24 - 6
src/views/receiveRefundsManagement/refundManagement/index.vue

@@ -28,20 +28,27 @@
       <el-col :span="24" style="margin-top: 20px">
         <el-button class="ch-button-warning" size="small" style="float: right" @click="handleReset()"><i class="el-icon-search" />&nbsp;重置</el-button>
         <el-button class="ch-button" size="small" style="float: right" @click="handleSearch()"><i class="el-icon-search" />&nbsp;查询</el-button>
+        <el-button class="ch-button-add" size="small" style="float: right;" @click="handleAdd()"><i class="el-icon-menu" />&nbsp;新增</el-button>
       </el-col>
     </el-row>
     <el-row class="handle-box">
       <el-col :span="24">
-        <el-table v-loading="loading" :data="AllData" row-class-name="g_table_row" stripe>
+        <el-table
+          v-loading="loading"
+          :data="AllData"
+          row-class-name="g_table_row"
+          border
+          :header-cell-style="{background:'#f2f2f2'}"
+        >
           <el-table-column type="index" width="60" />
           <el-table-column label="合同编号" prop="contractNumber" />
           <el-table-column label="申请人" prop="applicant" width="200" />
           <el-table-column label="买受人" prop="buyerName" width="200" />
           <el-table-column label="房屋" prop="houseName" width="200" />
-          <el-table-column label="退房原因" prop="reason" width="110" />
-          <el-table-column label="应退(元)" prop="" />
-          <el-table-column label="实退(元)" prop="" />
-          <el-table-column label="扣除" prop="" />
+          <el-table-column label="退房原因" prop="reasonStr" width="110" />
+          <el-table-column label="应退(元)" prop="refundAmount" />
+          <el-table-column label="实退(元)" prop="actualRefundAmount" />
+          <el-table-column label="扣除" prop="deductible" />
           <el-table-column label="关联审批单号" prop="approvalNumber" />
           <el-table-column header-align="center" label="操作" width="200">
             <template scope="scope">
@@ -95,7 +102,7 @@ export default {
     mixins: [Base, BaseData],
     data() {
         return {
-            dc_key: [],
+            dc_key: ['CHECK_OUT_REASON'],
             // 列表相关
             search: {
             },
@@ -145,8 +152,19 @@ export default {
             this.handleSearch()
         },
         getItemJson: function(item) {
+            item.reasonStr = this.dc_map.CHECK_OUT_REASON[item.reason]
             return item
         },
+        handleAdd: function() {
+            this.dialogVisible = true
+            const val = {
+                isView: false
+            }
+            // 新vue时调用的方法
+            this.$nextTick(() => {
+                this.$refs.addRefund.initData(val)
+            })
+        },
         /* 编辑*/
         handleEdit: function(val) {
             this.dialogVisible = true

+ 7 - 1
src/views/signingManagement/contractManagement/index.vue

@@ -52,7 +52,13 @@
     </el-row>
     <el-row class="handle-box">
       <el-col :span="24">
-        <el-table v-loading="loading" :data="AllData" row-class-name="g_table_row" stripe>
+        <el-table
+          v-loading="loading"
+          :data="AllData"
+          row-class-name="g_table_row"
+          border
+          :header-cell-style="{background:'#f2f2f2'}"
+        >
           <el-table-column type="index" width="60" />
           <el-table-column label="合同编号" prop="contractNumber" />
           <el-table-column label="网签备案号" prop="recordNumber" />