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

src/config/CodeTable/index.js

@@ -5707,6 +5707,11 @@ const CodeTable = {
 	litameadv:[
 		{label:"无特殊规定",value:"1" },
 		{label:"有特殊规定，条件为:",value:"2" },
+	],
+	swttlx:[
+		{label:"需要加押的SWIFT报文（MT999）",value:"M"},
+		{label:"需要加押的TELEX报文",value:"T"},
+		// {label:"正常",value:"N"}
 	]
 
 }

src/model/Ditopn/Pattern.js

@@ -20,9 +20,10 @@ export default {
         { type: "string", required: false, message: "必输项" },
         { max: 40, message: "长度不能超过40" }
     ],
-    "didgrp.apl.pts.ref": [
-        { type: "string", required: true, message: "必输项" },
-        { max: 16, message: "长度不能超过16" }
+    "didgrp.apl.pts.ref":[
+        {type: "string", required: true, message: "必输项"},
+        {max: 16,message:"长度不能超过16"},
+        {pattern:/(^\d+$)/, message: "只能输入数字", trigger: 'blur'}
     ],
     "ditp.usr.extkey": [
         { type: "string", required: false, message: "必输项" },

src/model/Ditopn/index.js

@@ -66,6 +66,7 @@ export default class Ditopn{
 								namelc:"",			//  名称		.didgrp.apl.namelc
 								adrelc:"",			//  地址		.didgrp.apl.adrelc
 								dbfadrblkcn:"",		//  Chinese address		.didgrp.apl.dbfadrblkcn
+								rolsetflg:"",		//  备查表相关字段		
 							},
 							ben:{
 								pts:new Pts().data,

src/model/Trnrel/Event.js

@@ -50,6 +50,7 @@ export default {
         this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
             if (!valid)
                 return;
+
             let rtnmsg = await Api.post("trnrel/searow", Utils.flatObject(this.model))
             if (rtnmsg.respCode == "AAAAAA") {
                 //TODO 处理数据逻辑
@@ -142,13 +143,28 @@ export default {
             let rtnmsg = await Api.post("/trnrel/executeRule/relrow", data)
             if (rtnmsg.respCode == "AAAAAA") {
                 //TODO 处理数据逻辑
-                console.log(res)
+
+                this.$message({
+                    type: 'success',
+                    message: 'Release成功！'
+                });
+                await this.sleep(2000);
+                this.$router.go(0);
+                    
+                
             }
             else {
                 that.$notify.error({ title: '错误', message: '服务请求失败！' });
             }
         })
     },
+    sleep (ms) {
+        return new Promise((resolve, reject) => {
+          setTimeout(() => {
+            resolve()
+          }, ms)
+        })
+      },
     onPrinte() {
         this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
             if (!valid)
@@ -178,15 +194,26 @@ export default {
         })
     },
     onRejrow() {
+        debugger;
         console.log(this.getSelectedData())
 
         this.model.trncorco.selinr['rows'] = this.getSelectedData();
         this.$parent.$parent.$parent.$parent.$refs.modelForm.validate(async valid => {
             // if (!valid)
             //     return;
-            let rtnmsg = await Api.post("trnrel/executeRule/rejrow", Utils.flatObject(this.model))
+            let rtnmsg = await Api.post("trnrel/rejrow", Utils.flatObject(this.model))
             if (rtnmsg.respCode == "AAAAAA") {
                 //TODO 处理数据逻辑
+                var cacheFileName = rtnmsg.data.cacheFileName;
+                let rejrowRtnmsg = await Api.post("trncor/init", {params:{"cacheFileName":cacheFileName}})
+                if(rejrowRtnmsg.respCode == "AAAAAA"){
+                    this.$message({
+                        type: 'success',
+                        message: 'Reject成功！'
+                    });
+                    await this.sleep(2000);
+                    this.$router.go(0);
+                }
 
             }
             else {

src/views/Business/Ditopn/Detp.vue

@@ -53,7 +53,7 @@
 
         <el-col :span="12">
             <el-form-item label="交单期限" prop="didgrp.blk.preper">
-                <c-input type="textarea" v-model="model.didgrp.blk.preper" :readonly="true" style="width:70%;margin-right:20px;" maxlength="105" show-word-limit placeholder="请输入"></c-input>
+                <c-input type="textarea" v-model="model.didgrp.blk.preper" :readonly="this.flag" style="width:70%;margin-right:20px;" maxlength="105" show-word-limit placeholder="请输入"></c-input>
                 <c-button size="small" type="primary" icon="el-icon-search" @click="onPreperButtxmsel">
                     ...
                 </c-button>
@@ -71,7 +71,7 @@
 
         <el-col :span="12">
             <el-form-item label="" prop="didgrp.blk.preperflg">
-                <c-checkbox v-model="model.didgrp.blk.preperflg">修改交单期限文本</c-checkbox>
+                <c-checkbox v-model="model.didgrp.blk.preperflg" :click="preperflgExtkeyEvent()">修改交单期限文本</c-checkbox>
             </el-form-item>
         </el-col>
 
@@ -149,10 +149,16 @@ export default {
     props:["model","codes"],
     data(){
         return {
-
+            flag:false,
         }
     },
-    methods:{...Event},
+    methods:{...Event,
+        preperflgExtkeyEvent(){
+            this.flag = !this.model.didgrp.blk.preperflg
+            console.log(this.flag)
+        },
+    },
+    
     created:function(){
 
     }

src/views/Business/Ditopn/Docpan.vue

@@ -46,6 +46,15 @@
                     </c-input>
                 </template>
             </el-table-column>
+            <el-table-column label="">
+                <template slot-scope="scope">
+                    <c-select v-model="model.trnmod.trndoc.doceot[scope.row.index].staflg" style="width:100%" placeholder="请选择"> 
+                        <el-option v-for="item in codes.swttlx" :key="item.value" :label="item.label"
+                            :value="item.value">
+                        </el-option>
+                    </c-select>
+                </template>
+            </el-table-column>
             <el-table-column label="操作">
                 <template slot-scope="scope">
                     <el-button

src/views/Business/Ditopn/Ovwp.vue

@@ -198,7 +198,12 @@
                   
        <el-col :span="12">
         <el-form-item  label="贸易类型" prop="didgrp.rec.mytype">
-            <c-select v-model="model.didgrp.rec.mytype" style="width:100%" placeholder="请选择贸易类型">
+            <c-select v-if="model.didgrp.rec.elcflg == 'N'" v-model="model.didgrp.rec.mytype" style="width:100%" placeholder="请选择贸易类型">
+                <el-option v-for="item in codes.mylx" :key="item.value" :label="item.label"
+                        :value="item.value">
+                </el-option>
+            </c-select>
+            <c-select v-else v-model="model.didgrp.rec.mytype" style="width:100%" placeholder="请选择贸易类型">
                 <el-option v-for="item in codes.mytype" :key="item.value" :label="item.label"
                         :value="item.value">
                 </el-option>
@@ -329,7 +334,7 @@
 
        <el-col :span="12">
         <el-form-item label="开证类型" prop="didgrp.rec.dkflg">
-            <c-select v-model="model.didgrp.rec.dkflg" style="width:100%" placeholder="请选择开证类型">
+            <c-select v-model="model.didgrp.rec.dkflg" style="width:100%" disabled placeholder="请选择开证类型">
                 <el-option v-for="item in codes.dkflg" :key="item.value" :label="item.label"
                         :value="item.value">
                 </el-option>
@@ -397,6 +402,7 @@ export default {
         return {
             declareParams:{"fileName":"ditopn.json","basePath":"{{basePath}}","method":"post","scheme":"{{schemes}}","host":"{{host}}","consume":"0","produce":"0","uri":"/ditopn/getElcsRef"},
             flag:true,
+            trade:"",
         }
     },
     methods:{
@@ -408,6 +414,7 @@ export default {
                 this.model.didgrp.apl.namelc = data.didgrp_apl_namelc;
                 this.model.didgrp.apl.adrelc = data.didgrp_apl_adrelc;
                 this.model.didgrp.apl.pts.extkey = data.didgrp_apl_pts_extkey;
+                this.model.didgrp.apl.rolsetflg = data.didgrp_apl_rolsetflg;
                 this.flag = false;
             })
         },

src/views/Business/Ditopn/index.vue

@@ -152,6 +152,7 @@ export default {
            rules:null,
            codes:{
                cur:CodeTable.cur,
+               mylx:CodeTable.mylx,
                mytype:CodeTable.mytype,
                elcflg:CodeTable.elcflg,
                dkflg:CodeTable.dkflg,
@@ -173,6 +174,7 @@ export default {
                avbby0:CodeTable.avbby0,
                uiltxt:CodeTable.uiltxt,
                docsnf:CodeTable.docsnf,
+               swttlx:CodeTable.swttlx,
            },
         }
     },

src/views/Business/Sptsel/index.vue

@@ -2,7 +2,7 @@
     <div class="eContainer">
         <el-form :model="model" :rules="rules" ref="modelForm" tokenKey="modelForm" label-width="170px" size="small">
             <el-tabs ref="elment" type="border-card" @tab-click="tabClick">
-                <el-tab-pane label="经办夹查询">
+                <el-tab-pane label="待办任务查询">
                     <m-menu :model="model" :codes="codes" ref="Menu"/>
                 </el-tab-pane>
             </el-tabs>