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/views/Business/Bctdav/Ovwp.vue

@@ -72,7 +72,7 @@
             v-model="model.bcdgrp.cbs.max.cur"
             style="width: 100%"
             placeholder="请选择Currency"
-            :code="codes.cur"
+            :code="codes.curtxt1"
           >
           </c-select>
         </el-form-item>

src/views/Business/Brtset/Outp.vue

@@ -131,7 +131,7 @@
             style="width: 100%"
           >
             <el-option
-              v-for="item in options"
+              v-for="item in codes.gitopn_cur"
               :key="item.value"
               :label="item.label"
               :value="item.value"
@@ -386,7 +386,7 @@ export default {
   mixins: [commonProcess],
   data() {
     return {
-      options: [],
+
     };
   },
 };

src/views/Business/Brtset/Utlp.vue

@@ -285,6 +285,20 @@
     </c-col>
     <!-- ====================右边======================= -->
     <c-col :span="11" :offset="1">
+          <c-col :span="24">
+             <c-col :span="13">
+                    <el-form-item label="Open Amt.L/C" prop="lidgrp.cbs.opn1.cur">
+                        <c-input  v-model="model.lidgrp.cbs.opn1.cur" maxlength="3"  placeholder="请输入Currency" disabled></c-input>
+                    </el-form-item>
+              </c-col>
+              <c-col :span="11">
+                  <el-form-item label="" prop="lidgrp.cbs.opn1.amt"  label-width="5px">
+                      <c-input  v-model="model.lidgrp.cbs.opn1.amt"  placeholder="请输入Balance" disabled></c-input>
+                  </el-form-item>
+               </c-col>
+          </c-col>
+
+
         <c-col :span="24">
         <el-form-item label="Name of Bill Contract" prop="brdgrp.rec.nam">
             <c-input  v-model="model.brdgrp.rec.nam" maxlength="40"  placeholder="请输入Name of Bill Contract" disabled></c-input>

src/views/Business/BusRouter.js

@@ -383,7 +383,7 @@ const BusRouter = [
     { path: 'getsel', component: Getsel, name: 'Getsel', meta: { title: 'Getsel' } },
     { path: 'getopn', component: Getopn, name: 'Getopn', meta: { title: '出口保函通知' } },
     { path: 'getame', component: Getame, name: 'Getame', meta: { title: '出口保函修改' } },
-    { path: 'getcrq', component: Getcrq, name: 'Getcrq', meta: { title: 'Getcrq' } },
+    { path: 'getcrq', component: Getcrq, name: 'Getcrq', meta: { title: '出口保函索偿' } },
     { path: 'getamc', component: Getamc, name: 'Getamc', meta: { title: '出口保函保兑' } },
     { path: 'notice', component: Notice, name: 'Notice', meta: { title: '通知公告设置' } },
 

src/views/Business/Cptopn/Opnp1.vue

@@ -440,22 +440,6 @@
           </c-col>
         </c-col>
 
-        <c-col :span="24">
-          <el-form-item label="货物类型">
-            <c-select
-              v-model="model.cpdgrp.rec.stagod"
-              style="width: 100%"
-              placeholder="请选择货物类型"
-            >
-              <el-option
-                v-for="item in codes.godcod"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
-            </c-select>
-          </el-form-item>
-        </c-col>
       </c-col>
     </c-col>
 

src/views/Business/Cptopn/index.vue

@@ -246,6 +246,9 @@ export default {
       if (this.isInDisplay) {
         this.restoreDisplay();
       }
+
+
+
     } else {
       this.$notify.error({ title: "错误", message: "服务请求失败！" });
     }

src/views/Business/Getcrq/Gitsetp1.vue

@@ -486,7 +486,7 @@
       <c-col :span="24" :offset="19">
         <c-checkbox
           v-model="model.extpay"
-          key="item.value"
+          @change="change"
           style="
             margin-left: 11px;
             height: 32px;
@@ -516,7 +516,8 @@
             v-model="model.gcdgrp.rec.docprbrol"
             style="width: 100%"
             placeholder="请选择Presented by"
-              @change="selectOrCheckboxRule('gcdgrp.rec.docprbrol')"
+           
+              @change="eventFunction('gcdgrp.rec.docprbrol')"
           >
            <el-option
               v-for="item in codes.docprbrol"
@@ -542,6 +543,7 @@
           <c-fullbox>
             <c-input
               v-model="model.gcdgrp.prb.pts.extkey"
+               :disabled="model.gcdgrp.rec.docprbrol!='PRB'"
               maxlength="16"
               placeholder="请输入External Key of Address"
               @keyup.enter.native="
@@ -576,6 +578,7 @@
             :rows="4"
             type="textarea"
             v-model="model.gcdgrp.prb.pts.adrblk"
+             :disabled="model.gcdgrp.rec.docprbrol!='PRB'"
             maxlength="300"
             show-word-limit
             placeholder="请输入Address Block"
@@ -589,7 +592,7 @@
             v-model="model.gcdgrp.rec.payrol"
             placeholder="请选择"
             style="width: 100%"
-           @change="selectOrCheckboxRule('gcdgrp.rec.payrol')"
+           @change="eventFunction('gcdgrp.rec.payrol')"
           >
           <el-option
               v-for="item in codes.payrol"
@@ -601,15 +604,17 @@
           </c-select>
         </c-form-item>
       </c-col>
-      <c-col :span="24">
+      <!-- <c-col :span="24">
         <el-form-item label="Reference " prop="gcdgrp.oth.pts.ref">
           <c-input
             v-model="model.gcdgrp.oth.pts.ref"
             maxlength="16"
             placeholder="请输入Reference "
+            :disabled="model.gcdgrp.rec.payrol!='OTH'"
+            
           ></c-input>
         </el-form-item>
-      </c-col>
+      </c-col> -->
       <c-col :span="24">
         <el-form-item label="" prop="gcdgrp.oth.pts.extkey">
           <c-fullbox>
@@ -617,6 +622,7 @@
               v-model="model.gcdgrp.oth.pts.extkey"
               maxlength="16"
               placeholder="请输入External Key of Address"
+               :disabled="model.gcdgrp.rec.payrol!='OTH'"
               @keyup.enter.native="
                 showGridPromptDialog('gcdgrp.oth.pts.extkey')
               "
@@ -653,6 +659,7 @@
             maxlength="100"
             show-word-limit
             placeholder="请输入Address Block"
+             :disabled="model.gcdgrp.rec.payrol!='OTH'"
           ></c-input>
         </el-form-item>
       </c-col>
@@ -720,6 +727,13 @@ export default {
 
   methods: {
     ...Event,
+    change(){
+      if(this.model.extpay == "X"){
+        this.model.nxtflg = "FP";
+      }else{
+        this.model.nxtflg = "SN";
+      }
+    }
   },
   created: function () {},
 };

src/views/Business/Gitcrq/Gitsetp1.vue

@@ -242,12 +242,13 @@
 
       <c-col :span="24">
         <el-form-item label="Date of Claim" prop="gcdgrp.rec.clmdat">
-          <c-input
-            v-model="model.gcdgrp.rec.clmdat"
-            maxlength="40"
+          <c-date-picker
+            type="date"
             disabled
-            placeholder="请输入Date of Claim"
-          ></c-input>
+            v-model="model.gcdgrp.rec.clmdat"
+            style="width: 100%"
+            placeholder="请选择Date of Claim"
+          ></c-date-picker>
         </el-form-item>
       </c-col>
     </c-col>
@@ -618,7 +619,7 @@
             v-model="model.gcdgrp.rec.docprbrol"
             style="width: 100%"
             placeholder="请选择Presented by"
-            @change="selectOrCheckboxRule('gcdgrp.rec.docprbrol')"
+            @change="eventFunction('gcdgrp.rec.docprbrol')"
           >
           <el-option
               v-for="item in codes.docprbrol"
@@ -646,6 +647,7 @@
               v-model="model.gcdgrp.prb.pts.extkey"
               maxlength="16"
               placeholder="请输入External Key of Address"
+              :disabled="model.gcdgrp.rec.docprbrol!='PRB'"
               @keyup.enter.native="
                 showGridPromptDialog('gcdgrp.prb.pts.extkey')
               "
@@ -678,6 +680,7 @@
             :rows="4"
             type="textarea"
             v-model="model.gcdgrp.prb.pts.adrblk"
+            :disabled="model.gcdgrp.rec.docprbrol!='PRB'"
             maxlength="300"
             show-word-limit
             placeholder="请输入Address Block"
@@ -691,7 +694,7 @@
             v-model="model.gcdgrp.rec.payrol"
             placeholder="请选择"
             style="width: 100%"
-            @change="selectOrCheckboxRule('gcdgrp.rec.payrol')"
+            @change="eventFunction('gcdgrp.rec.payrol')"
           >
           <el-option
               v-for="item in codes.payrol"
@@ -709,6 +712,7 @@
             v-model="model.gcdgrp.oth.pts.ref"
             maxlength="16"
             placeholder="请输入Reference "
+             :disabled="model.gcdgrp.rec.payrol!='OTH'"
           ></c-input>
         </el-form-item>
       </c-col>
@@ -722,6 +726,7 @@
               @keyup.enter.native="
                 showGridPromptDialog('gcdgrp.oth.pts.extkey')
               "
+             :disabled="model.gcdgrp.rec.payrol!='OTH'"
             >
             </c-input>
             <template slot="footer">
@@ -755,6 +760,7 @@
             maxlength="100"
             show-word-limit
             placeholder="请输入Address Block"
+            :disabled="model.gcdgrp.rec.payrol!='OTH'"
           ></c-input>
         </el-form-item>
       </c-col>

src/views/Business/Gitset/Gitsetp.vue

@@ -595,7 +595,7 @@
             v-model="model.gcdgrp.rec.payrol"
             placeholder="请选择Payer"
             style="width: 100%"
-             @change="selectOrCheckboxRule('gcdgrp.rec.payrol')"
+             @change="eventFunction('gcdgrp.rec.payrol')"
           >
             <el-option
               v-for="item in codes.payrol"
@@ -614,6 +614,7 @@
               v-model="model.gcdgrp.oth.pts.extkey"
               maxlength="16"
               placeholder="请输入External Key of Address"
+              :disabled="model.gcdgrp.rec.payrol!='OTH'"
               @keyup.enter.native="
                 showGridPromptDialog('gcdgrp.oth.pts.extkey')
               "
@@ -648,6 +649,7 @@
             type="textarea"
             rows="4"
             v-model="model.gcdgrp.oth.pts.adrblk"
+            :disabled="model.gcdgrp.rec.payrol!='OTH'"
             maxlength="100"
             show-word-limit
             placeholder="请输入Address Block"

src/views/Business/Gitset/Gitsetp1.vue

@@ -398,7 +398,7 @@
         >
       </c-col>
       <c-col :span="12" class="centerLable marginLable">
-        <c-checkbox v-model="model.mtabut.clsflgp" 
+        <c-checkbox v-model="model.mtabut.clsflgp" checked
           >Close Contract
         </c-checkbox>
       </c-col>
@@ -542,7 +542,7 @@
             v-model="model.gcdgrp.rec.payrol"
             placeholder="请选择Payer"
             style="width: 100%"
-             @change="selectOrCheckboxRule('gcdgrp.rec.payrol')"
+             @change="eventFunction('gcdgrp.rec.payrol')"
           >
             <el-option
               v-for="item in codes.payrol"
@@ -561,6 +561,7 @@
               v-model="model.gcdgrp.oth.pts.extkey"
               maxlength="16"
               placeholder="请输入External Key of Address"
+              :disabled="model.gcdgrp.rec.payrol!='OTH'"
               @keyup.enter.native="
                 showGridPromptDialog('gcdgrp.oth.pts.extkey')
               "
@@ -596,6 +597,7 @@
             type="textarea"
             rows="4"
             v-model="model.gcdgrp.oth.pts.adrblk"
+            :disabled="model.gcdgrp.rec.payrol!='OTH'"
             maxlength="100"
             show-word-limit
             placeholder="请输入Address Block"

src/views/Business/Infbcd/Infsea.vue

@@ -185,10 +185,8 @@
     </c-list-search>
 
 
-
-
     <c-col :span="24" style="margin-top: 10px">
-      <c-button class="medium_bcs" size="medium" style="margin-left: 0px" type="primary" @click="toBctdav">寄单</c-button>
+      <c-button class="medium_bcs" size="medium" style="margin-left: 0px" type="primary" @click="toBctdav">进口代收到单通知</c-button>
     </c-col>
 
 

src/views/Public/Sbxx.vue

@@ -226,10 +226,16 @@ export default {
         if(this.model.bopmod.szflg==='3'){
             this.model.bopmod.ownextkey = '';
             this.model.bopmod.acttyp = '';
+            this.model.bopmod.basflg='';
         }
     }
   },
   created: function () {
+      //给人民币申报赋值
+      this.model.cnybop.cnyflg="2";
+      this.model.cnybop.traflg="2";
+      this.model.cnybop.libflg="2";
+      this.model.cnybop.vouflg="2";
   },
   watch: {
       "model.bopmod.ownextkey": function(){