apply-clients 4.1.10-11 → 4.1.10-weinan

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

@@ -1,119 +1,96 @@
 <template>
-    <div class="text-center" style="padding-top: 1%" >
-      <div class="chart text-center" v-for=" row in defnames">
-        <div  style="padding-top: 5px;margin-bottom: 0px;padding-bottom: 0px" @click="getdefname(row)">{{row.defname}}</div>
-        <div class="to_bottom" v-if="$index != defnames.length-1"></div>
+    <div style="overflow: auto;background-color: #FFFFFF;margin-top: 20px">
+      <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'
-    export default {
-      title: "流程节点",
-      props:['selectdata'],
-      data(){
-        return{
-          defnames:[],
-          defname : ''
-        }
-      },
-      methods :{
-        //点击获取节点名
-        getdefname(row){
-          // if(row.defname === this.$supervisory_vue.start_activity){
-          //   row = Object.assign({},this.selectdata,row)
-          //   this.$dispatch('check', row)
-          // }else if(row.actorexpression){
-          //   row = Object.assign({},this.selectdata,row)
-          //   this.$dispatch('check', row)
-          // }else{
-          //   this.$showMessage("对不起，您没有查看此节点的权限！")
+  export default {
+    title: "流程节点",
+    props:['selectdata'],
+    data(){
+      return{
+        defnames: [] // 所有节点
+      }
+    },
+    created () {
+      this.initial()
+    },
+    methods :{
+      async initial() {
+        // 获取流程节点信息
+        let http = new HttpResetClass()
+        let temp = []
+        if(this.selectdata && this.selectdata.f_process_id){
+          let res = await http.load('POST','rs/sql/getAllNode',{data:{processid: this.selectdata.f_process_id}},{resolveMsg:null, rejectMsg:null})
+          //循环去除回退导致重复的节点
+          // for (let i = 0; i < res.data.length; i++) {
+          //   let flag = true
+          //   for (let j = 0; j < temp.length; j++) {
+          //     if (res.data[i].defname === temp[j].defname) {
+          //       flag = false
+          //     }
+          //   }
+          //   if(flag){
+          //     temp.push(res.data[i])
+          //   }
           // }
-          // 检测是否有权限
-          if (row.defname === '合同信息') {
-            if (this.$login.f.f_parentname === '工程部') {
-              row = Object.assign({},this.selectdata,row)
-              this.$dispatch('check', row)
-            }else {
-              this.$showMessage('请注意!该部门无当前状态/节点的查看权限！')
-              return
-            }
-          }else if (row.defname === '收款') {
-            if (this.$login.f.f_parentname === '财务部') {
-              row = Object.assign({},this.selectdata,row)
-              this.$dispatch('check', row)
-            }else {
-              this.$showMessage('请注意！该角色无当前状态/节点的查看权限！')
-              return
-            }
-          }else {
-            row = Object.assign({},this.selectdata,row)
-            this.$dispatch('check', row)
-          }
-        },
-        // 检测是否有权限
-        check(actorexpression){
-          let array = this.$login.f.rolesnames.split(',')
-          for(let i=0;i<array.length;i++){
-            if(array[i] && actorexpression.includes(array[i])){
-              return true
-            }else if(actorexpression.includes(this.$login.f.id)){ // P(张三)  // 张三
-              return true
-            }else if(array[i]=='报装流程监控'){
-              return true
-            }
-          }
-          return false
+          this.defnames = res.data
         }
       },
-      watch:{
-        async 'selectdata'(){
-          // 获取流程节点信息
-          let http = new HttpResetClass()
-          var  temp = []
-          if(this.selectdata){
-            let res = await http.load('POST','rs/sql/getdefname',{data:{processid:this.selectdata.f_process_id}},{resolveMsg:null, rejectMsg:null})
-            //循环去除回退导致重复的节点
-            for (var i = 0; i < res.data.length; i++) {
-              var flag = true
-              for (var j = 0; j< temp.length; j++){
-                if(res.data[i].defname == temp[j].defname){
-                  // 获取每个满足条件节点信息的人的分公司和部门
-
-                  http = new HttpResetClass()
-
-                  flag = false
-                }
-              }
-              if(flag){
-                temp.push(res.data[i])
-              }
-            }
-            this.defnames = temp
-          }
+      //点击获取节点名
+      getdefname(row){
+          row = Object.assign({},this.selectdata,row)
+          this.$dispatch('apply', row)
+      },
+      // 检测是否有权限
+      check(actorexpression){
+        let sign = actorexpression.charAt(0)
+        let str = actorexpression.substring(2,actorexpression.length-1)
+        let flag = false
+        if (sign === 'D' && this.$login.f.f_department_name.includes(str)) {
+          flag = true
+        }
+        if (sign === 'R' && this.$login.f.f_role_name.includes(str)) {
+          flag = true
         }
+        if (sign === 'P' && this.$login.f.id.includes(str)) {
+          flag = true
+        }
+        return flag
       }
+    },
+    watch:{
     }
+  }
 </script>
 
 <style scoped>
-.chart{
-  /*display: inline-block;*/
-  width: 10em;
-  height: 3em;
-  background-color: whitesmoke;
-  border-radius: 4em;
+.row{
+  text-align: center;
+  height: auto;
+  margin-right: 20px;
+}
+.item{
+  border-radius: 2em;
   border: 1px solid silver;
-  margin: 15px auto;
+  line-height: 25px;
 }
-.to_bottom {
-  width: 0;
-  height: 0;
-  margin-left: 38%;
-  margin-top: 5%;
-  border-top: 5px solid skyblue;
-  border-left: 15px solid transparent;
-  border-right: 15px solid transparent;
+.arrow{
+  width: 100%;
+  color: #5ac0d9;
+  font-weight: bold;
 }
+  .selectIndex{
+    background-color: #5ac0d9;
+    color: #ffffff;
+  }
 </style>

package/src/components/product/Test.vue

@@ -1,7 +1,5 @@
 <template>
-  <div class="basic-main" style="height: 100%">
-    {{{ model }}}
-  </div>
+
 </template>
 
 <script>
@@ -32,5 +30,11 @@
 </script>
 
 <style scoped>
-
+.my-swipe .van-swipe-item {
+  color: #fff;
+  font-size: 20px;
+  line-height: 150px;
+  text-align: center;
+  background-color: #39a9ed;
+}
 </style>

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

@@ -35,7 +35,7 @@
           <div class="right col-sm-7">
             <p :title="row.f_filename" class="clears"><strong>文件名：</strong>{{row.f_filename}}</p>
             <p :title="row.f_username" class="clears"><strong>操作员：</strong><span>{{row.f_username}}</span></p>
-            <p :title="row.fusetype" class="clears"><strong>使用类型：</strong><span>{{row.fusetype}}</span></p>
+            <p :title="row.fusetype" class="clears"><strong>文件类型：</strong><span>{{row.fusetype}}</span></p>
             <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">
@@ -66,7 +66,7 @@
             class="select select_list"
             :value.sync="headers.fusetype"
             v-model="headers.fusetype"
-            :options="$appdata.getParam('使用类型')"
+            :options="$appdata.getParam('文件类型')"
             :valueSingle="true"></input-select>
         </div>
       </div>
@@ -151,7 +151,7 @@ export default {
       })
 
       for (var i = 0; i < getFile.data.length; i++) {
-        // 如果使用类型包含导入字样,则是execl文件导入的,不做显示
+        // 如果文件类型包含导入字样,则是execl文件导入的,不做显示
         if(getFile.data[i].fusetype&&(getFile.data[i].fusetype.includes('execl导入'))){
           getFile.data.splice(i,1)
           i--
@@ -208,7 +208,7 @@ export default {
   },
   computed: {
     typeOfUse () {
-      return [{label: '全部', value: ''}, ...this.$appdata.getParam('使用类型')]
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('文件类型')]
     }
   },
   events: {

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

@@ -15,7 +15,7 @@
     props: {
       title: {
         type: String,
-        default: '供水应用'
+        default: '燃气应用'
       },
       needBack: {
         type: Boolean,

package/src/main.js

@@ -1,32 +1,25 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-import {ldap} from 'ldap-clients'
-import {system} from 'system-clients'
-import {sale} from 'sale-client'
-import {material} from 'material-client'
-
-import apply from './apply'
-//import applyAndroid from './applyAndroid'
-import 'lib-flexible/flexible.js'
-/*import vueBubble from 'vue-bubble'
-Vue.use(vueBubble)*/
-// import AndroidPlugin from './AndroidPlugin.js'
-import {systemphonegrid} from 'system-phone'
-// var Verificationfalg = false
-// system(Verificationfalg)
-all()
-system(false)
-apply()
-ldap()
-sale()
-material()
-
-// applyAndroid()
-// Vue.use(AndroidPlugin)
-require('./bootstrap/less/bootstrap.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+import {ldap} from 'ldap-clients'
+import {system} from 'system-clients'
+import {sale} from 'sale-client'
+import {material} from 'material-client'
+
+import apply from './apply'
+import applyAndroid from './applyAndroid'
+
+applyAndroid()
+all()
+apply()
+ldap()
+sale()
+material()
+system(false)
+
+require('system-clients/src/styles/less/bootstrap.less')
+require('./expandcss.less')
+new Vue({
+  el: 'body',
+  components: { App }
+})