apply-clients 3.3.68 → 3.3.71-2

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

@@ -1,137 +1,137 @@
-<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">
-          <supervisory-chart :selectdata="selectdata"></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"
-                            :isupload = "false"
-                            :isdelete="false"
-                            :isusetype="true"
-                            :isremark = "true"
-                            :takeimg="true"
-                            :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: {},
-        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: {
-      // 刷新控制层
-      async 'breakControl' (servicedata) {
-
-        if (servicedata.id) {
-          let data = {
-            condition: `u.id = ${servicedata.id}`,
-            data: {
-              orgid: this.$login.f.orgid
-            }
-          }
-          let res = await this.$resetpost(
-            'rs/sql/supervisory',
-            {data: data},
-            {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
-          )
-          this.selectdata = Object.assign({}, this.selectdata, res.data[0])
-        } else {
-          this.selectdata = servicedata
-        }
-
-        this.showtotal = false
-        this.$nextTick(() => {
-          this.showtotal = true
-        })
-
-      },
-      '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 = null
-        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)
-      }
-    },
-
-    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">
+          <supervisory-chart :selectdata="selectdata"></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"
+                            :isupload = "false"
+                            :isdelete="false"
+                            :isusetype="true"
+                            :isremark = "true"
+                            :takeimg="true"
+                            :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: {},
+        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: {
+      // 刷新控制层
+      async 'breakControl' (servicedata) {
+
+        if (servicedata.id) {
+          let data = {
+            condition: `u.id = ${servicedata.id}`,
+            data: {
+              orgid: this.$login.f.orgid
+            }
+          }
+          let res = await this.$resetpost(
+            'rs/sql/supervisory',
+            {data: data},
+            {resolveMsg: null, rejectMsg: '数据更新失败，请手查询更新！！！'}
+          )
+          this.selectdata = Object.assign({}, this.selectdata, res.data[0])
+        } else {
+          this.selectdata = servicedata
+        }
+
+        this.showtotal = false
+        this.$nextTick(() => {
+          this.showtotal = true
+        })
+
+      },
+      '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 = null
+        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)
+      }
+    },
+
+    watch: {
+    }
+  }
+</script>

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

@@ -132,6 +132,11 @@
                           condition="f_apply_date <= '{}'">
               </datepicker>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">施工单位：</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_construction_unit"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_construction_unit like '%{}%'" placeholder='施工单位'>
+            </div>
           </div>
         </div>
       </criteria>

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

@@ -1,130 +1,130 @@
-<template>
-    <div style="overflow: auto;background-color: #FFFFFF;">
-      <div class="row" v-for="(i,row) in defnames">
-        <div :class="row.id === selectdata.actid ? 'item selectIndex' : 'item'" @click="getdefname(row)" >
-          {{ row.defname }}
-          <span v-if="row.state === '结束'">({{ row.person }})</span>
-          <span v-if="row.state !== '结束' && row.actorexpression !== null && row.actorexpression.indexOf('PI') === 0">
-            ({{ row.peruser }})
-          </span>
-          <br>
-          {{i === (defnames.length) - 1 ? row.sendtime : row.finishtime}}
-        </div>
-        <div class="arrow glyphicon glyphicon-menu-down" v-if="i !== defnames.length-1" aria-hidden="true"></div>
-      </div>
-    </div>
-</template>
-
-<script>
-  import  {HttpResetClass} from 'vue-client'
-  import {isEmpty} from "../../Util";
-  export default {
-    title: "流程节点",
-    props:['selectdata'],
-    data(){
-      return{
-        defnames: [] // 所有节点
-      }
-    },
-    created () {
-      this.initial()
-    },
-    methods :{
-      async initial () {
-        // 获取流程节点信息
-        let http = new HttpResetClass()
-        let data = {
-          processid: this.selectdata.f_process_id
-        }
-
-        let res = await http.load(
-          'POST',
-          'rs/sql/getAllNode',
-          {data: data},
-          {resolveMsg: null, rejectMsg: '流程节点信息获取失败！！！'})
-
-        this.defnames = res.data
-      },
-      //点击获取节点名
-      getdefname (row) {
-        // 发起节点都可查看
-        // if(row.defname === this.$workflow_vue.start_activity){
-        //   row = Object.assign({},this.selectdata,row)
-        //   this.$dispatch('apply', row)
-        //   return
-        // }
-        // if(this.check(row.actorexpression)){
-        //   row = Object.assign({},this.selectdata,row)
-        //   this.$dispatch('apply', row)
-        //   return
-        // }
-        // this.$showMessage("对不起，您没有查看此节点的权限！")
-        delete row.id
-        row = Object.assign({},this.selectdata,row)
-        this.$dispatch('apply', row)
-      },
-      // 检测是否有权限
-      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.f_role_name.includes(str)
-          }
-        }
-
-        if (actorexpression.indexOf('R') === 0) {
-          str = actorexpression.substring(2, actorexpression.length-1)
-          return this.$login.f.f_role_name.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.f_role_name.includes('流程监控')
-      }
-    },
-    computed: {
-    },
-    watch:{
-    }
-  }
-</script>
-
-<style scoped>
-.row{
-  text-align: center;
-  height: auto;
-  margin-right: 20px;
-}
-.item{
-  border-radius: 2em;
-  border: 1px solid silver;
-  line-height: 25px;
-}
-.arrow{
-  width: 100%;
-  color: #5ac0d9;
-  font-weight: bold;
-}
-  .selectIndex{
-    background-color: #5ac0d9;
-    color: #ffffff;
-  }
-</style>
+<template>
+    <div style="overflow: auto;background-color: #FFFFFF;">
+      <div class="row" v-for="(i,row) in defnames">
+        <div :class="row.id === selectdata.actid ? 'item selectIndex' : 'item'" @click="getdefname(row)" >
+          {{ row.defname }}
+          <span v-if="row.state === '结束'">({{ row.person }})</span>
+          <span v-if="row.state !== '结束' && row.actorexpression !== null && row.actorexpression.indexOf('PI') === 0">
+            ({{ row.peruser }})
+          </span>
+          <br>
+          {{i === (defnames.length) - 1 ? row.sendtime : row.finishtime}}
+        </div>
+        <div class="arrow glyphicon glyphicon-menu-down" v-if="i !== defnames.length-1" aria-hidden="true"></div>
+      </div>
+    </div>
+</template>
+
+<script>
+  import  {HttpResetClass} from 'vue-client'
+  import {isEmpty} from "../../Util";
+  export default {
+    title: "流程节点",
+    props:['selectdata'],
+    data(){
+      return{
+        defnames: [] // 所有节点
+      }
+    },
+    created () {
+      this.initial()
+    },
+    methods :{
+      async initial () {
+        // 获取流程节点信息
+        let http = new HttpResetClass()
+        let data = {
+          processid: this.selectdata.f_process_id
+        }
+
+        let res = await http.load(
+          'POST',
+          'rs/sql/getAllNode',
+          {data: data},
+          {resolveMsg: null, rejectMsg: '流程节点信息获取失败！！！'})
+
+        this.defnames = res.data
+      },
+      //点击获取节点名
+      getdefname (row) {
+        // 发起节点都可查看
+        // if(row.defname === this.$workflow_vue.start_activity){
+        //   row = Object.assign({},this.selectdata,row)
+        //   this.$dispatch('apply', row)
+        //   return
+        // }
+        // if(this.check(row.actorexpression)){
+        //   row = Object.assign({},this.selectdata,row)
+        //   this.$dispatch('apply', row)
+        //   return
+        // }
+        // this.$showMessage("对不起，您没有查看此节点的权限！")
+        delete row.id
+        row = Object.assign({},this.selectdata,row)
+        this.$dispatch('apply', row)
+      },
+      // 检测是否有权限
+      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.f_role_name.includes(str)
+          }
+        }
+
+        if (actorexpression.indexOf('R') === 0) {
+          str = actorexpression.substring(2, actorexpression.length-1)
+          return this.$login.f.f_role_name.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.f_role_name.includes('流程监控')
+      }
+    },
+    computed: {
+    },
+    watch:{
+    }
+  }
+</script>
+
+<style scoped>
+.row{
+  text-align: center;
+  height: auto;
+  margin-right: 20px;
+}
+.item{
+  border-radius: 2em;
+  border: 1px solid silver;
+  line-height: 25px;
+}
+.arrow{
+  width: 100%;
+  color: #5ac0d9;
+  font-weight: bold;
+}
+  .selectIndex{
+    background-color: #5ac0d9;
+    color: #ffffff;
+  }
+</style>