Merge remote-tracking branch 'origin/master'

src/mixin/commonApi.js

@@ -6,7 +6,7 @@ export default {
         return {}
     },
     mounted(){
-        this.restoreDisplay()
+        //this.restoreDisplay()
     },
     methods:{
         init(params){

src/mixin/commonProcess.js

@@ -9,8 +9,10 @@ export default {
   },
   created: function () {},
   mounted() {
+    if(!this.isInDisplay){
       this.ruleWatcher()
       this.ruleCheck()
+    }
   },
   methods: {
     ruleWatcher() {
@@ -45,5 +47,10 @@ export default {
       }
       this.rules = res;
     }
+  },
+  computed:{
+    isInDisplay(){
+      return this.$store.state.Status.mode === 'display'
+    }
   }
 }
\ No newline at end of file

src/views/Business/Ditopn/index.vue

@@ -204,6 +204,9 @@ export default {
             console.log(rtnmsg)
             Utils.copyValueFromVO(this.model,rtnmsg.data)
             console.log(this.model);
+            if(this.isInDisplay)
+                this.restoreDisplay()
+
         }
         else
         {

src/views/Display/index.vue

@@ -6,9 +6,22 @@
 
 <script>
 import businessContainer from "../Business"
+import { mapMutations } from 'vuex'
 export default {
     components:{
         businessContainer //复用业务容器
+    },
+    created: function () {
+        console.log("进入快照界面")
+        this.setMode('display')
+    },
+    destroyed: function () {
+        this.setMode('normal')
+    },
+    methods: {
+        ...mapMutations([
+        'setMode'
+        ])
     }
 }
 </script>