apply-clients 3.4.3 → 3.4.4

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

@@ -3,6 +3,10 @@
       <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>
@@ -13,6 +17,7 @@
 
 <script>
   import  {HttpResetClass} from 'vue-client'
+  import {isEmpty} from "../../Util";
   export default {
     title: "流程节点",
     props:['selectdata'],
@@ -27,58 +32,76 @@
     methods :{
       async initial () {
         // 获取流程节点信息
-
+        let http = new HttpResetClass()
         let data = {
           processid: this.selectdata.f_process_id
         }
 
-        let res = await this.$resetpost(
+        let res = await http.load(
+          'POST',
           'rs/sql/getAllNode',
           {data: data},
-          {resolveMsg: null, rejectMsg: '流程节点信息获取失败！！！'}
-        )
+          {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("对不起，您没有查看此节点的权限！")
+        // 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 flag = false
 
-        // 获取标识
-        let mark = actorexpression.charAt(0)
+        let str = null
+
+        if (isEmpty(actorexpression)) {
+          return true
+        }
 
-        let str = actorexpression.substring(2, actorexpression.length-1)
+        if (actorexpression.indexOf('D') === 0) {
+          str = actorexpression.substring(2, actorexpression.length-1)
+          return this.$login.f.f_department_name.includes(str)
+        }
 
-        if (mark === 'D' && this.$login.f.f_department_name.includes(str)) {
-          flag = true
+        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 (mark === 'R' && this.$login.f.f_role_name.includes(str)) {
-          flag = true
+
+        if (actorexpression.indexOf('R') === 0) {
+          str = actorexpression.substring(2, actorexpression.length-1)
+          return this.$login.f.f_role_name.includes(str)
         }
-        if (mark === 'P' && this.$login.f.id.includes(str)) {
-          flag = true
+
+        if (actorexpression.indexOf('PI') === 0) {
+          str = actorexpression.substring(3, actorexpression.length-1)
+          return this.$login.f.id.includes(str)
         }
-        if (this.$login.f.f_role_name.includes('流程监控')) {
-          flag = true
+        if (actorexpression.indexOf('P') === 0) {
+          str = actorexpression.substring(2, actorexpression.length-1)
+          return this.$login.f.name.includes(str)
         }
-        return flag
+
+        return this.$login.f.f_role_name.includes('流程监控')
       }
     },
+    computed: {
+    },
     watch:{
     }
   }

package/src/components/product/VueUtils/ApplyUpload.vue

@@ -30,6 +30,8 @@
               <img v-if="row.f_filetype === 'pdf'" src="../../image/pdf.jpg" alt="" />
               <img v-if="row.f_filetype === 'xls'||row.f_filetype === 'xlsx'" src="../../image/excel.jpg" alt=""  />
               <img v-if="row.f_filetype === 'doc'||row.f_filetype === 'docx'" src="../../image/doc.jpg" alt=""  />
+              <img v-if="row.f_filetype === 'dwg'" src="../../image/dwg.jpg" alt=""  />
+              <img v-if="row.f_filetype === 'txt'" src="../../image/txt.jpg" alt=""  />
             </a>
           </div>
           <div class="right col-sm-7">
@@ -39,7 +41,7 @@
             <p :title="row.f_uploaddate" class="clears"><strong>上传时间：</strong><span>{{row.f_uploaddate}}</span></p>
             <p :title="row.fremarks" class="clears"><strong>文件说明：</strong>{{row.fremarks}}</p>
             <p class="clears">
-              <a v-if="row.f_filetype === 'jpg' || row.f_filetype==='png' || row.f_filetype==='gif' || row.f_filetype==='bmp'" :href="row.f_downloadURL" style="background:#6aa6e2" class="btn btn-primary" target="_blank" role="button">预览</a>
+              <a v-if="row.f_filetype === 'jpg' || row.f_filetype === 'txt' || row.f_filetype === 'dwg' || row.f_filetype==='png' || row.f_filetype==='gif' || row.f_filetype==='bmp'" :href="row.f_downloadURL" style="background:#6aa6e2" class="btn btn-primary" target="_blank" role="button">预览</a>
               <a v-else  @click="downloadfile(row.f_downloadURL)" style="background:#6aa6e2" class="btn btn-primary" role="button">下载</a>
               <a v-if="isdelete" @click="delet($index, row)" href="#" class="btn btn-default" role="button" role="button">删除</a>
             </p>
@@ -141,7 +143,7 @@ export default {
     // 查询
     async load() {
       let condition = ''
-      if(this.businessid){
+      if(!isEmpty(this.businessid)){
         condition = `f_businessid= '${this.headers.businessid}' `
       }else{
         condition = `f_blobid= '${this.headers.blodid}' `
@@ -234,40 +236,40 @@ export default {
 </script>
 
 <style scoped>
-.clears{
-  overflow:hidden;
-  text-overflow:ellipsis;
-  white-space:nowrap;
-}
-.showData {
-  padding: 15px 10px 0px 10px;
-  box-sizing: border-box;
-  height: 230px;
-  font-family: "微软雅黑";
-}
-.showData .item{
-  padding-bottom: 10px;
-  border-bottom: solid 1px #c1c1c1;
-}
-.left {
-  padding-right: 10px;
-}
-.left img{
-  height: 100%;
-  width: 100%;
-}
-.right{
-  height: 100%;
-  /*display: -webkit-flex;*/
-  /*display: flex;*/
-  /*flex-direction: column;*/
-  /*justify-content: space-around;*/
-}
-.item_btn{
-  width: 80%;
-  background-color: #6aa6e2;
-  border-radius: 4px;
-  color: #FFFFFF;
-  font-family: PingFang;
-}
+  .clears{
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+  }
+  .showData {
+    padding: 15px 10px 0px 10px;
+    box-sizing: border-box;
+    height: 230px;
+    font-family: "微软雅黑";
+  }
+  .showData .item{
+    padding-bottom: 10px;
+    border-bottom: solid 1px #c1c1c1;
+  }
+  .left {
+    padding-right: 10px;
+  }
+  .left img{
+    height: 100%;
+    width: 100%;
+  }
+  .right{
+    height: 100%;
+    /*display: -webkit-flex;*/
+    /*display: flex;*/
+    /*flex-direction: column;*/
+    /*justify-content: space-around;*/
+  }
+  .item_btn{
+    width: 80%;
+    background-color: #6aa6e2;
+    border-radius: 4px;
+    color: #FFFFFF;
+    font-family: PingFang;
+  }
 </style>