1

src/views/customerManagement/intentionalDeposit/addIntentionalDeposit.vue

@@ -55,6 +55,27 @@
                 </el-form-item>
               </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-select
+                    v-model="bankObject"
+                    placeholder=""
+                    filterable
+                    clearable
+                    @change="bankChange"
+                  >
+                    <el-option
+                      v-for="item in bankOptions"
+                      :key="item.value"
+                      :label="item.bankName + (item.bankBranchName?item.bankBranchName:'') + item.bankNumber"
+                      :value="item.id"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row>
               <el-col :span="3" class="col-txt"><span>备注</span></el-col>
               <el-col :span="21" class="col-input">
@@ -139,7 +160,9 @@ export default {
             customerManagementId: '',
             dateStr: '',
             username: '',
-            isView: false
+            isView: false,
+            bankOptions: [],
+            bankObject: ''
         }
     },
     mounted() {
@@ -151,6 +174,7 @@ export default {
     },
     methods: {
         initData(data) {
+            this.getBankOptions()
             this.customerManagementId = data.id
             this.initDict(this.dc_key).then(res => {
                 this.getByCustomerManagementId(data)
@@ -248,11 +272,38 @@ export default {
             const url = constant.BASE_URI + '/IntentionalDepositController/downLoadReceipt?id=' + this.form.id
             window.open(url, '_blank')
         },
+        getBankOptions() {
+            this.bankRequest('listAll', {}).then(res => {
+                this.bankOptions = res.data || []
+            })
+        },
+        bankChange(data) {
+            const val = this.bankOptions.find((e) => { return data == e.id })
+            this.form.bankName = val.bankName
+            this.form.bankBranchName = val.bankBranchName
+            this.form.bankNumber = val.bankNumber
+        },
+        getBankByFloor() {
+            this.fundRequest('getBankByFloor', { contractId: this.contractId }).then(res => {
+                if (res.data) {
+                    this.bankObject = res.data.bankFullName
+                    this.form.bankName = res.data.bankName
+                    this.form.bankBranchName = res.data.bankBranchName
+                    this.form.bankNumber = res.data.bankNumber
+                }
+            })
+        },
         baseRequest(opUrl, postData) {
             return this.$channel.globeRequest('IntentionalDepositController', opUrl, postData, 'project')
         },
         baseFQRequest: function(opUrl, postData) {
             return this.$channel.baseRequest('ParkFloorDiscController', opUrl, postData, 'User')
+        },
+        bankRequest(opUrl, postData) {
+            return this.$channel.globeRequest('InvoiceBankController', opUrl, postData, 'project')
+        },
+        fundRequest(opUrl, postData) {
+            return this.$channel.globeRequest('MaintenanceFundsManagementController', opUrl, postData, 'project')
         }
 
     }

src/views/customerManagement/roomChose/addHouse.vue

@@ -66,7 +66,6 @@
             <el-table-column label="操作" width="180">
               <template scope="scope">
                 <el-button
-                  :disabled="scope.row.status != '1'"
                   size="mini"
                   type="text"
                   @click="handleDelete(scope.$index)"
@@ -229,13 +228,13 @@ export default {
                         message: '请选择房间',
                         type: 'warning'
                     })
+                    return
                 }
-                if (this.AllData.length > 1) {
-                    this.$message({
-                        message: '只能选择一个房间',
-                        type: 'warning'
-                    })
-                }
+            } else if (this.AllData.length > 1) {
+                this.$message({
+                    message: '只能选择一个房间',
+                    type: 'warning'
+                })
                 return
             }
             const obj = this.AllData[0]

src/views/customerManagement/subscribe/addSubscribe.vue

@@ -55,6 +55,27 @@
                 </el-form-item>
               </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-select
+                    v-model="bankObject"
+                    placeholder=""
+                    filterable
+                    clearable
+                    @change="bankChange"
+                  >
+                    <el-option
+                      v-for="item in bankOptions"
+                      :key="item.value"
+                      :label="item.bankName + (item.bankBranchName?item.bankBranchName:'') + item.bankNumber"
+                      :value="item.id"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
             <el-row>
               <el-col :span="3" class="col-txt"><span>备注</span></el-col>
               <el-col :span="21" class="col-input">
@@ -124,7 +145,9 @@ export default {
             addLoading: false,
             serialNumber: '',
             fileList: [],
-            isView: false
+            isView: false,
+            bankOptions: [],
+            bankObject: ''
         }
     },
     mounted() {
@@ -134,10 +157,12 @@ export default {
         initData(data) {
             this.form = data
             this.isView = data.isView
+            this.getBankOptions()
             this.initDict(this.dc_key).then(res => {
                 if (data.statusStr === '未收取') {
                     this.getSerialNumber(data)
                     this.form.receivableMoney = data.receivableMoney
+                    // this.getBankByFloor()
                 } else {
                     this.getById(data.id)
                 }
@@ -156,6 +181,7 @@ export default {
                 if (this.form.fileList) {
                     this.fileList = JSON.parse(this.form.fileList)
                 }
+                this.bankObject = res.data.bankName + res.data.bankBranchName + res.data.bankNumber
             })
         },
         getSerialNumber(val) {
@@ -214,11 +240,38 @@ export default {
                 this.fileList.push(res)
             })
         },
+        getBankOptions() {
+            this.bankRequest('listAll', {}).then(res => {
+                this.bankOptions = res.data || []
+            })
+        },
+        bankChange(data) {
+            const val = this.bankOptions.find((e) => { return data == e.id })
+            this.form.bankName = val.bankName
+            this.form.bankBranchName = val.bankBranchName
+            this.form.bankNumber = val.bankNumber
+        },
+        getBankByFloor() {
+            this.fundRequest('getBankByFloor', { contractId: this.contractId }).then(res => {
+                if (res.data) {
+                    this.bankObject = res.data.bankFullName
+                    this.form.bankName = res.data.bankName
+                    this.form.bankBranchName = res.data.bankBranchName
+                    this.form.bankNumber = res.data.bankNumber
+                }
+            })
+        },
         baseRequest(opUrl, postData) {
             return this.$channel.globeRequest('RoomSelectionInfoController', opUrl, postData, 'project')
         },
         baseInfoRequest: function(opUrl, postData) {
             return this.$channel.baseRequest('ParkInfoController', opUrl, postData, 'User')
+        },
+        bankRequest(opUrl, postData) {
+            return this.$channel.globeRequest('InvoiceBankController', opUrl, postData, 'project')
+        },
+        fundRequest(opUrl, postData) {
+            return this.$channel.globeRequest('MaintenanceFundsManagementController', opUrl, postData, 'project')
         }
 
     }

src/views/parkAssets/parkBuild/index.vue

@@ -218,12 +218,12 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="4" class="col-txt"><span>*行政区划</span></el-col>
-                <el-col :span="8" class="col-input">
-                  <el-form-item prop="regionalismCode">
-                    <el-input v-model="buildForm.regionalismCode" />
-                  </el-form-item>
-                </el-col>
+<!--                <el-col :span="4" class="col-txt"><span>*行政区划</span></el-col>-->
+<!--                <el-col :span="8" class="col-input">-->
+<!--                  <el-form-item prop="regionalismCode">-->
+<!--                    <el-input v-model="buildForm.regionalismCode" />-->
+<!--                  </el-form-item>-->
+<!--                </el-col>-->
               </el-row>
               <el-row>
                 <el-col :span="4" class="col-txt"><span>*地号</span></el-col>

src/views/receiveRefundsManagement/depositManagement/index.vue

@@ -68,23 +68,6 @@
       </el-col>
     </el-row>
 
-    <!-- 转定金 -->
-    <el-dialog
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      title=""
-      width="90%"
-      top="20px"
-      class="statistic_base"
-      :append-to-body="true"
-      :modal-append-to-body="true"
-      custom-class="tagdialog"
-      @close="getData"
-    >
-      <to-deposit v-if="dialogVisible" ref="toDeposit" @cancel="cancel" />
-    </el-dialog>
-
     <!--定金查看-->
     <el-dialog
       :visible.sync="dialogAddVisible"
@@ -107,13 +90,12 @@
 <script>
 import Base from '@/views/base/base'
 import BaseData from '@/views/base/baseData'
-import ToDeposit from '@/views/receiveRefundsManagement/intentionalDepositManagement/toDeposit.vue'
 import AddSubscribe from '@/views/customerManagement/subscribe/addSubscribe.vue'
 import constant from '@/static/utils/constant'
 
 export default {
     name: 'Index',
-    components: { AddSubscribe, ToDeposit },
+    components: { AddSubscribe },
     mixins: [Base, BaseData],
     data() {
         return {
@@ -174,15 +156,6 @@ export default {
             item.statusStr = this.dc_map.DEPOSIT_STATUS[item.status]
             return item
         },
-        /* 编辑*/
-        handleEdit: function(val) {
-            this.dialogVisible = true
-            val.isView = false
-            // 新vue时调用的方法
-            this.$nextTick(() => {
-                this.$refs.toDeposit.initData(val)
-            })
-        },
         handleView(val) {
             this.dialogAddVisible = true
             this.dialogTitle = '查看'

src/views/receiveRefundsManagement/maintenanceFundsManagement/addFunds.vue

@@ -253,7 +253,7 @@ export default {
             })
         },
         bankChange(data) {
-            const val = this.bankOptions.findIndex((e) => { data = e.id })
+            const val = this.bankOptions.find((e) => { return  data == e.id })
             this.form.bankName = val.bankName
             this.form.bankBranchName = val.bankBranchName
             this.form.bankNumber = val.bankNumber

src/views/receiveRefundsManagement/paymentManagement/addPayment.vue

@@ -77,8 +77,6 @@
                 <el-form-item>
                   <el-select
                     v-model="bankObject"
-                    :popper-append-to-body="false"
-                    popper-class="statistic_base"
                     placeholder=""
                     filterable
                     clearable
@@ -87,8 +85,6 @@
                     <el-option
                       v-for="item in bankOptions"
                       :key="item.value"
-                      popper-class="statistic_base"
-                      :popper-append-to-body="false"
                       :label="item.bankName + (item.bankBranchName?item.bankBranchName:'') + item.bankNumber"
                       :value="item.id"
                     />
@@ -290,7 +286,7 @@ export default {
             })
         },
         bankChange(data) {
-            const val = this.bankOptions.findIndex((e) => { data = e.id })
+            const val = this.bankOptions.find(e => { return data == e.id })
             this.form.bankName = val.bankName
             this.form.bankBranchName = val.bankBranchName
             this.form.bankNumber = val.bankNumber

src/views/transactionRecord/collectionRecordIndex.vue

@@ -119,8 +119,8 @@
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="index" width="60" />
-          <el-table-column label="房屋" prop="houseName" />
-          <el-table-column label="流水号" prop="serialNumber" />
+          <el-table-column label="房屋" prop="houseName" width="250" />
+          <el-table-column label="流水号" prop="serialNumber" width="250" />
           <el-table-column label="买受人" prop="buyerName" width="200" />
           <el-table-column label="金额（元）" prop="money" width="200" />
           <el-table-column label="收款类型" prop="contentTypeStr" width="110" />

src/views/transactionRecord/convertRecordIndex.vue

@@ -89,8 +89,8 @@
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="index" width="60" />
-          <el-table-column label="房屋" prop="houseName" />
-          <el-table-column label="流水号" prop="serialNumber" />
+          <el-table-column label="房屋" prop="houseName" width="250" />
+          <el-table-column label="流水号" prop="serialNumber" width="250" />
           <el-table-column label="买受人" prop="buyerName" width="200" />
           <el-table-column label="金额（元）" prop="money" width="200" />
           <el-table-column label="转换类型" prop="contentTypeStr" width="110" />

src/views/transactionRecord/refundRecordIndex.vue

@@ -93,8 +93,8 @@
           @selection-change="handleSelectionChange"
         >
           <el-table-column type="index" width="60" />
-          <el-table-column label="房屋" prop="houseName" />
-          <el-table-column label="流水号" prop="serialNumber" />
+          <el-table-column label="房屋" prop="houseName" width="250" />
+          <el-table-column label="流水号" prop="serialNumber" width="250" />
           <el-table-column label="买受人" prop="buyerName" width="200" />
           <el-table-column label="金额（元）" prop="money" width="200" />
           <el-table-column label="退款类型" prop="contentTypeStr" width="110" />