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

@@ -16763,11 +16763,18 @@ const CodeTable = {
 		{label:"云平台保函",value:"Y" },
 	],
 	fsdsta:[
+		{label:"Sales Agreement Closed",value:"L" },
+		{label:"Sale Under Negotiation",value:"N" },
 		{label:"Sale Confirmed and Open",value:"O" },
 		{label:"Negotiations Cancelled",value:"C" },
 	],
 	fulmt:[
 		{label:"299",value:"299" },
+		{label:"199",value:"199" },
+		{label:"999",value:"999" },
+		{label:"299",value:"299" },
+		{label:"499",value:"499" },
+		{label:"799",value:"799" },
 	],
 	fulperflg:[
 		{label:"sum up the amounts of all IRD of a period (default)",value:"" },
@@ -17313,20 +17320,18 @@ const CodeTable = {
 	],
 	noticetype:[
 		{label:"额度扣减",value:"1" },
-		{label:"额度恢复",value:"2" },
-	],
-	notper:[
-		{label:"Months",value:"M" },
-		{label:"Days",value:"D" },
-	],
-	nxtflg:[
-		{label:"Diary for further processing",value:"FP" },
 		{label:"register Settlement of Claim",value:"SN" },
 		{label:"Acknowledgment of Receipt",value:"AR" },
+		{label:"Register for Extension now",value:"EN" },
+		{label:"wait for response",value:"" },
 	],
 	objtyp:[
 		{label:"Order",value:"ORD" },
+		{label:"Transaction",value:"TRN" },
+	],
 	obsper:[
+		{label:"15 Minutes",value:"003" },
+		{label:"None",value:"" },
 		{label:"100 Minutes",value:"020" },
 	],
 	okflg:[
@@ -17871,16 +17876,11 @@ const CodeTable = {
 	],
 	seahndtyp:[
 		{label:"Guarantee received ",value:"FR" },
-		{label:"Direct (we issue)",value:"OL" },
 		{label:"Inward Assignment",value:"FG" },
 		{label:"Advise with confirmation",value:"FI" },
 		{label:"Advise without confirmation",value:"FA" },
 		{label:"Indirect (please issue)",value:"OC" },
 	],
-	seapaytyp:[
-		{label:"Outgoing Payment",value:"O" },
-		{label:"Incoming Payment",value:"I" },
-	],
 	seasta:[
 		{label:"Closed",value:"C" },
 		{label:"Open",value:"O" },

src/views/Business/Infgid/Cbeinfp.vue

 <template>
   <div class="eibs-tab">
+<<<<<<< HEAD:src/views/Business/Infgid/Cbeinfp.vue
                               
        <c-col :span="12">
         <el-form-item label="stream of CBEs" prop="infcon.cbestm">
@@ -7,12 +8,19 @@
         </el-form-item>
        </c-col>
   </div>
+=======
+              </div>
+>>>>>>> 76ea812e7d5f5e9cbd030eb58098ca831ca35b43:src/views/Business/Letsel/Regp.vue
 </template>
 <script>
 import Api from "~/service/Api"
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable"
+<<<<<<< HEAD:src/views/Business/Infgid/Cbeinfp.vue
 import Event from "~/model/Infgid/Event"
+=======
+import Event from "~/model/Letsel/Event"
+>>>>>>> 76ea812e7d5f5e9cbd030eb58098ca831ca35b43:src/views/Business/Letsel/Regp.vue
 
 export default {
     inject: ['root'],

src/views/Business/Letsel/Regp.vue

@@ -7,6 +7,7 @@ import Api from "~/service/Api"
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable"
 import Event from "~/model/Letsel/Event"
+import Event from "~/model/Letsel/Event"
 
 export default {
     inject: ['root'],