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

@@ -6726,8 +6726,8 @@ const CodeTable = {
     //     {label:"Issuance of the credit amendment", value:"ISSU"},
     // ],
     trnchato: [
-        { label: "Applicant", value: "APPL" },
-        { label: "Beneficiary", value: "BENE" },
+        { label: "Applicant Side", value: "APPL" },
+        { label: "Beneficiary Side", value: "BENE" },
         { label: "Other", value: "OTHR" }
     ],
     bgftktyp: [
@@ -7027,5 +7027,27 @@ const CodeTable = {
         {label:"TEND",value:"TEND Tender or Bid"},
         {label:"WARR",value:"WARR Warrantyimaintenance"},
     ],
+    legfrm1:[
+        {label:"Standby letter of credit ",value:"STBY" },
+		{label:"Uniform Rules for Contract Guarant. URCG",value:"URG" },
+		{label:"Undertaking (for example guarantee, surely)",value:"UNDK" },
+		{label:"Uniform Rules for Contract Bonds    URCB",value:"URB" },
+		{label:"OTHER",value:"DEPU" },
+		{label:"Unit. Nations Convention ind. Guarantees",value:"UNC" },
+		{label:"Demand guarantee ",value:"DGAR" },
+		{label:"Guarantee (Standard)",value:"STD" },
+		{label:"Guarantee (Others)",value:"GUO" },
+		{label:"Surety Payable On First Demand ",value:"SPDM" },
+		{label:"Guarantee (ICC758)",value:"758" },
+		{label:"Guarantee (ICC458)",value:"458" },
+		{label:"Uniform Customs and Pract.Doc.Cre. UCP",value:"UCP" },
+		{label:"Standby Letter of Credit (ISP)",value:"ISP" },
+    ],
+    delto1:[
+        {label:"Beneficiary",value:"BENE" },
+		{label:"Specified address",value:"OTHR" },
+		{label:"Applicant",value:"APPL" },
+		{label:"Obligor",value:"OBLI" },
+    ],
 }
 export default CodeTable;

src/views/Business/Getamc/Conp.vue

@@ -111,7 +111,7 @@
             style="width: 100%"
             placeholder="请选择Outgoing Purpose"
             :code="codes.purpos"
-            
+            disabled
           >
           </c-select>
         </el-form-item>
@@ -123,7 +123,7 @@
             v-model="model.gidgrp.rec.gartyp"
             style="width: 100%"
             placeholder="请选择Type of Undertaking"
-            :code="codes.typgar"
+            :code="codes.typgar1"
             disabled
           >
           </c-select>
@@ -153,6 +153,7 @@
             style="width: 100%"
             placeholder="请选择Expiry Type"
             :code="codes.exptyp"
+            disabled
           >
           </c-select>
         </el-form-item>

src/views/Business/Getamc/Ovwp.vue

@@ -202,7 +202,7 @@
             placeholder="请选择Type of Undertaking"
           >
             <el-option
-              v-for="item in codes.typgar"
+              v-for="item in codes.typgar1"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -250,7 +250,7 @@
             style="width: 100%"
             placeholder="请选择Form of Undertaking"
             disabled
-            :code="codes.legfrm"
+            :code="codes.legfrm1"
           >
           </c-select>
         </el-form-item>
@@ -328,7 +328,7 @@
             disabled
           >
             <el-option
-              v-for="item in codes.gtxinr"
+              v-for="item in codes.gtxinr2"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -453,7 +453,7 @@
               v-model="model.gidgrp.rec.orddat"
               style="width: 100%"
               placeholder="请选择Order Date"
-              
+              disabled
             ></c-date-picker>
           </el-form-item>
         </c-col>
@@ -966,7 +966,7 @@
             v-model="model.gidgrp.rec.orddat"
             style="width: 100%"
             placeholder="请选择Order Date"
-            
+            disabled
           ></c-date-picker>
         </el-form-item>
       </c-col>

src/views/Business/Getamc/Preperp.vue

@@ -2,7 +2,6 @@
   <div class="eibs-tab">
     <c-row>
       <c-col :span="24"> 
-      
         <c-col :span="11">
           <c-col :span="24">
             <el-form-item
@@ -16,7 +15,7 @@
                   placeholder="请选择Delivery of Undertak."
                 >
                   <el-option
-                    v-for="item in codes.delori"
+                    v-for="item in codes.delori1"
                     :key="item.value"
                     :label="item.label"
                     :value="item.value"
@@ -47,6 +46,7 @@
                 v-model="model.gidgrp.rec.sndto"
                 style="width: 100%"
                 placeholder="请选择Undertaking Send to"
+                disabled
               >
                 <el-option
                   v-for="item in codes.rolall"
@@ -70,7 +70,7 @@
                 placeholder="请选择Deliv. To/Collection By"
               >
                 <el-option
-                  v-for="item in codes.delto"
+                  v-for="item in codes.delto1"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -87,11 +87,11 @@
             >
               <c-input
                 :disabled="
-                      model.gidgrp.rec.delto == '' ||
                       model.gidgrp.rec.delto == 'APPL' ||
                       model.gidgrp.rec.delto == 'BENE'
                     "
                 type="textarea"
+                :rows="4"
                 v-model="model.gidgrp.blk.deltoadr"
                 maxlength="35"
                 show-word-limit
@@ -108,6 +108,7 @@
                 maxlength="65"
                 show-word-limit
                 placeholder="请输入Transfer Conditions"
+                disabled
               ></c-input>
             </el-form-item>
           </c-col>