apply-clients 3.1.36 → 3.1.39

package/src/components/product/ServiceView.vue

@@ -178,7 +178,7 @@
         </div>
 
         <slot></slot>
-        <apply-charge-management v-ref:apply_charge :data="data" v-if="data.defname == '报建缴费' || data.defname == '收费审核' || data.defname == '确认尾款'"></apply-charge-management>
+        <apply-charge-management v-ref:apply_charge :mark="mark" :data="data" v-if="data.defname == '报建缴费' || data.defname == '收费审核' || data.defname == '确认尾款'"></apply-charge-management>
         <!--公司等属性-->
         <div class="col-sm-12 form-group text-center" style="padding-top:8px">
           <div class="col-sm-3 form-group center-block">
@@ -335,6 +335,10 @@
       data: {
         type: Object
       },
+      mark: {
+        type: Number,
+        default: 0
+      },
       showprint: {
         type: Boolean,
         default: true

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

@@ -1,153 +1,169 @@
-<template>
-  <div class="auto clearfix">
-    <show-back-reason v-if="selectdata.f_back_reason && selectdata.f_back_reason!=''"
-                      :data="data"></show-back-reason>
-  </div>
-  <service-view v-ref:service_show :data="data" v-if="showview" :showprint="false"></service-view>
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  // Date格式化
-  Date.prototype.Format = function (fmt) {
-    var o = {
-      'M+': this.getMonth() + 1, // 月份
-      'd+': this.getDate(), // 日
-      'H+': this.getHours(), // 小时
-      'm+': this.getMinutes(), // 分
-      's+': this.getSeconds(), // 秒
-      'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
-      'S': this.getMilliseconds() // 毫秒
-    }
-    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
-    for (var k in o) {
-      if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
-    }
-    return fmt
-  }
-  export default {
-    title: '报建监控控制层',
-    props: ['selectdata'],
-    data() {
-      return {
-        data: null,    // 展示的数据
-        json_datas: null, // json配置数据结构
-        showview: false // 控制显示层显示
-      }
-    },
-    created () {
-      this.initial()
-    },
-    methods: {
-      // 初始化模块
-      async initial() {
-        this.json_datas = this.$workflow_vue
-        let sum = 0
-        let jsonData = {}
-        this.json_datas.activitys.forEach(item => {
-          if (this.selectdata.defname === item.title) {
-            jsonData = item
-            sum++
-          }
-        })
-        if (sum === 0) {
-          this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)
-          return
-        }
-        if (sum === 1) {
-          this.data = jsonData
-          this.data = Object.assign({}, this.data, this.selectdata)
-          this.data.fields.forEach(item => {
-            if (this.selectdata[item.field]) {
-              item.value = this.selectdata[item.field]
-            }
-          })
-          await this.initializtion()
-          this.showview = true
-          return
-        }
-        this.$showMessage(`在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置:${sum}个`)
-      },
-      // json配置数据处理
-      async initializtion() {
-        this.data.fields.forEach(item => {
-          // 如果配置类型为select,获取options
-          if(item.type==='select'){
-            item.options=[]
-          }
-          if (typeof item.value === 'string' && item.value.startsWith("{") && item.value.endsWith("}")) {
-            item.value = JSON.parse(item.value)
-          }
-
-          // 将所有field都不可修改，不可操作
-          item.readonly = true
-          item.disabled = true
-        })
-
-        // onetomany 数据获取
-        if (this.data.onetomany) {
-          for (let index = 0; index < this.data.onetomany.length; index++) {
-            let http = new HttpResetClass()
-            let 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
-            this.data.onetomany[index].rows = res.data
-
-            // 初始化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)
-                }
-              }
-            }
-
-          }
-        }
-
-        // 去除button
-        this.data.buttons = null
-        // 完成时间和完成人,部门，分公司
-        if (this.selectdata.state === '结束') {
-          let user = await this.getUserById(this.selectdata.userid)
-          this.data.f_filiale = user[0].orgname
-          this.data.f_parentname = user[0].depname
-          this.data.operate_date = new Date(this.selectdata.finishtime).Format('yyyy-MM-dd')
-          this.data.operator = this.selectdata.person
-        }
-      },
-      async getUserById (userid) {
-        let http = new HttpResetClass()
-        let data  = {
-          id: userid
-        }
-        let res = await http.load('POST', 'rs/sql/getUserById', {data}, {resolveMsg: null, rejectMsg: null})
-        return res.data
-      }
-    },
-    events:{
-    },
-    watch: {
-      deep: true
-    }
-  }
-</script>
-<style scoped>
-  /*清除model中的浮动*/
-  .clearfix:after,.clearfix:before{
-    display: table;
-  }
-  .clearfix:after{
-    clear: both;
-  }
-</style>
+<template>
+  <div class="auto clearfix">
+    <show-back-reason v-if="selectdata.f_back_reason && selectdata.f_back_reason!=''"
+                      :data="data"></show-back-reason>
+  </div>
+  <service-view v-ref:service_show :mark="mark" :data="data" v-if="showview" :showprint="false"></service-view>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  // Date格式化
+  Date.prototype.Format = function (fmt) {
+    var o = {
+      'M+': this.getMonth() + 1, // 月份
+      'd+': this.getDate(), // 日
+      'H+': this.getHours(), // 小时
+      'm+': this.getMinutes(), // 分
+      's+': this.getSeconds(), // 秒
+      'q+': Math.floor((this.getMonth() + 3) / 3), // 季度
+      'S': this.getMilliseconds() // 毫秒
+    }
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + '').substr(4 - RegExp.$1.length))
+    for (var k in o) {
+      if (new RegExp('(' + k + ')').test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+    }
+    return fmt
+  }
+  export default {
+    title: '报建监控控制层',
+    props: {
+      selectdata: {
+        type: Object
+      },
+      mark: {
+        type: Number,
+        default: 1
+      }
+    },
+    data() {
+      return {
+        data: null,    // 展示的数据
+        json_datas: null, // json配置数据结构
+        showview: false // 控制显示层显示
+      }
+    },
+    created () {
+      this.initial()
+    },
+    methods: {
+      // 初始化模块
+      async initial() {
+        this.json_datas = this.$workflow_vue
+        let sum = 0
+        let jsonData = {}
+        this.json_datas.activitys.forEach(item => {
+          if (this.selectdata.defname === item.title) {
+            jsonData = item
+            sum++
+          }
+        })
+        if (sum === 0) {
+          this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)
+          return
+        }
+        if (sum === 1) {
+          this.data = jsonData
+          this.data = Object.assign({}, this.data, this.selectdata)
+          this.data.fields.forEach(item => {
+            if (this.selectdata[item.field]) {
+              item.value = this.selectdata[item.field]
+            }
+          })
+          await this.initializtion()
+          this.showview = true
+          return
+        }
+        this.$showMessage(`在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置:${sum}个`)
+        if (this.selectdata.components) {
+          this.selectdata.components.forEach(item => {
+            item.mark = 1
+            if (item.supervisory && this[item.supervisory]()) {
+              item.mark = 0
+            }
+          })
+        }
+      },
+      // json配置数据处理
+      async initializtion() {
+        this.data.fields.forEach(item => {
+          // 如果配置类型为select,获取options
+          if(item.type==='select'){
+            item.options=[]
+          }
+          if (typeof item.value === 'string' && item.value.startsWith("{") && item.value.endsWith("}")) {
+            item.value = JSON.parse(item.value)
+          }
+
+          // 将所有field都不可修改，不可操作
+          item.readonly = true
+          item.disabled = true
+        })
+
+        // onetomany 数据获取
+        if (this.data.onetomany) {
+          for (let index = 0; index < this.data.onetomany.length; index++) {
+            let http = new HttpResetClass()
+            let 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
+            this.data.onetomany[index].rows = res.data
+
+            // 初始化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)
+                }
+              }
+            }
+
+          }
+        }
+
+        // 去除button
+        this.data.buttons = null
+        // 完成时间和完成人,部门，分公司
+        // if (this.selectdata.state === '结束') {
+        //   let user = await this.getUserById(this.selectdata.userid)
+        //   this.data.f_filiale = user[0].orgname
+        //   this.data.f_parentname = user[0].depname
+        //   this.data.operate_date = new Date(this.selectdata.finishtime).Format('yyyy-MM-dd')
+        //   this.data.operator = this.selectdata.person
+        // }
+      },
+      async getUserById (userid) {
+        let http = new HttpResetClass()
+        let data  = {
+          id: userid
+        }
+        let res = await http.load('POST', 'rs/sql/getUserById', {data}, {resolveMsg: null, rejectMsg: null})
+        return res.data
+      }
+    },
+    events:{
+    },
+    watch: {
+      deep: true
+    }
+  }
+</script>
+<style scoped>
+  /*清除model中的浮动*/
+  .clearfix:after,.clearfix:before{
+    display: table;
+  }
+  .clearfix:after{
+    clear: both;
+  }
+</style>

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

@@ -1,132 +1,132 @@
-<template>
-  <div class="basic-main" style="overflow:auto;">
-    <div class="tops" v-bind:style="{ height: topheight }">
-      <supervisory-list v-ref:queryuser></supervisory-list>
-    </div>
-    <div v-if="showtotal" v-bind:style="{ height: botheight }">
-      <div class="col-sm-2" v-if="showbasic">
-        <supervisory-chart :selectdata="selectdata" :defname = "header"></supervisory-chart>
-      </div>
-      <div class="col-sm-10">
-        <tabset v-ref:tabs :close="false">
-          <tab :header='header' style="background-color :#ffffff!important;overflow: auto;">
-            <supervisory-service-control :selectdata="selectdata" ></supervisory-service-control>
-          </tab>
-          <tab header='附件' style="background-color :#ffffff!important;overflow: auto;">
-            <upload v-ref:file :blodid = "selectdata.f_process_id" :isusetype = "false" :isremark ="false"
-                    :isupload = "true"
-                    :takeimg = "true"
-                    :edit = "false">
-            </upload>
-          </tab>
-        </tabset>
-      </div>
-    </div>
-  </div>
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '流程监控',
-    props: ['defname'],
-    data () {
-      return {
-        flagl: false,
-        flagg: false,
-        showbasic: false, // 控制节点列表显示
-        showtotal: false, // 控制详细信息显示
-        header: null,
-        selectdata: {},
-        botheight: '0%',   // 详细信息显示高度
-        topheight: '100%', // 工程列表显示高度
-        info: '流程监控',
-        xmlname: '' // 配置文件名称
-      }
-    },
-    created () {
-    },
-    methods: {
-      // 获取页面配置json文件
-      async loadName () {
-        let http = new HttpResetClass()
-        let xmldata = {
-          data: this.$login.f,
-          workname: this.xmlname
-        }
-        let res = await http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null})
-
-        if (res.data.code && res.data.code === 200) {
-          Vue.prototype.$workflow_vue = res.data.workflow_vue
-        } else {
-          this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
-          return
-        }
-      }
-    },
-    events: {
-      'onMessage' (data) {
-        console.log('接收消息')
-        console.log(data)
-        if (data.type === 'apply-task') {
-          this.$refs.queryuser.$refs.cp.$refs.cri.search()
-        }
-      },
-      async 'apply' (val) {
-        this.selectdata = val
-        this.showtotal = false
-
-        if (this.selectdata.f_apply_type === '集中报建') {
-          this.xmlname = '集中报建流程'
-        } else if (this.selectdata.f_apply_type === '散户报建') {
-          this.xmlname = '散户报建流程'
-        } else if (this.selectdata.f_apply_type === '非民用报建') {
-          this.xmlname = '非民用报建流程'
-        } else {
-          this.$showMessage('暂无此类报装')
-          return
-        }
-
-        // 获取配置文件
-        await this.loadName()
-
-        this.topheight = '10%'
-        this.botheight = '90%'
-        // this.$refs.queryuser.$refs.cp.$refs.grid.model.rows = [val]
-        this.header = this.selectdata.defname
-        this.$refs.queryuser.$refs.cp.pager = false
-        this.showbasic = true
-        this.showtotal = true
-
-      },
-      'close'() {
-        this.showbasic = false
-        this.showtotal = false
-        this.topheight = '100%'
-        this.botheight = '0%'
-        this.$refs.queryuser.$refs.cp.$refs.cri.search()
-        this.$refs.queryuser.$refs.cp.pager = true
-      },
-      'hidden' (criteriaShow) {
-        if (!this.showtotal && !criteriaShow) {
-
-        }
-        if (!this.showtotal && criteriaShow) {
-
-        }
-        if (this.showtotal && !criteriaShow) {
-          this.topheight = '20%'
-          this.botheight = '80%'
-        }
-        if (this.showtotal && criteriaShow) {
-          this.topheight = '10%'
-          this.botheight = '90%'
-        }
-
-      }
-    },
-
-    watch: {
-    }
-  }
-</script>
+<template>
+  <div class="basic-main" style="overflow:auto;">
+    <div class="tops" v-bind:style="{ height: topheight }">
+      <supervisory-list v-ref:queryuser></supervisory-list>
+    </div>
+    <div v-if="showtotal" v-bind:style="{ height: botheight }">
+      <div class="col-sm-2" v-if="showbasic">
+        <supervisory-chart :selectdata="selectdata" :defname = "header"></supervisory-chart>
+      </div>
+      <div class="col-sm-10">
+        <tabset v-ref:tabs :close="false">
+          <tab :header='header' style="background-color :#ffffff!important;overflow: auto;">
+            <supervisory-service-control :selectdata="selectdata" ></supervisory-service-control>
+          </tab>
+          <tab header='附件' style="background-color :#ffffff!important;overflow: auto;">
+            <upload v-ref:file :blodid = "selectdata.f_process_id" :isusetype = "false" :isremark ="false"
+                    :isupload = "true"
+                    :takeimg = "true"
+                    :edit = "false">
+            </upload>
+          </tab>
+        </tabset>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '流程监控',
+    props: ['defname'],
+    data () {
+      return {
+        flagl: false,
+        flagg: false,
+        showbasic: false, // 控制节点列表显示
+        showtotal: false, // 控制详细信息显示
+        header: null,
+        selectdata: {},
+        botheight: '0%',   // 详细信息显示高度
+        topheight: '100%', // 工程列表显示高度
+        info: '流程监控',
+        xmlname: '' // 配置文件名称
+      }
+    },
+    created () {
+    },
+    methods: {
+      // 获取页面配置json文件
+      async loadName () {
+        let http = new HttpResetClass()
+        let xmldata = {
+          data: this.$login.f,
+          workname: this.xmlname
+        }
+        let res = await http.load('POST', 'rs/logic/ApplyGetConfigs', {data: xmldata}, {resolveMsg: null, rejectMsg: null})
+
+        if (res.data.code && res.data.code === 200) {
+          Vue.prototype.$workflow_vue = res.data.workflow_vue
+        } else {
+          this.$showMessage('获取报建配置失败,原因:' + res.data.msg)
+          return
+        }
+      }
+    },
+    events: {
+      'onMessage' (data) {
+        console.log('接收消息')
+        console.log(data)
+        if (data.type === 'apply-task') {
+          this.$refs.queryuser.$refs.cp.$refs.cri.search()
+        }
+      },
+      async 'apply' (val) {
+        this.selectdata = val
+        this.showtotal = false
+
+        if (this.selectdata.f_apply_type === '集中报建') {
+          this.xmlname = '集中报建流程'
+        } else if (this.selectdata.f_apply_type === '散户报建') {
+          this.xmlname = '散户报建流程'
+        } else if (this.selectdata.f_apply_type === '非民用报建') {
+          this.xmlname = '非民用报建流程'
+        } else {
+          this.$showMessage('暂无此类报装')
+          return
+        }
+
+        // 获取配置文件
+        await this.loadName()
+
+        this.topheight = '10%'
+        this.botheight = '90%'
+        // this.$refs.queryuser.$refs.cp.$refs.grid.model.rows = [val]
+        this.header = this.selectdata.defname
+        this.$refs.queryuser.$refs.cp.pager = false
+        this.showbasic = true
+        this.showtotal = true
+
+      },
+      'close'() {
+        this.showbasic = false
+        this.showtotal = false
+        this.topheight = '100%'
+        this.botheight = '0%'
+        this.$refs.queryuser.$refs.cp.$refs.cri.search()
+        this.$refs.queryuser.$refs.cp.pager = true
+      },
+      'hidden' (criteriaShow) {
+        if (!this.showtotal && !criteriaShow) {
+
+        }
+        if (!this.showtotal && criteriaShow) {
+
+        }
+        if (this.showtotal && !criteriaShow) {
+          this.topheight = '20%'
+          this.botheight = '80%'
+        }
+        if (this.showtotal && criteriaShow) {
+          this.topheight = '10%'
+          this.botheight = '90%'
+        }
+
+      }
+    },
+
+    watch: {
+    }
+  }
+</script>