Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'development-202206' of http://114.115.138.98:8900/fukai/vue-gjjs into development-202206

src/model/Cptcan/Pattern.js

@@ -54,7 +54,7 @@ export default {
         {max: 40,message:"长度不能超过40"}
     ],
     "strinf":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 50,message:"长度不能超过50"}
     ],
 

src/views/Business/Bdtdck/Docpre.vue

@@ -4,7 +4,7 @@
       <!-- 左边 -->
       <c-col :span="14">
         <c-col :span="20">
-          <el-form-item label="不符点">
+          <el-form-item label="不符点" prop="bddgrp.blk.docdis">
             <c-input type="textarea"
               :disabled="model.bddgrp.blk.docdisflg ? false : true" :rows="6"
               v-model="model.bddgrp.blk.docdis" maxlength="65" show-word-limit placeholder="请输入不符点"></c-input>

src/views/Business/Cptati/Docpan.vue

@@ -58,7 +58,18 @@ export default {
     methods:{...Event},
     created:function(){
 
+    },
+    watch:{
+        "model.lendoc.actflg":{
+            immediate:true,
+            handler(){
+                if(this.model.lendoc.actflg==false){
+                    this.model.lendoc.account==""
+                }
+            }
         }
+    }
+
 }
 </script>
 <style>

src/views/Business/Cptati/Pardet.vue

@@ -36,7 +36,7 @@
               placeholder="请输入External Key of Address"
               :disabled="flag"
               @keyup.enter.native="
-                showGridPromptDialog('attp.atd.sbkact')
+                showGridPromptDialog('cpdgrp.ori.pts.extkey')
                "
             ></c-input>
           </el-form-item>

src/views/Business/Cptati/index.vue

@@ -60,9 +60,9 @@
           </el-tab-pane>
 
           <!-- Messages -->
-          <el-tab-pane label="Messages" name="docpan1">
+          <el-tab-pane label="Messages" name="docpan">
             <c-content>
-              <m-docpan1 :model="model" :codes="codes" />
+              <m-docpan :model="model" :codes="codes" />
             </c-content>
           </el-tab-pane>
 
@@ -90,9 +90,9 @@
           </el-tab-pane>
 
           <!--收账通知 -->
-          <el-tab-pane label="收账通知" name="docpan">
+          <el-tab-pane label="收账通知" name="docpan1">
             <c-content>
-              <m-docpan :model="model" :codes="codes" />
+              <m-docpan1 :model="model" :codes="codes" />
             </c-content>
           </el-tab-pane>
 
@@ -134,8 +134,8 @@ import Setpan from "~/views/Public/Setpan";
 import Coninfp from "~/views/Public/Coninfp";
 import Addinf from "./Addinf";
 import Doctre from "~/views/Public/Doctre";
-import Docpan1 from "~/views/Public/Docpan";
-import Docpan from "./Docpan";
+import Docpan from "~/views/Public/Docpan";
+import Docpan1 from "./Docpan";
 import Wg from "./Wg";
 import Dbe from "./Dbe.vue";
 import Dbb from "./Dbb.vue";
@@ -151,8 +151,8 @@ export default {
     "m-coninfp": Coninfp,
     "m-addinf": Addinf,
     "m-doctre": Doctre,
-    "m-docpan1": Docpan1,
     "m-docpan": Docpan,
+    "m-docpan1": Docpan1,
     "m-wg": Wg,
     "m-dbe": Dbe,
     "m-dbb": Dbb,

src/views/Business/Cptcan/Canp.vue

@@ -5,7 +5,7 @@
       <c-col :span="24">
         <el-form-item label="Our Referance" prop="cpdgrp.rec.ownref">
           <c-fullbox>
-            <c-input v-model="model.cpdgrp.rec.ownref"></c-input>
+            <c-input v-model="model.cpdgrp.rec.ownref" disabled></c-input>
             <template slot="footer">
               <c-button type="primary"
                 ><span style="font-family: '宋体'; font-weight: bold"
@@ -20,7 +20,7 @@
       <c-col :span="24">
         <c-col :span="13">
           <el-form-item label="Payment Amount" prop="cpdgrp.cbs.nom1.cur">
-            <c-input v-model="model.cpdgrp.cbs.nom1.cur"></c-input>
+            <c-input v-model="model.cpdgrp.cbs.nom1.cur" disabled></c-input>
           </el-form-item>
         </c-col>
 
@@ -34,6 +34,7 @@
               v-model="model.cpdgrp.cbs.nom1.amt"
               style="text-align: left; width: 100%"
               placeholder="请输入汇款金额"
+              disabled
               @keyup.enter.native="
                 defaultFunction(
                   'cpdgrp.cbs.nom1.amt',
@@ -48,7 +49,7 @@
       <c-col :span="24">
         <c-col :span="13">
           <el-form-item label="Received Amount" prop="cpdgrp.cbs.max.cur">
-            <c-input v-model="model.cpdgrp.cbs.max.cur"></c-input>
+            <c-input v-model="model.cpdgrp.cbs.max.cur" disabled></c-input>
           </el-form-item>
         </c-col>
 
@@ -61,6 +62,7 @@
             <c-input-currency
               v-model="model.cpdgrp.cbs.max.amt"
               style="text-align: left; width: 100%"
+              disabled
               @keyup.enter.native="
                 defaultFunction(
                   'cpdgrp.cbs.nom1.amt',
@@ -78,13 +80,14 @@
               type="date"
               v-model="model.cpdgrp.rec.valdat"
               style="width: 100%"
+              disabled
             ></c-date-picker>
           </el-form-item>
       </c-col>
 
       <c-col :span="24"> 
           <el-form-item label="Payment Type" prop="cpdgrp.rec.paytyp">
-              <c-input v-model="model.cpdgrp.rec.paytyp"></c-input>
+              <c-input v-model="model.cpdgrp.rec.paytyp" disabled></c-input>
           </el-form-item>
       </c-col>   
     </c-col> 
@@ -92,42 +95,42 @@
     <c-col :span="11" :offset="1"> 
         <c-col :span="24">
             <el-form-item label="Name" prop="cpdgrp.rec.nam">
-                <c-input v-model="model.cpdgrp.rec.nam"></c-input>
+                <c-input v-model="model.cpdgrp.rec.nam" disabled></c-input>
             </el-form-item>
         </c-col>
 
         <c-col :span="24">
             <el-form-item label="Ordering Customer" prop="cpdgrp.orc.pts.nam">
-            <c-input type="textarea" v-model="model.cpdgrp.orc.pts.nam"></c-input>
+            <c-input type="textarea" v-model="model.cpdgrp.orc.pts.nam" disabled></c-input>
             </el-form-item>
         </c-col>
 
         <c-col :span="24">
             <el-form-item label="Ordering Institution" prop="cpdgrp.ori.pts.nam">
-            <c-input type="textarea" v-model="model.cpdgrp.ori.pts.nam"></c-input>
+            <c-input type="textarea" v-model="model.cpdgrp.ori.pts.nam" disabled></c-input>
             </el-form-item>
         </c-col>
 
         <c-col :span="24">
             <el-form-item label="Pay Bank" prop="cpdgrp.pyb.pts.pts">
-            <c-input type="textarea" v-model="model.cpdgrp.pyb.pts.pts"></c-input>
+            <c-input type="textarea" v-model="model.cpdgrp.pyb.pts.pts" disabled></c-input>
             </el-form-item>
         </c-col>
 
         <c-col :span="24">
             <el-form-item label="Payee" prop="cpdgrp.pye.pts.nam">
-            <c-input type="textarea" v-model="model.cpdgrp.pye.pts.nam"></c-input>
+            <c-input type="textarea" v-model="model.cpdgrp.pye.pts.nam" disabled></c-input>
             </el-form-item>
         </c-col>
     </c-col>
 
     <c-col :span="24">
-        <c-col :span="18">
+        <c-col :span="11">
             <el-form-item label="Narrative" prop="strinf">
-            <c-input type="textarea" v-model="model.strinf"></c-input>
+            <c-input type="textarea" v-model="model.strinf" rows="4"></c-input>
             </el-form-item>
         </c-col>
-        <c-col :span="6">
+        <c-col :span="6" :offset="1">
             <c-checkbox v-model="model.sndsmg">Send Message</c-checkbox>
         </c-col>
     </c-col>

src/views/Business/Cptcan/index.vue

 <template>
   <div class="eContainer">
+
+      <c-function-btn
+        :handleSubmit="handleSubmit"
+        :handleCheck="handleCheck"
+        :handleStash="handleStash"
+      >
+        <el-button size="small">备忘录</el-button>
+        <el-button size="small">影像信息</el-button>
+        <!-- <el-button size="small">保存模板</el-button> -->
+        <!-- <el-button size="small">使用模板</el-button> -->
+        <el-button size="small">制裁信息</el-button>
+        <!-- <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="right" size="small" :validate-on-rule-change="false">
        <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
                    <!--cptcan PD000016 Cancelation -->
@@ -40,6 +55,7 @@ import Coninfp from "~/views/Public/Coninfp";
 import Docpan from "~/views/Public/Docpan";
 import Doctre from "~/views/Public/Doctre";
 
+import commonFuncs from "~/mixin/commonFuncs";
 
 export default {
     name: "Cptcan",
@@ -55,7 +71,7 @@ export default {
             root: this
         }
     },
-    mixins: [commonProcess],    // 里面包含了Default、Check等的公共处理
+    mixins: [commonProcess,commonFuncs],    // 里面包含了Default、Check等的公共处理
     data(){
         return {
             tabVal: "canp",

src/views/Business/Cptrel/Inftrnps.vue

@@ -18,12 +18,18 @@
                 style="width: 100%"
               >
                 <c-col :span="16">
-                  <c-input
+                  <c-select
                     v-model="model.trncorco.usfmod.flt"
                     maxlength="16"
                     placeholder="请输入Selection  of User"
+                  ><el-option
+                    v-for="item in flt"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
                   >
-                  </c-input>
+                  </el-option>
+                  </c-select>
                 </c-col>
 
                 <c-button size="small" type="primary">Show_Set</c-button>
@@ -58,7 +64,7 @@
                 placeholder="请选择汇款性质"
               >
                 <el-option
-                  v-for="item in codes.trntyp"
+                  v-for="item in trntyp"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -108,12 +114,12 @@
           </c-col>
 
           <c-col :span="8">
-            <el-form-item label="Currency" prop="relcur" style="width: 100%">
+            <el-form-item label="支持币种" prop="relcur" style="width: 100%">
               <c-select
                 v-model="model.relcur"
                 style="width: 100%"
                 placeholder="请选择Currency"
-                :code="codes.currencycode"
+                :code="currencycode"
               >
               </c-select>
             </el-form-item>
@@ -184,19 +190,36 @@
 
           <c-col :span="8">
             <el-form-item label="branch" prop="branch" style="width: 100%">
-              <c-input
+              <c-select
                 v-model="model.branch"
                 maxlength="24"
+                style="width: 100%"
                 placeholder="请输入Select Single Party"
-              >
-              </c-input>
+              ><el-option
+                v-for="item in branch"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              ></el-option>
+              </c-select>
             </el-form-item>
           </c-col>
         </c-col>
 
-        <c-col :span="24">
-          <el-form-item label="Transaction Type" prop="atp.cod">
-            <c-input v-model="model.atp.cod"></c-input>
+        <c-col :span="8">
+          <el-form-item label="Transaction Type" prop="atp.cod" style="width: 100%">
+            <c-fullbox>
+              <c-input v-model="model.atp.cod" style="width: 100%"></c-input>
+              <template slot="footer">
+                <c-button
+                style="margin: 0 10px 0 10px; padding: 0 12px"
+                size="small"
+                type="primary"
+              >
+                <span style="font-family: '宋体'; font-weight: bold">i</span>
+              </c-button>     
+              </template>
+            </c-fullbox>
           </el-form-item>
         </c-col>
       </c-row>
@@ -564,6 +587,58 @@ export default {
         data: [],
       },
       searchToggle: true,
+      flt: [
+        { label: "All Users", value: "<ALL>" },
+        { label: "Selected User", value: "<SELU>" },
+      ],
+      branch:[
+        {label:"LM ADD", value:"00001047"}
+      ],
+      currencycode:[
+        {label:"ASF 记账瑞士法郎",value:"ASF"},
+        {label:"ATS 先令",value:"ATS"},
+        {label:"AUD 澳大利亚元",value:"AUD"},
+        {label:"BEF 比利时法郎",value:"BEF"},
+        {label:"CAD 加元",value:"CAD"},
+        {label:"CHF 瑞士法郎",value:"CHF"},
+        {label:"CNY 人民币元",value:"CNY"},
+        {label:"DEM 德国马克",value:"DEM"},
+        {label:"DKK 丹麦克朗",value:"DKK"},
+        {label:"EUR 欧元",value:"EUR"},
+        {label:"FIM 马克",value:"FIM"},
+        {label:"FRF 法国法郎",value:"FRF"},
+        {label:"GBP 英镑",value:"GBP"},
+        {label:"HKD 香港元",value:"HKD"},
+        {label:"ITL 意大利里拉",value:"ITL"},
+        {label:"JPY 日元",value:"JPY"},
+        {label:"KRW 园",value:"KRW"},
+        {label:"MOP 澳门元",value:"MOP"},
+        {label:"NLG 荷兰盾",value:"NLG"},
+        {label:"NOK 挪威克朗",value:"NOK"},
+        {label:"NZD 新西兰元",value:"NZD"},
+        {label:"SEK 瑞典克朗",value:"SEK"},
+        {label:"SGD 新加坡元",value:"SGD"},
+        {label:"THB 铢",value:"THB"},
+        {label:"TWD 新台湾元",value:"TWD"},
+        {label:"USD 美元",value:"USD"},
+        {label:"XEU 欧洲货币单元(E.C.U)",value:"XEU"}
+      ],
+      relflg: [
+        { label: "<all>", value: "" },
+        { label: "Correct", value: "C" },
+        { label: "Final", value: "F" },
+        { label: "Picked up", value: "P" },
+        { label: "Rejected", value: "N" },
+        { label: "Released", value: "R" },
+        { label: "Waiting", value: "W" },
+    ],
+    trntyp:[
+      {label:"ALL",value:""},
+      {label:"贸易",value:"0"},
+      {label:"非贸易",value:"1"},
+      {label:"资本",value:"2"},
+      {label:"非资本",value:"3"},
+    ],
     };
   },
   methods: {

src/views/Business/Cptrel/index.vue

@@ -9,7 +9,7 @@
            </el-tab-pane>
 
             <!-- 控制展示页面 -->
-           <el-tab-pane label="Transaction Header" name="trnp0" v-if="true">
+           <!-- <el-tab-pane label="Transaction Header" name="trnp0" v-if="true">
                <m-trnp0 :model="model" :codes="codes"></m-trnp0>
            </el-tab-pane>
 
@@ -31,7 +31,7 @@
 
            <el-tab-pane label="传票打印" name="subpena" v-if="true">
                <m-subpena :model="model" :codes="codes"></m-subpena>
-           </el-tab-pane>
+           </el-tab-pane> -->
 
            <el-tab-pane label="流程记录" name="orerec" v-if="true">
                <m-orerec :model="model" :codes="codes"></m-orerec>

src/views/Business/Ditdck/Docpre.vue

@@ -2,7 +2,7 @@
   <div class="eibs-tab">
     <!-- =================左边====================== -->
     <c-col :span="12">
-      <el-form-item label="不符点">
+      <el-form-item label="不符点" prop="bddgrp.blk.docdis">
         <c-col :span="21">
           <c-input type="textarea" v-model="model.bddgrp.blk.docdis" :disabled="!model.bddgrp.blk.docdisflg"
             maxlength="50" show-word-limit placeholder="请输入不符点"></c-input>
@@ -17,14 +17,14 @@
       </el-form-item>
 
       <c-col :span="24">
-        <el-form-item label="注释和结论">
+        <el-form-item label="注释和结论" prop="bddgrp.blk.comcon">
           <c-input type="textarea" v-model="model.bddgrp.blk.comcon" maxlength="65" show-word-limit
             placeholder="请输入注释和结论"></c-input>
         </el-form-item>
       </c-col>
 
       <c-col :span="24">
-        <el-form-item label="到期付款确认备注">
+        <el-form-item label="到期付款确认备注" prop="bddgrp.blk.accrmk">
           <c-input type="textarea" v-model="model.bddgrp.blk.accrmk" maxlength="65" show-word-limit
             placeholder="请输入到期付款确认备注"></c-input>
         </el-form-item>
@@ -34,11 +34,19 @@
     <!-- =================右边====================== -->
     <c-col :span="12">
       <c-col :span="24">
+        <c-col :span="12">
+        <c-col :span="12">
         <el-form-item label="" prop="bddgrp.rec.igndisflg">
           <c-checkbox v-model="model.bddgrp.rec.igndisflg">忽略不符点</c-checkbox>
+        </el-form-item>
+      </c-col>
+      <c-col :span="12">
+        <el-form-item label="" prop="bddgrp.blk.docdisflg">
           <c-checkbox v-model="model.bddgrp.blk.docdisflg" @change="docdis">录入不符点</c-checkbox>
         </el-form-item>
       </c-col>
+    </c-col>
+  </c-col>
 
       <!-- <c-col :span="24">
                 <el-form-item label="" prop="bddgrp.blk.docdisflg">
@@ -67,11 +75,21 @@
       </c-col>
 
       <c-col :span="24">
+        <c-col :span="12">
+      <c-col :span="12">
         <el-form-item label="" prop="bddgrp.rec.approvcod">
           <c-checkbox v-model="model.bddgrp.rec.approvcod">议付行担保协议</c-checkbox>
+        </el-form-item>
+      </c-col>
+      <c-col :span="12">
+        <el-form-item label="" prop="bdtp.cre732flg">
           <c-checkbox v-model="model.bdtp.cre732flg" disabled>Create MT 732</c-checkbox>
         </el-form-item>
       </c-col>
+    </c-col>
+    </c-col>
+
+
 
       <!-- <c-col :span="8">
                 <c-checkbox v-model="model.bdtp.cre752flg">Create MT 752</c-checkbox>

src/views/Business/Letdav/Davp.vue

@@ -488,6 +488,13 @@
               :code="codes.payrol"
               @change="eventFunction('bedgrp.rec.payrol')"
             >
+              <!-- <el-option
+                  v-for="item in codeTable"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              >
+              </el-option> -->
             </c-select>
           </el-form-item>
         </c-col>
@@ -1089,7 +1096,12 @@ export default {
   props: ['model', 'codes'],
   mixins: [commonProcess],
   data() {
-    return {}
+    return {
+      // codeTable: [
+      //   { label: "Issuing Bank", value: "ISS" },
+      //   { label: "Further Party", value: "OTH" },
+      // ],
+    }
   },
   methods: {
     ...Event,