1

src/views/customerManagement/intentionalDeposit/addIntentionalDeposit.vue

@@ -29,8 +29,6 @@
                 <el-form-item prop="paymentMethod">
                   <el-select
                     v-model="form.paymentMethod"
-                    :popper-append-to-body="false"
-                    popper-class="statistic_base"
                     placeholder=""
                     filterable
                     clearable
@@ -38,8 +36,6 @@
                     <el-option
                       v-for="item in dc_data.COLLECTION_METHODS"
                       :key="item.value"
-                      popper-class="statistic_base"
-                      :popper-append-to-body="false"
                       :label="item.label"
                       :value="item.value"
                     />

src/views/customerManagement/numberManagement/index.vue

@@ -122,7 +122,7 @@
               <el-button
                 size="mini"
                 type="text"
-                :disabled="scope.row.statusStr === '已签约' || scope.row.statusStr === '已入驻' || scope.row.statusStr === '已退房' || scope.row.statusStr === '放弃资格'"
+                :disabled="scope.row.statusStr === '已选房' || scope.row.statusStr === '已签约' || scope.row.statusStr === '已入驻' || scope.row.statusStr === '已退房' || scope.row.statusStr === '放弃资格'"
                 @click="handleIntentionalDeposit(scope.row)"
               >意向金
               </el-button>

src/views/customerManagement/roomChose/addHouse.vue

@@ -154,7 +154,7 @@ export default {
     },
     methods: {
         initData(data) {
-            this.form = data
+            this.getByCustomerManagementId(data.id)
             this.initDict(this.dc_key).then(res => {
                 this.customerManagementId = data.id
                 this.groupId = data.groupId
@@ -269,8 +269,18 @@ export default {
             }
             this.dialogRoomVisible = false
         },
+        getByCustomerManagementId(val) {
+            this.form = {}
+            this.baseCustomerRequest('getById', { id: val }).then(res => {
+                this.form = res.data
+            }).catch((err) => {
+            })
+        },
         baseRequest(opUrl, postData) {
             return this.$channel.globeRequest('RoomSelectionInfoController', opUrl, postData, 'project')
+        },
+        baseCustomerRequest(opUrl, postData) {
+            return this.$channel.globeRequest('CustomerManagementController', opUrl, postData, 'project')
         }
 
     }

src/views/customerManagement/subscribe/subscribeIndex.vue

@@ -50,6 +50,7 @@
                 <el-button
                   size="mini"
                   type="text"
+                  :disabled="scope.row.status == '1'"
                   @click="downLoad(scope.row)"
                 > 定金收据
                 </el-button>

src/views/invoice/components/addInvoice.vue

@@ -221,6 +221,10 @@ export default {
         },
         confirmSubmit() {
             const _this = this
+            if (!this.form.contractId) {
+                this.$message.warning('请选择签约信息')
+                return
+            }
             _this.loadingFlag = true
             let soaUrl = 'add'
             if (this.id) {

src/views/invoice/formalInvoiceManage.vue

@@ -225,7 +225,7 @@ export default {
     mixins: [Base, BaseData],
     data() {
         return {
-            dc_key: ['INVOICE_STATUS', 'SEND_STATUS', 'HOUSE_PAYMENT_STATUS'],
+            dc_key: ['INVOICE_STATUS', 'SEND_STATUS', 'HOUSE_PAYMENT_STATUS', 'MAINTENANCE_FUNDS_STATUS'],
             // 列表相关
             search: {
             },
@@ -286,7 +286,7 @@ export default {
                 item.collectionStatusStr = this.dc_map.HOUSE_PAYMENT_STATUS[item.collectionStatus]
             }
             if (item.paymentType === '2') {
-                item.collectionStatusStr = this.dc_map.HOUSE_PAYMENT_STATUS[item.fundCollectionStatus]
+                item.collectionStatusStr = this.dc_map.MAINTENANCE_FUNDS_STATUS[item.fundCollectionStatus]
             }
             item.paymentTypeStr = item.paymentType === '1' ? '房款' : '专项维修资金'
             return item

src/views/parkAssets/parkBuild/index.vue

@@ -204,8 +204,6 @@
                   <el-form-item prop="structure">
                     <el-select
                       v-model="buildForm.structure"
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
                       placeholder=""
                       filterable
                       clearable
@@ -214,8 +212,6 @@
                       <el-option
                         v-for="item in dc_data.BUILD_STRUCTURE"
                         :key="item.value"
-                        :popper-append-to-body="false"
-                        popper-class="statistic_base"
                         :label="item.label"
                         :value="item.value"
                       />

src/views/parkAssets/parkFloorDisc/index.vue

@@ -114,14 +114,10 @@
                       filterable
                       clearable
                       :disabled="isView"
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
                     >
                       <el-option
                         v-for="item in dc_data.GROUP_NATURE"
                         :key="item.value"
-                        :popper-append-to-body="false"
-                        popper-class="statistic_base"
                         :label="item.label"
                         :value="item.value"
                       />
@@ -145,14 +141,10 @@
                       filterable
                       clearable
                       :disabled="isView"
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
                     >
                       <el-option
                         v-for="item in dc_data.COMPANY_NAME"
                         :key="item.value"
-                        :popper-append-to-body="false"
-                        popper-class="statistic_base"
                         :label="item.label"
                         :value="item.value"
                       />
@@ -245,14 +237,10 @@
                       placeholder=""
                       filterable
                       clearable
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
                     >
                       <el-option
                         v-for="item in dc_data.MAPPING_STATUS"
                         :key="item.id"
-                        :popper-append-to-body="false"
-                        popper-class="statistic_base"
                         :label="item.label"
                         :value="item.value"
                       />
@@ -269,14 +257,10 @@
                       placeholder=""
                       filterable
                       clearable
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
                     >
                       <el-option
                         v-for="item in dc_data.SALE_STATUS"
                         :key="item.id"
-                        :popper-append-to-body="false"
-                        popper-class="statistic_base"
                         :label="item.label"
                         :value="item.value"
                       />
@@ -291,14 +275,10 @@
                       placeholder=""
                       filterable
                       clearable
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
                     >
                       <el-option
                         v-for="item in dc_data.REGIONALISM_CODE"
                         :key="item.id"
-                        :popper-append-to-body="false"
-                        popper-class="statistic_base"
                         :label="item.label"
                         :value="item.value"
                       />
@@ -357,14 +337,10 @@
                       placeholder=""
                       filterable
                       clearable
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
                     >
                       <el-option
                         v-for="item in groupList"
                         :key="item.id"
-                        :popper-append-to-body="false"
-                        popper-class="statistic_base"
                         :label="item.groupName"
                         :value="item.id"
                       />

src/views/parkAssets/parkRoom/index.vue

@@ -290,8 +290,6 @@
                   <el-form-item prop="roomUse">
                     <el-select
                       v-model="houseForm.roomUse"
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
                       placeholder=""
                       filterable
                       clearable
@@ -300,8 +298,6 @@
                       <el-option
                         v-for="item in dc_data.HOUSE_USAGE"
                         :key="item.value"
-                        popper-class="statistic_base"
-                        :popper-append-to-body="false"
                         :label="item.label"
                         :value="item.value"
                       />
@@ -325,14 +321,10 @@
                       filterable
                       clearable
                       :disabled="isView"
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
                     >
                       <el-option
                         v-for="item in dc_data.DECORATION_SITUATION"
                         :key="item.value"
-                        :popper-append-to-body="false"
-                        popper-class="statistic_base"
                         :label="item.label"
                         :value="item.value"
                       />
@@ -355,15 +347,11 @@
                       placeholder=""
                       filterable
                       clearable
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
                       @change="houseTypeChange"
                     >
                       <el-option
                         v-for="item in houseTypeOption"
                         :key="item.value"
-                        :popper-append-to-body="false"
-                        popper-class="statistic_base"
                         :label="item.label"
                         :value="item.value"
                       />
@@ -419,14 +407,10 @@
                       size="small"
                       :disabled="isView"
                       clearable
-                      :popper-append-to-body="false"
-                      popper-class="statistic_base"
                     >
                       <el-option
                         v-for="item in dc_data.SALE_STATUS"
                         :key="item.value"
-                        :popper-append-to-body="false"
-                        popper-class="statistic_base"
                         :label="item.label"
                         :value="item.value"
                       />

src/views/receiveRefundsManagement/depositManagement/index.vue

@@ -4,6 +4,22 @@
       <el-col :span="24">
         <span>姓名&nbsp;</span>
         <el-input v-model="search.buyerName" class="ch-input ch-input-size" placeholder="买受人" size="small" @keyup.enter.native="handleSearch()" />
+        <span>定金状态&nbsp;</span>
+        <el-select
+          v-model="search.status"
+          clearable
+          filterable
+          placeholder="定金状态"
+          size="small"
+          @change="handleSearch"
+        >
+          <el-option
+            v-for="item in dc_data.DEPOSIT_STATUS"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
       </el-col>
     </el-row>
     <el-row class="handle-box" style="margin-bottom: 10px">

src/views/receiveRefundsManagement/intentionalDepositManagement/toDeposit.vue

@@ -245,6 +245,7 @@ export default {
                 groupId: this.form.groupId,
                 discId: this.form.discId
             }
+            console.log('data', data)
             // 新vue时调用的方法
             this.$nextTick(() => {
                 this.$refs.addHouse.initData(data)

src/views/receiveRefundsManagement/maintenanceFundsManagement/addFunds.vue

@@ -203,7 +203,10 @@ export default {
             this.$refs.form.validate(valid => {
                 if (valid) {
                     _this.loading = true
-                    const soaUrl = 'add'
+                    let soaUrl = 'add'
+                    if (_this.form.id) {
+                        soaUrl = 'edit'
+                    }
                     const extraData = {
                         paymentVoucher: JSON.stringify(_this.fileList),
                         contractId: this.contractId

src/views/receiveRefundsManagement/maintenanceFundsManagement/index.vue

@@ -27,7 +27,7 @@
       <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 type="primary" size="small" style="float: right" @click="downLoad()">&nbsp;专项维修资金凭证</el-button>
+<!--        <el-button type="primary" size="small" style="float: right" @click="downLoad()">&nbsp;专项维修资金凭证</el-button>-->
       </el-col>
     </el-row>
     <el-row class="handle-box">
@@ -58,7 +58,7 @@
           </el-table-column>
           <el-table-column header-align="center" label="操作" width="180">
             <template scope="scope">
-              <el-button :disabled="scope.row.fundCollectionStatus !== 1" size="mini" type="text" @click="handleEdit(scope.row)">收款登记</el-button>
+              <el-button size="mini" type="text" @click="handleEdit(scope.row)">收款登记</el-button>
               <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
             </template>
           </el-table-column>

src/views/receiveRefundsManagement/paymentManagement/addPayment.vue

@@ -207,7 +207,7 @@ export default {
 
             this.getBankOptions()
             this.initDict(this.dc_key).then(res => {
-                this.contentTypeOption = this.dc_data.CONTENT_TYPE.filter(item => item.label !== '定金' &&
+                this.contentTypeOption = this.dc_data.CONTENT_TYPE.filter(item =>
                     item.label !== '专项维修资金' && item.label !== '意向金')
                 if (data.id) {
                     this.getById(data)

src/views/receiveRefundsManagement/paymentManagement/index.vue

@@ -12,8 +12,6 @@
           clearable
           filterable
           placeholder="收款状态"
-          :popper-append-to-body="false"
-          popper-class="statistic_base"
           size="small"
           @change="handleSearch"
         >
@@ -22,8 +20,6 @@
             :key="item.value"
             :label="item.label"
             :value="item.value"
-            :popper-append-to-body="false"
-            popper-class="statistic_base"
           />
         </el-select>
       </el-col>

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>

src/views/signingManagement/contractManagement/contractAdd.vue

@@ -355,6 +355,9 @@ export default {
             dialogVisible: false,
             dialogTitle: '新增',
             form: {
+                downPaymentsProportion: '',
+                paymentMethod: '',
+                institution: '',
                 dynamicItem: [
                     {
                         id: '',

src/views/signingManagement/contractManagement/index.vue

@@ -122,7 +122,7 @@
       custom-class="tagdialog"
       @close="getData"
     >
-      <contract-add v-if="dialogVisible" ref="contractAdd" @cancel="cancel" />
+      <contract-add ref="contractAdd" @cancel="cancel" />
     </el-dialog>
 
   </div>

vue.config.js

@@ -54,7 +54,7 @@ module.exports = {
         proxy: {
             // 配置跨域
             "/webServer": {
-                target: 'https://www.idea-co-sf.com/settleDownApi',
+                target: 'http://localhost:9001',
                 ws: true,
                 changOrigin: true, // 允许跨域
                 pathRewrite: {