Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/components/FunctionBtn.vue

@@ -98,6 +98,7 @@ export default {
       })
         .then(res => {
           // this.$router.back();
+          this.$store.dispatch("TagsView/delView", this.$route)
           this.handleExit && this.handleExit()
           if (this.$route.query && this.$route.query.routeParams) {
             setTimeout(() => {

src/mixin/commonFuncs.js

@@ -11,7 +11,10 @@ export default {
           message: "保存成功",
           type: "success",
         });
-        this.$router.history.push("/business/trnrel");
+        this.$store.dispatch("TagsView/delView", this.$route)
+        this.$router.history.push("/taskList", () => {
+          this.$store.commit("setTaskListTabVal", 'trnrel')
+        });
       } else{
         this.$notify({
           title: "失败",
@@ -36,7 +39,10 @@ export default {
           message: "暂存成功",
           type: "success",
         });
-        this.$router.history.push("/business/sptsel");
+        this.$store.dispatch("TagsView/delView", this.$route)
+        this.$router.history.push("/taskList", () => {
+          this.$store.commit("setTaskListTabVal", 'sptbrk')
+        });
       } else {
         this.$notify({
           title: "失败",
@@ -70,11 +76,6 @@ export default {
           });
           return
         }
-        this.$notify({
-          title: "成功",
-          message: "校核成功",
-          type: "success",
-        });
       } else {
         this.$notify.error({ title: "错误", message: result.respMsg });
       }

src/model/Trnrel/Event.js

@@ -95,17 +95,48 @@ export default {
 
         let rtnmsg = await this.executeRule("relrow", params)
         if (rtnmsg.respCode == SUCCESS) {
-
-
-            this.$message({
-                type: 'success',
-                message: 'Reject成功！'
-            });
-
-
+            debugger;
+            let errorMsg = "";
+            let fieldErrorsFlag = (JSON.stringify(rtnmsg.fieldErrors) == "{}");
+            if(!fieldErrorsFlag){
+                let errorMsgkey = "";
+                let errorMsgVal = "";
+                for (const key in rtnmsg.fieldErrors) {
+                    errorMsgkey = key;
+                    errorMsgVal = rtnmsg.fieldErrors[key];
+                }
+                errorMsg = errorMsgkey+':'+errorMsgVal;
+                this.$notify.error({title: '错误',message: '复核失败！错误信息['+errorMsg+']'});
+            }else{
+                this.$notify({
+                    title: '成功',
+                    message: '复核成功',
+                    type: 'success'
+                });
+                debugger;
+                const that = this.root;
+                that.executeRule("searow").then(res => {
+                    //TODO 处理数据逻辑
+                    that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
+                    this.model.trncorco.trnstm = res.data.trncorco_trnstm;
+                })
+            }         
         }
         else {
-            this.$notify.error({ title: '错误', message: '服务请求失败！' });
+            let errorMsg = "";
+            let fieldErrorsFlag = (JSON.stringify(rtnmsg.fieldErrors) == "{}");
+            if(!fieldErrorsFlag){
+                let errorMsgkey = "";
+                let errorMsgVal = "";
+                for (const key in rtnmsg.fieldErrors) {
+                    errorMsgkey = key;
+                    errorMsgVal = rtnmsg.fieldErrors[key];
+                }
+                errorMsg = errorMsgkey+':'+errorMsgVal;
+            }else if(rtnmsg.respMsg){
+                errorMsg = rtnmsg.respMsg;
+            }
+            this.$notify.error({title: '错误',message: '复核失败！错误信息['+errorMsg+']'});
         }
     },
     sleep(ms) {
@@ -287,18 +318,18 @@ export default {
     },
     async handleSearch() {
         const that = this.root;
-        if (this.model.searchAllUsers) {
-            that.executeRule("seajbh").then(res => {
-                //TODO 处理数据逻辑
-                that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
-            })
-        } else {
+        // if (this.model.searchAllUsers) {
+        //     that.executeRule("seajbh").then(res => {
+        //         //TODO 处理数据逻辑
+        //         that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
+        //     })
+        // } else {
             that.executeRule("searow").then(res => {
                 //TODO 处理数据逻辑
                 that.$refs.inftrnps.stmData.data = res.data.trncorco_trnstm.rows;
                 this.model.trncorco.trnstm = res.data.trncorco_trnstm;
             })
-        }
+        // }
     },
 
     async handleReset() {
@@ -312,7 +343,8 @@ export default {
         this.model.trncorco.dflg = "ALL";
         this.model.atptxt = "";
         this.model.searchAllUsers = false;
-    }
+    },
+
 
 
 }
\ No newline at end of file

src/store/Status.js

@@ -21,7 +21,8 @@ const Status = {
 			check: false,
 			// 暂存
 			stash: false
-		}
+		},
+		taskListTabVal: ''
 	},
 	mutations: {
 		setMode(state, value) {
@@ -78,6 +79,9 @@ const Status = {
 		},
 		setLoadingStash(state, value) {
 			state.loading.stash = value;
+		},
+		setTaskListTabVal(state, value) {
+			state.taskListTabVal = value;
 		}
 	}
 }

src/views/Business/Infdid/index.vue

@@ -5,7 +5,9 @@
         
             <!--PD000006 -->
            <!-- <el-tab-pane label="信用证查询" name="infsea"> -->
+                <c-content>
                 <m-infsea :model="model" :codes="codes"/>
+                </c-content>
            <!-- </el-tab-pane> -->
  
             <!--PD000001 -->

src/views/Business/Trnrel/Inftrnps.vue

@@ -412,10 +412,12 @@
                 style="margin-left: 0"
                 size="small"
                 type="primary"
-               
+                @click="display(scope.$index, scope.row)"
               >
-                详情
-              </c-button>
+                快照
+              </c-button> 
+             
+      
               <c-button
                 style="margin-left: 0"
                 size="small"

src/views/TaskList/index.vue

@@ -37,26 +37,33 @@ import Bopsel from "~/views/Business/Bopsel";
 export default {
   data(){
     return{
-      tabVal:"sptsel",
+    }
+  },
+  computed: {
+    tabVal: {
+      get() {
+        return this.$store.state.Status.taskListTabVal || "sptsel"
+      },
+      set(val) {
+        this.$store.commit("setTaskListTabVal", val)
+      }
     }
   },
   name: "TaskList",
-
-  methods: {
-    tabClick() {},
+  created() {
   },
-    components:{
-        "t-sptsel" : Sptsel,
-        "t-sptbrk" : Sptbrk,
-        "t-trnrel" : Trnrel,
-        "t-trnfnd" : Trnfnd,
-        "t-diasel" : Diasel,
-        "t-bopsel" : Bopsel,
+  methods: {
+    tabClick(tab) {
     },
-
-   
-  
-    
+  },
+  components:{
+      "t-sptsel" : Sptsel,
+      "t-sptbrk" : Sptbrk,
+      "t-trnrel" : Trnrel,
+      "t-trnfnd" : Trnfnd,
+      "t-diasel" : Diasel,
+      "t-bopsel" : Bopsel,
+  },
 };
 </script>