apply-clients 7.1.36-yuchuan-5 → 7.1.36-yuchuan-7

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

@@ -1,116 +1,116 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div :class="showData ? 'top' : 'auto'">
-        <supervisory-list v-ref:query :show-data="showData"></supervisory-list>
-      </div>
-      <div v-if="showtotal" style="height: 89%">
-        <div class="col-sm-2" style="margin-top: 20px">
-          <new-supervisory-chart :selectdata="selectdata"></new-supervisory-chart>
-        </div>
-        <div class="col-sm-10" style="margin-top: 20px">
-          <tabset v-ref:tabs :close="false">
-            <tab :header='selectdata.defname'>
-              <supervisory-service-control :selectdata="selectdata" :node-snapshot="true"></supervisory-service-control>
-            </tab>
-            <tab header='附件'>
-              <apply-upload :blodid="selectdata.f_process_id"
-                            :source="source"
-                            :isupload = "projectStart"
-                            :isdelete="false"
-                            :isusetype="true"
-                            :isremark = "true"
-                            :takeimg="false"
-                            :issearch="true"
-                            :defname="selectdata.defname">
-              </apply-upload>
-            </tab>
-          </tabset>
-        </div>
-      </div>
-    </div>
-  </div>
-
-</template>
-<script>
-  import Vue from 'vue'
-  import {HttpResetClass} from 'vue-client'
-  export default {
-    title: '流程监控',
-    data () {
-      return {
-        showtotal: false, // 控制详细信息显示
-        showData: true,
-        selectdata: {},
-        source: '流程查看',
-        xmlname: '' // 配置文件名称
-      }
-    },
-    created () {
-    },
-    methods: {
-      // 获取页面配置json文件
-      async loadName () {
-        let data = {
-          workname: this.selectdata.processname
-        }
-
-        let res = await this.$resetpost(
-          'rs/logic/ApplyGetConfigs',
-          {data: data},
-          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
-        )
-
-        Vue.prototype.$workflow_vue = res.data
-      }
-    },
-    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
-
-        // 获取配置文件
-        await this.loadName()
-
-        this.$refs.query.$refs.cp.pager = false
-        this.showData = false
-
-        this.showtotal = true
-      },
-      'search' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.$refs.cri.search()
-      },
-      'loadPage' () {
-        // 关闭详细
-        this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
-      }
-    },
-    computed: {
-      projectStart () {
-        return this.$login.r.includes('报装文件上传')
-      }
-    },
-    watch: {
-    }
-  }
-</script>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div :class="showData ? 'top' : 'auto'">
+        <supervisory-list v-ref:query :show-data="showData"></supervisory-list>
+      </div>
+      <div v-if="showtotal" style="height: 89%">
+        <div class="col-sm-2" style="margin-top: 20px">
+          <new-supervisory-chart :selectdata="selectdata"></new-supervisory-chart>
+        </div>
+        <div class="col-sm-10" style="margin-top: 20px">
+          <tabset v-ref:tabs :close="false">
+            <tab :header='selectdata.defname'>
+              <supervisory-service-control :selectdata="selectdata" :node-snapshot="true"></supervisory-service-control>
+            </tab>
+            <tab header='附件'>
+              <apply-upload :blodid="selectdata.f_process_id"
+                            :source="source"
+                            :isupload = "projectStart"
+                            :isdelete="false"
+                            :isusetype="true"
+                            :isremark = "true"
+                            :takeimg="false"
+                            :issearch="true"
+                            :defname="selectdata.defname">
+              </apply-upload>
+            </tab>
+          </tabset>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+<script>
+  import Vue from 'vue'
+  import {HttpResetClass} from 'vue-client'
+  export default {
+    title: '流程监控',
+    data () {
+      return {
+        showtotal: false, // 控制详细信息显示
+        showData: true,
+        selectdata: {},
+        source: '流程查看',
+        xmlname: '' // 配置文件名称
+      }
+    },
+    created () {
+    },
+    methods: {
+      // 获取页面配置json文件
+      async loadName () {
+        let data = {
+          workname: this.selectdata.processname
+        }
+
+        let res = await this.$resetpost(
+          'rs/logic/ApplyGetConfigs',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
+        )
+
+        Vue.prototype.$workflow_vue = res.data
+      }
+    },
+    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
+
+        // 获取配置文件
+        await this.loadName()
+
+        this.$refs.query.$refs.cp.pager = false
+        this.showData = false
+
+        this.showtotal = true
+      },
+      'search' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.$refs.cri.search()
+      },
+      'loadPage' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
+      }
+    },
+    computed: {
+      projectStart () {
+        return this.$login.r.includes('报装文件上传')
+      }
+    },
+    watch: {
+    }
+  }
+</script>

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

@@ -355,16 +355,16 @@
       return {
         model: new PagedList('rs/sql/supervisory', 20, {
           data: {
-            f_filiale: this.$login.f.f_fengongsi
+            f_filiale: this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:''
           },
         }),
-        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')?this.$appdata.getParam('报建类型'):[]],
         defnames: isEmpty(this.$appdata.getParam('办理环节')) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')], // 流程节点
         applyNatures: [{label: '全部', value: ''},{label: '工业', value: '工业'},{label: '商业', value: '商业'},{label: '散户', value: '散户'},{label: '小区', value: '小区'},{label: '分户挂表', value: '分户挂表'}], // 报建性质
         criteriaShow: false,
         sources:[{label: '微信公众号', value: '微信公众号'},{label: '线下发起', value: '线下发起'}],
         filetype:[{label: '已上传图纸', value: 'is not null'}, {label: '未上传图纸', value: 'is null'}],
-        UserList:[{label: '全部', value: ''}, ...this.$appdata.getParam('用户分类')],
+        UserList:[{label: '全部', value: ''}, ...this.$appdata.getParam('用户分类')?this.$appdata.getParam('用户分类'):[]],
         UserType:[{label: '全部', value: ''}, {label: '普通用户', value: '普通用户'}, {label: '煤改用户', value: '煤改用户'}],
         designerPeoples:  this.getDesigner(),
         dispatching:  [{label: '全部', value: ''}, {label: '施工工队', value: '施工工队'}, {label: '安检维修中心', value: '安检维修中心'}],

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

@@ -338,16 +338,16 @@
       return {
         model: new PagedList('rs/sql/yiBanSupervisory', 20, {
           data: {
-            f_filiale: this.$login.f.f_fengongsi
+            f_filiale: this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:''
           },
         }),
-        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+        applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')?this.$appdata.getParam('报建类型'):[]],
         defnames: isEmpty(this.$appdata.getParam('办理环节')) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam('办理环节')], // 流程节点
         applyNatures: [{label: '全部', value: ''},{label: '工业', value: '工业'},{label: '商业', value: '商业'},{label: '散户', value: '散户'},{label: '小区', value: '小区'},{label: '分户挂表', value: '分户挂表'}], // 报建性质
         criteriaShow: false,
         sources:[{label: '微信公众号', value: '微信公众号'},{label: '线下发起', value: '线下发起'}],
         filetype:[{label: '已上传图纸', value: 'is not null'}, {label: '未上传图纸', value: 'is null'}],
-        UserList:[{label: '全部', value: ''}, ...this.$appdata.getParam('用户分类')],
+        UserList:[{label: '全部', value: ''}, ...this.$appdata.getParam('用户分类')?this.$appdata.getParam('用户分类'):[]],
         UserType:[{label: '全部', value: ''}, {label: '普通用户', value: '普通用户'}, {label: '煤改用户', value: '煤改用户'}],
         designerPeoples:  this.getDesigner(),
         dispatching:  [{label: '全部', value: ''}, {label: '施工工队', value: '施工工队'}, {label: '安检维修中心', value: '安检维修中心'}],