system-clients 3.2.1-16 → 3.2.1-19

package/package.json

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

package/src/components/Main.vue

@@ -267,11 +267,7 @@ export default {
         }
         new HttpResetClass().load('POST','rs/path/operatorService/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
           if(res.data && res.data.n !== 0){
-             this.$showMessage('你有'+res.data.n+'个工单待处理，是否跳转到站点工单页面',['confirm','cancel']).then((res) => {
-               if(res === 'confirm'){
-                 this.$refs.route.init('stand-work', {})
-               }
-             })
+             this.$showMessage('你有'+res.data.n+'个工单待处理，请尽快前往站点工单页面进行处理')
           }
         })
       }

package/src/components/server/Login.vue

@@ -103,6 +103,14 @@
                 <span >{{$login.f.deps}}</span>
               </div> -->
             </div>
+            <div class="col-sm-12 " v-if="AppDaiBan !==''">
+                <label class="col-sm-2">报装待办:</label>
+              <span style="font-weight:normal">{{AppDaiBan}}</span>
+            </div>
+            <div class="col-sm-12 " v-if="OrderDaiBan !==''">
+              <label class="col-sm-2">预约待办:</label>
+              <span style="font-weight:normal">{{OrderDaiBan}}</span>
+            </div>
           </div>
         </form>
       </article>
@@ -189,6 +197,10 @@ let saveGen = function *(self) {
       })
     } else if ((!self.otherLogin) && self.$login.depPrompt) {
       self.depPromptShow = true
+      if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
+        // 获取待办
+        self.getDaiBan()
+      }
     } else {
       self.$goto('home-page', {functions: self.$login.f})
       // if (self.otherLogin){
@@ -289,10 +301,56 @@ export default {
       logoandroid:false,
       showus:false,
       notice:'',
-      loginotherflag :true
+      loginotherflag :true,
+      // 报建待办
+      AppDaiBan: '',
+      // 预约待处理
+      OrderDaiBan: ''
     }
   },
   methods: {
+    async getDaiBan(){
+      let http = new HttpResetClass()
+      let data = {
+        condition: '1 = 1',
+        data: {
+          orgid: this.$login.f.orgid,
+          id: this.$login.f.id
+        }
+      }
+      await http.load('POST', '/rs/sql/checkuser', {data: data}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((res) => {
+        let AppDaiBan = {}
+        res.data.forEach(item=>{
+          AppDaiBan[item.defname] = AppDaiBan[item.defname] || []
+          AppDaiBan[item.defname].push(item)
+        })
+        this.AppDaiBan = `您有${res.data.length}条需要处理的报建待办业务！`
+        if (res.data.length> 0){
+          this.AppDaiBan += `其中 ${Object.keys(AppDaiBan).map(key=>`${key}：${AppDaiBan[key].length}条`).join(', ')}`
+        }
+      })
+      await http.load('POST', '/rs/sql/singleTable', {data: {
+          tablename:'t_order_center',
+          condition:` f_orderstate != '预约成功' and  f_orderstate != '预约失败'`
+
+        }}, {
+        resolveMsg: null,
+        rejectMsg: null
+      }).then((res) => {
+        let OrderDaiBan = {}
+        res.data.forEach(item=>{
+          OrderDaiBan[item.f_ordertype] = OrderDaiBan[item.f_ordertype] || []
+          OrderDaiBan[item.f_ordertype].push(item)
+        })
+        this.OrderDaiBan = `您有${res.data.length}条需要处理的微信预约业务！`
+        if (res.data.length> 0){
+          this.OrderDaiBan += `其中 ${Object.keys(OrderDaiBan).map(key=>`${key}：${OrderDaiBan[key].length}条`).join(', ')}`
+        }
+      })
+    },
     async loginother(){
       if (this.config.distanceLogin) {
         if (this.$login && this.$login.getUrlParames('name') ) {

package/src/system.js

@@ -26,7 +26,7 @@ import ResSelectGroup from './components/server/ResSelectGroup'
 //资源选择测试
 import TestResSelect from './components/server/TestResSelect'
 import RoleSelector from "./components/server/RoleSelector";
-export default function (val,filiale,showLogin) {
+export default function (val,filiale,showLogin,show_daiBan) {
   console.log(val,filiale,showLogin)
   //验证码开关赋值
   if(val!=null){
@@ -36,6 +36,10 @@ export default function (val,filiale,showLogin) {
   if(showLogin!=null){
     GetLoginInfoService.depPrompt=showLogin
   }
+  //展示待办赋值
+  if(show_daiBan!=null){
+    GetLoginInfoService.showDaiBan=!!show_daiBan
+  }
   Vue.use(GetLoginInfoService)
   Vue.use(GetAppDataService)
   Vue.use(HeatGetLoginInfoService)

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Fri Mar 13 10:30:51 GMT+08:00 2020
-gradle.version=3.5

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -1 +0,0 @@
-