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/config/CodeTable/index.js

@@ -7304,7 +7304,12 @@ const CodeTable = {
         { label: "保函（标准）", value: "STD" },
         { label: "见索即付保函", value: "DGAR" },
         { label: "备用信用证", value: "STBY" },
-        { label: "其他", value: "DEPU" },
+        { label: "其他", value: "UNDK" },
+    ],
+    legfrm3: [
+        { label: "见索即付保函", value: "DGAR" },
+        { label: "备用信用证", value: "STBY" },
+        { label: "Undertaking (for example guarantee, surety)", value: "DEPU" },
     ],
     deloric: [
         { label: "用集合", value: "COLL" },
@@ -8000,6 +8005,29 @@ const CodeTable = {
     mt:[
         
     ],
+    tag23h:[
+        { label: "Opening of a service call by Trade Operations (SWT,BOL)", value: "CLSVOPEN" },
+        { label: "Closing of a service call by Trade Operations (SWT,BOL)", value: "CLSVCLOS" },
+        { label: "Advice of fraud attempt (SWT,BOL)", value: "FRAUDMSG" },
+        { label: "General information advice (DTA/E,SWT,BOL)", value: "GENINFAD" },
+        // { label: "Amendment of a free-form undertaking e.g. dependent guar. (BOL,SWT)", value: "ISSAMEND" },
+        // { label: "Issue of a free-form undertaking such as a dependent guarantee (SWT)", value: "ISSUANCE" },
+        { label: "Other request (BOL,DTA/E,SWT)", value: "OTHERFNC" },
+        { label: "Request related to a reimbursement (SWT,BOL)", value: "REIMBURS" },
+        // { label: "Request to amend an undertaking (BOL,SWT)", value: "REQAMEND" },
+        { label: "Financing request (SWT,BOL)", value: "REQFINAN" },
+        // { label: "Request to issue an undertaking (SWT)", value: "REQISSUE" },
+        { label: "Transfer of a undertaking (SWT,BOL)", value: "TRANSFER" },
+        // { label: "Request Confirmation (DTE)", value: "DTABESTA" },
+        // { label: "Request financing (DTE)", value: "DTAFINAN" },
+        { label: "Status request (BOL,DTA/E)", value: "DTASTATU" },
+        { label: "Correction of Order (DTA)", value: "DTAKORRE" },
+        { label: "Advice", value: "ADV" },
+        { label: "Confirmation (BOL)", value: "CNF" },
+        { label: "Status information (BOL)", value: "STA" },
+        { label: "Pre-debit notification (SWT)", value: "PREDENOT" },
+        // { label: "Request to extend the maturity date", value: "REXTMATU" },
+    ],
     bchlst:[
         {label:'08350012中国光大银行北京分行',value:'1'},
         {label:'08357112中国光大银行股份有限公司大连分行',value:'2'},

src/model/Gitcan/index.js

@@ -50,6 +50,7 @@ export default class Gitcan{
 								redamt:"",			//  Reduced Amount to be Paid		.gidgrp.rec.redamt
 								outcur:"",			//  Amount Outstanding		.gidgrp.rec.outcur
 								outamt:"",			//  Outstanding Amount		.gidgrp.rec.outamt
+								purpos:"",
 							},
 							cbs:{
 								max:{

src/model/Gitfre/index.js

@@ -30,6 +30,7 @@ export default class Gitfre{
 								gartyp:"",			//  Type of Undertaking		.gidgrp.rec.gartyp
 								expdat:"",			//  Valid until		.gidgrp.rec.expdat
 								liadat:"",			//  Liability until		.gidgrp.rec.liadat
+								purpos:"",
 							},
 							cbs:{
 								max:{

src/views/Business/Brtset/Utlp.vue

@@ -287,7 +287,7 @@
               <c-input
                 v-model="model.aamset.utlamt"
                 placeholder="请输入金额"
-                
+                disabled
                 @keyup.enter.native="$event.target.blur()"
                 @blur="eventFunction('aamset.utlamt')"
               ></c-input>
@@ -313,7 +313,7 @@
               <c-input
                 v-model="model.aamset.utlamt2"
                 placeholder="请输入金额"
-              
+                disabled
                 @change="eventFunction('aamset.utlamt2')"
               ></c-input>
             </el-form-item>
@@ -343,9 +343,10 @@
               label-width="120px"
               style="float: left"
             >
-              <c-checkbox :disabled="this.model.trnmod.cmtflg==''" v-model="model.mtabut.clsflg" true-label="C"
+              <c-checkbox disabled v-model="model.mtabut.clsflg" true-label="C"
                 >闭卷标识</c-checkbox
               >
+              <!--:disabled="this.model.trnmod.cmtflg==''"  -->
             </el-form-item>
           </c-col>
         </c-col>

src/views/Business/Brtudp/Cfap.vue

@@ -6,7 +6,7 @@
           v-model="model.cfabrt.cfaflg"
           style="width: 100%"
           placeholder="请选择数据采集标志"
-          :code="codes.cfaflg"
+          :code="codes.cfaflg1"
           @change="eventFunction('cfabrt.cfaflg')"
         >
         </c-select>

src/views/Business/Brtudp/Payp.vue

@@ -290,7 +290,7 @@
             <c-input
               v-model="model.aamset.utlamt"
               placeholder="请输入单据金额"
-              :disabled="model.brdgrp.rec.acpnowflg == ''"
+              disabled
             ></c-input>
           </el-form-item>
         </c-col>
@@ -312,7 +312,7 @@
             <c-input
               v-model="model.aamset.utlamt2"
               placeholder="请输入附加金额"
-              :disabled="model.brdgrp.rec.acpnowflg == ''"
+              disabled
             ></c-input>
           </el-form-item>
         </c-col>

src/views/Business/Gctfre/Ovwp.vue

@@ -38,7 +38,7 @@ export default {
   mixins: [commonProcess],
   data() {
     return {
-      activeNames: ["ovwp1"],
+      activeNames: ["frep"],
     };
   },
   methods: { ...Event, handleChange() {} },

src/views/Business/Getame/Ameps20.vue

@@ -183,7 +183,6 @@
             >
               <c-select
                 v-model="model.gitamep.ramrol"
-                :disabled="model.trnmod.swiadd.amemsgdonflg == ''"
                 style="width: 100%"
                 placeholder="请输入保函修改的收件人"
               >

src/views/Business/Getame/Ovwp1.vue

@@ -1070,7 +1070,10 @@
     props: ["model", "codes"],
     mixins: [commonProcess],
     data() {
-      return {};
+      return {
+       codes: {
+        ...CodeTable} ,
+      };
     },
     methods: { ...Event },
     created: function () {},

src/views/Business/Gitcan/Canp.vue

@@ -51,12 +51,14 @@
 
       <c-col :span="24">
         <el-form-item label="接收目的" prop="gidgrp.rec.purposin">
-          <c-input v-model="model.gidgrp.rec.purposin" maxlength="16" disabled placeholder="请输入"></c-input>
+          <c-select v-model="model.gidgrp.rec.purposin" style="width: 100%" disabled placeholder="请输入"
+          :code="codes.purposin"></c-select>
         </el-form-item>
       </c-col>
       <c-col :span="24">
         <el-form-item label="报文目的" prop="gidgrp.rec.purpos">
-          <c-input v-model="model.gidgrp.rec.purpos" disabled maxlength="16" placeholder="请输入"></c-input>
+          <c-select v-model="model.gidgrp.rec.purpos" disabled style="width: 100%" placeholder="请输入"
+          :code="codes.purpos"></c-select>
         </el-form-item>
       </c-col>
       <c-col :span="24">
@@ -173,7 +175,9 @@ export default {
   props: ["model", "codes"],
   mixins: [commonProcess],
   data() {
-    return {};
+    return {
+      codes: {...CodeTable},
+    };
 
   },
   methods: {

src/views/Business/Gitfre/Gitfrep1.vue

@@ -128,13 +128,14 @@
 
       <c-col :span="24">
         <el-form-item label="目的信息" prop="gidgrp.rec.purpos">
-          <c-input
+          <c-select
             disabled
             v-model="model.gidgrp.rec.purpos"
             style="width: 100%"
             placeholder="请选择目的信息"
+            :code="codes.purpos"
           >
-          </c-input>
+          </c-select>
         </el-form-item>
       </c-col>
 
@@ -502,7 +503,9 @@ export default {
   props: ["model", "codes"],
   mixins: [commonProcess],
   data() {
-    return {};
+    return {
+      codes:{...CodeTable}
+    };
   },
   methods: { ...Event,
      async flg() {

src/views/Business/Lttame/Ovwp.vue

@@ -22,7 +22,7 @@
     <el-collapse-item title="货物描述" name="dogpame">
       <m-dogpame :model="model" :codes="codes" />
     </el-collapse-item>
-    <el-collapse-item title="MT 742报销申请" name="rcldetp">
+    <el-collapse-item title="MT 742报销申请" name="rcldetp" v-if="false">
       <m-rcldetp :model="model" :codes="codes" />
     </el-collapse-item>
     <el-collapse-item title="单据要求" name="dorpame">

src/views/Business/Lttame/Ovwp1.vue

@@ -105,7 +105,7 @@
             v-model="model.ltdgrp.rec.lcrtyp"
             style="width: 100%"
             placeholder="请选择转让信用证类型"
-            :code="codes.lcrtyp1"
+            :code="codes.lcrtyp"
           >
           </c-select>
         </el-form-item>