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

@@ -7140,5 +7140,9 @@ const CodeTable = {
     ELC022: [
         { label: "拒绝通知", value: "ADRE" },
     ],
+    guarantee: [
+        { label: "进口保函", value: "LG" },
+        { label: "出口保函", value: "AG" },
+    ],
 }
 export default CodeTable;

src/model/Infgcd/Event.js

@@ -86,7 +86,10 @@ export default {
                     this.$notify.error({ title: '错误', message: '查询结束日期必输！' });
                     return;
                 }
-                let rtnmsg = await this.executeRule("infbut.searow")
+                let params = {
+                    "isGuarantee" : this.isGuarantee,
+                }
+                let rtnmsg = await this.executeRule("infbut.searow", params)
                 if (rtnmsg.respCode == SUCCESS) {
                     this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
         

src/model/Infgid/Event.js

@@ -391,8 +391,11 @@ export default {
                     this.$notify.error({ title: '错误', message: '查询结束日期必输！' });
                     return;
                 }
-                let rtnmsg = await this.executeRule("infbut.searow")
-                if (rtnmsg.respCode == SUCCESS) {
+                let params = {
+                    "isGuarantee" : this.isGuarantee,
+                }
+                let rtnmsg = await this.executeRule("infbut.searow", params)
+                if (rtnmsg.respCode == SUCCESS) { 
                     this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
         
                 }

src/views/Business/BusRouter.js

@@ -358,7 +358,7 @@ const BusRouter = [
     { path: 'gitopn', component: Gitopn, name: 'Gitopn', meta: { title: '进口保函开立' } },
     { path: 'gitame', component: Gitame, name: 'Gitame', meta: { title: '进口保函修改' } },
     { path: 'gitsel', component: Gitsel, name: 'Gitsel', meta: { title: '进口保函查询' } },
-    { path: 'infgid', component: Infgid, name: 'Infgid', meta: { title: '进口保函入口交易' } },
+    { path: 'infgid', component: Infgid, name: 'Infgid', meta: { title: '保函入口交易' } },
     { path: 'gitset', component: Gitset, name: 'Gitset', meta: { title: '进口保函赔付' } },
     { path: 'gitcrq', component: Gitcrq, name: 'Gitcrq', meta: { title: '进口保函索赔登记' } },
     { path: 'infgcd', component: Infgcd, name: 'Infgcd', meta: { title: '保函赔付查询' } },

src/views/Business/Infgcd/Infsea.vue

@@ -59,15 +59,15 @@
 
               <c-col :span="8">
                 <el-form-item
-                  label="Party Reference"
-                  prop="infcon.searef"
+                  label="进口/出口保函"
                   style="width: 100%"
                 >
-                  <c-input
-                    v-model="model.infcon.searef"
-                    maxlength="16"
-                    placeholder="请输入Party Reference"
-                  ></c-input>
+                  <c-select
+                    v-model="isGuarantee"
+                    style="width: 100%"
+                    placeholder="请选择进口/出口保函"
+                    :code="codes.guarantee"
+                  ></c-select>
                 </el-form-item>
               </c-col>
             </c-col>
@@ -199,7 +199,7 @@
                     placeholder="请选择Currency"
                   >
                     <el-option
-                      v-for="item in codes.cur"
+                      v-for="item in codes.curtxt1"
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
@@ -236,6 +236,20 @@
             <c-col :span="24">
               <c-col :span="8">
                 <el-form-item
+                  label="Party Reference"
+                  prop="infcon.searef"
+                  style="width: 100%"
+                >
+                  <c-input
+                    v-model="model.infcon.searef"
+                    maxlength="16"
+                    placeholder="请输入Party Reference"
+                  ></c-input>
+                </el-form-item>
+              </c-col>
+
+              <c-col :span="8">
+                <el-form-item
                   label="Undertaking Type"
                   prop="seagtyp"
                   style="width: 100%"
@@ -244,6 +258,7 @@
                     v-model="model.seagtyp"
                     style="width: 100%"
                     placeholder="请选择Undertaking Type"
+                    :code="codes.seagtyp"
                   >
                   </c-select>
                 </el-form-item>
@@ -535,6 +550,7 @@ export default {
       ownref: "",
       dialogTableVisible: false,
       dialogFlag: true,
+      isGuarantee:'',
       trnData: {
         columns: [
           '0 1 "Trn ID" 100',

src/views/Business/Infgid/Infsea.vue

@@ -63,15 +63,15 @@
 
               <c-col :span="8">
                 <el-form-item
-                  label="Party Reference"
-                  prop="infcon.searef"
+                  label="进口/出口保函"
                   style="width: 100%"
                 >
-                  <c-input
-                    v-model="model.infcon.searef"
-                    maxlength="16"
-                    placeholder="请输入Party Reference"
-                  ></c-input>
+                  <c-select
+                    v-model="isGuarantee"
+                    style="width: 100%"
+                    placeholder="请选择进口/出口保函"
+                    :code="codes.guarantee"
+                  ></c-select>
                 </el-form-item>
               </c-col>
             </c-col>
@@ -416,6 +416,19 @@
             <c-col :span="24">
               <c-col :span="8">
                 <el-form-item
+                  label="Party Reference"
+                  prop="infcon.searef"
+                  style="width: 100%"
+                >
+                  <c-input
+                    v-model="model.infcon.searef"
+                    maxlength="16"
+                    placeholder="请输入Party Reference"
+                  ></c-input>
+                </el-form-item>
+              </c-col>
+              <c-col :span="8">
+                <el-form-item
                   label=""
                   style="margin-left: 110px"
                   prop="model.cmtflg"
@@ -753,6 +766,7 @@ export default {
       ownref: "",
       dialogTableVisible: false,
       dialogFlag: true,
+      isGuarantee:'',
       trnData: {
         columns: [
           '0 1 "Trn ID" 100',

src/views/Layout/SideMenu.vue

@@ -141,9 +141,9 @@ export default {
 
         { inifrm: "12", ininam: "智能审单", pntmiu: "" },
         { inifrm: "examRule", ininam: "智能审单规则配置", pntmiu: "12" },
-        //进口保函
-        { inifrm: "13", ininam: "进口保函", pntmiu: "" },
-        { inifrm: "infgid", ininam: "进口保函入口交易", pntmiu: "13" },
+        //保函
+        { inifrm: "13", ininam: "保函", pntmiu: "" },
+        { inifrm: "infgid", ininam: "保函入口交易", pntmiu: "13" },
         { inifrm: "infgcd", ininam: "保函赔付查询", pntmiu: "13" },
         // { inifrm: "gitsel", ininam: "进口保函查询", pntmiu: "13" },
         // { inifrm: "gitset", ininam: "进口保函赔付", pntmiu: "13" },