LAPTOP-FO2T5SIU\35838 8 months ago
parent
commit
aa325bda26

+ 29 - 4
src/views/customerManagement/numberManagement/addCustomer.vue

@@ -61,7 +61,10 @@
                     </el-form-item>
                     </el-form-item>
                   </el-col>
                   </el-col>
                   <el-col :span="4" class="col-input">
                   <el-col :span="4" class="col-input">
-                    <el-form-item :prop="'dynamicItem.' + index + '.identityCard'">
+                    <el-form-item
+                      :prop="'dynamicItem.' + index + '.identityCard'"
+                      :rules="rules.identityCard"
+                    >
                       <el-input
                       <el-input
                         v-model="item.identityCard"
                         v-model="item.identityCard"
                         placeholder="请填写身份证号"
                         placeholder="请填写身份证号"
@@ -69,7 +72,10 @@
                     </el-form-item>
                     </el-form-item>
                   </el-col>
                   </el-col>
                   <el-col :span="4" class="col-input">
                   <el-col :span="4" class="col-input">
-                    <el-form-item :prop="'dynamicItem.' + index + '.phone'">
+                    <el-form-item
+                      :prop="'dynamicItem.' + index + '.phone'"
+                      :rules="rules.phone"
+                    >
                       <el-input
                       <el-input
                         v-model="item.phone"
                         v-model="item.phone"
                         placeholder="请填写手机号"
                         placeholder="请填写手机号"
@@ -129,6 +135,18 @@ export default {
     components: { },
     components: { },
     mixins: [Base, BaseData],
     mixins: [Base, BaseData],
     data() {
     data() {
+        var checkPhone = (rule, value, callback) => { // 手机号验证
+            if (!value) {
+                return callback(new Error('手机号不能为空'))
+            } else {
+                const reg = /^1[3456789]\d{9}$/
+                if (reg.test(value)) {
+                    callback()
+                } else {
+                    return callback(new Error('请输入正确的手机号'))
+                }
+            }
+        }
         return {
         return {
             dc_key: ['RELATIONSHIP'],
             dc_key: ['RELATIONSHIP'],
             form: {
             form: {
@@ -144,7 +162,13 @@ export default {
                 ]
                 ]
             },
             },
             rules: {
             rules: {
-
+                phone: [{ required: true, message: '请输入手机号', trigger: 'blur' }, {
+                    validator: checkPhone, trigger: 'blur'
+                }],
+                identityCard: [
+                    { required: true, message: '请输入身份证ID', trigger: 'blur' },
+                    { pattern: /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/, message: '身份证格式不正确' }
+                ]
             },
             },
             addLoading: false,
             addLoading: false,
             options: [],
             options: [],
@@ -180,7 +204,8 @@ export default {
                             name: item.name,
                             name: item.name,
                             identityCard: item.identityCard,
                             identityCard: item.identityCard,
                             phone: item.phone,
                             phone: item.phone,
-                            relationship: item.relationship
+                            relationship: item.relationship,
+                            orderNum: item.orderNum
                         }
                         }
                         this.form.dynamicItem.push(data)
                         this.form.dynamicItem.push(data)
                     })
                     })

+ 4 - 0
src/views/invoice/invoiceBank.vue

@@ -38,6 +38,10 @@
       top="50px"
       top="50px"
       :close-on-press-escape="false"
       :close-on-press-escape="false"
       :close-on-click-modal="false"
       :close-on-click-modal="false"
+      class="statistic_base"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      custom-class="tagdialog"
       @close="handleClose"
       @close="handleClose"
     >
     >
       <invoice-bank-edit v-if="dialogVisible" ref="edit" @editClose="handleClose" />
       <invoice-bank-edit v-if="dialogVisible" ref="edit" @editClose="handleClose" />

+ 20 - 15
src/views/parkAssets/parkRoom/index.vue

@@ -230,29 +230,29 @@
               <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-col :span="9" class="col-input">
-                  <el-form-item prop="roomNo">
-                    <el-input v-model="houseForm.predictionInternalArea" :disabled="isView" />
+                  <el-form-item prop="predictionInternalArea">
+                    <el-input v-model="houseForm.predictionInternalArea" :disabled="isView" type="number" />
                   </el-form-item>
                   </el-form-item>
                 </el-col>
                 </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-col :span="9" class="col-input">
-                  <el-form-item prop="roomNo">
-                    <el-input v-model="houseForm.predictionShareArea" :disabled="isView" />
+                  <el-form-item prop="predictionShareArea">
+                    <el-input v-model="houseForm.predictionShareArea" :disabled="isView" type="number" />
                   </el-form-item>
                   </el-form-item>
                 </el-col>
                 </el-col>
               </el-row>
               </el-row>
               <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-col :span="9" class="col-input">
-                  <el-form-item prop="roomNo">
-                    <el-input v-model="houseForm.predictionBuildArea" :disabled="isView" />
+                  <el-form-item prop="predictionBuildArea">
+                    <el-input v-model="houseForm.predictionBuildArea" :disabled="isView" type="number" />
                   </el-form-item>
                   </el-form-item>
                 </el-col>
                 </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-col :span="9" class="col-input">
-                  <el-form-item prop="roomNo">
-                    <el-input v-model="houseForm.predictionLandArea" :disabled="isView" />
+                  <el-form-item prop="predictionLandArea">
+                    <el-input v-model="houseForm.predictionLandArea" :disabled="isView" type="number" />
                   </el-form-item>
                   </el-form-item>
                 </el-col>
                 </el-col>
               </el-row>
               </el-row>
@@ -260,13 +260,13 @@
                 <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-col :span="9" class="col-input">
                   <el-form-item prop="actualInternalArea">
                   <el-form-item prop="actualInternalArea">
-                    <el-input v-model="houseForm.actualInternalArea" :disabled="isView" />
+                    <el-input v-model="houseForm.actualInternalArea" :disabled="isView" type="number" />
                   </el-form-item>
                   </el-form-item>
                 </el-col>
                 </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-col :span="9" class="col-input">
                   <el-form-item prop="actualShareArea">
                   <el-form-item prop="actualShareArea">
-                    <el-input v-model="houseForm.actualShareArea" :disabled="isView" />
+                    <el-input v-model="houseForm.actualShareArea" :disabled="isView" type="number" />
                   </el-form-item>
                   </el-form-item>
                 </el-col>
                 </el-col>
               </el-row>
               </el-row>
@@ -274,13 +274,13 @@
                 <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-col :span="9" class="col-input">
                   <el-form-item prop="actualBuildArea">
                   <el-form-item prop="actualBuildArea">
-                    <el-input v-model="houseForm.actualBuildArea" :disabled="isView" />
+                    <el-input v-model="houseForm.actualBuildArea" :disabled="isView" type="number" />
                   </el-form-item>
                   </el-form-item>
                 </el-col>
                 </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-col :span="9" class="col-input">
                   <el-form-item prop="actualLandArea">
                   <el-form-item prop="actualLandArea">
-                    <el-input v-model="houseForm.actualLandArea" :disabled="isView" />
+                    <el-input v-model="houseForm.actualLandArea" :disabled="isView" type="number" />
                   </el-form-item>
                   </el-form-item>
                 </el-col>
                 </el-col>
               </el-row>
               </el-row>
@@ -339,8 +339,8 @@
                     </el-select>
                     </el-select>
                   </el-form-item>
                   </el-form-item>
                 </el-col>
                 </el-col>
-                <el-col :span="2" class="col-txt"><span>2.2M以</span></el-col>
-                <el-col :span="10" class="col-input">
+                <el-col :span="3" class="col-txt"><span>2.2米以上面积</span></el-col>
+                <el-col :span="9" class="col-input">
                   <el-form-item>
                   <el-form-item>
                     <el-input v-model="houseForm.twoPointTwo" :disabled="isView" />
                     <el-input v-model="houseForm.twoPointTwo" :disabled="isView" />
                   </el-form-item>
                   </el-form-item>
@@ -854,7 +854,7 @@ export default {
                 cancelButtonText: '取消',
                 cancelButtonText: '取消',
                 type: 'warning'
                 type: 'warning'
             }).then(() => {
             }).then(() => {
-                this.baseRequest('delete', { id: val }).then(res => {
+                this.baseRequest('delete', { id: val.id }).then(res => {
                     if (res.data.code == 200) {
                     if (res.data.code == 200) {
                         this.getData()
                         this.getData()
                         this.getTreeData()
                         this.getTreeData()
@@ -862,6 +862,11 @@ export default {
                             type: 'success',
                             type: 'success',
                             message: '删除成功!'
                             message: '删除成功!'
                         })
                         })
+                    } else {
+                        this.$message({
+                            type: 'error',
+                            message: res.data.msg
+                        })
                     }
                     }
                 }).catch((err) => {
                 }).catch((err) => {
                     this.$message({
                     this.$message({