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

src/model/Infltd/Event.js

@@ -8,16 +8,24 @@ export default {
             //TODO 处理数据逻辑
             this.stmData.data = rtnmsg.data.infbut_dspstm.rows;
             //console.log("smhstm:",rtnmsg);
+            if (rtnmsg.data.infbut_dspstm.rows.length == 0) {
+                this.$notify({
+                    title: '成功',
+                    message: '搜索完毕，无满足条件记录',
+                    type: 'success'
+                });
+            }
         }
         else {
             this.$notify.error({ title: '错误', message: '服务请求失败！' });
         }
     },
-    async onInfbutDsp() {
+    async onInfbutDsp(row) {
         let rtnmsg = await this.executeRule("infbut.dsp")
         if (rtnmsg.respCode == SUCCESS) {
             //TODO 处理数据逻辑
-            //console.log(rtnmsg);
+            console.log("rows:", row);
+            console.log("你猜", rtnmsg);
 
         }
         else {
@@ -28,6 +36,7 @@ export default {
         let rtnmsg = await this.executeRule("infbut.userow")
         if (rtnmsg.respCode == SUCCESS) {
             //TODO 处理数据逻辑
+            //console.log("use测试：",rtnmsg);
 
         }
         else {
@@ -35,7 +44,24 @@ export default {
         }
     },
     async onInfbutClr() {
-        let rtnmsg = await this.executeRule("infbut.clr")
+        this.model.infcon.seaownref = "";
+        this.model.infcon.searef = "";
+        this.model.infcon.pty.extkey = "";
+        this.model.infcon.seapty = "";
+        this.model.infcon.opndatfrom = "";
+        this.model.infcon.opndatto = "";
+        this.model.infcon.seaamtfr = "";
+        this.model.infcon.seaamtto = "";
+        this.model.infcon.seasta = "";
+        this.model.infcon.usr.extkey = "";
+        this.model.infcon.nam = "";
+        this.model.infcon.hndtyp = "";
+        this.model.infcon.pty.nam = "";
+        this.model.infcon.searol = "";
+        this.model.infcon.seacur = "";
+        this.stmData.data = "";
+
+        //let rtnmsg = await this.executeRule("infbut.clr")
         if (rtnmsg.respCode == SUCCESS) {
             //TODO 处理数据逻辑
 
@@ -55,7 +81,27 @@ export default {
         }
     },
     async onInfbutExi() {
-        let rtnmsg = await this.executeRule("infbut.exi")
+        this.$confirm("确认退出？", "", {
+            confirmButtonText: "确认",
+            cancelButtonText: "取消",
+            type: "warning",
+          })
+            .then((res) => {
+              // this.$router.back();
+              this.$store.dispatch("TagsView/delView", this.$route);
+              this.handleExit && this.handleExit();
+              if (this.$route.query && this.$route.query.routeParams) {
+                setTimeout(() => {
+                  this.$router.back();
+                }, 500);
+              } else {
+                setTimeout(() => {
+                  this.$router.push("/home");
+                }, 500);
+              }
+            })
+            .catch(() => {});
+        //let rtnmsg = await this.executeRule("infbut.exi")
         if (rtnmsg.respCode == SUCCESS) {
             //TODO 处理数据逻辑
 

src/model/Letopn/Pattern.js

@@ -76,11 +76,11 @@ export default {
     ],
 
     "ledgrp.rec.nomtop": [
-        { type: "string", required: false, message: "必输项" },
+        { required: false, message: "必输项" },
         { max: 2, message: "长度不能超过2" }
     ],
     "ledgrp.rec.nomton": [
-        { type: "string", required: false, message: "必输项" },
+        { required: false, message: "必输项" },
         { max: 2, message: "长度不能超过2" }
     ],
     "ledgrp.ben.adrelc": [
@@ -103,7 +103,7 @@ export default {
         { max: 16, message: "长度不能超过16" }
     ],
     "ledgrp.rec.opndat": [
-        { required: false, message: "输入正确的日期" }
+        { required: true, message: "输入正确的日期" }
     ],
     "ledgrp.rec.preadvdt": [
         { required: false, message: "输入正确的日期" }
@@ -137,7 +137,7 @@ export default {
         { max: 140, message: "长度不能超过140" }
     ],
     "ledgrp.rec.expdat": [
-        { required: false, message: "输入正确的日期" }
+        { required: true, message: "输入正确的日期" }
     ],
     "ledgrp.iss.adrelc": [
         { type: "string", required: true, message: "必输项" },

src/views/Business/Infcpd/Infsea.vue

@@ -342,29 +342,32 @@ export default {
       searchToggle: true,
       stmData: {
         columns: [
-          '1 1 "Reference" 120 ',
-          '2 1 "Resp. User" 1200 ',
-          '3 1 "PYE NO." 120 ',
-          '1 2 "Party Number" 150',
-          '2 2 "Payee Customer" 150',
-          '3 2 "PYE.Customer CN" 150',
-          '1 3 "Party Number" 150',
-          '2 3 "Ord.Customer" 150',
-          '3 3 "Ord.Customer CN" 150',
-          '1 4 "Party Number" 150',
-          '2 4 "Ord.Institution" 150',
-          '3 4 "ORC NO." 150',
-          '1 5 "Party Number" 150',
-          '2 5 "Paying Bank" 150',
-          '1 6 "Opened" 100',
-          '2 6 "Value" 100',
-          '1 7 "Closed" 100',
-          '1 8 "Cur" 100',
-          '2 8 "Cur" 100',
-          '1 9 "Paym.Amount" 150',
-          '2 9 "Amount rcvd." 150',
-          '1 10 "Pyectycod" 150',
-          '1 11 "Orcctycod" 150',
+          '1 1 "Reference" 150 ',
+          '2 2 "Resp. User" 100 ',
+          '12 3 "PYE NO." 100 ',
+          '9 4 "Payee.Party Number" 150',
+          '10 5 "Payee Customer" 250',
+          '11 6 "PYE.Customer CN" 130',
+          '13 7 "Ord.Party Number" 150',
+          '14 8 "Ord.Customer" 250',
+          '15 9 "Ord.Customer CN" 130',
+          '16 10 "1.Party Number" 150',
+          '17 11 "Ord.Institution" 200',
+          '12 12 "ORC NO." 150',
+          '18 13 "2.Party Number" 150',
+          '19 14 "Paying Bank" 150',
+          //'3 15 "Opened" 140',
+          {index:3,position:15,width:140,pattern:'time',label:'Opened'},
+          //'4 16 "Value" 140',
+          {index:4,position:16,width:140,pattern:'time',label:'Value'},
+          //'5 17 "Closed" 140',
+          {index:5,position:17,width:140,pattern:'time',label:'Closed'},
+          '20 18 "1.Cur" 80',
+          '22 19 "2.Cur" 80',
+          '21 20 "Paym.Amount" 120',
+          '23 21 "Amount rcvd." 120',
+          '6 22 "Pyectycod" 100',
+          '7 23 "Orcctycod" 100',
         ],
         data: [],
       },
@@ -372,7 +375,7 @@ export default {
   },
   methods: {
     ...Event,
-    handleSearch(callback) {
+   /*  handleSearch(callback) {
       setTimeout(() => {
         this.$notify.info({
           title: "提示",
@@ -381,7 +384,7 @@ export default {
         // 执行子组件回调函数控制按钮状态
         callback();
       }, 1000);
-    },
+    }, */
     handleReset() {},
   },
   created: function () {},

src/views/Business/Infltd/Ovwp.vue

@@ -62,7 +62,7 @@
             ></c-input>
           </el-form-item>
         </c-col>
-        <c-col :span="24">
+        <!-- <c-col :span="24">
           <el-form-item
             label="Drag  Drop Sender"
             prop="recpan.be1p.ptsget.sdamod.dadsnd"
@@ -72,7 +72,7 @@
               placeholder="请输入Drag  Drop Sender"
             ></c-input>
           </el-form-item>
-        </c-col>
+        </c-col> -->
         <c-col :span="12">
           <el-form-item label="Nominal Amount" prop="ltdgrp.cbs.nom1.cur">
             <c-select

src/views/Business/Infltd/Ptyp.vue

@@ -155,48 +155,6 @@
     </c-row>
 
     <c-col :span="12">
-      <el-form-item
-        label="Drag  Drop Sender"
-        prop="recpan.a2tp.ptsget.sdamod.dadsnd"
-      >
-        <c-input
-          v-model="model.recpan.a2tp.ptsget.sdamod.dadsnd"
-          placeholder="请输入Drag  Drop Sender"
-        ></c-input>
-      </el-form-item>
-    </c-col>
-
-    <c-col :span="12">
-      <el-form-item
-        label="Drag  Drop Sender"
-        prop="recpan.rmtp.ptsget.sdamod.dadsnd"
-      >
-        <c-input
-          v-model="model.recpan.rmtp.ptsget.sdamod.dadsnd"
-          placeholder="请输入Drag  Drop Sender"
-        ></c-input>
-      </el-form-item>
-    </c-col>
-
-    <c-col :span="12">
-      <el-form-item label="" prop="recpan.a2tp.ptsget.sdamod.seainf">
-        <c-input
-          v-model="model.recpan.a2tp.ptsget.sdamod.seainf"
-          placeholder="请输入"
-        ></c-input>
-      </el-form-item>
-    </c-col>
-
-    <c-col :span="12">
-      <el-form-item label="" prop="recpan.rmtp.ptsget.sdamod.seainf">
-        <c-input
-          v-model="model.recpan.rmtp.ptsget.sdamod.seainf"
-          placeholder="请输入"
-        ></c-input>
-      </el-form-item>
-    </c-col>
-
-    <c-col :span="12">
       <el-form-item label="名称" prop="ltdgrp.a2t.namelc">
         <c-input
           type="textarea"
@@ -269,18 +227,6 @@
     </c-col>
 
     <c-col :span="12">
-      <el-form-item
-        label="Drag  Drop Sender"
-        prop="recpan.conp.ptsget.sdamod.dadsnd"
-      >
-        <c-input
-          v-model="model.recpan.conp.ptsget.sdamod.dadsnd"
-          placeholder="请输入Drag  Drop Sender"
-        ></c-input>
-      </el-form-item>
-    </c-col>
-
-    <c-col :span="12">
       <el-form-item label="" prop="recpan.conp.ptsget.sdamod.seainf">
         <c-input
           v-model="model.recpan.conp.ptsget.sdamod.seainf"

src/views/Business/Infltd/index.vue

@@ -12,7 +12,9 @@
       <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="tabClick">
         <!--PD000006 -->
         <el-tab-pane label="Selection" name="infsea">
-          <m-infsea :model="model" :codes="codes" />
+          <c-content>
+            <m-infsea :model="model" :codes="codes" />
+          </c-content>
         </el-tab-pane>
 
         <!--PD000001 -->
@@ -27,7 +29,9 @@
 
         <!--PD000042 -->
         <el-tab-pane label="Parties" name="ptyp">
-          <m-ptyp :model="model" :codes="codes" />
+          <c-content>
+            <m-ptyp :model="model" :codes="codes" />
+          </c-content>
         </el-tab-pane>
 
         <!--PD000169 -->
@@ -146,7 +150,7 @@ export default {
       pattern: Pattern,
       rules: null,
       codes: { ...CodeTable },
-    }
+    };
   },
   methods: {
     tabClick() {},
@@ -155,7 +159,7 @@ export default {
     console.log("进入infltd交易");
     let rtnmsg = await this.init({});
     if (rtnmsg.respCode == SUCCESS) {
-      console.log("ini方法：")
+      console.log("ini方法：");
       //TODO 处理数据逻辑
     } else {
       this.$notify.error({ title: "错误", message: "服务请求失败！" });

src/views/Business/Letopn/Detp.vue

@@ -9,6 +9,7 @@
               v-model="model.ledgrp.rec.avbwth"
               style="width: 100%"
               placeholder="请选择指定银行"
+              :code="codes.avbwth"
             >
             </c-select>
           </el-form-item>

src/views/Business/Letsel/Sel.vue

@@ -255,13 +255,13 @@ export default {
             {
               title: "Pre-Advising/Notifying",
               url: "/business/letrsv",
-              disabled: false,
+              disabled: this.model.ledgrp.rec.ownref ? true : false,
             },
             {
               title: "Advising/Confirming",
               url: "/business/letopn",
               hotsubx: "6",
-              disabled: false,
+              disabled: this.model.ledgrp.rec.ownref ? true : false,
             },
             { title: "Reservation", url: "#", disabled: false },
             { title: "Resevation & Receving Docs", url: "#", disabled: false },
@@ -270,7 +270,7 @@ export default {
               title: "Amending Issuing Bank",
               url: "/business/letame",
               hotsubx: "6",
-              disabled: false,
+              disabled: this.model.ledgrp.rec.ownref ? false : true,
             },
             {
               title: "Changing Issuing Bank",

src/views/Business/Letsel/SelMune.vue

@@ -9,6 +9,7 @@
     <el-table-column prop="title" align="center">
       <template slot-scope="scope">
         <c-button
+          class="c_button_style"
           @click.native="onNarBtnClick(scope.row.url, scope.row.hotsubx)"
           :title="scope.row.title"
           :disabled="scope.row.disabled"
@@ -52,11 +53,8 @@ export default {
 </script>
 
 <style>
-a {
-  text-decoration-line: none;
-  color: #606266;
-}
-a:hover {
-  color: blue;
+.c_button_style {
+  border: 0px;
+  border-radius: 5px;
 }
 </style>
\ No newline at end of file