apply-clients 7.1.36-yuchuan-14 → 7.1.36-yuchuan-15

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

@@ -1,175 +1,175 @@
-<template>
-  <div>
-    <div id="container"></div>
-  </div>
-</template>
-
-<script>
-import  {HttpResetClass} from 'vue-client'
-import LogicFlow from '@logicflow/core'
-import '@logicflow/core/dist/style/index.css'
-import {isEmpty} from '../../Util'
-export default {
-  title: '测试',
-  props:['selectdata'],
-  data () {
-    return {
-      lf: null,
-      data: null
-    }
-  },
-  ready () {
-    this.installLogicFlow()
-    this.initData()
-  },
-  methods: {
-    nodeClick (args) {
-      if (!args.data.properties || args.data.properties.length === 0) {
-        return
-      }
-      let act = args.data.properties[0]
-      console.log(act)
-      console.log("sacasassa",args.data)
-      if(act.defname==='收费标准' || act.defname==='报装缴费' || act.defname==='合同签订' ){
-        if (this.check(act.actorexpression)) {
-          this.$dispatch('apply', Object.assign({}, this.selectdata, act))
-          return
-        }else {
-          this.$showMessage("对不起，您没有查看此节点的权限！")
-        }
-      }else {
-        this.$dispatch('apply', Object.assign({}, this.selectdata, act))
-        return
-      }
-      this.$showMessage("对不起，您没有查看此节点的权限！")
-    },
-    // 检测是否有权限
-    check (actorexpression){
-      let str = null
-
-      if (isEmpty(actorexpression)) {
-        return true
-      }
-
-      if (actorexpression.indexOf('D') === 0) {
-        str = actorexpression.substring(2, actorexpression.length-1)
-        return this.$login.f.f_department_name.includes(str)
-      }
-      if (actorexpression.indexOf('RS') === 0) {
-        for (str of actorexpression.substring(3, actorexpression.length-1).split(',')) {
-          return this.$login.f.rolesnames.includes(str)
-        }
-      }
-      //
-      if (actorexpression.indexOf('R') === 0) {
-        str = actorexpression.substring(2, actorexpression.length-1)
-        return this.$login.f.rolesnames.includes(str)
-      }
-      //
-      if (actorexpression.indexOf('PI') === 0) {
-        str = actorexpression.substring(3, actorexpression.length-1)
-        return this.$login.f.id.includes(str)
-      }
-      if (actorexpression.indexOf('P') === 0) {
-        str = actorexpression.substring(2, actorexpression.length-1)
-        return this.$login.f.name.includes(str)
-      }
-
-      return this.$login.f.rolesnames.includes('流程监控')
-    },
-    async initData () {
-      let http = new HttpResetClass()
-      let data = {
-        f_process_id: this.selectdata.f_process_id,
-        width: parseInt(this.lf.width),
-        levelHeight: 100,
-        nodeType: 'rect',
-        edgeType: 'polyline'
-      }
-
-      let res = await http.load('POST', 'rs/logic/getAllNode', {data: data}, {
-        resolveMsg: null,
-        rejectMsg: null
-      })
-
-      this.data = res.data
-    },
-    // 创建LogicFlow实例
-    installLogicFlow () {
-
-      this.lf = new LogicFlow({
-        container: document.querySelector('#container'),
-        grid: false,
-        textEdit: false,
-        isSilentMode: true // 开启静默模式
-      })
-
-      this.lf.render()
-
-      this.lf.on('node:click', this.nodeClick)
-    }
-  },
-  watch: {
-    'data' () {
-      if (!this.data) {
-        return
-      }
-      // 不采用直接渲染  节点样式无法单独设置  需要在设置节点前设置样式
-      // this.lf.setTheme({
-      //   rect: {
-      //     width: 100,
-      //     height: 50,
-      //     radius: 6,
-      //     fill: '#4a7cae',
-      //     stroke: '#c75450',
-      //     strokeWidth: 0
-      //   }
-      // })
-      // this.lf.render(this.data)
-
-
-      console.log('---------------节点样式--------------')
-
-      let style = {
-        rect: {
-          width: 120,
-          height: 50,
-          radius: 6,
-          fill: '#ffffff',
-          stroke: '#000000',
-          strokeWidth: 1
-        }
-      }
-
-      for (const node of this.data.nodes) {
-        if (!node.properties || node.properties.length === 0) {
-          style.rect.strokeWidth = 1
-          style.rect.fill = '#ffffff'
-        } else {
-          style.rect.strokeWidth = 0
-
-          let act = node.properties[0]
-
-          if (act.state === '开始活动') {
-            style.rect.fill = '#c75450'
-          } else {
-            style.rect.fill = '#4a7cae'
-          }
-
-          node.text = `${node.text}\n${act.sendtime}`
-        }
-
-        this.lf.setTheme(style)
-        this.lf.addNode(node)
-      }
-
-      for (const edge of this.data.edges) {
-        this.lf.createEdge(edge)
-      }
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>
+<template>
+  <div>
+    <div id="container"></div>
+  </div>
+</template>
+
+<script>
+import  {HttpResetClass} from 'vue-client'
+import LogicFlow from '@logicflow/core'
+import '@logicflow/core/dist/style/index.css'
+import {isEmpty} from '../../Util'
+export default {
+  title: '测试',
+  props:['selectdata'],
+  data () {
+    return {
+      lf: null,
+      data: null
+    }
+  },
+  ready () {
+    this.installLogicFlow()
+    this.initData()
+  },
+  methods: {
+    nodeClick (args) {
+      if (!args.data.properties || args.data.properties.length === 0) {
+        return
+      }
+      let act = args.data.properties[0]
+      console.log(act)
+      console.log("sacasassa",args.data)
+      if(act.defname==='收费标准' || act.defname==='报装缴费' || act.defname==='合同签订' ){
+        if (this.check(act.actorexpression)) {
+          this.$dispatch('apply', Object.assign({}, this.selectdata, act))
+          return
+        }else {
+          this.$showMessage("对不起，您没有查看此节点的权限！")
+        }
+      }else {
+        this.$dispatch('apply', Object.assign({}, this.selectdata, act))
+        return
+      }
+      this.$showMessage("对不起，您没有查看此节点的权限！")
+    },
+    // 检测是否有权限
+    check (actorexpression){
+      let str = null
+
+      if (isEmpty(actorexpression)) {
+        return true
+      }
+
+      if (actorexpression.indexOf('D') === 0) {
+        str = actorexpression.substring(2, actorexpression.length-1)
+        return this.$login.f.f_parentname.includes(str)
+      }
+      if (actorexpression.indexOf('RS') === 0) {
+        for (str of actorexpression.substring(3, actorexpression.length-1).split(',')) {
+          return this.$login.f.rolesnames.includes(str)
+        }
+      }
+      //
+      if (actorexpression.indexOf('R') === 0) {
+        str = actorexpression.substring(2, actorexpression.length-1)
+        return this.$login.f.rolesnames.includes(str)
+      }
+      //
+      if (actorexpression.indexOf('PI') === 0) {
+        str = actorexpression.substring(3, actorexpression.length-1)
+        return this.$login.f.id.includes(str)
+      }
+      if (actorexpression.indexOf('P') === 0) {
+        str = actorexpression.substring(2, actorexpression.length-1)
+        return this.$login.f.name.includes(str)
+      }
+
+      return this.$login.f.rolesnames.includes('流程监控')
+    },
+    async initData () {
+      let http = new HttpResetClass()
+      let data = {
+        f_process_id: this.selectdata.f_process_id,
+        width: parseInt(this.lf.width),
+        levelHeight: 100,
+        nodeType: 'rect',
+        edgeType: 'polyline'
+      }
+
+      let res = await http.load('POST', 'rs/logic/getAllNode', {data: data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      })
+
+      this.data = res.data
+    },
+    // 创建LogicFlow实例
+    installLogicFlow () {
+
+      this.lf = new LogicFlow({
+        container: document.querySelector('#container'),
+        grid: false,
+        textEdit: false,
+        isSilentMode: true // 开启静默模式
+      })
+
+      this.lf.render()
+
+      this.lf.on('node:click', this.nodeClick)
+    }
+  },
+  watch: {
+    'data' () {
+      if (!this.data) {
+        return
+      }
+      // 不采用直接渲染  节点样式无法单独设置  需要在设置节点前设置样式
+      // this.lf.setTheme({
+      //   rect: {
+      //     width: 100,
+      //     height: 50,
+      //     radius: 6,
+      //     fill: '#4a7cae',
+      //     stroke: '#c75450',
+      //     strokeWidth: 0
+      //   }
+      // })
+      // this.lf.render(this.data)
+
+
+      console.log('---------------节点样式--------------')
+
+      let style = {
+        rect: {
+          width: 120,
+          height: 50,
+          radius: 6,
+          fill: '#ffffff',
+          stroke: '#000000',
+          strokeWidth: 1
+        }
+      }
+
+      for (const node of this.data.nodes) {
+        if (!node.properties || node.properties.length === 0) {
+          style.rect.strokeWidth = 1
+          style.rect.fill = '#ffffff'
+        } else {
+          style.rect.strokeWidth = 0
+
+          let act = node.properties[0]
+
+          if (act.state === '开始活动') {
+            style.rect.fill = '#c75450'
+          } else {
+            style.rect.fill = '#4a7cae'
+          }
+
+          node.text = `${node.text}\n${act.sendtime}`
+        }
+
+        this.lf.setTheme(style)
+        this.lf.addNode(node)
+      }
+
+      for (const edge of this.data.edges) {
+        this.lf.createEdge(edge)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

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

@@ -252,7 +252,7 @@
       async getResidentialArea () {
         let data = {
           tablename: 't_area_address',
-          condition: `f_filiale = '${this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'}' and f_area_status = '启用'`
+          condition: `f_filiale like '%${this.$login.f.orgs}%' and f_area_status = '启用'`
         }
         let http = new HttpResetClass()
         let res = await http.load(

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,7 +355,7 @@
       return {
         model: new PagedList('rs/sql/supervisory', 20, {
           data: {
-            f_filiale: this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'
+            f_filiale:this.$login.f.orgs
           },
         }),
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')?this.$appdata.getParam('报建类型'):[]],
@@ -543,7 +543,7 @@
           condition: this.$refs.cp.$refs.cri.condition,
           data: {
             // orgid: this.$login.f.orgid
-            f_filiale: this.$login.f.f_fengongsi?this.$login.f.f_fengongsi:'榆林.榆川天然气'
+            f_filiale: this.$login.f.orgs
           }
         }
       },