apply-clients 4.1.41-weinan → 4.1.42-weinan

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "4.1.41-weinan",
+  "version": "4.1.42-weinan",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/app_apply/PlaceControler.vue

@@ -80,7 +80,9 @@
           }
         },
         // actName: this.$appdata.getParam('用气类型'),  // 报建app需提取的流程名称
-        faultshow: 8     // 控制 故障汇总 在 菜单里显示与否
+        faultshow: 8,     // 控制 故障汇总 在 菜单里显示与否
+        selectdatacopy: null,
+        num: 0
       }
     },
 
@@ -116,13 +118,23 @@
         console.log('name=>' + name)
         if (name === 'apply-info') {
           this.tabs[name].props = {service: this.row, shutype: 'shu'}
+          if (this.num === 1) {
+            this.selectdatacopy = this.$children[0].$children[0].show_data
+          }
         } else if (name === 'app-take-pic') {
           this.tabs[name].props = {blobid: this.row.f_process_id, defname: this.row.defname, isdelete: 'true', istakepic: 'true', istype: 'true'}
+          if (this.num === 1) {
+            this.selectdatacopy = this.$children[0].$children[0].show_data
+          }
         } else {
           this.row.defname = this.row.defname
           // this.row.fields = new Array()
           // this.row.buttons = new Array()
-          this.tabs[name].props = {selectdata: this.row}
+          if (this.num === 1) {
+            this.selectdatacopy = this.$children[0].$children[0].show_data
+          }
+          this.num += 1
+          this.tabs[name].props = {selectdata: this.row,copydata: this.selectdatacopy}
         }
         console.log('即将goto=>' + name + ',props:' + JSON.stringify(this.tabs[name].props))
         this.$goto(name, this.tabs[name].props, 'apply')

package/src/components/app_apply/ServiceControl.vue

@@ -8,7 +8,7 @@
   import {isEmpty} from "../Util";
   export default {
     title: '报建流程业务控制层',
-    props: ['selectdata'],
+    props: ['selectdata','copydata'],
     data () {
       return {
         data:null, // 数据库数据，json配置文件数据的数据集合
@@ -176,7 +176,9 @@
           temp['back_reason'] = this.selectdata.f_back_reason
         }
         console.log('即将给show_data赋值temp=>' + JSON.stringify(temp))
-        this.show_data = temp
+        if (this.show_data==null){
+          this.show_data = temp
+        }
         console.log('initializtion()方法结束,showview')
         this.showview = true
         if (this.selectdata.defname === '现场勘察' || this.selectdata.defname ==='入户安装') {
@@ -280,6 +282,12 @@
           this.show_data.fields[index+11].required = false
           this.show_data.fields[index+12].required = false
           this.show_data.fields[index+13].required = false
+        }else if (this.data.fields[index].label === '是否具备安装条件'&& this.show_data.fields[index].value === '是') {
+          this.show_data.fields[index+9].required = true
+          this.show_data.fields[index+10].required = true
+          this.show_data.fields[index+11].required = true
+          this.show_data.fields[index+12].required = true
+          this.show_data.fields[index+13].required = true
         }
         // this.$refs.service_show.model_temp // 子业务显示组件
         // 级联操作示例：
@@ -392,8 +400,14 @@
     watch:{
       // 监听selectdata的变化
       'selectdata'() {
+        debugger
           console.log('进入selectdata改变事件data=>' + JSON.stringify(this.selectdata))
+        if(this.copydata!=null){
+          this.show_data=this.copydata
+          this.refurbish()
+        }else{
           this.refurbish()
+        }
       },
       deep:true
     }