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

src/model/Sptsel/Event.js

@@ -93,15 +93,9 @@ export default {
     },
     async handleSearch() {
             if(this.sourceModel.length===0){
-                this.model.chkinc = "t";
-                this.model.chkdzt = "t";
-                this.model.chkcor = "t";
-                this.model.chkaut = "t";
-                this.model.chkdel = "t";
-                this.model.chktco = "t";
-                this.model.chkcan = "t";
-                this.model.chkypt = "t";
-
+                this.sourceData.forEach(s => {
+                    this.model[s.value] = 't';
+                  })
             }
             this.executeDefault("sptstm").then(res => {
                 //TODO 处理数据逻辑

src/model/Trnrel/Event.js

@@ -88,25 +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) {
-
-
-            this.$message({
-                type: 'success',
-                message: 'Reject成功！'
-            });
-
+        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;
+                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;
+                }
+                this.$notify.error({title: '错误',message: '复核失败！错误信息['+errorMsg+']'});
+            }
+        })
 
-        }
-        else {
-            this.$notify.error({ title: '错误', message: '服务请求失败！' });
-        }
+       
     },
     sleep(ms) {
         return new Promise((resolve, reject) => {
@@ -287,18 +326,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 +351,8 @@ export default {
         this.model.trncorco.dflg = "ALL";
         this.model.atptxt = "";
         this.model.searchAllUsers = false;
-    }
+    },
+
 
 
 }
\ No newline at end of file

src/views/Business/Bctacc/Detp.vue

 <template>
-    <div class="eibs-tab">
-
+    <c-row>
         <!-- ====================左边======================= -->
         <c-col :span="12">
             <c-col :span="24">
@@ -107,7 +106,7 @@
                 <c-checkbox v-model="model.bcdgrp.rec.focflg">Free of Payment</c-checkbox>
             </c-col>
         </c-col>
-    </div>
+    </c-row>
 </template>
 <script>
     import Api from "~/service/Api"

src/views/Business/Bctacc/index.vue

@@ -10,7 +10,7 @@
                     <el-button size="small">拆分报文</el-button>
                     <el-button size="small">智能提示</el-button>
                </c-function-btn>
-               <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="left"
+               <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right"
                     size="small" :validate-on-rule-change="false">
                     <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
 

src/views/Business/Bctrad/Detp.vue

 <template>
-    <div class="eibs-tab">
-
+    <c-row>
         <!-- ====================左边======================= -->
         <c-col :span="12">
             <c-col :span="24">
@@ -59,12 +58,12 @@
         <!-- ====================右边======================= -->
         <c-col :span="12">
             <c-col :span="24">
-                <c-col :span="20">
+                <c-col :span="24">
                     <el-form-item label="Charges Condition" prop="bcdgrp.blk.othins">
                         <c-select type="textarea" v-model="model.bcdgrp.blk.othins" maxlength="65" show-word-limit
                             placeholder="请输入Charges Condition"></c-select>
                     </el-form-item>
-                    <el-option v-for="item in codes.chadet" :key="item.value" :label="item.label" :value="item.value">
+                    <el-option v-for="item in codes.othins" :key="item.value" :label="item.label" :value="item.value">
                     </el-option>
                 </c-col>
             </c-col>
@@ -107,7 +106,7 @@
                 <c-checkbox v-model="model.bcdgrp.rec.focflg">Free of Payment</c-checkbox>
             </c-col>
         </c-col>
-    </div>
+    </c-row>
 </template>
 <script>
     import Api from "~/service/Api"

src/views/Business/Bctrad/index.vue

@@ -10,7 +10,7 @@
                 <el-button size="small">拆分报文</el-button>
                 <el-button size="small">智能提示</el-button>
             </c-function-btn>
-            <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="left"
+            <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right"
                 size="small" :validate-on-rule-change="false">
                 <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
 

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>

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/Sptsel/Menu.vue

@@ -104,6 +104,7 @@
                   placeholder="请选择来源"
                   multiple
                   collapse-tags
+                  @change="sourceChangeEvent"
                 >
                   <el-option
                     v-for="item in sourceData"
@@ -367,7 +368,7 @@ export default {
   mixins: [CommonProcess],
   data() {
     return {
-      //sourceModel: [],
+      sourceModel: [],
       sourceData: [],
       initdialog: false,
       transactionStatus: {
@@ -420,95 +421,17 @@ export default {
         { label: "云平台", value: "chkypt" },
       ];
   },
-  computed: {
-    chkinc: {
-      get() {
-        return this.model.chkinc === "t";
-      },
-      set(val) {
-        this.model.chkinc = val ? "t" : "";
-      },
-    },
-    chkdzt: {
-      get() {
-        return this.model.chkdzt === "t";
-      },
-      set(val) {
-        this.model.chkdzt = val ? "t" : "";
-      },
-    },
-    chkpen: {
-      get() {
-        return this.model.chkpen === "t";
-      },
-      set(val) {
-        this.model.chkpen = val ? "t" : "";
-      },
-    },
-    chkcor: {
-      get() {
-        return this.model.chkcor === "t";
-      },
-      set(val) {
-        this.model.chkcor = val ? "t" : "";
-      },
-    },
-    chkaut: {
-      get() {
-        return this.model.chkaut === "t";
-      },
-      set(val) {
-        this.model.chkaut = val ? "t" : "";
-      },
-    },
-    chkdel: {
-      get() {
-        return this.model.chkdel === "t";
-      },
-      set(val) {
-        this.model.chkdel = val ? "t" : "";
-      },
-    },
-    chktco: {
-      get() {
-        return this.model.chktco === "t";
-      },
-      set(val) {
-        this.model.chktco = val ? "t" : "";
-      },
-    },
-    chkcan: {
-      get() {
-        return this.model.chkcan === "t";
-      },
-      set(val) {
-        this.model.chkcan = val ? "t" : "";
-      },
-    },
-    sourceModel: {
-      get() {
-        let arr = [];
-        this.sourceData.forEach((element) => {
-          if (this.model[element.value]) {
-            arr.push(element.value);
-          }
-        });
-        return arr;
-      },
-      set(val) {
-        let set = new Set(val);
-        this.sourceData.forEach((element) => {
-          if (set.has(element.value)) {
-            this.model[element.value] = true;
-          } else {
-            this.model[element.value] = false;
-          }
-        });
-      },
+  methods: {
+    sourceChangeEvent(val) {
+      this.sourceData.forEach(s => {
+        this.model[s.value] = '';
+      })
+      val.forEach((element) => {
+        this.model[element] = 't';
+      });
     },
+    ...Event
   },
-
-  methods: { ...Event },
   created: function () {},
 };
 </script>

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"