个贷、自动关联已存在的实物状况

src/api/modules/personalScene.js

@@ -4,13 +4,10 @@ import request from '@/utils/request'
 */
 export default {
   saveScene(params){
-    return request.post(`personalScene`, params)
+    return request.put(`personalScene/scene`, params)
   },
   getScene(params){
     return request.get(`personalScene/${params}`)
   },
-  updateScene(params){
-    return request.put(`personalScene`,params)
-  }
 
 }

src/api/modules/personalTarget.js

@@ -47,5 +47,8 @@ export default {
   },
   doFeedback(params){
     return request.put(`personalTarget/doFeedback`, params)
+  },
+  fuzzyLocation(params){
+    return request.post(`personalTarget/bg/fuzzy?location=${params}`)
   }
 }

src/components/personalForms/backgroundInfo.vue

@@ -7,8 +7,10 @@
             <el-divider content-position="left">地理位置</el-divider>
             <el-row class="row-style">
               <el-col :xs="24" :sm="12" :lg="12" :span="6">
-                <el-form-item label="坐落：" prop="location" label-width="140px" class="postInfo-container-item">
-                  <el-input v-model="backgroundInfo.location" class="filter-item" />
+                <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>
+                  </el-autocomplete>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="12" :span="6">
@@ -33,39 +35,43 @@
 
             <el-divider content-position="left">交通状况</el-divider>
             <el-row class="row-style">
-              <el-col :xs="24" :sm="12" :lg="6" :span="6">
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
                 <el-form-item label="路网道路1：" prop="road1" label-width="140px" class="postInfo-container-item">
                   <el-input v-model="backgroundInfo.road1" class="filter-item" />
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6" :span="6">
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
                 <el-form-item label="路网道路2：" prop="road2" label-width="140px" class="postInfo-container-item">
                   <el-input v-model="backgroundInfo.road2" class="filter-item" />
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            </el-row>
+              <el-row class="row-style">
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
                 <el-form-item label="路网道路3：" prop="road3" label-width="140px" class="postInfo-container-item">
                   <el-input v-model="backgroundInfo.road3" class="filter-item" />
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6" :span="6">
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
                 <el-form-item label="通达程度：" prop="roadSmooth" label-width="140px" class="postInfo-container-item">
                   <el-input v-model="backgroundInfo.roadSmooth" class="filter-item" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row class="row-style">
-              <el-col :xs="24" :sm="12" :lg="6" :span="6">
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
                 <el-form-item label="公交线路：" prop="pubTraffic" label-width="140px" class="postInfo-container-item">
                   <el-input v-model="backgroundInfo.pubTraffic" class="filter-item" />
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6" :span="6">
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
                 <el-form-item label="地铁：" prop="subway" label-width="140px" class="postInfo-container-item">
                   <el-input v-model="backgroundInfo.subway" class="filter-item" />
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            </el-row>
+            <el-row class="row-style">
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
                 <el-form-item label="公交便捷度：" prop="bgTraffic" label-width="140px" class="postInfo-container-item">
                   <el-select v-model="backgroundInfo.bgTraffic" placeholder="请选择" style="width:100%">
                     <el-option label="较好" value="较好"></el-option>
@@ -73,7 +79,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6" :span="6">
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
                 <el-form-item label="交通限制：" prop="trafficLimit" label-width="140px" class="postInfo-container-item">
                   <el-input v-model="backgroundInfo.trafficLimit" class="filter-item" />
                 </el-form-item>
@@ -82,29 +88,31 @@
 
             <el-divider content-position="left">公共配套</el-divider>
             <el-row class="row-style">
-              <el-col :xs="24" :sm="12" :lg="6" :span="6">
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
                 <el-form-item label="商业网点：" prop="businessPoint" label-width="140px" class="postInfo-container-item">
                   <el-input v-model="backgroundInfo.businessPoint" class="filter-item" />
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6" :span="6">
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
                 <el-form-item label="金融网点：" prop="financePoint" label-width="140px" class="postInfo-container-item">
                   <el-input v-model="backgroundInfo.financePoint" class="filter-item" />
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6" :span="6">
+            </el-row>
+            <el-row class="row-style">
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
                 <el-form-item label="教育设施：" prop="eduEquipment" label-width="140px" class="postInfo-container-item">
                   <el-input v-model="backgroundInfo.eduEquipment" class="filter-item" />
                 </el-form-item>
               </el-col>
-              <el-col :xs="24" :sm="12" :lg="6" :span="6">
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
                 <el-form-item label="文体设施：" prop="cultureEquipment" label-width="140px" class="postInfo-container-item">
                   <el-input v-model="backgroundInfo.cultureEquipment" class="filter-item" />
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row class="row-style">
-              <el-col :xs="24" :sm="12" :lg="6" :span="6">
+              <el-col :xs="24" :sm="12" :lg="12" :span="6">
                 <el-form-item label="医疗卫生：" prop="medicalInfo" label-width="140px" class="postInfo-container-item">
                   <el-input v-model="backgroundInfo.medicalInfo" class="filter-item" />
                 </el-form-item>
@@ -167,7 +175,6 @@
 
 <script>
 import YDetailPageLayout from '@/components/YDetailPageLayout/index_detail'
-import { isNumber } from '@/utils/validate'
 
 export default {
   name: "backgroundInfo",
@@ -257,7 +264,7 @@ export default {
         badFactors: '无',
         bgEnvir: '所在区域废气、噪音污染不明显，街道较整洁，绿化率较高，整体环境较好',
         bgBase: '估价对象区域基础设施完善，已实现“六通”（ 通上下水、电、气、讯、道路），区域基础设施完善。'
-      }
+      },
     }
 
   },
@@ -292,7 +299,29 @@ export default {
     // 组件事件
     callParentEvent(data) {
       this.$emit('custom-event', data);
-    }
+    },
+    fetchSuggestions(queryString, callback){
+      if (this.backgroundInfo.location){
+        const location = this.backgroundInfo.location;
+        var list = [{}]
+        this.$api.personalTarget.fuzzyLocation(location).then(res=>{
+
+          if (res.code === 200 && res.data.length>0){
+            for (let i of res.data) {
+              i.value = i.location;// 将想要展示的数据作为value
+            }
+            list = res.data;
+            callback(list)
+
+            }
+        })
+      }
+    },
+    handleSelect(item) {
+        const id = this.backgroundInfo.id;
+        this.backgroundInfo = item;
+        this.backgroundInfo.id = id;
+      }
   }
 }
 </script>

src/components/personalForms/entityInfo.vue

@@ -14,8 +14,8 @@
               <el-col :xs="24" :sm="12" :lg="6" :span="6">
                 <el-form-item label="房屋类型：" prop="buildingType" label-width="140px" class="postInfo-container-item">
                   <el-select v-model="entityInfo.buildingType" placeholder="请选择" style="width:100%">
-                    <el-option label="多层" value="多层"></el-option>
                     <el-option label="高层" value="高层"></el-option>
+                    <el-option label="多层" value="多层"></el-option>
                     <el-option label="独栋别墅" value="独栋别墅"></el-option>
                     <el-option label="联排别墅" value="联排别墅"></el-option>
                   </el-select>
@@ -335,7 +335,7 @@ export default {
       entityInfo: {
         id: null,
         communityName: null,
-        buildingType: '多层',
+        buildingType: '高层',
         allFloor: null,
         wallDecoration: null,
         buildingStructure: null,

src/components/personalForms/houseCertificate.vue

@@ -14,13 +14,13 @@
                                     </el-radio-group>
                                 </el-form-item>
                             </el-col>
-                            <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                            <el-col :xs="24" :sm="12" :lg="9" :span="6">
                                 <el-form-item label="房产证号：" prop="houseCertificateNo" label-width="140px"
                                     class="postInfo-container-item">
                                     <el-input v-model="certificate.houseCertificateNo" class="filter-item" />
                                 </el-form-item>
                             </el-col>
-                            <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                            <el-col :xs="24" :sm="12" :lg="9" :span="6">
                                 <el-form-item label="丘(地)号/档案保管号/业务件号：" prop="businessNo" label-width="250px"
                                     class="postInfo-container-item">
                                     <el-input v-model="certificate.businessNo" class="filter-item" />
@@ -164,13 +164,13 @@
                                     <el-input v-model="certificate.otherOwner" class="filter-item" />
                                 </el-form-item>
                             </el-col>
-                            <el-col :xs="24" :sm="12" :lg="6" :span="6">
+                            <el-col :xs="24" :sm="12" :lg="9" :span="6">
                                 <el-form-item label="共有证号：" prop="otherOwnerNo" label-width="140px"
                                     class="postInfo-container-item">
                                     <el-input v-model="certificate.otherOwnerNo" class="filter-item" />
                                 </el-form-item>
                             </el-col>
-                            <el-col :xs="24" :sm="12" :lg="12" :span="6">
+                            <el-col :xs="24" :sm="12" :lg="9" :span="6">
                                 <el-form-item label="土地使用权获得方式：" prop="landRightOwnType" label-width="180px"
                                     class="postInfo-container-item">
                                     <el-input v-model="certificate.landRightOwnType" class="filter-item" />

src/views/major/detail.vue

@@ -2624,7 +2624,7 @@
         if (this.activeTagName === 'quality'){
           this.getPerformance(this.majorId,(this.reportNo==null?this.statementNo:this.reportNo));
         }
-        if (tab.name === 'finance' && this.productionFinance.length == 0){
+        if (this.activeTagName === 'finance' && this.productionFinance.length == 0){
           this.getFinanceInvoiceAmountInfo();
         }
         // if (this.nodeBusinessInfo.currentNodeInstanceId){

src/views/market/payment/list.vue

@@ -128,7 +128,14 @@
         </el-form-item>
 
         <el-form-item label="回款名称：" prop="name" :rules="{ required: true, message: '请填写回款名称', trigger: 'blur' }">
-          <el-input v-model="temp.name" class="filter-item" />
+          <el-select v-model="temp.name" style="width: 100%;">
+              <el-option label="一次性付款" value="一次性付款"></el-option>
+              <el-option label="预付款" value="预付款"></el-option>
+              <el-option label="尾款" value="尾款"></el-option>
+              <el-option label="第一次回款" value="第一次回款"></el-option>
+              <el-option label="第二次回款" value="第二次回款"></el-option>
+              <el-option label="第三次回款" value="第三次回款"></el-option>
+          </el-select>
         </el-form-item>
 
         <el-form-item label="回款金额：" prop="amount" :rules="{ required: true, message: '请填写回款金额', trigger: 'blur' }">

src/views/personal/todoDetail.vue

@@ -444,7 +444,7 @@
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6" :span="6">
               <el-button  type="primary" round @click="savePrice()" style="margin-left: 20px;"
-                v-if="target.isOnline && ( currentNode.nodeCode === 'DETERMINE_PRICE' || currentNode.nodeCode === 'REVIEW_STATEMENT' 
+                v-if=" ( currentNode.nodeCode === 'DETERMINE_PRICE' || currentNode.nodeCode === 'REVIEW_STATEMENT' 
                 || currentNode.nodeCode === 'CHECK_REPORT' || currentNode.nodeCode === 'CHECK_LETTER')">保存</el-button>
             </el-col>
           </el-row>
@@ -493,7 +493,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="4" :span="6">
+            <el-col :xs="24" :sm="12" :lg="5" :span="6">
               <el-form-item label="计算方式：" prop="calculateType" label-width="120px"
                 :rules="{ required: true, message: '计算方式不能为空', trigger: 'blur' }" class="postInfo-container-item">
                 <el-select v-model="compareList.calculateType" clearable placeholder="请选择"
@@ -1105,6 +1105,9 @@ export default {
         if (newVal.id) {
           this.getProductions();
         }
+        if (newVal.isOnline){
+          this.jumpTabs();
+        }
       },
       deep: true
     },
@@ -1273,7 +1276,7 @@ export default {
         acreage: null,
         amount: null,
         price: null,
-        isOnline: false,
+        isOnline: null,
         feedback: null,
         houseCertificate: null,
         landCertificate: null,
@@ -1484,6 +1487,7 @@ export default {
   created() {
     this.personalId = this.$route.query.id;
     this.businessSubId = this.$route.query.orderId;
+    this.isOnline = this.$route.query.isOnline==='true';
     this.nodeBusinessInfo.currentNodeInstanceCode = this.$route.query.currentNodeCode;
     this.nodeBusinessInfo.doWorkflow = this.$route.query.doWorkflow === 'true';
     this.nodeBusinessInfo.businessId = this.$route.query.id;
@@ -1795,7 +1799,7 @@ export default {
       if (evaluate.includes(nodeCode)) {
         return 'evaluate'
       }
-      if (certificates.includes(nodeCode)) {
+      if (certificates.includes(nodeCode) && this.isOnline) {
         return 'certificateInfo';
       }
       if (this.feedback == null) {
@@ -2309,7 +2313,8 @@ export default {
       this.$refs.sceneForm.validate((valid) => {
         if (valid) {
           if (this.sceneForm.id) {
-            this.$api.personalScene.updateScene(this.sceneForm).then(res => {
+            const taskRecordDTO = this.buildTaskRecordDTO(this.sceneForm)
+            this.$api.personalScene.saveScene(taskRecordDTO).then(res => {
               if (res.code === 200 && res.data) {
                 this.$notify({
                   title: '成功',
@@ -2322,7 +2327,8 @@ export default {
             })
           }else{
             this.sceneForm.personalId = this.personal.id;
-            this.$api.personalScene.saveScene(this.sceneForm).then(res => {
+            const taskRecordDTO = this.buildTaskRecordDTO(this.sceneForm)
+            this.$api.personalScene.saveScene(taskRecordDTO).then(res => {
               if (res.code === 200 && res.data) {
                 this.$notify({
                   title: '成功',

src/views/personal/todoList.vue

@@ -295,7 +295,7 @@ export default {
          return;
       }
       else{
-        this.$router.push(`/personal/todo?id=${row.businessId}&currentNodeCode=${row.nodeCode}&orderId=${row.orderId}&doWorkflow=${true}&back=${'/personal/todo/list'}`)
+        this.$router.push(`/personal/todo?id=${row.businessId}&currentNodeCode=${row.nodeCode}&orderId=${row.orderId}&doWorkflow=${true}&isOnline=${row.isOnline}&back=${'/personal/todo/list'}`)
       }
     },