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/Betsnd/Pattern.js

@@ -506,7 +506,7 @@ export default {
         {max: 80,message:"长度不能超过80"}
     ],
     "cnybop.cnylib.sforeigncountrycode":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 3,message:"长度不能超过3"}
     ],
 
@@ -521,7 +521,7 @@ export default {
     ],
 
     "cnybop.cnylib.famt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -537,7 +537,7 @@ export default {
         {type: "date", required: false, message: "输入正确的日期"}
     ],
     "cnybop.saddwordlib":[
-        {type: "string", required: false, message: "必输项"},
+        {type: "string", required: true, message: "必输项"},
         {max: 80,message:"长度不能超过80"}
     ],
     "liaall.limmod.ecifno":[

src/model/Infbrd/index.js

@@ -6,6 +6,7 @@ export default class Infbrd{
         this.data = {
 						infcon:{
 							seaownref:"",			//  Own Reference		.infcon.seaownref
+							seashgref:"",			//  SG Reference		.infcon.seashgref
 							nam:"",			//  Name		.infcon.nam
 							searef:"",			//  Party Reference		.infcon.searef
 							pty:{

src/views/Business/Betdrv/Drv.vue

@@ -175,14 +175,15 @@
       </c-col>
       <c-col :span="8">
         <el-form-item label="" label-width="5px" prop="bedgrp.cbs.opn1.amt">
-          <c-input
+          <c-input-currency
             v-model="model.bedgrp.cbs.opn1.amt"
             style="text-align: left; width: 100%"
             class="m-input-currency"
             placeholder="请输入Balance"
             disabled
-          ></c-input>
+          ></c-input-currency>
         </el-form-item>
+
       </c-col>
       <c-col :span="4">
       </c-col>
@@ -228,7 +229,7 @@
                 style="width: 100%"
                 placeholder="请选择Received on"
                 value-format="yyyy-MM-dd"
-                :disabled="model.bedgrp.rec.doctypcod=='E'"
+                disabled
               ></c-date-picker>
             </el-form-item>
           </c-col>
@@ -327,6 +328,7 @@
                 v-model="model.bedgrp.apl.pts.nam"
                 maxlength="40"
                 placeholder="请输入Name of Party"
+                disabled
               ></c-input>
             </el-form-item>
           </c-col>
@@ -406,22 +408,28 @@
     </c-col> -->
     <!-- <c-col :span="24" v-show="model.oldbedgrp.cbs.max.amt!= model.bedgrp.cbs.max.amt"> -->
       <c-col :span="24">
-        <c-col :span="12">
+        <c-col :span="6">
+          <span class="span_oridoclab"
+            style="width: 100%;" 
+          > </span>
+        </c-col>
+        <c-col :span="6">
           <span v-text="model.oridoclab" data-path=".oridoclab"
             class="span_oridoclab"
             style="width: 100%;" 
+            v-show="model.oldbedgrp.cbs.max.amt!= model.bedgrp.cbs.max.amt"
           > </span>
         </c-col>
         <c-col :span="12">
           <el-form-item label="" label-width="5px" prop="oldbedgrp.cbs.max.amt">
-            <c-input
+            <c-input-currency
               v-model="model.oldbedgrp.cbs.max.amt"
               style="width: 100%"
               class="m-input-currency"
               placeholder="请输入Balance"
               disabled
               v-show="model.oldbedgrp.cbs.max.amt!= model.bedgrp.cbs.max.amt"
-            ></c-input>
+            ></c-input-currency>
           </el-form-item>
         </c-col>
     </c-col>
@@ -445,7 +453,6 @@
                 v-model="model.bedgrp.cbs.max2.amt"
                 placeholder="请输入附加金额"
                 class="m-input-currency"
-                :disabled="model.bedgrp.cbs.opn2.amt==0"
               ></c-input>
               <!-- :disabled="model.betp.adaflg==''" 
               :disabled="model.bedgrp.cbs.opn2.amt==0"-->
@@ -628,9 +635,7 @@
           >
           </c-ptap1>
         </c-col>
-
       </c-col>
-
     </c-col>
   </div>
 </template>

src/views/Business/Betdrv/Dscins.vue

@@ -21,9 +21,10 @@
             size="small"
             type="primary"
             icon="el-icon-search"
-            @click="onDocdisButtxmsel"
             :disabled="model.bedgrp.blk.docdisflg==''"
+            @click="showGridPromptDialog('betp.docdis.buttxmsel',null,null,{TXT:'bedgrp.blk.docdis'},{TXT:false},'doxpDialog')"
           >
+          <!-- @click="onDocdisButtxmsel" -->
             ...
           </c-button>
         </c-col>
@@ -47,8 +48,9 @@
             size="small"
             type="primary"
             icon="el-icon-search"
-            @click="onIntdisButtxmsel"
+            @click="showGridPromptDialog('betp.intdis.buttxmsel',null,null,{TXT:'bedgrp.blk.intdis'},{TXT:false},'doxpDialog')"
           >
+          <!-- @click="onIntdisButtxmsel" -->
             ...
           </c-button>
         </c-col>
@@ -72,8 +74,9 @@
             size="small"
             type="primary"
             icon="el-icon-search"
-            @click="onComconButtxmsel"
+            @click="showGridPromptDialog('betp.comcon.buttxmsel',null,null,{TXT:'bedgrp.blk.comcon'},{TXT:false},'doxpDialog')"
           >
+          <!-- @click="onComconButtxmsel" -->
             ...
           </c-button>
         </c-col>
@@ -100,8 +103,9 @@
             size="small"
             type="primary"
             icon="el-icon-search"
-            @click="onSetinstxmButtxmsel"
+            @click="showGridPromptDialog('betp.setinstxm.buttxmsel',null,null,{TXT:'bedgrp.blk.setinsbe'},{TXT:false},'doxpDialog')"
           >
+          <!-- @click="onSetinstxmButtxmsel" -->
             ...
           </c-button>
         </c-col>

src/views/Business/Betdrv/index.vue

@@ -107,6 +107,13 @@
         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/Betsnd/Dscins.vue

@@ -22,8 +22,9 @@
             size="small"
             type="primary"
             icon="el-icon-search"
-            @click="onIntdisButtxmsel"
+            @click="showGridPromptDialog('betp.intdis.buttxmsel',null,null,{TXT:'bedgrp.blk.intdis'},{TXT:false},'doxpDialog')"
           >
+          <!-- @click="onIntdisButtxmsel" -->
             ...
           </c-button>
         </c-col>
@@ -47,8 +48,9 @@
             size="small"
             type="primary"
             icon="el-icon-search"
-            @click="onComconButtxmsel"
+            @click="showGridPromptDialog('betp.comcon.buttxmsel',null,null,{TXT:'bedgrp.blk.comcon'},{TXT:false},'doxpDialog')"
           >
+          <!-- @click="onComconButtxmsel" -->
             ...
           </c-button>
         </c-col>
@@ -75,8 +77,9 @@
             size="small"
             type="primary"
             icon="el-icon-search"
-            @click="onSetinstxmButtxmsel"
+            @click="showGridPromptDialog('betp.setinstxm.buttxmsel',null,null,{TXT:'bedgrp.blk.setinsbe'},{TXT:false},'doxpDialog')"
           >
+          <!-- @click="onSetinstxmButtxmsel" -->
             ...
           </c-button>
         </c-col>
@@ -105,9 +108,10 @@
             size="small"
             type="primary"
             icon="el-icon-search"
-            @click="onDocdisButtxmsel"
+            @click="showGridPromptDialog('betp.docdis.buttxmsel',null,null,{TXT:'bedgrp.blk.docdis'},{TXT:false},'doxpDialog')"
             :disabled="model.bedgrp.blk.docdisflg==''"
           >
+          <!-- @click="onDocdisButtxmsel" -->
             ...
           </c-button>
         </c-col>

src/views/Business/Betsnd/Libp.vue

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

src/views/Business/Betsnd/Rgfdet.vue

@@ -19,8 +19,9 @@
         size="small"
         type="primary"
         icon="el-icon-search"
-        @click="onUsatxtButtxmsel"
+        @click="showGridPromptDialog('bedsnd.usatxt.buttxmsel',null,null,{TXT:'bedsnd.usadet'},{TXT:false},'doxpDialog')"
       >
+      <!-- @click="onUsatxtButtxmsel" -->
         ...
       </c-button>
     </c-col>
@@ -46,8 +47,9 @@
         size="small"
         type="primary"
         icon="el-icon-search"
-        @click="onRgfphrButtxmsel"
+        @click="showGridPromptDialog('bedsnd.rgfphr.buttxmsel',null,null,{TXT:'bedsnd.addphr'},{TXT:false},'doxpDialog')"
       >
+      <!-- @click="onRgfphrButtxmsel" -->
         ...
       </c-button>
     </c-col>

src/views/Business/Betsnd/index.vue

@@ -109,6 +109,13 @@
       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>
 </template>
 <script>

src/views/Business/Brtacp/index.vue

@@ -113,17 +113,15 @@ export default {
     created:async function(){
         console.log("进入brtacp交易");
         let rtnmsg = await this.init({})
-        if(rtnmsg.respCode == SUCCESS)
-        {
-           this.updateModel(rtnmsg.data)
-           //TODO 处理数据逻辑
-
+        if (rtnmsg.respCode == SUCCESS) {
+          Utils.copyValueFromVO(this.model, rtnmsg.data);
+          if (this.isInDisplay) {
+          this.restoreDisplay();
           }
-        else
-        {
+        } else {
             this.$notify.error({title: '错误',message: '服务请求失败！'});
         }
-    }
+    },
 }
 </script>
 <style>

src/views/Business/Brtame/index.vue

@@ -135,14 +135,16 @@ export default {
              **/
         // },
     },
-    created: async function () {
+    created:async function(){
         console.log("进入brtame交易");
-        let rtnmsg = await this.init({});
+        let rtnmsg = await this.init({})
         if (rtnmsg.respCode == SUCCESS) {
-            this.updateModel(rtnmsg.data);
-            //TODO 处理数据逻辑
+          Utils.copyValueFromVO(this.model, rtnmsg.data);
+          if (this.isInDisplay) {
+          this.restoreDisplay();
+          }
         } else {
-            this.$notify.error({ title: "错误", message: "服务请求失败！" });
+            this.$notify.error({title: '错误',message: '服务请求失败！'});
         }
     },
 };

src/views/Business/Brtcan/index.vue

@@ -151,18 +151,15 @@ export default {
     created:async function(){
         console.log("进入brtcan交易");
         let rtnmsg = await this.init({})
-        if(rtnmsg.respCode == SUCCESS)
-        {
-           //TODO 处理数据逻辑
-            this.updateModel(rtnmsg.data)
+        if (rtnmsg.respCode == SUCCESS) {
+          Utils.copyValueFromVO(this.model, rtnmsg.data);
+          if (this.isInDisplay) {
+          this.restoreDisplay();
           }
-        else
-        {
+        } else {
             this.$notify.error({title: '错误',message: '服务请求失败！'});
         }
-
-
-    }
+    },
 
 }
 </script>

src/views/Business/Brtcsg/index.vue

@@ -155,17 +155,15 @@ export default {
     created:async function(){
         console.log("进入brtcsg交易");
         let rtnmsg = await this.init({})
-        if(rtnmsg.respCode == SUCCESS)
-        {
-           this.updateModel(rtnmsg.data)
-           //TODO 处理数据逻辑
-
+        if (rtnmsg.respCode == SUCCESS) {
+          Utils.copyValueFromVO(this.model, rtnmsg.data);
+          if (this.isInDisplay) {
+          this.restoreDisplay();
           }
-        else
-        {
+        } else {
             this.$notify.error({title: '错误',message: '服务请求失败！'});
         }
-    }
+    },
 }
 </script>
 <style>

src/views/Business/Brtdcr/index.vue

@@ -168,17 +168,15 @@ export default {
     created:async function(){
         console.log("进入brtdcr交易");
         let rtnmsg = await this.init({})
-        if(rtnmsg.respCode == SUCCESS)
-        {
-           this.updateModel(rtnmsg.data)
-           //TODO 处理数据逻辑
-
+        if (rtnmsg.respCode == SUCCESS) {
+          Utils.copyValueFromVO(this.model, rtnmsg.data);
+          if (this.isInDisplay) {
+          this.restoreDisplay();
           }
-        else
-        {
+        } else {
             this.$notify.error({title: '错误',message: '服务请求失败！'});
         }
-    }
+    },
 }
 </script>
 <style>

src/views/Business/Brtlat/index.vue

@@ -214,17 +214,15 @@ export default {
     created:async function(){
         console.log("进入brtlat交易");
         let rtnmsg = await this.init({})
-        if(rtnmsg.respCode == SUCCESS)
-        {
-           this.updateModel(rtnmsg.data)
-           //TODO 处理数据逻辑
-
+        if (rtnmsg.respCode == SUCCESS) {
+          Utils.copyValueFromVO(this.model, rtnmsg.data);
+          if (this.isInDisplay) {
+          this.restoreDisplay();
           }
-        else
-        {
+        } else {
             this.$notify.error({title: '错误',message: '服务请求失败！'});
         }
-    }
+    },
 }
 </script>
 <style>

src/views/Business/Brtset/index.vue

@@ -206,20 +206,20 @@ export default {
     watch:{
 
     },
+   
     created:async function(){
         console.log("进入brtset交易");
         let rtnmsg = await this.init({})
-        if(rtnmsg.respCode == SUCCESS)
-        {
-           this.updateModel(rtnmsg.data)
-           //TODO 处理数据逻辑
+        if (rtnmsg.respCode == SUCCESS) {
+          Utils.copyValueFromVO(this.model, rtnmsg.data);
           this.model.mtabut.clsflg="X";
+          if (this.isInDisplay) {
+          this.restoreDisplay();
           }
-        else
-        {
+        } else {
             this.$notify.error({title: '错误',message: '服务请求失败！'});
         }
-    }
+    },
     
 }
 </script>

src/views/Business/Brtsnd/index.vue

@@ -182,17 +182,15 @@ export default {
     created:async function(){
         console.log("进入brtsnd交易");
         let rtnmsg = await this.init({})
-        if(rtnmsg.respCode == SUCCESS)
-        {
-           this.updateModel(rtnmsg.data)
-           //TODO 处理数据逻辑
-
+        if (rtnmsg.respCode == SUCCESS) {
+          Utils.copyValueFromVO(this.model, rtnmsg.data);
+          if (this.isInDisplay) {
+          this.restoreDisplay();
           }
-        else
-        {
+        } else {
             this.$notify.error({title: '错误',message: '服务请求失败！'});
         }
-    }
+    },
 }
 </script>
 <style>

src/views/Business/Infbrd/Infsea.vue

@@ -13,6 +13,10 @@
             </el-form-item>
           </c-col>
 
+
+          
+
+
           <c-col :span="8">
             <el-form-item label="Opening between" prop="infcon.opndatfrom">
               <c-col :span="11">
@@ -48,6 +52,19 @@
           </c-col>
         </c-row>
 
+
+        <c-row>
+          <c-col :span="8">
+            <el-form-item label="SG Reference" prop="infcon.seashgref">
+              <c-input
+                v-model="model.infcon.seashgref"
+                maxlength="16"
+                placeholder="请输入SG Reference"
+              ></c-input>
+            </el-form-item>
+          </c-col>
+        </c-row>
+
         <c-row v-show="searchSlot.searchToggle">
           <c-row>
             <c-col :span="8">

src/views/Business/Letcan/Canp.vue

@@ -304,11 +304,12 @@
               placeholder="请输入Narrative"
             ></c-input>
             <template slot="footer">
+              <!-- @click="onCanletButtxmsel" -->
               <c-button
                 size="small"
                 type="primary"
                 icon="el-icon-search"
-                @click="onCanletButtxmsel"
+                @click="showGridPromptDialog('letcanp.canlet.buttxmsel', null, null,{TXT: 'letcanf.strinf'}, {TXT: false},'doxpDialog')"
               >
                 ...
               </c-button>

src/views/Public/Engp.vue

@@ -18,7 +18,7 @@
             <c-date-picker
               type="date"
               v-model="scope.row.matdat"
-              value-format="yyyy-MM-dd"
+              value-format="YYYY-MM-DD"
               placeholder="请选择Date"
               style="width: 100%"
               @change="executeDefault('liaall.liaallg.matdat')"
@@ -59,9 +59,9 @@
         <el-table-column prop="acc" label="Account" width="150px">
         </el-table-column>
         <el-table-column prop="valdat" label="Value Date" width="200px">
-          <!-- <template slot-scope="scope">
+          <template slot-scope="scope">
                   {{dateFormat(scope.row.valdat)}}
-         </template> -->
+         </template>
         </el-table-column>
         <el-table-column label="" prop="det" width="80px" fixed="right">
           <template slot-scope="scope" slot="header">