apply-clients 4.0.64 → 4.0.67

package/src/components/product/Statistics/ApplyPaySearch/ApplyCheckBill.vue

@@ -119,7 +119,7 @@
         <!--f_cost: 0,f_glf: 0,f_ysfwf: 0,f_other_charge: 0,f_dhclf: 0,f_dhqtfy: 0-->
       </tr>
     </table>
-    <colligate-details :showinfo="showinfo" :businesstype="businesstype" :data="data" @close-info="showinfo=false"></colligate-details>
+<!--    <colligate-details :showinfo="showinfo" :businesstype="businesstype" :data="data" @close-info="showinfo=false"></colligate-details>-->
     <modal :show.sync="printshow" v-ref:modal backdrop="false">
       <header slot="modal-header" class="modal-header text-center">
         <h4 class="modal-title">打印列选择</h4>

package/src/components/product/Statistics/ApplyPaySearch/ApplyPaySearch.vue

@@ -90,7 +90,7 @@
         <!--f_cost: 0,f_glf: 0,f_ysfwf: 0,f_other_charge: 0,f_dhclf: 0,f_dhqtfy: 0-->
       </tr>
     </table>
-    <colligate-details :showinfo="showinfo" :businesstype="businesstype" :data="data" @close-info="showinfo=false"></colligate-details>
+<!--    <colligate-details :showinfo="showinfo" :businesstype="businesstype" :data="data" @close-info="showinfo=false"></colligate-details>-->
     <modal :show.sync="printshow" v-ref:modal backdrop="false">
       <header slot="modal-header" class="modal-header text-center">
         <h4 class="modal-title">打印列选择</h4>

package/src/components/product/Statistics/ApplyPaySearch/MaterialSummary.vue

@@ -100,7 +100,7 @@
         <!--f_cost: 0,f_glf: 0,f_ysfwf: 0,f_other_charge: 0,f_dhclf: 0,f_dhqtfy: 0-->
       </tr>
     </table>
-    <colligate-details :showinfo="showinfo" :businesstype="businesstype" :data="data" @close-info="showinfo=false"></colligate-details>
+<!--    <colligate-details :showinfo="showinfo" :businesstype="businesstype" :data="data" @close-info="showinfo=false"></colligate-details>-->
     <modal :show.sync="printshow" v-ref:modal backdrop="false">
       <header slot="modal-header" class="modal-header text-center">
         <h4 class="modal-title">打印列选择</h4>

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

@@ -165,7 +165,7 @@
       }
     },
     watch:{
-      'selectdata'() {
+      async 'selectdata'() {
         this.json_datas=this.$supervisory_vue
         let sum = 0
         let jsonData ={}
@@ -177,6 +177,22 @@
         }
         if(sum==1){
           this.data = jsonData
+          for(let i=0;i<this.data.fields.length;i++){
+            if(this.data.fields[i].label == '工料费'||this.data.fields[i].label == '延伸服务费'||this.data.fields[i].label =='金额'||this.data.fields[i].label =='不锈钢波纹管费合计') {
+              this.data.fields[i].readonly = true
+              let httpf = new HttpResetClass()
+              let resf = await httpf.load('POST','rs/sql/ApplyPaySearch', {data:{condition: ` f_apply_num ='${this.selectdata.f_apply_num}'`}},{resolveMsg: null, rejectMsg: '获取工料费和延伸服务费失败!'})
+              if(this.data.fields[i].label == '工料费'){
+                this.data.fields[i].value = resf.data[0].f_glf
+              }else if(this.data.fields[i].label == '延伸服务费'){
+                this.data.fields[i].value = resf.data[0].f_ysfwf
+              }else if(this.selectdata.defname == '点火'&&this.data.fields[i].label =='不锈钢波纹管费合计'){
+                this.data.fields[i].value = resf.data[0].f_dhbxgbwg
+              }else if(this.selectdata.defname == '点火申请'&&this.data.fields[i].label =='金额'){
+                this.data.fields[i].value = resf.data[0].f_ysfwf
+              }
+            }
+          }
           this.initializtion()
           this.showview = true
         } else if(sum==0) {

package/src/components/product/Supervisory/SupervisoryControl.vue

@@ -1,157 +1,157 @@
-<template>
-  <div class="col-sm-12" style="overflow:auto;">
-      <button  type="button" class="btn btn-primary" header="全部查询" @click="$dispatch('tabsselect',1)" >未完成环节查询
-      </button>
-      <button type="button" class="btn btn-primary" header="完成环节查询" @click="$dispatch('tabsselect',2)">已完成环节查询
-      </button>
-    <div class="tops" v-bind:style="{ height: topheight }">
-      <supervisory-list v-if="showflag" v-ref:queryuser></supervisory-list>
-      <apply-finish-search v-if="!showflag" v-ref:queryuser ></apply-finish-search>
-    </div>
-    <div v-show="showtotal" v-bind:style="{ height: botheight }">
-      <div class="col-sm-2" v-show="showbasic">
-        <supervisory-chart :selectdata="selectdata" v-ref:supervisorychart></supervisory-chart>
-      </div>
-      <div class="col-sm-9">
-        <tabset v-ref:tabs :close="false">
-          <tab :header='header'>
-            <supervisory-service-control  :selectdata="selectdata" ></supervisory-service-control>
-          </tab>
-        <!--  <tab header='户档案信息'>
-            <record-message v-ref:record :selectdata="selectdata" :key="tittle1" :edit = "false"></record-message>
-          </tab>
-          <tab header='表档案信息'>
-            <record-message v-ref:record :selectdata="selectdata" :key="tittle2" :edit = "false"></record-message>
-          </tab>
-          <tab header='设备信息' v-if="selectdata.f_user_type =='非民用'">
-          <equipment-message v-ref:equipment :selectdata="selectdata" :key="tittle3" :edit = "false"></equipment-message>
-          </tab>
-          <tab header='材料信息'>
-            <material-message v-ref:material :selectdata="selectdata" :edit = "false"></material-message>
-          </tab>-->
-          <tab header='附件'>
-            <image-upload v-ref:file :blodid = "selectdata.f_process_id" :isusetype = "false" :isremark ="false"
-                    :isupload = "true"
-                    :takeimg = "true"
-                    :defname = "selectdata.defname"
-                    :edit = "false">
-            </image-upload>
-          </tab>
-        </tabset>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-  import Vue from 'vue'
-  import  {HttpResetClass} from 'vue-client'
-    export default {
-      title: '流程监控',
-      props: [ 'defname'],
-      data() {
-        return {
-          showflag:true,
-          flagl:false,
-          flagg: false,
-          showbasic: false,
-          showtotal: false,
-          header: null,
-          selectdata: {},
-          botheight: '0%',
-          topheight: '90%',
-          tittle1:'户档案管理',
-          tittle2:'表档案管理',
-          tittle3:'设备管理',
-          info: '流程监控'
-        }
-      },
-      created(){
-        let http = new HttpResetClass()
-        http.load('POST','rs/logic/ApplyGetConfigs', {data:this.$login.f}, {resolveMsg: null, rejectMsg: null}
-        ).then((res)=>{
-          if(res.data.code && res.data.code == 200){
-            Vue.supervisory_vue = Vue.prototype.$supervisory_vue = res.data.workflow_vue
-          }else{
-            this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
-            return
-          }
-        }).catch((ret)=>{
-          this.$showMessage('获取报建配置失败,原因:' + JSON.stringify(ret.data))
-          return
-        })
-        console.log("$supervisory_vue:"+JSON.stringify(this.$supervisory_vue))
-      },
-      events: {
-        'tabsselect'(val){
-          if(val==1){
-            this.showflag = true
-          }
-          if(val==2){
-            this.showflag = false
-          }
-        },
-        'addactive'() {
-          this.$refs.queryuser.$refs.cp.$refs.cri.search()
-          this.hidden()
-          this.showbasic = true
-          this.topheight = '20%'
-          this.botheight = '80%'
-        },
-        'changeheight'() {
-          this.show = false
-          this.botheight = '0%'
-        },
-        'check'(val) {
-          this.selectdata = ''
-          this.selectdata = val
-          console.log("节点编号:"+this.selectdata.actdefid,"节点名称:"+this.selectdata.defname)
-          this.topheight = '20%'
-          this.botheight = '80%'
-          this.$refs.queryuser.$refs.cp.$refs.grid.model.rows = [val]
-          this.$refs.queryuser.$refs.cp.pager = false
-          this.showbasic = true
-          let msg = val.defname
-          this.header = msg
-          this.hidden()
-        },
-        'selfsearch'() {
-          this.$refs.queryuser.$refs.cp.$refs.cri.search()
-        },
-        'close'() {
-          this.hidden()
-          this.showtotal = false
-          this.topheight = '90%'
-          this.botheight = '0%'
-          if(this.$refs.queryuser){
-            this.$refs.queryuser.$refs.cp.pager = true
-          }
-        }
-      },
-      methods: {
-        hidden() {
-          this.showtotal = true
-        },
-        close() {
-          this.hidden()
-          this.topheight = '100%'
-          this.botheight = '0%'
-        }
-      },
-      watch: {
-        'selectdata'(val) {
-          console.log('selectdata:', val)
-        },
-        'selectdata.f_customer_type'() {
-          if (this.selectdata.f_customer_type == '企业') {
-            this.flagg = true
-          }
-        },
-        'selectdata.f_apply_type'() {
-          if (this.selectdata.f_apply_type=="集体报建" || this.selectdata.f_apply_type=="集体报建流程") {
-            this.flagl = true
-          }
-        }
-      },
-
-    }
-</script>
+<template>
+  <div class="col-sm-12" style="overflow:auto;">
+      <button  type="button" class="btn btn-primary" header="全部查询" @click="$dispatch('tabsselect',1)" >未完成环节查询
+      </button>
+      <button type="button" class="btn btn-primary" header="完成环节查询" @click="$dispatch('tabsselect',2)">已完成环节查询
+      </button>
+    <div class="tops" v-bind:style="{ height: topheight }">
+      <supervisory-list v-if="showflag" v-ref:queryuser></supervisory-list>
+      <apply-finish-search v-if="!showflag" v-ref:queryuser ></apply-finish-search>
+    </div>
+    <div v-show="showtotal" v-bind:style="{ height: botheight }">
+      <div class="col-sm-2" v-show="showbasic">
+        <supervisory-chart :selectdata="selectdata" v-ref:supervisorychart></supervisory-chart>
+      </div>
+      <div class="col-sm-9">
+        <tabset v-ref:tabs :close="false">
+          <tab :header='header'>
+            <supervisory-service-control  :selectdata="selectdata" ></supervisory-service-control>
+          </tab>
+        <!--  <tab header='户档案信息'>
+            <record-message v-ref:record :selectdata="selectdata" :key="tittle1" :edit = "false"></record-message>
+          </tab>
+          <tab header='表档案信息'>
+            <record-message v-ref:record :selectdata="selectdata" :key="tittle2" :edit = "false"></record-message>
+          </tab>
+          <tab header='设备信息' v-if="selectdata.f_user_type =='非民用'">
+          <equipment-message v-ref:equipment :selectdata="selectdata" :key="tittle3" :edit = "false"></equipment-message>
+          </tab>
+          <tab header='材料信息'>
+            <material-message v-ref:material :selectdata="selectdata" :edit = "false"></material-message>
+          </tab>-->
+          <tab header='附件'>
+            <image-upload1 v-ref:file :blodid = "selectdata" :isusetype = "false" :isremark ="false"
+                    :isupload = "true"
+                    :takeimg = "true"
+                    :defname = "selectdata.defname"
+                    :edit = "false">
+            </image-upload1>
+          </tab>
+        </tabset>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import  {HttpResetClass} from 'vue-client'
+    export default {
+      title: '流程监控',
+      props: [ 'defname'],
+      data() {
+        return {
+          showflag:true,
+          flagl:false,
+          flagg: false,
+          showbasic: false,
+          showtotal: false,
+          header: null,
+          selectdata: {},
+          botheight: '0%',
+          topheight: '90%',
+          tittle1:'户档案管理',
+          tittle2:'表档案管理',
+          tittle3:'设备管理',
+          info: '流程监控'
+        }
+      },
+      created(){
+        let http = new HttpResetClass()
+        http.load('POST','rs/logic/ApplyGetConfigs', {data:this.$login.f}, {resolveMsg: null, rejectMsg: null}
+        ).then((res)=>{
+          if(res.data.code && res.data.code == 200){
+            Vue.supervisory_vue = Vue.prototype.$supervisory_vue = res.data.workflow_vue
+          }else{
+            this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
+            return
+          }
+        }).catch((ret)=>{
+          this.$showMessage('获取报建配置失败,原因:' + JSON.stringify(ret.data))
+          return
+        })
+        console.log("$supervisory_vue:"+JSON.stringify(this.$supervisory_vue))
+      },
+      events: {
+        'tabsselect'(val){
+          if(val==1){
+            this.showflag = true
+          }
+          if(val==2){
+            this.showflag = false
+          }
+        },
+        'addactive'() {
+          this.$refs.queryuser.$refs.cp.$refs.cri.search()
+          this.hidden()
+          this.showbasic = true
+          this.topheight = '20%'
+          this.botheight = '80%'
+        },
+        'changeheight'() {
+          this.show = false
+          this.botheight = '0%'
+        },
+        'check'(val) {
+          this.selectdata = ''
+          this.selectdata = val
+          console.log("节点编号:"+this.selectdata.actdefid,"节点名称:"+this.selectdata.defname)
+          this.topheight = '20%'
+          this.botheight = '80%'
+          this.$refs.queryuser.$refs.cp.$refs.grid.model.rows = [val]
+          this.$refs.queryuser.$refs.cp.pager = false
+          this.showbasic = true
+          let msg = val.defname
+          this.header = msg
+          this.hidden()
+        },
+        'selfsearch'() {
+          this.$refs.queryuser.$refs.cp.$refs.cri.search()
+        },
+        'close'() {
+          this.hidden()
+          this.showtotal = false
+          this.topheight = '90%'
+          this.botheight = '0%'
+          if(this.$refs.queryuser){
+            this.$refs.queryuser.$refs.cp.pager = true
+          }
+        }
+      },
+      methods: {
+        hidden() {
+          this.showtotal = true
+        },
+        close() {
+          this.hidden()
+          this.topheight = '100%'
+          this.botheight = '0%'
+        }
+      },
+      watch: {
+        'selectdata'(val) {
+          console.log('selectdata:', val)
+        },
+        'selectdata.f_customer_type'() {
+          if (this.selectdata.f_customer_type == '企业') {
+            this.flagg = true
+          }
+        },
+        'selectdata.f_apply_type'() {
+          if (this.selectdata.f_apply_type=="集体报建" || this.selectdata.f_apply_type=="集体报建流程") {
+            this.flagl = true
+          }
+        }
+      },
+
+    }
+</script>