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/model/Botame/Default.js

@@ -68,5 +68,7 @@ export default {
     "oldbodgrp.rec.matpertyp"                      :Utils.defaultFunction,
     "botamep.amedat"                      :Utils.defaultFunction,
     "oldbodgrp.rec.matpercnt"                      :Utils.defaultFunction,
+    "bodgrp.blk.docpre"                     :Utils.defaultFunction,
+    "botp.docgrdm.docgrd"                   :Utils.defaultFunction,
 }
 //你可以添加自动default处理

src/model/Botset/index.js

@@ -213,6 +213,7 @@ export default class Botset{
 							account:"",			//  ACT		.lendoc.account
 							vercerref:"",			//  Verification Certificate Number		.lendoc.vercerref
 							decnum:"",			//  Declaration Number		.lendoc.decnum
+							botsetl1blk:"",
 						},
 						bopmod:{
 							szflg:"",			//  申报类型		.bopmod.szflg

src/views/Business/Bctame/Detp.vue

@@ -12,7 +12,17 @@
                 </c-col>
 
                 <c-col :span="1">
-                    <c-button size="small" type="primary" icon="el-icon-search" @click="onColinsButtxmsel">
+                    <c-button size="small" type="primary" icon="el-icon-search" 
+                    @click="
+                  showGridPromptDialog(
+                    'bctp.colins.buttxmsel',
+                    null,
+                    null,
+                    { TXT: 'bcdgrp.blk.colins' },
+                    { TXT: false },
+                    'doxpDialog'
+                  )
+                ">
                     </c-button>
                 </c-col>
             </c-col>
@@ -25,7 +35,17 @@
                 </c-col>
 
                 <c-col :span="1">
-                    <c-button size="small" type="primary" icon="el-icon-search" @click="onDftinsButtxmsel">
+                    <c-button size="small" type="primary" icon="el-icon-search" 
+                      @click="
+                  showGridPromptDialog(
+                    'bctp.dftins.buttxmsel',
+                    null,
+                    null,
+                    { TXT: 'bcdgrp.blk.dftins' },
+                    { TXT: false },
+                    'doxpDialog'
+                  )
+                ">
                     </c-button>
                 </c-col>
             </c-col>
@@ -48,7 +68,17 @@
                 </c-col>
 
                 <c-col :span="1">
-                    <c-button size="small" type="primary" icon="el-icon-search" @click="onOthins1Buttxmsel">
+                    <c-button size="small" type="primary" icon="el-icon-search" 
+                       @click="
+                  showGridPromptDialog(
+                    'bctp.othins.buttxmsel',
+                    null,
+                    null,
+                    { TXT: 'bcdgrp.blk.othins' },
+                    { TXT: false },
+                    'doxpDialog'
+                  )
+                ">
                     </c-button>
                 </c-col>
             </c-col>

src/views/Business/Bctame/Ovwp.vue

@@ -259,7 +259,7 @@
             v-model="model.bcdgrp.blk.bcgdet"
             maxlength="45"
             show-word-limit
-            disabled
+            :disabled="model.bcdgrp.blk.bcgdetflg!='X'"
             placeholder="请输入Maturity Text"
           ></c-input>
         </el-form-item>

src/views/Business/Bctame/Ptyp.vue

@@ -22,6 +22,7 @@
               v-model="model.bcdgrp.dre.pts.extkey"
               maxlength="50"
               placeholder="请输入External Key of Address"
+              @keyup.enter.native="showGridPromptDialog('bcdgrp.dre.pts.extkey')"
             ></c-input>
             <template slot="footer">
               <c-button
@@ -79,7 +80,7 @@
               v-model="model.bcdgrp.co2.pts.extkey"
               maxlength="50"
               placeholder="请输入External Key of Address"
-              
+              @keyup.enter.native="showGridPromptDialog('bcdgrp.co2.pts.extkey')"
             ></c-input>
             <template slot="footer">
               <c-button
@@ -170,7 +171,7 @@
               v-model="model.bcdgrp.rmi.pts.extkey"
               maxlength="50"
               placeholder="请输入External Key of Address"
-            
+            @keyup.enter.native="showGridPromptDialog('bcdgrp.rmi.pts.extkey')"
             ></c-input>
             <template slot="footer">
               <c-button
@@ -226,7 +227,7 @@
               v-model="model.bcdgrp.drr.pts.extkey"
               maxlength="50"
               placeholder="请输入External Key of Address"
-              
+              @keyup.enter.native="showGridPromptDialog('bcdgrp.drr.pts.extkey')"
             ></c-input>
             <template slot="footer">
               <c-button

src/views/Business/Bctame/index.vue

@@ -79,6 +79,13 @@
         :promptData="promptData"
         v-on:select-ety="selectEty"
       ></c-grid-ety-prompt-dialog>
+      <c-grid-ety-prompt-dialog
+      ref="doxpDialog"
+      :isPty="false"
+      :promptData="promptData"
+      @select-ety="selectMsg"
+    >
+    </c-grid-ety-prompt-dialog>
     </div>
   </c-page>
 </template>

src/views/Business/Botdav/Libp.vue

@@ -69,7 +69,7 @@
               v-model="model.cnybop.cnylib.sforeigncountrycode"
               maxlength="3"
               placeholder="请输入境外企业国别地区代码"
-              @keyup.enter.native="eventFunction('cnybop.cnylib.sforeigncountrycode')"
+              @keyup.enter.native="showGridPromptDialog('cnybop.cnylib.sforeigncountrycode')"
             ></c-input>
             <template slot="footer">
               <!-- @click="showGridPromptDialog('cnybop.libcty.selbut1',null,null,{TXT:'cnybop.cnylib.sforeigncountrycode'},{TXT:false},'doxpDialog')" -->
@@ -77,7 +77,7 @@
                 size="small"
                 type="primary"
                 icon="el-icon-search"
-                @click="onLibctySelbut1"
+                @click="showGridPromptDialog('cnybop.codcny.selbut1', null, null,{COD: 'cnybop.cnylib.sforeigncountrycode'}, {TXT: false},'doxpDialog')"
               >
                 ?
               </c-button>

src/views/Public/Doctre.vue

@@ -180,7 +180,6 @@ export default {
     },
     methods:{
         getType(idx) {
-          console.log(this.codes);
 
           for (let i = 0; i < this.codes.doceotCortyp.length; i++) {
             const c = this.codes.doceotCortyp[i];

src/views/Public/Doxp.vue

@@ -64,7 +64,6 @@ export default {
     getBlk(dtyp, rec) {
       let blk = { blkMsg: {}, rulePath: "" };
       let tp = rec.slice(0, 2);
-      console.log('tp is :',tp);
       switch (dtyp) {
         case "dogp":
           blk.blkMsg = {

src/views/Public/Setpan.vue

@@ -258,7 +258,9 @@
                 </el-table-column>
             </c-table>
         </c-col>
+        <div style="height=500px">
             <setpan-dialog ref="setpanDialog" :model="model" :idx="index" :codes="codes" />
+        </div>
         <c-col :span="23" style="margin-left:9px;height:24px;margin-top:25px">
             <el-form-item class="formItemLabel" label="Settlement:" label-width="100px">
                 <span style="color:red">{{ this.model.setmod.dspflg == 'C'? "temporary":"" }}</span>