Merge branch 'develop' of ssh://nvwa.jiuqi.com.cn:2222/GFP/RBC/rbc-frontend into develop-yuancheng

develop/@rbc/bill-runner-query/src/views/query-runner.vue

 <template>
   <gms-query
     :templateName="config.name"
-    v-if="config.name"
+    v-if="config.name && visible"
     :extrCondition="extrCondition"
     :tableHeight="tableHeight"
   ></gms-query>
@@ -29,6 +29,7 @@ export default {
     return {
       extrCondition: [],
       tableHeight: height,
+      visible: true,
     };
   },
   mounted() {
@@ -38,6 +39,20 @@ export default {
     if(GMS.$hideContainer.$route.query && GMS.$hideContainer.$route.query.param){
       this.extrCondition = GMS.$hideContainer.$route.query.param.fieldQueryRelation;
     }
+    this.$root.$on('updated', this.refresh)
+  },
+  beforeUnmount() {
+    this.$root.$off('updated', this.refresh)
+  },
+  methods: {
+    refresh(visible) {
+      if (visible == 'show') {
+        this.visible = false
+        this.$nextTick(() => {
+          this.visible = true
+        })
+      }
+    },
   },
 };
 </script>

develop/@rbc/runner-bill-form/src/views/bill-form-runner.vue

@@ -56,7 +56,6 @@ export default {
       this.init = false;
       this.$nextTick(() => {
         this.init = true;
-        // this.type = 'load'
       });
     });
     GMS.vbus.$on("workflow-state-change", (val) => {
@@ -79,7 +78,7 @@ export default {
         return
       }
       const tem = this.curBill && this.curBill.getBuillData() || {}
-      if (compareData(GMS.oldBillDataMap[this.curTagId], tem)) cb(true)
+      if (compareData(GMS.oldBillDataMap[this.curTagId], tem) || this.state == 'readOnly') cb(true)
       else {
         this.$Modal.confirm({
           title: "信息提示",
@@ -96,9 +95,13 @@ export default {
     loadFinishFun(bill) {
       this.curBill = bill;
       const billState = bill.getMasterData().getValue('billState')
-			if ([90,92].includes(billState)) {
-				this.state = 'readOnly'
-			}
+      if (this.state != 'readOnly' && [90,92].includes(billState)) {
+        this.state = 'readOnly' ;
+        this.init = false;
+        this.$nextTick(() => {
+          this.init = true;
+        });
+      }
       setTimeout(() => {
         GMS.oldBillData = bill.getBuillData();
         if (!GMS.oldBillDataMap) GMS.oldBillDataMap = {}

develop/@rbc/welcome-page/app.config.json

 {
   "name": "welcome-page",
-  "title": "大屏配置",
+  "title": "云报销配置",
   "author": "admin",
   "keywords": "invoice",
   "company": "久其软件",
@@ -19,6 +19,11 @@
       "title": "登录页配置",
       "icon": "",
       "component": "LoginPage"
+    },
+    {
+      "title": "系统版本",
+      "icon": "",
+      "component": "About"
     }
   ],
   "data": {

develop/@rbc/welcome-page/index.demo.js

@@ -5,6 +5,7 @@
 import Vue from 'vue'
 import WelcomePage from './src/views/welcome-page'
 import LoginPage from './src/views/login-page'
+import About from './src/views/about'
 
 
 // 在此处引入vuex和router，将下面导出对象改为{app: App, store: store, router: router}
@@ -15,6 +16,9 @@ export default {
   },
   LoginPage: {
     app: LoginPage,
-  }
+  },
+  About: {
+    app: About,
+  },
 }
  
\ No newline at end of file

develop/@rbc/welcome-page/package.json

@@ -6,6 +6,7 @@
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "build-dev": "vue-cli-service build --mode development",
+    "build-dev-watch": "vue-cli-service build --mode development --watch",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {

develop/@rbc/welcome-page/src/views/about.vue

+<template>
+  <div>{{version}}</div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      version: '',
+    }
+  },
+  mounted() {
+    const appStoreServer = window.nros.createNewInstance({
+      baseURL: `${window.location.origin}/`,
+    })
+    let times = new Date().getTime()
+    appStoreServer.get(`${window.NROS_PREFIX || '/'}version.json?times=`+times).then((res) => {
+      console.log(res)
+      this.version = res && res.data && res.data.rbcVersion
+    })
+  }
+}
+</script>
+
+<style>
+
+</style>
\ No newline at end of file