bug修复

src/views/customerManagement/intentionalDeposit/addIntentionalDeposit.vue

@@ -12,13 +12,13 @@
             <el-row>
               <el-col :span="3" class="col-txt"><span>*应收定金（元）</span></el-col>
               <el-col :span="9" class="col-input">
-                <el-form-item>
+                <el-form-item prop="receivableMoney">
                   <el-input v-model="form.receivableMoney" />
                 </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-form-item prop="receivedAmount">
                   <el-input v-model="form.receivedAmount" />
                 </el-form-item>
               </el-col>
@@ -26,7 +26,7 @@
             <el-row>
               <el-col :span="3" class="col-txt"><span>*收款方式</span></el-col>
               <el-col :span="9" class="col-input">
-                <el-form-item>
+                <el-form-item prop="paymentMethod">
                   <el-select
                     v-model="form.paymentMethod"
                     :popper-append-to-body="false"
@@ -46,9 +46,9 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="3" class="col-txt"><span>收款时间</span></el-col>
+              <el-col :span="3" class="col-txt"><span>*收款时间</span></el-col>
               <el-col :span="9" class="col-input">
-                <el-form-item>
+                <el-form-item prop="collectionTime">
                   <el-date-picker
                     v-model="form.collectionTime"
                     popper-class="statistic_base"

src/views/customerManagement/numberManagement/addCustomer.vue

@@ -238,7 +238,7 @@ export default {
                             _this.cancel()
                         } else {
                             _this.$message({
-                                message: res.msg,
+                                message: res.data.msg,
                                 type: 'warning'
                             })
                         }

src/views/customerManagement/numberManagement/index.vue

@@ -24,7 +24,7 @@
       </el-col>
       <el-col :span="24">
         <div style="display: flex;align-items: center">
-          <div style="    white-space: break-spaces;">项目</div>
+          <div style="    white-space: nowrap;">项目</div>
           <div class="listBox">
             <div
               v-for="item in groupOption"
@@ -39,9 +39,9 @@
           </div>
         </div>
       </el-col>
-      <el-col :span="24">
+      <el-col v-if="discOption.length > 0" :span="24">
         <div style="display: flex;align-items: center">
-          <div style="    white-space: break-spaces;">分期</div>
+          <div style="    white-space: nowrap;">分期</div>
           <div class="listBox">
             <div
               v-for="item in discOption"
@@ -267,8 +267,8 @@ export default {
         }
     },
     mounted() {
-        this.getGroupList()
-        this.getDiscList()
+        this.getGroupList(true)
+        // this.getDiscList()
         this.initDict(this.dc_key).then((res) => {
             this.getData()
         })
@@ -308,6 +308,7 @@ export default {
             }
             this.groupIds = []
             this.discIds = []
+            this.discOption = []
             this.handleSearch()
         },
         handleAdd() {
@@ -431,6 +432,7 @@ export default {
                 this.groupIds.push(i)
             }
             this.search.groupIds = this.groupIds.join(',')
+            this.getDiscList()
         },
         checkedFQBox(i) {
             if (this.discIds.includes(i)) {
@@ -451,7 +453,7 @@ export default {
             this.dialogIntentionalVisible = false
             this.dialogAbandonVisible = false
         },
-        getGroupList() {
+        getGroupList(firstLoad) {
             this.groupOption = []
             this.baseParkRequest('listAll', {}).then(res => {
                 if (res.data) {
@@ -467,12 +469,18 @@ export default {
                         }
                         this.groupOption.push(obj)
                     })
+                    if (firstLoad) {
+                        this.checkedBox(this.groupOption[1].value)
+                    }
                 }
             })
         },
         getDiscList() {
             this.discOption = []
-            this.baseFQRequest('listAll', {}).then(res => {
+            const data = {
+                groupIds: this.search.groupIds
+            }
+            this.baseFQRequest('listAll', data).then(res => {
                 if (res.data) {
                     const idArr = res.data.map(obj => { return obj.id })
                     this.discOption.push({

src/views/customerManagement/roomChose/roomIndex.vue

@@ -99,6 +99,22 @@
               </el-checkbox-group>
             </el-col>
           </el-row>
+          <el-row class="lineheight20">
+            <el-col :span="2">
+              选房状态：
+            </el-col>
+            <el-col :span="22">
+              <el-checkbox-group
+                v-model="chooseStatus"
+              >
+                <el-checkbox
+                  v-for="item in chooseOptions"
+                  :key="item.value"
+                  :label="item.value"
+                >{{ item.label }}</el-checkbox>
+              </el-checkbox-group>
+            </el-col>
+          </el-row>
           <el-row class="lineheight20">
             <el-col :span="4">
               <div style="margin-top: 6px">套内面积（㎡）：</div>
@@ -177,8 +193,8 @@
               <el-table-column label="选房状态" prop="isChooseStr" />
               <el-table-column label="操作" header-align="center" width="250">
                 <template scope="scope">
-                  <el-button size="mini" type="text" @click="handleEdit(scope.row)">编辑</el-button>
-                  <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>
+                  <!--                  <el-button size="mini" type="text" @click="handleEdit(scope.row)">编辑</el-button>-->
+                  <!--                  <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>-->
                   <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
                 </template>
               </el-table-column>
@@ -532,6 +548,7 @@ export default {
             roomUse: [],
             saleStatus: [],
             soldStatus: [],
+            chooseStatus: [],
             decorationSituation: [],
             isView: false,
             fileList: [],
@@ -628,6 +645,7 @@ export default {
             this.roomUse = []
             this.saleStatus = []
             this.soldStatus = []
+            this.chooseStatus = []
             this.decorationSituation = []
             this.getData()
         },
@@ -659,6 +677,7 @@ export default {
             _this.queryParam.roomUse = _this.roomUse.join(',')
             _this.queryParam.saleStatus = _this.saleStatus.join(',')
             _this.queryParam.soldStatus = _this.soldStatus.join(',')
+            _this.queryParam.chooseStatus = _this.chooseStatus.join(',')
             _this.queryParam.decorationSituation = _this.decorationSituation.join(',')
 
             _this.baseRequest('listByModel', _this.queryParam).then((res) => {

src/views/customerManagement/subscribe/addSubscribe.vue

@@ -12,13 +12,13 @@
             <el-row>
               <el-col :span="3" class="col-txt"><span>*应收定金（元）</span></el-col>
               <el-col :span="9" class="col-input">
-                <el-form-item>
+                <el-form-item prop="receivableMoney">
                   <el-input v-model="form.receivableMoney" />
                 </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-form-item prop="receivedAmount">
                   <el-input v-model="form.receivedAmount" />
                 </el-form-item>
               </el-col>
@@ -26,7 +26,7 @@
             <el-row>
               <el-col :span="3" class="col-txt"><span>*收款方式</span></el-col>
               <el-col :span="9" class="col-input">
-                <el-form-item>
+                <el-form-item prop="paymentMethod">
                   <el-select
                     v-model="form.paymentMethod"
                     :popper-append-to-body="false"
@@ -46,9 +46,9 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="3" class="col-txt"><span>收款时间</span></el-col>
+              <el-col :span="3" class="col-txt"><span>*收款时间</span></el-col>
               <el-col :span="9" class="col-input">
-                <el-form-item>
+                <el-form-item prop="collectionTime">
                   <el-date-picker
                     v-model="form.collectionTime"
                     popper-class="statistic_base"
@@ -98,7 +98,7 @@
     </el-form>
     <div style="text-align: right">
       <el-button @click="cancel">取 消</el-button>
-      <el-button v-if="isView" type="primary" @click="confirmSubmit()">提 交</el-button>
+      <el-button v-if="!isView" type="primary" @click="confirmSubmit()">提 交</el-button>
     </div>
 
   </div>
@@ -137,9 +137,7 @@ export default {
     methods: {
         initData(data) {
             this.form = data
-            if (data.isView) {
-                this.isView = data.isView
-            }
+            this.isView = data.isView
             this.initDict(this.dc_key).then(res => {
                 if (data.statusStr === '未收取') {
                     this.getSerialNumber(data)

src/views/customerManagement/subscribe/subscribeIndex.vue

@@ -120,6 +120,7 @@ export default {
         },
         handleAdd(val) {
             this.dialogAddVisible = true
+            val.isView = false
             // 新vue时调用的方法
             this.$nextTick(() => {
                 this.$refs.addSubscribe.initData(val)
@@ -127,6 +128,7 @@ export default {
         },
         handleEdit(val) {
             this.dialogAddVisible = true
+            val.isView = false
             // 新vue时调用的方法
             this.$nextTick(() => {
                 this.$refs.addSubscribe.initData(val)

src/views/parkAssets/parkFloorDisc/index.vue

@@ -413,7 +413,7 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="4" class="col-txt"><span>共持比例</span></el-col>
+                <el-col :span="4" class="col-txt"><span>共持比例（%）</span></el-col>
                 <el-col :span="20" class="col-input">
                   <el-form-item>
                     <el-input v-model="formLP.proportion" oninput="value=value.replace(/[^\d.]/g,'')" />
@@ -715,7 +715,7 @@ export default {
         handleAddFQ: function() {
             this.formLP = this.getBaseForm()
             this.dialogFQVisible = true
-            this.dialogTitle = '新增楼盘'
+            this.dialogTitle = '新增分期'
         },
 
         confirmSubmit: function() {

src/views/parkAssets/parkRoom/index.vue

@@ -228,30 +228,30 @@
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="3" class="col-txt"><span>*预测套内面积(㎡)</span></el-col>
+                <el-col :span="3" class="col-txt"><span>预测套内面积(㎡)</span></el-col>
                 <el-col :span="9" class="col-input">
-                  <el-form-item prop="predictionInternalArea">
+                  <el-form-item>
                     <el-input v-model="houseForm.predictionInternalArea" :disabled="isView" type="number" />
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="3" class="col-txt"><span>*预测分摊面积(㎡)</span></el-col>
+                <el-col :span="3" class="col-txt"><span>预测分摊面积(㎡)</span></el-col>
                 <el-col :span="9" class="col-input">
-                  <el-form-item prop="predictionShareArea">
+                  <el-form-item>
                     <el-input v-model="houseForm.predictionShareArea" :disabled="isView" type="number" />
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row>
-                <el-col :span="3" class="col-txt"><span>*预测建筑面积(㎡)</span></el-col>
+                <el-col :span="3" class="col-txt"><span>预测建筑面积(㎡)</span></el-col>
                 <el-col :span="9" class="col-input">
-                  <el-form-item prop="predictionBuildArea">
+                  <el-form-item>
                     <el-input v-model="houseForm.predictionBuildArea" :disabled="isView" type="number" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="3" class="col-txt"><span>*预测土地面积(㎡)</span></el-col>
+                <el-col :span="3" class="col-txt"><span>预测土地面积(㎡)</span></el-col>
                 <el-col :span="9" class="col-input">
-                  <el-form-item prop="predictionLandArea">
+                  <el-form-item>
                     <el-input v-model="houseForm.predictionLandArea" :disabled="isView" type="number" />
                   </el-form-item>
                 </el-col>
@@ -277,9 +277,9 @@
                     <el-input v-model="houseForm.actualBuildArea" :disabled="isView" type="number" />
                   </el-form-item>
                 </el-col>
-                <el-col :span="3" class="col-txt"><span>*实测土地面积(㎡)</span></el-col>
+                <el-col :span="3" class="col-txt"><span>实测土地面积(㎡)</span></el-col>
                 <el-col :span="9" class="col-input">
-                  <el-form-item prop="actualLandArea">
+                  <el-form-item>
                     <el-input v-model="houseForm.actualLandArea" :disabled="isView" type="number" />
                   </el-form-item>
                 </el-col>
@@ -308,9 +308,9 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="3" class="col-txt"><span>*户编号</span></el-col>
+                <el-col :span="3" class="col-txt"><span>户编号</span></el-col>
                 <el-col :span="9" class="col-input">
-                  <el-form-item prop="roomNumber">
+                  <el-form-item>
                     <el-input v-model="houseForm.roomNumber" :disabled="isView" />
                   </el-form-item>
                 </el-col>
@@ -501,16 +501,16 @@ export default {
                 findids: [{ required: true, trigger: 'blur', message: '请选择父级' }],
                 roomNo: [{ required: true, trigger: 'blur', message: '请输入户室号' }],
                 floor: [{ required: true, trigger: 'blur', message: '请输入所在层' }],
-                predictionInternalArea: [{ required: true, trigger: 'blur', message: '请输入预测套内面积' }],
-                predictionShareArea: [{ required: true, trigger: 'blur', message: '请输入预测分摊面积' }],
-                predictionBuildArea: [{ required: true, trigger: 'blur', message: '请输入预测建筑面积' }],
-                predictionLandArea: [{ required: true, trigger: 'blur', message: '请输入预测土地面积' }],
+                // predictionInternalArea: [{ required: true, trigger: 'blur', message: '请输入预测套内面积' }],
+                // predictionShareArea: [{ required: true, trigger: 'blur', message: '请输入预测分摊面积' }],
+                // predictionBuildArea: [{ required: true, trigger: 'blur', message: '请输入预测建筑面积' }],
+                // predictionLandArea: [{ required: true, trigger: 'blur', message: '请输入预测土地面积' }],
                 actualInternalArea: [{ required: true, trigger: 'blur', message: '请输入实测分摊面积' }],
                 actualShareArea: [{ required: true, trigger: 'blur', message: '请输入实测分摊面积' }],
                 actualBuildArea: [{ required: true, trigger: 'blur', message: '请输入实测建筑面积' }],
-                actualLandArea: [{ required: true, trigger: 'blur', message: '请输入实测土地面积' }],
+                // actualLandArea: [{ required: true, trigger: 'blur', message: '请输入实测土地面积' }],
                 roomUse: [{ required: true, trigger: 'blur', message: '请输入用途' }],
-                roomNumber: [{ required: true, trigger: 'blur', message: '请输入户编号' }]
+                // roomNumber: [{ required: true, trigger: 'blur', message: '请输入户编号' }]
             },
 
             roomId: '',

src/views/signingManagement/contractManagement/contractAdd.vue

@@ -13,9 +13,9 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="5" class="col-txt"><span>*合同编号</span></el-col>
+              <el-col :span="5" class="col-txt"><span>合同编号</span></el-col>
               <el-col :span="18" class="col-input">
-                <el-form-item prop="contractNumber">
+                <el-form-item>
                   <el-input v-model="form.contractNumber" />
                 </el-form-item>
               </el-col>
@@ -95,7 +95,7 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="5" class="col-txt"><span>*实测建筑面积</span></el-col>
+              <el-col :span="5" class="col-txt"><span>*实测建筑面积（㎡）</span></el-col>
               <el-col :span="18" class="col-input">
                 <el-form-item prop="actualBuildArea">
                   <el-input v-model="form.actualBuildArea" readonly />
@@ -103,7 +103,7 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="5" class="col-txt"><span>套内建筑面积</span></el-col>
+              <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.actualInternalArea" readonly />
@@ -111,7 +111,7 @@
               </el-col>
             </el-row>
             <el-row>
-              <el-col :span="5" class="col-txt"><span>分摊共有建筑</span></el-col>
+              <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.actualShareArea" readonly />
@@ -159,7 +159,7 @@
             <el-row>
               <el-col :span="5" class="col-txt"><span>备注说明</span></el-col>
               <el-col :span="18" class="col-input">
-                <el-input v-model="form.remark" type="textarea" maxlength="2000" show-word-limit :disabled="isView" />
+                <el-input v-model="form.remark" type="textarea" maxlength="2000" show-word-limit />
               </el-col>
             </el-row>
             <el-row>
@@ -188,7 +188,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.buyerProportion" @input="proportionChange" type="number" />
+                  <el-input v-model="form.buyerProportion" type="number" @input="proportionChange" />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -248,20 +248,20 @@
                 </el-form-item>
               </el-col>
             </el-row>
-            <el-row>
-              <el-col :span="5" class="col-txt"><span>付款截止日</span></el-col>
-              <el-col :span="18" 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-row>
+            <!--            <el-row>-->
+            <!--              <el-col :span="5" class="col-txt"><span>付款截止日</span></el-col>-->
+            <!--              <el-col :span="18" 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-row>-->
             <el-row>
               <el-divider />
             </el-row>
@@ -379,7 +379,7 @@ export default {
                 ]
             },
             rules: {
-                contractNumber: [{ required: true, trigger: 'blur', message: '请输入合同编号' }],
+                // contractNumber: [{ required: true, trigger: 'blur', message: '请输入合同编号' }],
                 actualBuildArea: [{ required: true, trigger: 'blur', message: '实测建筑面积' }]
             },
             contractOriginalList: [],
@@ -462,6 +462,10 @@ export default {
         },
         confirmSubmit: function(type) {
             const _this = this
+            if (!_this.form.recordNumber && !_this.form.contractNumber) {
+                _this.$message.warning('网签备案号/合同编号,必须至少填写其一')
+                return
+            }
             const p1 = new Promise((resolve, reject) => {
                 this.$refs['form'].validate((valid) => {
                     if (valid) resolve()

src/views/signingManagement/contractManagement/index.vue

@@ -8,7 +8,7 @@
         <el-input v-model="search.houseName" class="ch-input ch-input-size" placeholder="房屋" size="small" @keyup.enter.native="handleSearch()" />
         <span>合同状态&nbsp;</span>
         <el-select
-          v-model="search.status"
+          v-model="search.contractStatus"
           clearable
           filterable
           placeholder="合同状态"
@@ -60,8 +60,8 @@
           <el-table-column label="房屋" prop="houseName" width="200" />
           <el-table-column label="实测建筑面积（㎡）" prop="actualBuildArea" width="110" />
           <el-table-column label="买卖单价（㎡）" prop="housePrice" />
-          <el-table-column label="买受人产权份额占比" prop="buyerProportion" />
-          <el-table-column label="付款方式" prop="paymentMethod" />
+          <el-table-column label="买受人产权份额占比" prop="buyerProportionStr" />
+          <el-table-column label="付款方式" prop="paymentMethodStr" />
           <el-table-column label="应收房款（元）" prop="totalPrice" />
           <el-table-column label="应收专项维修资金（元）" prop="maintenanceFunds" />
           <el-table-column label="合同状态" prop="contractStatusStr" width="110">
@@ -127,7 +127,7 @@ export default {
     mixins: [Base, BaseData],
     data() {
         return {
-            dc_key: ['CONTRACT_STATUS'],
+            dc_key: ['CONTRACT_STATUS', 'PAYMENT_METHODS'],
             // 列表相关
             search: {
             },
@@ -178,6 +178,8 @@ export default {
             this.handleSearch()
         },
         getItemJson: function(item) {
+            item.buyerProportionStr = item.buyerProportion + '%'
+            item.paymentMethodStr = this.dc_map.PAYMENT_METHODS[item.paymentMethod]
             item.contractStatusStr = this.dc_map.CONTRACT_STATUS[item.contractStatus]
             return item
         },