Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/model/Infbpd/Event.js

@@ -110,5 +110,16 @@ export default {
                 this.$notify.error({title: '错误',message: '服务请求失败！'});
                 }
             },
+            async handleSearch() {
+                let rtnmsg = await this.executeRule("infbut.searow")
+                if(rtnmsg.respCode == SUCCESS)
+                {
+                    this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
+                }
+                else
+                {
+                this.$notify.error({title: '错误',message: '服务请求失败！'});
+                }
+        },
 
 }
\ No newline at end of file

src/views/Business/BusRouter.js

@@ -120,6 +120,7 @@ import Getset from "./Getset"
 import Getcrq from "./Getcrq"
 import Betdcr from "./Betdcr"
 import Betdrv from "./Betdrv"
+import Letnot from "./Letnot"
 
 import Ditdav from "./Ditdav"
 import Infpty from "./Infpty"
@@ -219,7 +220,7 @@ const BusRouter = [
   { path: 'inflid', component: Inflid, name: 'Inflid', meta: { title: '进口信用证查询' } },
   { path: 'inftrd', component: Inftrd, name: 'Inftrd', meta: { title: '进口押汇查询' } },
   { path: 'trtame', component: Trtame, name: 'Trtame', meta: { title: '进口融资修改' } },
-  { path: 'infbpd', component: Infbpd, name: 'Infbpd', meta: { title: '进口单据查询' } },
+  
   { path: 'inftxm', component: Inftxm, name: 'Inftxm', meta: { title: '条式语句查询' } },
   // { path: 'infdet', component: Infdet, name: 'Infdet', meta: { title: 'Infdet' } },
   { path: 'botdav', component: Botdav, name: 'Botdav', meta: { title: '出口托收寄单' } },
@@ -256,6 +257,9 @@ const BusRouter = [
   { path: 'Dbipty', component: Dbipty, name: 'Dbipty', meta: { title: 'Dbipty' } },
   { path: 'betdcr', component: Betdcr, name: 'Betdcr', meta: { title: '出口信用证电提不符点/拒付' } },
   { path: 'betdrv', component: Betdrv, name: 'Betdrv', meta: { title: '出口信用证单据修改' } },
+  { path: 'letnot', component: Letnot, name: 'Letnot', meta: { title: '出口信用证预通知' } },
+  { path: 'infbpd', component: Infbpd, name: 'Infbpd', meta: { title: '出口押汇查询' } },
+
 
   { path: 'getset', component: Getset, name: 'Getset', meta: { title: 'Getset' } },
   { path: 'getsel', component: Getsel, name: 'Getsel', meta: { title: 'Getsel' } },

src/views/Business/Infbpd/Infovwp.vue

@@ -82,13 +82,13 @@
         </el-form-item>
        </c-col>
                   
-       <c-col :span="12">
+       <c-col :span="10">
         <el-form-item label="" prop="recpan.fiap.ptsget.sdamod.seainf">
             <c-input  v-model="model.recpan.fiap.ptsget.sdamod.seainf"  placeholder="请输入"></c-input>
         </el-form-item>
        </c-col>
                   
-       <c-col :span="12">
+       <c-col :span="2">
         <c-button size="small" type="primary"  @click="onFiapDet">
             Details
         </c-button>
@@ -164,22 +164,22 @@
        </c-col>
                                    
        <c-col :span="12">
-        <el-form-item label="利率调�'方式" prop="finmod.ratchgtyp">
-            <c-select v-model="model.finmod.ratchgtyp" style="width:100%" placeholder="请选择利率调�'方式">
+        <el-form-item label="利率调整方式" prop="finmod.ratchgtyp">
+            <c-select v-model="model.finmod.ratchgtyp" style="width:100%" placeholder="请选择利率调整方式">
               </c-select>
         </el-form-item>
        </c-col>
                                    
        <c-col :span="12">
-        <el-form-item label="利率调�'周期" prop="finmod.ratchgprd">
-            <c-select v-model="model.finmod.ratchgprd" style="width:100%" placeholder="请选择利率调�'周期">
+        <el-form-item label="利率调整周期" prop="finmod.ratchgprd">
+            <c-select v-model="model.finmod.ratchgprd" style="width:100%" placeholder="请选择利率调整周期">
               </c-select>
         </el-form-item>
        </c-col>
                                    
        <c-col :span="12">
-        <el-form-item label="利率调�'月日数" prop="finmod.ratchgdat">
-            <c-input  v-model="model.finmod.ratchgdat" maxlength="4"  placeholder="请输入利率调�'月日数"></c-input>
+        <el-form-item label="利率调整月日数" prop="finmod.ratchgdat">
+            <c-input  v-model="model.finmod.ratchgdat" maxlength="4"  placeholder="请输入利率调整月日数"></c-input>
         </el-form-item>
        </c-col>
                                    
@@ -260,8 +260,8 @@
 	</c-col>
                                    
        <c-col :span="12">
-        <el-form-item label="第一还款�'�号" prop="finmod.act1">
-            <c-input  v-model="model.finmod.act1" maxlength="21"  placeholder="请输入第一还款�'�号"></c-input>
+        <el-form-item label="第一还款账号" prop="finmod.act1">
+            <c-input  v-model="model.finmod.act1" maxlength="21"  placeholder="请输入第一还款账号"></c-input>
         </el-form-item>
        </c-col>
                                    
@@ -286,8 +286,8 @@
        </c-col>
                                    
        <c-col :span="12">
-        <el-form-item label="第三方还款�'�号" prop="finmod.act3">
-            <c-input  v-model="model.finmod.act3" maxlength="21"  placeholder="请输入第三方还款�'�号"></c-input>
+        <el-form-item label="第三方还款账号" prop="finmod.act3">
+            <c-input  v-model="model.finmod.act3" maxlength="21"  placeholder="请输入第三方还款账号"></c-input>
         </el-form-item>
        </c-col>
   </div>

src/views/Business/Infbpd/index.vue

 <template>
   <div class="eContainer">
-    <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="left" size="small" :validate-on-rule-change="false">
-       <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
-        
-           <el-tab-pane label="Selection" name="infsea">
-                <m-infsea :model="model" :codes="codes"/>
-           </el-tab-pane>
-
+    <el-form
+      :model="model"
+      :rules="rules"
+      ref="modelForm"
+      label-width="150px"
+      label-position="left"
+      size="small"
+      :validate-on-rule-change="false"
+    >
+      <m-infsea
+        v-show="!showPanel"
+        :model="model"
+        :codes="codes"
+        @updateShowPanel="updateShowPanel($event)"
+      />
+      <c-tabs
+        v-show="showPanel"
+        v-model="tabVal"
+        ref="elment"
+        type="card"
+        @tab-click="tabClick"
+      >
+        <!-- <el-tab-pane label="Selection" name="infsea">
+          <c-content>
+            <m-infsea :model="model" :codes="codes" />
+          </c-content>
+        </el-tab-pane> -->
         <el-tab-pane label="Overview" name="infovwp">
-                <m-infovwp :model="model" :codes="codes"/>
+          <c-content>
+            <m-infovwp :model="model" :codes="codes" />
+          </c-content>
         </el-tab-pane>
 
         <el-tab-pane label="Completion" name="coninfp">
-                <m-coninfp :model="model" :codes="codes"/>
+          <m-coninfp :model="model" :codes="codes" />
         </el-tab-pane>
 
         <el-tab-pane label="Transactions" name="trnpan">
-                <m-trnpan :model="model" :codes="codes"/>
+          <m-trnpan :model="model" :codes="codes" />
         </el-tab-pane>
 
         <el-tab-pane label="CBS Info" name="cbsinfp">
-                <m-cbsinfp :model="model" :codes="codes"/>
+          <m-cbsinfp :model="model" :codes="codes" />
         </el-tab-pane>
 
         <el-tab-pane label="CBE Info" name="cbeinfp">
-                <m-cbeinfp :model="model" :codes="codes"/>
+          <m-cbeinfp :model="model" :codes="codes" />
         </el-tab-pane>
 
         <el-tab-pane label="FEP/FCP Info" name="fepinfp">
-                <m-fepinfp :model="model" :codes="codes"/>
+          <m-fepinfp :model="model" :codes="codes" />
         </el-tab-pane>
 
         <el-tab-pane label="SEP Info" name="sepinfp">
-                <m-sepinfp :model="model" :codes="codes"/>
+          <m-sepinfp :model="model" :codes="codes" />
         </el-tab-pane>
 
         <el-tab-pane label="GLE Bookings" name="gleinfp">
-                <m-gleinfp :model="model" :codes="codes"/>
+          <m-gleinfp :model="model" :codes="codes" />
         </el-tab-pane>
 
         <el-tab-pane label="SMH Info" name="smhinfp">
-                <m-smhinfp :model="model" :codes="codes"/>
+          <m-smhinfp :model="model" :codes="codes" />
         </el-tab-pane>
 
         <el-tab-pane label="SPT/DIA Info" name="peninfp">
-                <m-peninfp :model="model" :codes="codes"/>
+          <m-peninfp :model="model" :codes="codes" />
         </el-tab-pane>
 
         <el-tab-pane label="Engagement" name="liainfp">
-                <m-liainfp :model="model" :codes="codes"/>
+          <m-liainfp :model="model" :codes="codes" />
         </el-tab-pane>
 
         <el-tab-pane label="Print" name="prtpan">
-                <m-prtpan :model="model" :codes="codes"/>
+          <m-prtpan :model="model" :codes="codes" />
         </el-tab-pane>
 
         <el-tab-pane label="Order" name="ordpan">
-                <m-ordpan :model="model" :codes="codes"/>
+          <m-ordpan :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 Infbpd from "~/model/Infbpd"
-import commonProcess from "~/mixin/commonProcess"
-import Check from "~/model/Infbpd/Check"
-import Default from "~/model/Infbpd/Default"
-import Pattern from "~/model/Infbpd/Pattern"
-import Infsea from "./Infsea"
-import Ordpan from "./Ordpan"
-import Infovwp from "./Infovwp"
-import Coninfp from "./Coninfp"
-import Trnpan from "./Trnpan"
-import Cbsinfp from "./Cbsinfp"
-import Cbeinfp from "./Cbeinfp"
-import Fepinfp from "./Fepinfp"
-import Sepinfp from "./Sepinfp"
-import Gleinfp from "./Gleinfp"
-import Smhinfp from "./Smhinfp"
-import Peninfp from "./Peninfp"
-import Liainfp from "./Liainfp"
-import Prtpan from "./Prtpan"
-
+import Api from "~/service/Api";
+import CodeTable from "~/config/CodeTable";
+import Infbpd from "~/model/Infbpd";
+import commonProcess from "~/mixin/commonProcess";
+import Check from "~/model/Infbpd/Check";
+import Default from "~/model/Infbpd/Default";
+import Pattern from "~/model/Infbpd/Pattern";
+import Infsea from "./Infsea";
+import Ordpan from "./Ordpan";
+import Infovwp from "./Infovwp";
+import Coninfp from "./Coninfp";
+import Trnpan from "./Trnpan";
+import Cbsinfp from "./Cbsinfp";
+import Cbeinfp from "./Cbeinfp";
+import Fepinfp from "./Fepinfp";
+import Sepinfp from "./Sepinfp";
+import Gleinfp from "./Gleinfp";
+import Smhinfp from "./Smhinfp";
+import Peninfp from "./Peninfp";
+import Liainfp from "./Liainfp";
+import Prtpan from "./Prtpan";
 
 export default {
-    components:{
-        "m-infsea" : Infsea,
-        "m-ordpan" : Ordpan,
-        "m-infovwp" : Infovwp,
-        "m-coninfp" : Coninfp,
-        "m-trnpan" : Trnpan,
-        "m-cbsinfp" : Cbsinfp,
-        "m-cbeinfp" : Cbeinfp,
-        "m-fepinfp" : Fepinfp,
-        "m-sepinfp" : Sepinfp,
-        "m-gleinfp" : Gleinfp,
-        "m-smhinfp" : Smhinfp,
-        "m-peninfp" : Peninfp,
-        "m-liainfp" : Liainfp,
-        "m-prtpan" : Prtpan,
+  components: {
+    "m-infsea": Infsea,
+    "m-ordpan": Ordpan,
+    "m-infovwp": Infovwp,
+    "m-coninfp": Coninfp,
+    "m-trnpan": Trnpan,
+    "m-cbsinfp": Cbsinfp,
+    "m-cbeinfp": Cbeinfp,
+    "m-fepinfp": Fepinfp,
+    "m-sepinfp": Sepinfp,
+    "m-gleinfp": Gleinfp,
+    "m-smhinfp": Smhinfp,
+    "m-peninfp": Peninfp,
+    "m-liainfp": Liainfp,
+    "m-prtpan": Prtpan,
   },
   provide() {
     return {
-            root: this
-        }
+      root: this,
+    };
   },
   mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
-    data(){
+  data() {
     return {
-            tabVal: "infsea",
+      tabVal: "",
       trnName: "infbpd",
       model: new Infbpd().data,
       checkRules: Check,
@@ -120,27 +140,30 @@ export default {
       pattern: Pattern,
       rules: null,
       codes: { ...CodeTable },
-        }
+      showPanel: false,
+    };
   },
-    methods:{
-        tabClick(){
+  methods: {
+    tabClick() {},
+  },
+  async updateShowPanel(value) {
+    this.showPanel = value;
+    if (value) {
+      this.tabVal = "infovwp";
+    } else {
+      this.tabVal = "";
     }
   },
-    created:async function(){
+  created: async function () {
     console.log("进入infbpd交易");
-        let rtnmsg = await this.init({})
-        if(rtnmsg.respCode == SUCCESS)
-        {
-           //TODO 处理数据逻辑
-
-        }
-        else
-        {
-            this.$notify.error({title: '错误',message: '服务请求失败！'});
+    let rtnmsg = await this.init({});
+    if (rtnmsg.respCode == SUCCESS) {
+      this.updateModel(rtnmsg.data)
+    } else {
+      this.$notify.error({ title: "错误", message: "服务请求失败！" });
     }
-    }
-}
+  },
+};
 </script>
 <style>
-
 </style>

src/views/Layout/SideMenu.vue

@@ -62,6 +62,7 @@ export default {
         { inifrm: "3", ininam: "出口信用证", pntmiu: "" },
         { inifrm: "letsel", ininam: "出口信用证查询", pntmiu: "3" },
         { inifrm: "letopn", ininam: "出口信用证通知", pntmiu: "3" },
+        { inifrm: "letnot", ininam: "出口信用证预通知", pntmiu: "3" },
         { inifrm: "letame", ininam: "出口信用证修改", pntmiu: "3" },
         { inifrm: "letrsv", ininam: "出口信用证补通知", pntmiu: "3" },
         { inifrm: "infled", ininam: "出口信用证查询infled", pntmiu: "3" },
@@ -72,6 +73,7 @@ export default {
         { inifrm: "betrcl", ininam: "出口信用证单据索汇", pntmiu: "3" },
         { inifrm: "betdcr", ininam: "出口信用证不符点/拒付", pntmiu: "3" },
         { inifrm: "betdrv", ininam: "出口信用证单据修改", pntmiu: "3" },
+        { inifrm: "infbpd", ininam: "出口押汇查询", pntmiu: "3" },
         { inifrm: "4", ininam: "进口信用证", pntmiu: "" },
         { inifrm: "inflid", ininam: "进口信用证查询", pntmiu: "4" },
         { inifrm: "litopn", ininam: "进口信用证开立", pntmiu: "4" },
@@ -81,7 +83,6 @@ export default {
         { inifrm: "litcan", ininam: "进口信用证注销", pntmiu: "4" },
         { inifrm: "inftrd", ininam: "进口押汇查询", pntmiu: "4" },
         { inifrm: "trtame", ininam: "进口融资修改", pntmiu: "4" },
-        { inifrm: "infbpd", ininam: "进口单据查询", pntmiu: "4" },
         { inifrm: "inftxm", ininam: "条式语句查询", pntmiu: "4" },
         { inifrm: "5", ininam: "进口代收", pntmiu: "" },
         { inifrm: "bctdav", ininam: "进口代收到单通知", pntmiu: "5" },