system-clients 3.2.67 → 3.2.69

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "system-clients",
-  "version": "3.2.67",
+  "version": "3.2.69",
   "description": "系统基础框架",
   "main": "src/index.js",
   "directories": {

package/src/App.vue

@@ -1,24 +1,24 @@
-<template>
-  <app-base class="bg">
-    <div class='flex'>
-      <article>
-        <!--<route :comp="{name: 'check-model'}"></route>-->
-        <!--<route :comp="{name: 'vender-management'}"></route>-->
-        <route :comp="{name: 'login'}"></route>
-        <!-- <route :comp="{name: 'load-data'}"></route> -->
-        <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
-        <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
-      </article>
-    </div>
-  </app-base>
-</template>
-
-<script>
-// import cardListen from './plugins/CardListen'
-
-export default {
-  // ready () {
-  //   cardListen.startListen()
-  // }
-}
-</script>
+<template>
+  <app-base class="bg">
+    <div class='flex'>
+      <article>
+        <!--<route :comp="{name: 'check-model'}"></route>-->
+        <!--<route :comp="{name: 'vender-management'}"></route>-->
+        <route :comp="{name: 'login'}"></route>
+        <!-- <route :comp="{name: 'load-data'}"></route> -->
+        <!-- <route  :comp="{name: 'load-params', props: {componentName: 'login'}}"></route> -->
+        <!-- <route :comp="{name: 'load-params', props: {dataUrl: ['rs/sql/getMeterBrand','rs/sql/getPriceType','rs/sql/getMeterStyle'], componentName: 'login'}}"></route> -->
+      </article>
+    </div>
+  </app-base>
+</template>
+
+<script>
+// import cardListen from './plugins/CardListen'
+
+export default {
+  // ready () {
+  //   cardListen.startListen()
+  // }
+}
+</script>

package/src/components/Main.vue

@@ -128,6 +128,10 @@
               <label class="col-sm-2">预约待办:</label>
               <span style="font-weight:normal">{{OrderDaiBan}}</span>
             </div>
+            <div class="col-sm-12 " v-if="flowDaiBan !==''">
+              <label class="col-sm-2">流程审核待办:</label>
+              <span style="font-weight:normal">{{flowDaiBan}}</span>
+            </div>
           </div>
         </form>
       </article>
@@ -220,6 +224,7 @@ let createWaterMark = function (userName) {
         newTipContextShow: false,
         AppDaiBan: '',
         OrderDaiBan: '',
+        flowDaiBan: '',
         // 左侧树下部三个小图标
         imgs: {
           open: '/images/lefticon/菜单伸缩.png',
@@ -304,6 +309,9 @@ let createWaterMark = function (userName) {
       }
       // 获取预约列表
       this.functions.f_role_name && this.functions.f_role_name.includes(this.config.msgRole) && this.config.isTip && this.getOrderList()
+      if (this.config.approve) {
+        this.getFlowList()
+      }
     },
     methods: {
       getOrderList(){
@@ -317,6 +325,19 @@ let createWaterMark = function (userName) {
           console.log('捕获到异常', error)
         }
       },
+      // 获取审核待办
+      getFlowList(){
+        console.log('======获取流程审核待办=====')
+        let times = this.config.approveTimes * 60 * 1000
+        console.log("=定时提示间隔=", times)
+        try {
+          this.interval = setInterval(() => {
+            this.getFlowDaiBan()
+          }, times)
+        } catch (error) {
+          console.log('捕获到异常', error)
+        }
+      },
       getTimesgotoWorkOrderSite(){
         let teltimes = 2*60*1000 // 两分钟
         try {
@@ -327,6 +348,27 @@ let createWaterMark = function (userName) {
           console.log('捕获到异常', e)
         }
       },
+      async getFlowDaiBan(){
+        this.flowDaiBan = ''
+        let http = new HttpResetClass()
+        let data = {
+          condition: `f_handler = '${this.$login.f.name}'`
+        }
+        await http.load('POST', 'rs/sql/future_getMyWorkFlowList', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: null
+        }).then((res) => {
+          if (res.data.length > 0){
+            this.flowDaiBan = `您有${res.data.length}条需要处理的审核流程业务！`
+          }
+        }).catch((e)=>{
+          console.log('报错了！！')
+          console.error(e)
+        })
+        if(this.flowDaiBan){
+          this.newTipShow = true
+        }
+      },
       async getDaiBan(){
         this.OrderDaiBan  = ''
         this.AppDaiBan  = ''

package/src/components/server/Login.vue

@@ -85,7 +85,7 @@
       技术支持：西安奥枫软件有限公司
     </div>
     <div class="login-foot" v-show="$login.BAinformation">
-      {{ $login.BAinformation }}
+      {{{ $login.BAinformation }}}
     </div>
 
     <modal v-if="depPromptShow" :show.sync="depPromptShow" :backdrop="false" v-ref:modal >
@@ -314,6 +314,8 @@ export default {
         msgRole : '预约处理人员',
         // 定时获取提示间隔 单位：分钟
         times: 25,
+        approve: false, // 是否获取审核提醒
+        approveTimes: 1 // 审核时间见间隔
       },
       titleShow: true, //标题显示
       otherLogin:false,