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">
+               <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/Getamc/Conp.vue

@@ -31,7 +31,6 @@
             disabled
             v-model="model.gidgrp.cbs.max.cur"
             style="width: 100%"
-            placeholder="USD"
           >
             <el-option
               v-for="item in codes.cur"
@@ -65,7 +64,6 @@
             disabled
             v-model="model.gidgrp.cbs.opn1.cur"
             style="width: 100%"
-            placeholder="USD"
           >
             <el-option
               v-for="item in codes.cur"
@@ -217,7 +215,6 @@
               disabled
               v-model="model.gidgrp.cbs.cnf.cur"
               style="width: 100%"
-              placeholder="USD"
             >
               <el-option
                 v-for="item in codes.cur"

src/views/Business/Getamc/index.vue

 <template>
   <div class="eContainer">
-    <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false">
+    <c-function-btn
+      :handleSubmit="handleSubmit"
+      :handleCheck="handleCheck"
+      :handleStash="handleStash"
+    >
+      <el-button size="small">流程附言</el-button>
+      <el-button size="small">交易历史</el-button>
+      <el-button size="small">备忘录</el-button>
+      <el-button size="small">影像信息</el-button>
+      <!-- <el-button size="small">保存模板</el-button> -->
+      <!-- <el-button size="small">使用模板</el-button> -->
+      <el-button size="small">制裁信息</el-button>
+      <!-- <el-button size="small">拆分报文</el-button> -->
+      <el-button size="small">智能提示</el-button>
+    </c-function-btn>
+    <el-form
+      :model="model"
+      :rules="rules"
+      ref="modelForm"
+      label-width="150px"
+      label-position="right"
+      size="small"
+      :validate-on-rule-change="false"
+    >
       <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
+        <!--PD001291 -->
+        <el-tab-pane label="开立方式" name="opnp">
+          <m-opnp :model="model" :codes="codes" />
+        </el-tab-pane>
 
         <!--PD000017 -->
         <el-tab-pane label="Confirmation" name="conp">
-                <m-conp :model="model" :codes="codes"/>
+          <m-conp :model="model" :codes="codes" />
+        </el-tab-pane>
+
+        <el-tab-pane
+          v-if="model.gitp.swiftflg == ''"
+          label="Overview"
+          name="ovwp"
+        >
+          <c-content>
+            <m-ovwp :model="model" :codes="codes" />
+          </c-content>
         </el-tab-pane>
 
         <!--PD000002 -->
-           <el-tab-pane label="Overview" name="ovwp">
-                <m-ovwp :model="model" :codes="codes"/>
+        <el-tab-pane
+          v-if="model.gitp.swiftflg == 'Y'"
+          label="Overview"
+          name="ovwp20"
+        >
+          <c-content>
+            <m-ovwp20 :model="model" :codes="codes" />
+          </c-content>
+        </el-tab-pane>
+
+        <el-tab-pane
+          v-if="model.gitp.swiftflg == 'N'"
+          label="Overview"
+          name="ovwp"
+        >
+          <c-content>
+            <m-ovwp :model="model" :codes="codes" />
+          </c-content>
         </el-tab-pane>
 
         <!--PD000727 -->
-           <el-tab-pane label="Presentation/Delivery" name="preperp">
-                <m-preperp :model="model" :codes="codes"/>
+        <el-tab-pane
+          v-if="model.gitp.swiftflg == ''"
+          label="Presentation/Delivery"
+          name="preperp"
+        >
+          <c-content>
+            <m-preperp :model="model" :codes="codes" />
+          </c-content>
+        </el-tab-pane>
+
+        <el-tab-pane
+          v-if="model.gitp.swiftflg == 'Y'"
+          label="Presentation/Delivery"
+          name="preperp"
+        >
+          <c-content>
+            <m-preperp :model="model" :codes="codes" />
+          </c-content>
         </el-tab-pane>
 
         <!--PD000389 -->
         <el-tab-pane label="Details" name="detp">
-                <m-detp :model="model" :codes="codes"/>
+          <m-detp :model="model" :codes="codes" />
         </el-tab-pane>
 
         <!--PD000210 -->
         <el-tab-pane label="Undertaking Text" name="gidtxtp">
-                <m-gidtxtp :model="model" :codes="codes"/>
+          <m-gidtxtp :model="model" :codes="codes" />
         </el-tab-pane>
 
         <!--PD000027 -->
         <el-tab-pane label="Liability" name="engp">
-                <m-engp :model="model" :codes="codes"/>
+          <m-engp :model="model" :codes="codes" />
         </el-tab-pane>
 
         <!--PD000000 -->
         <el-tab-pane label="Settlement" name="setpan">
-                <m-setpan :model="model" :codes="codes"/>
+          <m-setpan :model="model" :codes="codes" />
         </el-tab-pane>
 
         <!--PD000000 -->
         <el-tab-pane label="Completion" name="coninfp">
-                <m-coninfp :model="model" :codes="codes"/>
+          <m-coninfp :model="model" :codes="codes" />
         </el-tab-pane>
 
         <!--PD000529 -->
         <el-tab-pane label="Massages" name="docpan">
-                <m-docpan :model="model" :codes="codes"/>
+          <m-docpan :model="model" :codes="codes" />
         </el-tab-pane>
 
-            <!--PD001291 -->
-           <el-tab-pane label="開立方式" name="opnp">
-                <m-opnp :model="model" :codes="codes"/>
+        <el-tab-pane label="Attachments" name="doctre">
+          <c-content>
+            <m-doctre :model="model" :codes="codes" />
+          </c-content>
+        </el-tab-pane>
+
+        <el-tab-pane v-if="model.gitp.swiftflg=='N'&&model.gidgrp.ghd.segtyp=='02'" label="汇总征税" name="detpp">
+                <c-content>
+                    <m-detpp :model="model" :codes="codes"/>
+                </c-content>
             </el-tab-pane>
 
         <!--PD000001 -->
         <el-tab-pane label="統一授信" name="limitbody">
-                <m-limitbody :model="model" :codes="codes"/>
+          <m-limitbody :model="model" :codes="codes" />
         </el-tab-pane>
       </c-tabs>
     </el-form>
   </div>
 </template>
 <script>
-import Api from "~/service/Api"
-import CodeTable from "~/config/CodeTable"
-import Getamc from "~/model/Getamc"
-import commonProcess from "~/mixin/commonProcess"
+import Api from "~/service/Api";
+import CodeTable from "~/config/CodeTable";
+import Getamc from "~/model/Getamc";
+import commonProcess from "~/mixin/commonProcess";
 import commonFuncs from "~/mixin/commonFuncs";
-import Check from "~/model/Getamc/Check"
-import Default from "~/model/Getamc/Default"
-import Pattern from "~/model/Getamc/Pattern"
-import Conp from "./Conp"
-import Ovwp from "./Ovwp"
-import Preperp from "./Preperp"
-import Detp from "./Detp"
-import Gidtxtp from "./Gidtxtp"
-import Opnp from "./Opnp"
+import Check from "~/model/Getamc/Check";
+import Default from "~/model/Getamc/Default";
+import Pattern from "~/model/Getamc/Pattern";
+import Conp from "./Conp";
+import Ovwp from "./Ovwp";
+import Preperp from "./Preperp";
+import Detp from "./Detp";
+import Gidtxtp from "./Gidtxtp";
+import Opnp from "./Opnp";
 
 import Engp from "~/views/Public/Engp";
 import Setpan from "~/views/Public/Setpan";
 import Coninfp from "~/views/Public/Coninfp";
 import Docpan from "~/views/Public/Docpan";
+import Doctre from "~/views/Public/Doctre";
 import Limitbody from "~/views/Public/Limitbody";
 
-
 export default {
   name: "Getamc",
-    components:{
-        "m-conp" : Conp,
-        "m-ovwp" : Ovwp,
-        "m-preperp" : Preperp,
-        "m-detp" : Detp,
-        "m-gidtxtp" : Gidtxtp,
-        "m-engp" : Engp,
-        "m-setpan" : Setpan,
-        "m-coninfp" : Coninfp,
-        "m-docpan" : Docpan,
-        "m-opnp" : Opnp,
-        "m-limitbody" : Limitbody,
+  components: {
+    "m-conp": Conp,
+    "m-ovwp": Ovwp,
+    "m-preperp": Preperp,
+    "m-detp": Detp,
+    "m-gidtxtp": Gidtxtp,
+    "m-engp": Engp,
+    "m-setpan": Setpan,
+    "m-coninfp": Coninfp,
+    "m-docpan": Docpan,
+    "m-doctre" :Doctre,
+    "m-opnp": Opnp,
+    "m-limitbody": Limitbody,
   },
   provide() {
     return {
-            root: this
-        }
+      root: this,
+    };
   },
   mixins: [commonProcess, commonFuncs], // 里面包含了Default、Check等的公共处理
-    data(){
+  data() {
     return {
       tabVal: "",
       trnName: "getamc",
@@ -115,34 +192,29 @@ export default {
       pattern: Pattern,
       rules: null,
       codes: {
-               ...CodeTable 
+        ...CodeTable,
       },
-        }
+    };
   },
-    methods:{
-        myTabClick(tab){
-            this.tabClick(tab)
+  methods: {
+    myTabClick(tab) {
+      this.tabClick(tab);
       /**
        *  do it yourself
        **/
-        }
     },
-    created:async function(){
+  },
+  created: async function () {
     console.log("进入getamc交易");
-        let rtnmsg = await this.init({})
-        if(rtnmsg.respCode == SUCCESS)
-        {
-           this.updateModel(rtnmsg.data)
+    let rtnmsg = await this.init({});
+    if (rtnmsg.respCode == SUCCESS) {
+      this.updateModel(rtnmsg.data);
       //TODO 处理数据逻辑
-
-        }
-        else
-        {
-            this.$notify.error({title: '错误',message: '服务请求失败！'});
-        }
+    } else {
+      this.$notify.error({ title: "错误", message: "服务请求失败！" });
     }
-}
+  },
+};
 </script>
 <style>
-
 </style>

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) {
           //重置数组
@@ -107,8 +105,7 @@ export default {
             let newList = {
               code: arr[0],
               label: arr[1],
-            //   isDis: arr[2],
-              isDis:true,
+              isDis: arr[2],
               title: arr[3],
               index: index,
             };