apply-clients 5.0.35-7 → 5.0.35-73

package/src/components/product/ServiceView.vue

@@ -10,13 +10,13 @@
     <!--</div>-->
     <validator name="v">
       <form class="form-horizontal">
-        <div class="col-sm-12 form-group">
+        <div class="col-sm-12 form-group form-group1">
           <div v-for="(index,item) in data.fields">
             <!--input-->
-            <div :style="item.style? item.style+';height: 34px;':'height: 34px;'"
+            <div :style="item.style+';height: 34px;'"
                  v-if="item.type==='input' || item.type==='number'||item.type === 'tel'||item.type === 'email'"
                  v-show="!item.hidden"
-                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
+                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group form-group1']">
               <label :style="item.label_style? item.label_style:''+';width:85px;'"
                      :class="item.label_bootstraped?item.label_bootstraped+' control-label-justify control-label':item.label_style?'':'control-label-justify control-label col-sm-6'">{{item.label}}</label>
               <div :style="item.value_style? item.value_style:''"
@@ -36,7 +36,7 @@
             <!--时间datepicker-->
             <div :style="item.style? item.style+';height: 34px;':'height: 34px;'" v-if="item.type==='datepicker'"
                  v-show="!item.hidden"
-                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
+                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group form-group1']">
               <label style="width:85px"
                 :class="item.label_bootstraped?item.label_bootstraped+' control-label-justify control-label':'control-label control-label-justify col-sm-6'">{{item.label}}</label>
               <div :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'">
@@ -94,7 +94,7 @@
 
             <!--select-->
             <div style="height: 34px" v-if="item.type==='select'" v-show="!item.hidden"
-                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
+                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group ':'col-sm-4 form-group']">
               <label style="width:85px;"
                 :class="item.label_bootstraped?item.label_bootstraped+' control-label control-label-justify':'control-label-justify control-label col-sm-6'">{{item.label}}</label>
               <input-select :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'" @blur="check_disable"
@@ -106,6 +106,7 @@
 
             </div>
 
+
             <!--checkbox-->
             <div v-if="item.type==='checkbox'"
                  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-12 form-group']">
@@ -122,7 +123,7 @@
           </div>
           <!-- onetomany -->
           <div class="col-sm-12" v-for="(i,datagrid) in data.onetomany">
-            <table v-show="!datagrid.hidden" class="table table-bordered table-striped table-hover">
+            <table v-show="!datagrid.hidden" class="table table-bordered table-striped table-hover" style="margin-top: 80px">
               <tr style="background-color: #00A3F0">
                 <th style="text-align: center;border-color: #00A3F0"><font color="white">序号</font></th>
                 <th v-for="labels in datagrid.fields" style="text-align: center;border-color: #00A3F0">
@@ -506,6 +507,12 @@
       },
       // 初始化数据
       initializtion() {
+        if(this.data.f_apply_type='集体报建' && this.data.f_user_type=='非民用' && this.data.defname=='验收'){
+          for(let j=0;j< this.data.fields.length;j++) {
+            this.data.fields[j].required = false
+          }
+        }
+
         let fields = this.data.fields
         let flag = false
         for (let i = 0; i < fields.length; i++) {
@@ -797,4 +804,7 @@
   tr {
     height: 34px;
   }
+  .form-group{
+    margin-top:20px;
+  }
 </style>

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 = []
@@ -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 {