wucl пре 6 месеци
родитељ
комит
1d8c567b23

+ 19 - 2
src/components/personalForms/backgroundInfo.vue

@@ -9,7 +9,7 @@
               <el-col :xs="24" :sm="12" :lg="12" :span="6">
                 <el-form-item label="坐落:" prop="location" label-width="140px" class="postInfo-container-item" >
                   <el-autocomplete v-model="backgroundInfo.location" :fetch-suggestions="fetchSuggestions"  @select="handleSelect"
-                  placeholder="请输入小区名称" style="width:100%" clearable>
+                  placeholder="请输入坐落" style="width:100%" clearable>
                   </el-autocomplete>
                 </el-form-item>
               </el-col>
@@ -194,6 +194,10 @@ export default {
       type: Boolean,
       default: false
     },
+    linkAttributes: {
+      type: Object,
+      default: null
+    },
   },
   watch: {
     id: function (value) {
@@ -204,6 +208,11 @@ export default {
         this.backgroundInfo = value;
       }
     },
+    linkAttributes:function(value){
+      if (value) {
+        this.backgroundInfo = value;
+      }
+    }
   },
 
   computed: {
@@ -214,6 +223,8 @@ export default {
     this.backgroundInfo.id = this.id;
     if (this.backgroundInfoObject) {
       this.backgroundInfo = this.backgroundInfoObject;
+    }else{
+      this.backgroundInfo.location = this.linkAttributes.location;
     }
   },
   data() {
@@ -321,7 +332,13 @@ export default {
         const id = this.backgroundInfo.id;
         this.backgroundInfo = item;
         this.backgroundInfo.id = id;
-      }
+      },
+      refreshLinkAttributes(){
+            if (this.backgroundInfoObject == null) {
+                this.backgroundInfo.location = this.linkAttributes.location;
+            
+            }
+        }
   }
 }
 </script>

+ 2 - 2
src/components/personalForms/entityInfo.vue

@@ -270,7 +270,7 @@ export default {
       this.entityInfo = this.entityInfoObject;
     }
     if (this.entityInfoObject == null) {
-      this.entityInfo.communityName = this.linkAttributes.location;
+      this.entityInfo.communityName = this.linkAttributes.communityName;
       this.entityInfo.allFloor = this.linkAttributes.allFloor;
       this.entityInfo.acreage = this.linkAttributes.acreage;
       this.entityInfo.atFloor = this.linkAttributes.atFloor;
@@ -306,7 +306,7 @@ export default {
         atFloor: [{ required: true, message: '所在楼层不能为空', trigger: 'blur' }],
         aspect: [{ required: true, message: '朝向不能为空', trigger: 'blur' }],
         ladderToHouse: [{ required: true, message: '梯户数不能为空', trigger: 'blur' }],
-        floorHeight: [{ required: true, message: '层高不能为空', trigger: 'blur' }, { validator: isNumber, trigger: 'blur' }],
+        floorHeight: [{ required: true, message: '层高不能为空', trigger: 'blur' }],
         houseType: [{ required: true, message: '户型不能为空', trigger: 'blur' }],
         rightsToPurpose: [{ required: true, message: '产权用途不能为空', trigger: 'blur' }],
         realToPurpose: [{ required: true, message: '实际用途不能为空', trigger: 'blur' }],

+ 0 - 2
src/components/personalForms/houseCertificate.vue

@@ -309,8 +309,6 @@ export default {
         return {
             name: "houseCertificate",
             rules: {
-                bailor1Tel: [{ validator: phoneNumber, trigger: 'blur' }],
-                bailor2Tel: [{ validator: phoneNumber, trigger: 'blur' }],
                 bailor1IdNo: [{ validator: isIdNumber, trigger: 'blur' }],
                 bailor2IdNo: [{ validator: isIdNumber, trigger: 'blur' }],
                 allAcreage: [{ required: true, message: '建筑面积不能为空', trigger: 'blur' }, { validator: isNumber, trigger: 'blur' }],

+ 0 - 2
src/components/personalForms/immovableCertificate.vue

@@ -276,8 +276,6 @@ export default {
   data() {
     return {
       rules: {
-        bailor1Tel: [{ validator: phoneNumber, trigger: 'blur' }],
-        bailor2Tel: [{ validator: phoneNumber, trigger: 'blur' }],
         bailor1IdNo: [{ validator: isIdNumber, trigger: 'blur' }],
         bailor2IdNo: [{ validator: isIdNumber, trigger: 'blur' }],
         acreage: [{ required: true, message: '建筑面积不能为空', trigger: 'blur' }, { validator: isNumber, trigger: 'blur' }],

+ 14 - 9
src/components/personalForms/sellingAbilityInfo.vue

@@ -233,6 +233,10 @@ export default {
     outWardStaffId:{
       type: Number,
       required: true
+    },
+    valueTiming: {
+      type: String,
+      default: false
     }
   },
   watch: {
@@ -261,12 +265,13 @@ export default {
     this.sellingAbilityInfo.outStaffId = this.outWardStaffId;
     if (this.sellingAbilityInfoObject) {
       this.sellingAbilityInfo = this.sellingAbilityInfoObject;
+    }else{
+      this.sellingAbilityInfo.sceneDateD = this.valueTiming.split(" ")[0];
     }
     this.getOutStaffs();
     setTimeout(()=>{
       this.selectOutStaff();
       this.getLimitDate();
-      this.getYestoday();
     },1000)
    
   },
@@ -373,14 +378,14 @@ export default {
       this.$emit('custom-event', data);
     },
 
-    getYestoday(){
-      // 获取当前日期
-      var today = new Date();
-      // 获取昨天的日期
-      var yesterday = new Date(today);
-      yesterday.setDate(today.getDate() - 1);
-      this.sellingAbilityInfo.sceneDateD = yesterday;
-    }
+    // getYestoday(){
+    //   // 获取当前日期
+    //   var today = new Date();
+    //   // 获取昨天的日期
+    //   var yesterday = new Date(today);
+    //   yesterday.setDate(today.getDate() - 1);
+    //   this.sellingAbilityInfo.sceneDateD = yesterday;
+    // }
 
 
   }

+ 1 - 1
src/views/finance/fundList.vue

@@ -750,7 +750,7 @@ export default {
 
     exportData() {
       this.$utils.exportUtil(
-        "/financeRealFund/export", this.listQuery,
+        "/financeRealFund/not/claim/export", this.listQuery,
         "导出"
       );
     },

+ 24 - 16
src/views/personal/todoDetail.vue

@@ -788,14 +788,14 @@
           </el-tab-pane>
           <el-tab-pane name="backgroundInfo" class="pane-class" :lazy=true>
             <span slot="label"><i class="el-icon-paperclip"></i> 区位状况</span>
-            <BackgroundInfo @custom-event="getPersonalTarget()" :id="target.id"
-              :backgroundInfoObject="target.backgroundInfo" :editStatus="certificateCouldEdit"></BackgroundInfo>
+            <BackgroundInfo @custom-event="getPersonalTarget()" :id="target.id" ref="backgroundInfoComponet"
+              :backgroundInfoObject="target.backgroundInfo" :linkAttributes="linkAttributes" :editStatus="certificateCouldEdit"></BackgroundInfo>
           </el-tab-pane>
           <el-tab-pane name="sellingAbilityInfo" class="pane-class" :lazy=true>
             <span slot="label"><i class="el-icon-paperclip"></i> 变现能力</span>
             <SellingAbilityInfo @custom-event="getPersonalTarget()" :id="target.id"
               :sellingAbilityInfoObject="target.sellingAbility" :editStatus="certificateCouldEdit"
-              :outWardStaffId="personal.outwardStaff"></SellingAbilityInfo>
+              :outWardStaffId="personal.outwardStaff" :valueTiming="valueTiming"></SellingAbilityInfo>
           </el-tab-pane>
         </el-tabs>
       </el-tab-pane>
@@ -1154,6 +1154,7 @@ export default {
     },
     personal: {
       handler(newVal, oldVal) {
+        console.log(newVal,'personal')
         if (newVal.outwardStaff) {
           this.outwardStaffTip = false;
         } else {
@@ -1188,16 +1189,13 @@ export default {
     },
     target: {
       handler(newVal, oldVal) {
+        this.getPersonal();
         if (newVal.acreage != null && newVal.price != null && newVal.price !=null && newVal.price != 0) {
           let acrege = Decimal(newVal.acreage);
           let price = Decimal(newVal.price);
           let wan = Decimal(10000);
           let amount = acrege.mul(price).div(wan);
-          // console.log(acrege.toString())
-          // console.log(price.toString())
-          // console.log(amount.toString())
           newVal.amount = utils.roundToDecimalPlace(amount,2)
-          // console.log(newVal.amount)
         }
       
         if (newVal.id) {
@@ -1206,7 +1204,9 @@ export default {
         if (newVal.isOnline) {
           this.jumpTabs();
         }
-       
+        if (this.$refs.backgroundInfoComponet) {
+            this.$refs.backgroundInfoComponet.refreshLinkAttributes();
+        }
       },
       deep: true
     },
@@ -1568,7 +1568,8 @@ export default {
         allFloor: null,
         purpose: null,
         ownerName: null,
-        atFloor: null
+        atFloor: null,
+        communityName:null
 
       },
       statementProd: {
@@ -1636,7 +1637,8 @@ export default {
       checkerId:null,
       checkers:[],
       decideProduction:false,
-      checkStateFlag:false
+      checkStateFlag:false,
+      valueTiming:null
 
     }
   },
@@ -1668,11 +1670,11 @@ export default {
             res.data.credentials = JSON.parse(res.data.credentials);
             res.data.purpose = JSON.parse(res.data.purpose);
             this.personal = res.data;
-            this.linkAttributes.location = this.personal.location;
-            this.linkAttributes.bailor1 = this.personal.bailorA;
-            this.linkAttributes.bailor1Tel = this.personal.bailoraTel;
-            this.linkAttributes.bailor2 = this.personal.bailorB;
-            this.linkAttributes.bailor2Tel = this.personal.bailorbTel;
+            // this.linkAttributes.location = this.personal.location;
+            // this.linkAttributes.bailor1 = this.personal.bailorA;
+            // this.linkAttributes.bailor1Tel = this.personal.bailoraTel;
+            // this.linkAttributes.bailor2 = this.personal.bailorB;
+            // this.linkAttributes.bailor2Tel = this.personal.bailorbTel;
             this.linkAttributes.purpose = this.personal.purpose;
             if (this.personal.evaluateAim === '抵押') {
               this.linkAttributes.ownerName = this.personal.bailorA;
@@ -1700,18 +1702,21 @@ export default {
             }
             if (res.data.houseCertificate) {
               this.target.houseCertificate = JSON.parse(res.data.houseCertificate);
+              this.linkAttributes.location = this.target.houseCertificate.location;
             }
             if (res.data.landCertificate) {
-              this.target.landCertificate = JSON.parse(res.data.landCertificate);
+              this.target.landCertificate = JSON.parse(res.data.landCertificate)  ;
             }
             if (res.data.immovableCertificate) {
               this.target.immovableCertificate = JSON.parse(res.data.immovableCertificate);
+              this.linkAttributes.location = this.target.immovableCertificate.location;
             }
             if (res.data.entityInfo) {
               this.target.entityInfo = JSON.parse(res.data.entityInfo);
             }
             if (res.data.backgroundInfo) {
               this.target.backgroundInfo = JSON.parse(res.data.backgroundInfo);
+              this.linkAttributes.location = this.target.backgroundInfo.location;
             }
             if (res.data.sellingAbility) {
               this.target.sellingAbility = JSON.parse(res.data.sellingAbility);
@@ -1763,6 +1768,8 @@ export default {
       this.$api.workflowLog.list(param).then(res => {
         if (res.code === 200) {
           this.workflowLogs = res.data;
+          const sences = this.workflowLogs.filter(item=>item.nodeName=='现场勘查');
+          this.valueTiming = sences[sences.length-1].created
         }
       })
     },
@@ -2170,6 +2177,7 @@ export default {
             this.linkAttributes.allFloor = this.compareList.analysisData[6].target.valueB;
             this.linkAttributes.atFloor = this.compareList.analysisData[6].target.valueA;
             this.linkAttributes.houseType = this.compareList.analysisData[7].target.valueA;
+            this.linkAttributes.communityName = this.compareList.analysisData[0].target.valueA;
             this.selectCalculateType();
           }else {
             this.defalutYearMonth();