Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

src/model/Trnrel/Event.js

@@ -88,56 +88,64 @@ export default {
     },
     async onRelrow(idx,row) {
 
-        const selIds = [idx+1]; //rowno选中行
-        const selDst = "trncorco.trnstm" //列表对应后台模型中的stream
-
-        let params = { selDst: selDst, selIds: selIds };
-
-        let rtnmsg = await this.executeRule("relrow", params)
-        if (rtnmsg.respCode == SUCCESS) {
-            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'
-                });
+        this.$confirm('您确定复核该笔交易?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning'
+        }).then(async ()=>{
+            const selIds = [idx+1]; //rowno选中行
+            const selDst = "trncorco.trnstm" //列表对应后台模型中的stream
+    
+            let params = { selDst: selDst, selIds: selIds };
+    
+            let rtnmsg = await this.executeRule("relrow", params)
+            if (rtnmsg.respCode == 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 {
-            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];
+                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 {
+                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;
                 }
-                errorMsg = errorMsgkey+':'+errorMsgVal;
-            }else if(rtnmsg.respMsg){
-                errorMsg = rtnmsg.respMsg;
+                this.$notify.error({title: '错误',message: '复核失败！错误信息['+errorMsg+']'});
             }
-            this.$notify.error({title: '错误',message: '复核失败！错误信息['+errorMsg+']'});
-        }
+        })
+
+       
     },
     sleep(ms) {
         return new Promise((resolve, reject) => {

src/views/Business/Infdid/Infsea.vue

@@ -125,6 +125,7 @@
                       v-model="model.infcon.opndatfrom"
                       style="width: 100%"
                       placeholder="请选择Opening between"
+                      value-format="yyyy-MM-dd"
                     ></el-date-picker>
                   </c-col>
                   <c-col :span="2" style="text-align: center">
@@ -136,6 +137,7 @@
                       v-model="model.infcon.opndatto"
                       style="width: 100%"
                       placeholder="请选择Open Date to"
+                      value-format="yyyy-MM-dd"
                     ></el-date-picker>
                   </c-col>
                 </el-form-item>