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

@@ -2901,7 +2901,7 @@ const CodeTable = {
         { label: "信用证单据承兑", value: "1" },
     ],
     docsta: [
-        { label: "已寄单索数", value: "A" },
+        { label: "已寄单索款", value: "A" },
         { label: "已到单", value: "B" },
         { label: "已到期付款确认", value: "C" },
         { label: "待付款", value: "D" },

src/model/Bftsnd/Pattern.js

@@ -323,13 +323,13 @@ export default {
     ],
 
     "mtabut.coninf.oitinf.oit.inftxt": [
-        { type: "string", required: true, message: "必输项" },
+        { type: "string", required: false, message: "必输项" },
         { max: 60, message: "长度不能超过60" }
     ],
 
 
     "mtabut.coninf.oitset.oit.inftxt": [
-        { type: "string", required: true, message: "必输项" },
+        { type: "string", required: false, message: "必输项" },
         { max: 60, message: "长度不能超过60" }
     ],
 

src/views/Business/Bftset/index.vue

@@ -35,7 +35,9 @@
 
            <!--PD000000 -->
            <el-tab-pane label="账务" name="setpan">
-                <m-setpan :model="model" :codes="codes"/>
+               <c-content>
+                   <m-setpan :model="model" :codes="codes"/>
+               </c-content>
            </el-tab-pane>
 
             <!--PD000000 -->

src/views/Business/Bftsnd/Dscins.vue

@@ -224,7 +224,7 @@
         >
       </c-col>
 
-      <c-col :span="24" style="margin-left: 150px">
+      <c-col :span="24">
         <el-form-item label="Receiver of Documents" prop="bfdgrp.rec.docrol">
           <c-select
             v-model="model.bfdgrp.rec.docrol"
@@ -237,17 +237,18 @@
       </c-col>
 
       <c-col :span="24">
-            <c-ptap1
+            <c-ptap
             :model="model"
             :argadr="{
-                title: '',
+                title: '寄单行',
                 grp: 'bfdgrp',
                 rol: 'ben',
             }"
             :disabled="true"
             :isAdrblk="false"
+            :noRef="true"
             >
-            </c-ptap1>
+            </c-ptap>
       </c-col>  
     </c-col>
 
@@ -416,14 +417,14 @@ import Api from "~/service/Api";
 import commonProcess from "~/mixin/commonProcess";
 import CodeTable from "~/config/CodeTable";
 import Event from "~/model/Bftsnd/Event";
-import Ptap1 from "~/views/Public/Ptap1";
+import Ptap from "~/views/Public/Ptap";
 
 export default {
   inject: ["root"],
   props: ["model", "codes"],
   mixins: [commonProcess],
   components: {
-    "c-ptap1": Ptap1,
+    "c-ptap": Ptap,
   },
   data() {
     return {};

src/views/Business/Bftsnd/Rgfp.vue

@@ -333,7 +333,7 @@
             <c-input v-model="scope.row.cmail1"></c-input>
           </template>
         </el-table-column>
-        <el-table-column label="2st" width="auto">
+        <el-table-column label="2nd" width="auto">
           <template slot-scope="scope">
             <c-input v-model="scope.row.cmail2"></c-input>
           </template>

src/views/Business/Infbdd/Infsea.vue

@@ -307,7 +307,7 @@
 
     <el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
       <div class="m-list-btns">
-          <m-busbtn ref="childs"  :ownref="ownref" trnCode="ditsel" :model="ditselModel" @onChoose="onChoose" >11</m-busbtn>
+          <m-busbtn ref="childs"  :ownref="ownref" trnCode="ditsel" :model="ditselModel" ownrefPath="bddgrp" tabIndex=3 @onChoose="onChoose" >11</m-busbtn>
       </div>
     </el-dialog>
   </div>

src/views/Business/Infbed/Infsea.vue

@@ -238,7 +238,7 @@
 
     <el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
       <div class="m-list-btns">
-          <m-busbtn ref="childs"  :ownref="ownref" trnCode="letsel" ownrefPath="bedgrp" :model="letselModel"   @onChoose="onChoose" >11</m-busbtn>
+          <m-busbtn ref="childs"  :ownref="ownref" trnCode="letsel" ownrefPath="bedgrp" tabIndex=3 :model="letselModel"   @onChoose="onChoose" >11</m-busbtn>
       </div>
     </el-dialog>
   </div>

src/views/Business/Infled/Infsea.vue

@@ -452,7 +452,7 @@
 
     <el-dialog :visible.sync="initdialog" :title="'交易列表'" append-to-body>
       <div class="m-list-btns">
-        <m-busbtn ref="childs" :ownref="ownref" trnCode="letsel" ownrefPath="ledgrp" :model="letselModel" @onChoose="onChoose"
+        <m-busbtn ref="childs" :ownref="ownref" trnCode="letsel" ownrefPath="ledgrp" tabIndex=3 :model="letselModel" @onChoose="onChoose"
           >11</m-busbtn
         >
       </div>

src/views/Public/BusNavbar.vue

@@ -89,8 +89,6 @@ export default {
         this.navcode = [];
         //请求按钮数据
         this.model[this.ownrefPath].rec.ownref = this.ownref;
-        // console.log("ownref:" + this.ownref);
-
         let rtnmsg = await this.executeRule(this.ownrefPath+".rec.ownref"); //didgrp_rec_ownref
         if (rtnmsg.respCode == SUCCESS) {
           //重置数组