apply-clients 5.0.35-9 → 5.0.35-90

package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue

@@ -20,6 +20,7 @@
 </template>
 <script>
   import {HttpResetClass} from 'vue-client'
+  import Vue from "vue";
   export default {
     title: '报建监控控制层',
     props: ['selectdata'],
@@ -36,6 +37,45 @@
       },
       // json配置数据处理 比如下拉框的options
       async initializtion() {
+        // onetomany 数据获取
+        if (this.data.onetomany) {
+          console.log('判断是onetomany,this.data.onetomany的数据为=>' + JSON.stringify(this.data.onetomany))
+          for (let index = 0; index < this.data.onetomany.length; index++) {
+            let http = new HttpResetClass()
+            let data = {}
+            if (this.data.onetomany[index].tables[0] == 't_charge_record') {
+              data = {
+                tablename: this.data.onetomany[index].tables[0],
+                condition: `f_apply_num = '${this.selectdata.f_apply_num}'  and f_process_id='${this.selectdata.f_process_id}' and f_charging_status != '作废'`
+              }
+            } else {
+              data = {
+                tablename: this.data.onetomany[index].tables[0],
+                condition: `f_process_id='${this.selectdata.f_process_id}'`
+              }
+            }
+            let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
+              resolveMsg: null,
+              rejectMsg: 'onetomany查询失败'
+            })
+            // 初始化 onetomany
+            let rows = []
+            console.log('查询返回结果res.data=>' + JSON.stringify(res.data))
+            this.data.onetomany[index].rows = res.data
+            // console.log(JSON.stringify('this.data.onetomany[index].rows=>' + JSON.stringify(this.data.onetomany[index].rows)))
+
+            // 初始化onetomany中的fields
+            for (let j = 0; j < this.data.onetomany[index].fields.length; j++) {
+              // 如果配置类型为select,优先从参数列表获取options
+              if (this.data.onetomany[index].fields[j].type === 'select') {
+                let temp = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
+                if (temp && temp.length > 0) {
+                  this.data.onetomany[index].fields[j].options = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
+                }
+              }
+            }
+          }
+        }
         // selectdata 填充 data
         if (this.selectdata.f_survey_name) {
           let buyerinfos = []
@@ -93,11 +133,11 @@
           }
           this.data.fields[i].readonly = true
           this.data.fields[i].disabled = true
-            if(this.$login.r.find(value => value == '报建流程修改') && this.data.f_apply_type=='个人报建' && this.$login.r.includes('报建流程修改')){
+            if(this.$login.r.find(value => value == '报建流程修改') && this.$login.r.includes('报建流程修改')){
             this.data.fields[i].readonly = false
             this.data.fields[i].disabled = false
           }
-          if(this.$login.r.find(value => value == '集体报建流程修改') && this.data.f_apply_type=='集体报建' && this.$login.r.includes('报建流程修改')){
+          if(this.$login.r.find(value => value == '集体报建流程修改')  && this.$login.r.includes('报建流程修改')){
               this.data.fields[i].readonly = false
               this.data.fields[i].disabled = false
           }
@@ -117,7 +157,7 @@
           }
         }
         this.data.buttons = null
-        if( this.$login.r.find(value => value == '报建流程修改')  && this.data.f_apply_type=='个人报建' ){
+        if( this.$login.r.find(value => value == '报建流程修改')  ){
           // 仅留保存按钮
           this.data.buttons = [
             {
@@ -125,7 +165,7 @@
             }
           ]
         }
-        if(this.data.f_apply_type=='集体报建' && this.$login.r.includes('集体报建流程修改')){
+        if(this.$login.r.includes('集体报建流程修改')){
           // 仅留保存按钮
           this.data.buttons = [
             {
@@ -133,11 +173,6 @@
             }
           ]
         }
-        // 完成时间和完成人,部门，分公司
-        this.data.filiale = this.selectdata.f_filiale
-        this.data.f_parentname = this.selectdata.f_parentname
-        this.data.operate_date = this.selectdata.finishtime
-        this.data.operator = this.selectdata.sender
       }
     },
     events:{
@@ -393,7 +428,19 @@
         if (sum == 1) {
           this.data = jsonData
           this.initializtion()
-          this.showview = true
+          // 完成时间和完成人,部门，分公司
+          if(this.selectdata.defname =='完工'){ this.data.filiale = this.selectdata.f_filiale
+            this.data.f_parentname = this.selectdata.f_parentname
+            this.data.operate_date = this.selectdata.sendtime
+            this.data.operator = this.selectdata.sender
+            this.showview = true
+          }else{
+            this.data.f_parentname = this.selectdata.f_parentname
+            this.data.operate_date = this.selectdata.finishtime
+            this.data.operator = this.selectdata.person
+            this.showview = true
+          }
+
         } else if (sum == 0) {
           this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)
         } else {