apply-clients 3.3.33 → 3.3.37

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

@@ -118,6 +118,16 @@
         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)
       }
     },
 

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

@@ -26,6 +26,7 @@
             </div>
             <div class="form-group col-sm-2 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
+              <button class="button_search button_spacing" @click="$parent.$parent.loadPage()">返回</button>
               <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
               <div
                 :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -200,6 +201,9 @@
     events: {
     },
     methods: {
+      loadPage () {
+        this.$dispatch('loadPage')
+      },
       // 查询
       search () {
         this.$dispatch('search')

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

@@ -1,124 +1,124 @@
-<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 }}
-          <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('流程监控')
-      }
-    },
-    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 }}
+          <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('流程监控')
+      }
+    },
+    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>