#253

src/model/Botdav/Pattern.js

@@ -231,7 +231,7 @@ export default {
     ],
     "bodgrp.blk.delins":[
         {type: "string", required: true, message: "必输项"},
-        {max: 65,message:"长度不能超过65"}
+        {max: 300,message:"长度不能超过300"}
     ],
 
     "bodgrp.blk.intins":[

src/views/Business/Botdav/Inst.vue

@@ -75,7 +75,11 @@
               placeholder="请输入Draft Instructions">
             </c-input>
             <template slot="footer">
-              <c-button size="small" type="primary">
+              <c-button 
+                size="small" 
+                type="primary" 
+                @click="showGridPromptDialog('botp.dftins.buttxmsel',null,null,{TXT:'bodgrp.blk.dftins'},{TXT:false},'doxpDialog')"
+                >
                 ...
               </c-button>
             </template>
@@ -108,7 +112,11 @@
               placeholder="请输入Protest Instructions">
             </c-input>
             <template slot="footer">
-              <c-button size="small" type="primary">
+              <c-button 
+                size="small" 
+                type="primary" 
+                @click="showGridPromptDialog('botp.proins.buttxmsel',null,null,{TXT:'bodgrp.blk.proins'},{TXT:false},'doxpDialog')"
+                >
                 ...
               </c-button>
             </template>
@@ -143,7 +151,11 @@
               placeholder="请输入Other Instructions">
             </c-input>
             <template slot="footer">
-              <c-button size="small" type="primary">
+              <c-button 
+                size="small" 
+                type="primary" 
+                @click="showGridPromptDialog('botp.othins.buttxmsel',null,null,{TXT:'bodgrp.blk.othins'},{TXT:false},'doxpDialog')"
+                >
                 ...
               </c-button>
             </template>
@@ -174,7 +186,11 @@
               placeholder="请输入Warehouse/Insurance instruction">
             </c-input>
             <template slot="footer">
-              <c-button size="small" type="primary">
+              <c-button 
+                size="small" 
+                type="primary" 
+                @click="showGridPromptDialog('botp.whins.buttxmsel',null,null,{TXT:'bodgrp.blk.delins'},{TXT:false},'doxpDialog')"
+                >
                 ...
               </c-button>
             </template>
@@ -309,8 +325,8 @@
       <c-col :span="12">
         <el-form-item label="less comm" prop="bodgrp.cbs.opn1.cur" style="padding-top:15px">
 
-          <c-select v-model="model.bodgrp.cbs.opn1.cur" style="width: %" placeholder="请选择Document Amount" :disabled="true"
-            :code="codes.cur">
+          <c-select v-model="model.bodgrp.cbs.opn1.cur" style="width:100%" placeholder="请选择Document Amount"
+            :disabled="true" :code="codes.cur">
           </c-select>
 
         </el-form-item>
@@ -338,36 +354,36 @@
   </c-row>
 </template>
 <script>
-import Api from "~/service/Api"
-import commonProcess from "~/mixin/commonProcess";
-import CodeTable from "~/config/CodeTable"
-import Event from "~/model/Botdav/Event"
-
-export default {
-  inject: ['root'],
-  props: ["model", "codes"],
-  mixins: [commonProcess],
-  data() {
-    return {
+  import Api from "~/service/Api"
+  import commonProcess from "~/mixin/commonProcess";
+  import CodeTable from "~/config/CodeTable"
+  import Event from "~/model/Botdav/Event"
+
+  export default {
+    inject: ['root'],
+    props: ["model", "codes"],
+    mixins: [commonProcess],
+    data() {
+      return {
+
+      }
+    },
+    methods: { ...Event },
+    created: function () {
 
-    }
-  },
-  methods: { ...Event },
-  created: function () {
-
-  },
-  computed:{
-    colinsflg:{
-      get(){
-        return this.model.bodgrp.blk.colinsflg ==="X";
-      },
-      set(val){
-        this.model.bodgrp.blk.colinsflg=val ? "X":"";
-      },
     },
+    computed: {
+      colinsflg: {
+        get() {
+          return this.model.bodgrp.blk.colinsflg === "X";
+        },
+        set(val) {
+          this.model.bodgrp.blk.colinsflg = val ? "X" : "";
+        },
+      },
+    }
   }
-}
 
 </script>
 <style>
-</style>
+</style>
\ No newline at end of file

src/views/Business/Botdav/index.vue

@@ -87,97 +87,98 @@
                          </el-tab-pane>
                     </c-tabs>
                </el-form>
-               <c-grid-ety-prompt-dialog ref="etyDialog" :promptData="promptData" v-on:select-ety="selectEty">
+               <c-grid-ety-prompt-dialog ref="doxpDialog" :isPty="false" :promptData="promptData"
+                    @select-ety="selectMsg">
                </c-grid-ety-prompt-dialog>
           </div>
      </c-page>
 </template>
 <script>
-import Api from "~/service/Api"
-import CodeTable from "~/config/CodeTable"
-import Botdav from "~/model/Botdav"
-import commonProcess from "~/mixin/commonProcess"
-import commonFuncs from "~/mixin/commonFuncs";
-import Check from "~/model/Botdav/Check"
-import Default from "~/model/Botdav/Default"
-import Pattern from "~/model/Botdav/Pattern"
-import Ovwp from "./Ovwp"
-import Inst from "./Inst"
-import Ptyp from "./Ptyp"
-import Instrecp from "./Instrecp"
-import Setpan from "~/views/Public/Setpan"
-import Coninfp from "~/views/Public/Coninfp"
-import Docpan from "~/views/Public/Docpan"
-//import Doctre from "./Doctre"
-import Cnyp from "./Cnyp"
-import Srmp from "./Srmp"
-import Engp from "~/views/Public/Engp"
-import Glepan from "~/views/Public/Glepan"
-import Doctre from "~/views/Public/Doctre"
-
-
-export default {
-     name: "botdav",
-     components: {
-          "m-ovwp": Ovwp,
-          "m-inst": Inst,
-          "m-ptyp": Ptyp,
-          "m-instrecp": Instrecp,
-          "m-setpan": Setpan,
-          "m-coninfp": Coninfp,
-          "m-docpan": Docpan,
-          "m-doctre": Doctre,
-          "m-cnyp": Cnyp,
-          "m-srmp": Srmp,
-          "m-engp": Engp,
-          "m-glepan": Glepan,
-
-     },
-     provide() {
-          return {
-               root: this
-          }
-     },
-     mixins: [commonProcess, commonFuncs],    // 里面包含了Default、Check等的公共处理
-     data() {
-          return {
-               tabVal: "ovwp",
-               trnName: "botdav",
-               model: new Botdav().data,
-               //   checkRules: Check,
-               defaultRules: Default,
-               pattern: Pattern,
-               rules: null,
-               codes: {
-                    ...CodeTable
-               },
-          }
-     },
-     methods: {
-          //    tabClick(){
-          //    },
-          //    handleSubmit(){},
-          //    handleCheck(){},
-          //    handleStash(){},
-
-
-     },
-     created: async function () {
-          console.log("进入botdav交易");
-          let rtnmsg = await this.init({})
-          if (rtnmsg.respCode == SUCCESS) {
-               //TODO 处理数据逻辑
-               this.updateModel(rtnmsg.data)
-               if (this.isInDisplay) {
-                    this.restoreDisplay();
+     import Api from "~/service/Api"
+     import CodeTable from "~/config/CodeTable"
+     import Botdav from "~/model/Botdav"
+     import commonProcess from "~/mixin/commonProcess"
+     import commonFuncs from "~/mixin/commonFuncs";
+     import Check from "~/model/Botdav/Check"
+     import Default from "~/model/Botdav/Default"
+     import Pattern from "~/model/Botdav/Pattern"
+     import Ovwp from "./Ovwp"
+     import Inst from "./Inst"
+     import Ptyp from "./Ptyp"
+     import Instrecp from "./Instrecp"
+     import Setpan from "~/views/Public/Setpan"
+     import Coninfp from "~/views/Public/Coninfp"
+     import Docpan from "~/views/Public/Docpan"
+     //import Doctre from "./Doctre"
+     import Cnyp from "./Cnyp"
+     import Srmp from "./Srmp"
+     import Engp from "~/views/Public/Engp"
+     import Glepan from "~/views/Public/Glepan"
+     import Doctre from "~/views/Public/Doctre"
+
+
+     export default {
+          name: "botdav",
+          components: {
+               "m-ovwp": Ovwp,
+               "m-inst": Inst,
+               "m-ptyp": Ptyp,
+               "m-instrecp": Instrecp,
+               "m-setpan": Setpan,
+               "m-coninfp": Coninfp,
+               "m-docpan": Docpan,
+               "m-doctre": Doctre,
+               "m-cnyp": Cnyp,
+               "m-srmp": Srmp,
+               "m-engp": Engp,
+               "m-glepan": Glepan,
+
+          },
+          provide() {
+               return {
+                    root: this
                }
+          },
+          mixins: [commonProcess, commonFuncs],    // 里面包含了Default、Check等的公共处理
+          data() {
+               return {
+                    tabVal: "ovwp",
+                    trnName: "botdav",
+                    model: new Botdav().data,
+                    //   checkRules: Check,
+                    defaultRules: Default,
+                    pattern: Pattern,
+                    rules: null,
+                    codes: {
+                         ...CodeTable
+                    },
+               }
+          },
+          methods: {
+               //    tabClick(){
+               //    },
+               //    handleSubmit(){},
+               //    handleCheck(){},
+               //    handleStash(){},
+
+
+          },
+          created: async function () {
+               console.log("进入botdav交易");
+               let rtnmsg = await this.init({})
+               if (rtnmsg.respCode == SUCCESS) {
+                    //TODO 处理数据逻辑
+                    this.updateModel(rtnmsg.data)
+                    if (this.isInDisplay) {
+                         this.restoreDisplay();
+                    }
 
-          }
-          else {
-               this.$notify.error({ title: '错误', message: '服务请求失败！' });
-          }
-     },
-};
+               }
+               else {
+                    this.$notify.error({ title: '错误', message: '服务请求失败！' });
+               }
+          },
+     };
 </script>
 <style>
-</style>
+</style>
\ No newline at end of file