Merge branch 'develop' of http://192.168.0.110:11080/isc-v3.1/isc-web-vue into develop

src/page/Frontend/Bsnsel/views/Mainpl.vue

@@ -8,7 +8,7 @@
           <el-row>
             <c-col :span="8">
               <el-form-item label="报文标准" prop="bsnp.msgtyp">
-                <c-select v-model="model.bsnp.msgtyp" style="width:100%" dbCode="MSGTP3" @change="getSubtyp(model.bsnp.msgtyp, 'bsnp.subtyp')">
+                <c-select v-model="model.bsnp.msgtyp" style="width:100%" dbCode="MSGTP3" sort="SRT" @change="getSubtyp(model.bsnp.msgtyp, 'bsnp.subtyp')">
                 </c-select>
               </el-form-item>
             </c-col>

src/page/Frontend/Cpswjz/views/Mainplwjz.vue

@@ -17,7 +17,7 @@
             </c-col>
             <c-col :span="8">
               <el-form-item label="报文标准" prop="wlzp.msgtyp" style="width: 100%">
-                <c-select v-model="model.wlzp.msgtyp" style="width: 100%" dbCode="MSGTP3">
+                <c-select v-model="model.wlzp.msgtyp" style="width: 100%" dbCode="MSGTP3" sort="SRT">
                 </c-select>
               </el-form-item>
             </c-col>
@@ -124,7 +124,7 @@
               :min-width="item.width">
               <template slot-scope="scope">
                 <c-select-value-to-label v-if="item.prop == 'msgtyp'" v-model="scope.row.msgtyp"
-                  dbCode="MSGTP3"></c-select-value-to-label>
+                  dbCode="MSGTP3" sort="SRT"></c-select-value-to-label>
                 <c-select-value-to-label v-if="item.prop == 'rspsta'" v-model="scope.row.rspsta"
                   dbCode="RSPSTA"></c-select-value-to-label>
                 <c-select-value-to-label v-if="item.prop == 'chnipt'" v-model="scope.row.chnipt"

src/page/Frontend/Dblktl/views/Selp.vue

@@ -7,7 +7,7 @@
           <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="BIC" prop="ktlp.ptpmod.pty.extkey" style="width: 100%">
-                <c-select v-model="model.ktlp.ptpmod.pty.extkey" style="width: 100%" dbCode="MSGTP3">
+                <c-select v-model="model.ktlp.ptpmod.pty.extkey" style="width: 100%" dbCode="MSGTP3" sort="SRT">
                 </c-select>
               </el-form-item>
             </c-col>

src/page/Frontend/Dotopn/views/Dotp01.vue

@@ -7,7 +7,7 @@
           <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="账户行" prop="ptpmod.pty.extkey" style="width: 100%">
-                <c-input v-model="model.ptpmod.pty.extkey" style="width: 100%" dbCode="MSGTP3">
+                <c-input v-model="model.ptpmod.pty.extkey" style="width: 100%" dbCode="MSGTP3" sort="SRT">
                 </c-input>
               </el-form-item>
             </c-col>

src/page/Frontend/Msgrsm/views/Rsmp.vue

@@ -7,7 +7,7 @@
           <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="报文标准" prop="sndp.msgtyp" style="width: 100%">
-                <c-select v-model="model.sndp.msgtyp" style="width: 100%" placeholder="请选择货押标识" dbCode="MSGTP3">
+                <c-select v-model="model.sndp.msgtyp" style="width: 100%" placeholder="请选择货押标识" dbCode="MSGTP3" sort="SRT">
                 </c-select>
               </el-form-item>
             </c-col>

src/page/Frontend/Msgrtm/views/Schpnl.vue

@@ -7,7 +7,7 @@
           <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="报文标准" prop="msgtyp" style="width: 100%">
-                <c-select v-model="model.sndp.msgtyp" style="width: 100%" placeholder="请选择货押标识" dbCode="MSGTP3"
+                <c-select v-model="model.sndp.msgtyp" style="width: 100%" placeholder="请选择货押标识" dbCode="MSGTP3" sort="SRT"
                   @change="getSubtyp(model.sndp.msgtyp, 'sndp.subtyp')">
                 </c-select>
               </el-form-item>

src/page/Frontend/Msgsel/views/Msgpnl.vue

@@ -7,7 +7,7 @@
           <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="报文标准" prop="sndp.msgtyp" style="width: 100%">
-                <c-select v-model="model.sndp.msgtyp" style="width: 100%" dbCode="MSGTP3" @change="getSubtyp(model.sndp.msgtyp, 'sndp.subtyp')" />
+                <c-select v-model="model.sndp.msgtyp" style="width: 100%" dbCode="MSGTP3" sort="SRT" @change="getSubtyp(model.sndp.msgtyp, 'sndp.subtyp')" />
               </el-form-item>
             </c-col>
             <c-col :span="8">

src/page/Frontend/Msgsep/views/Mainp.vue

@@ -7,7 +7,7 @@
           <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="报文标准" prop="sndp.msgtyp" style="width: 100%">
-                <c-select v-model="model.sndp.msgtyp" style="width: 100%" placeholder="请选择货押标识" dbCode="MSGTP3"
+                <c-select v-model="model.sndp.msgtyp" style="width: 100%" placeholder="请选择货押标识" dbCode="MSGTP3" sort="SRT"
                   @change="getSubtyp(model.sndp.msgtyp, 'sndp.subtyp')">
                 </c-select>
               </el-form-item>

src/page/Frontend/Msgstp/views/Stpp.vue

@@ -4,7 +4,7 @@
       <c-col :span="24">
         <c-col :span="8">
           <el-form-item label="报文标准" prop="" style="width: 100%">
-            <c-select v-model="model.msgp.typ" style="width: 100%" dbCode="MSGTP3"/>
+            <c-select v-model="model.msgp.typ" style="width: 100%" dbCode="MSGTP3" sort="SRT"/>
           </el-form-item>
         </c-col>
       </c-col>

src/page/Frontend/Oftame/views/Oftp2.vue

@@ -7,7 +7,7 @@
           <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="账户行BIC" prop="oftp.ptpmod.pty.extkey" style="width: 100%">
-                <c-input v-model="model.oftp.ptpmod.pty.extkey" style="width: 100%" dbCode="MSGTP3">
+                <c-input v-model="model.oftp.ptpmod.pty.extkey" style="width: 100%" dbCode="MSGTP3" sort="SRT">
                 </c-input>
               </el-form-item>
             </c-col>

src/page/Frontend/Oftdtl/event/index.js

@@ -3,7 +3,47 @@ import Oftdtl from "../model"
 export default {
   methods: {
     async handleSearch() {
-      
+      let amtu = this.model.oftp.smd.amtu;
+      if (!amtu || amtu === "") {
+        this.$notify.error({
+          title: this.$t("financing.错误"),
+          message: this.$t("financing.金额上限必输！"),
+        });
+        return;
+      }
+      let amtd = this.model.oftp.smd.amtd;
+      if (!amtd || amtd === "") {
+        this.$notify.error({
+          title: this.$t("financing.错误"),
+          message: this.$t("financing.金额下限必输！"),
+        });
+        return;
+      }
+
+      this.load = true;
+      // TODO rewrite url
+      let rtnmsg = await Api.post("/frontend/oftdtl/smdQuery", {
+        ...this.model,
+        pageNum: this.pagination.pageNum,
+        pageSize: this.pagination.pageSize,
+      });
+      if (rtnmsg.respCode == SUCCESS) {
+        this.load = false;
+        this.model.oftgrp.dotsmd.lst  = [];
+        let list  = rtnmsg.data.oftp.smd.dotrec.lst;
+        this.model.oftgrp.dotsmd.lst = list;
+        this.pagination = {
+          pageNum: rtnmsg.data.pageNum || 1,
+          pageSize: rtnmsg.data.pageSize || 10,
+          total: parseInt(rtnmsg.data.total),
+        };
+      } else {
+        this.$notify.error({
+          title: this.$t("financing.错误"),
+          message: this.$t("financing.服务请求失败！"),
+        });
+      }
+      this.load = false;
     },
     async handleReset() {
       this.model = new Oftdtl().data;
@@ -21,6 +61,62 @@ export default {
     },
     handleSelectionChange(val) {
       this.multipleSelection = val;
+    },
+    
+    // 手工关联
+    async oftopm(){
+      this.model.oftp.smd.dotrec.lst = this.multipleSelection;
+      let rtnmsg = await Api.post("/frontend/oftdtl/oftopm", {
+        ...this.model,
+      });
+      if (rtnmsg.respCode == SUCCESS) {
+        if(rtnmsg.data == true){
+          this.$notify.info({
+            title: this.$t("financing.成功"),
+            message: this.$t("financing.手工关联成功"),
+          });
+          //this.handleSearch();
+        }else{
+          this.$notify.error({
+            title: this.$t("financing.错误"),
+            message: this.$t("financing."+rtnmsg.data),
+          });
+        }
+       
+      } else {
+        this.$notify.error({
+          title: this.$t("financing.错误"),
+          message: this.$t("financing.服务请求失败！"),
+        });
+      }
+    },
+     // 提前放行
+     async pass(){
+      this.model.oftp.smd.dotrec.lst = this.multipleSelection;
+      let rtnmsg = await Api.post("/frontend/oftdtl/pass", {
+        ...this.model,
+      });
+      if (rtnmsg.respCode == SUCCESS) {
+        if(rtnmsg.data.mpsinr){
+          this.routerPush({
+            path: '/business/msgpss',
+            query: {
+              inr: rtnmsg.data.mpsinr,
+            }
+          })
+        }else{
+          this.$notify.error({
+            title: this.$t("financing.错误"),
+            message: this.$t("financing."+rtnmsg.data),
+          });
+        }
+       
+      } else {
+        this.$notify.error({
+          title: this.$t("financing.错误"),
+          message: this.$t("financing.服务请求失败！"),
+        });
+      }
     }
   },
 };

src/page/Frontend/Oftdtl/model/check.js

@@ -19,10 +19,10 @@ export default {
   ],
 
   "oftp.smd.amtd": [
-    { type: "string", required: false, message: "必输项" },
+    { required: true, message: "必输项" },
   ],
   "oftp.smd.amtu": [
-    { type: "string", required: false, message: "必输项" },
+    { required: true, message: "必输项" },
   ],
 
   "oftp.smd.ref": [

src/page/Frontend/Oftdtl/views/Oftdtl.vue

@@ -8,13 +8,13 @@
             <c-col :span="8">
               <el-form-item label="起息日" prop="oftp.smd.vludats" style="width: 100%">
                 <c-col :span="11">
-                  <c-date-picker type="date" v-model="model.oftp.smd.vludats" style="width:100%"></c-date-picker>
+                  <c-date-picker type="date" v-model="model.oftp.smd.vludate" style="width:100%"></c-date-picker>
                 </c-col>
                 <c-col :span="2" style="text-align: center">
                   <label style="display: inline-block; width: 100%">-</label>
                 </c-col>
                 <c-col :span="11">
-                  <c-date-picker type="date" v-model="model.oftp.smd.vludate" style="width:100%"></c-date-picker>
+                  <c-date-picker type="date" v-model="model.oftp.smd.vludats" style="width:100%"></c-date-picker>
                 </c-col>
               </el-form-item>
             </c-col>
@@ -95,22 +95,27 @@
     </c-list-search>
 
     <el-col :span="24" style="margin-top: 10px;margin-bottom: 10px;">
-      <c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0px">
+      <c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 0px" @click="showMsg">
+        原报展示
+        </c-button>
+      <c-button class="medium_bcs" :disabled="isDisable" size="medium" type="primary" style="margin-left: 30px" @click="oftopm">
         手工关联
       </c-button>
-      <c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 30px">
+      <!-- <c-button class="medium_bcs" size="medium" type="primary" style="margin-left: 30px" @click="pass">
         提前放行
-        </c-button>
+        </c-button> 
       <c-button style="margin-left: 30px" class="medium_bcs" size="medium" type="primary">
         导出
-      </c-button>
+      </c-button> -->
     </el-col>
 
     <el-col :span="24" style="margin-top: 10px">
       <div>
         <c-col :span="24">
-          <el-table :data="model.oftgrp.dotsmd.lst" v-loading="load" style="width: 100%" size="small" :border="true" height="calc(100vh - 320px)" :highlight-current-row="true">
-            <el-table-column prop="mty" label="报文类型" width="100">
+          <el-table :data="model.oftgrp.dotsmd.lst" @selection-change="handleSelectionChange" 
+           v-loading="load" style="width: 100%" size="small" :border="true" height="calc(100vh - 320px)" :highlight-current-row="true">
+           <el-table-column type="selection" width="55"></el-table-column>
+           <el-table-column prop="mty" label="报文类型" width="100">
             </el-table-column>
             <el-table-column prop="rsptim" label="收报时间" width="100">
             </el-table-column>
@@ -288,25 +293,23 @@ export default {
     };
   },
   computed:{
-    isFoldDisable: function(){
-      return this.multipleSelection.length == 0;
-    } ,
-    isRoutingDisable:function(){
-      return this.multipleSelection.length == 0; 
+    isDisable: function(){
+      return this.multipleSelection.length != 1;
     } 
   },
   watch: {
     
   },
   methods: {
-    dbClickRow(row) {
+    showMsg() {
       this.routerPush({
         path: '/business/msgdtl',
         query: {
-          mpsinr: row.inr
+          mpsinr: this.model.msggrp.mps.inr
         }
       })
-    }
+    },
+
   },
   mounted: function () {
   },

src/page/Frontend/Oftdtl/views/index.vue

@@ -45,15 +45,18 @@ export default {
   },
   created: async function () {
     console.log("进入oftdtl交易");
-    let params = {
-      transName: this.trnName,
-      fxdgrp: {
-        rec: {
-          inr: this.$route.query.inr || "",
-        },
-      },
-    };
-    this.init(params)
+
+    let rtnmsg = await Api.post("/frontend/oftdtl/init", {
+        dotinr: this.$route.query.dotinr || "",
+      });
+      if (rtnmsg.respCode == SUCCESS) {
+        this.model = rtnmsg.data;
+      } else {
+        this.$notify.error({
+          title: this.$t("financing.错误"),
+          message: this.$t("financing.服务请求失败！"),
+        });
+      }
   }
 }
 </script>

src/page/Frontend/Ofthng/views/Ofghngmainpnl.vue

@@ -18,7 +18,7 @@
             </c-col>
             <c-col :span="8">
               <el-form-item label="报文类型" prop="oftgrp.dot.mty" style="width: 100%">
-                <c-select v-model="model.oftgrp.dot.mty" style="width: 100%" placeholder="请选择报文类型" dbCode="MSGTP3">
+                <c-select v-model="model.oftgrp.dot.mty" style="width: 100%" placeholder="请选择报文类型" dbCode="MSGTP3" sort="SRT">
                 </c-select>
               </el-form-item>
             </c-col>

src/page/Frontend/Oftopn/event/index.js

@@ -71,20 +71,26 @@ export default {
     handleSelectionChange (val) {
       this.multipleSelection = val;
     },
-    exportToExcel() {
-      let codeKeysMap = {
-        typ: 'kpasta',
-        sta: 'zfqsta',
-        area: 'stacd1',
-        offsta: 'offsta',
-        multimsg: 'chncod',
-        chk: 'chncod',
-        kpatyp: 'chncod',
-      };
+
+    async exportToExcel () {
+      // const loading = this.loading();
+      let rsptims = this.model.oftp.rel.rsptims;
+      let rsptime = this.model.oftp.rel.rsptime;
       let params = {
         ...this.model.oftp.rel,
+        rsptims: rsptims ? moment(rsptims).format("YYYY-MM-DD") + ' 00:00:00' : "",
+        rsptime: moment(rsptime).format("YYYY-MM-DD") + ' 23:59:59',
+        pageNumber: this.pagination.pageIndex,
+        pageSize: this.pagination.pageSize,
+      };
+      let res = await Api.post("/frontend/oftopn/exportExcel", params);
+      if (res.respCode == SUCCESS) {
+        console.log(res.data)
+        let name = moment(new Date()).format('yyyy-MM-DD HH:mm:ss');
+
+        Utils.exportToExcel(res.data, "待关联报文查询_" + name + ".xlsx", "待关联报文查询");
       }
-      this.exportExcel(this.stmData.columns, '/frontend/oftopn/exportExcel', params, codeKeysMap, '待关联报文处理');
+      // loading.close();
     }
   },
 };

src/page/Frontend/Oftopn/views/Oftp13.vue

@@ -7,7 +7,7 @@
           <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="报文标准"  style="width: 100%">
-                <c-select v-model="model.oftp.rel.msgtyp" style="width: 100%" dbCode="MSGTP3" @change="getSubtyp(model.oftp.rel.msgtyp, 'oftp.rel.mty')" />
+                <c-select v-model="model.oftp.rel.msgtyp" style="width: 100%" dbCode="MSGTP3" sort="SRT" @change="getSubtyp(model.oftp.rel.msgtyp, 'oftp.rel.mty')" />
               </el-form-item>
             </c-col>
             <c-col :span="8">

src/page/Frontend/Oftsel/views/Oftp01.vue

@@ -7,7 +7,7 @@
           <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="报文标准" style="width: 100%">
-                <c-select v-model="model.oftp.rel.msgtyp" style="width: 100%" dbCode="MSGTP3"
+                <c-select v-model="model.oftp.rel.msgtyp" style="width: 100%" dbCode="MSGTP3" sort="SRT"
                   @change="getSubtyp(model.oftp.rel.msgtyp, 'oftp.rel.mty')" />
               </el-form-item>
             </c-col>

src/page/Frontend/Qrtsel/views/Inqpnl.vue

@@ -12,7 +12,7 @@
             </c-col>
             <c-col :span="8">
               <el-form-item label="报文类型" prop="qrdgrp.rec.msgtyp" style="width: 100%">
-                <c-select v-model="model.qrdgrp.rec.msgtyp" style="width: 100%" placeholder="请选择报文类型" dbCode="MSGTP3" />
+                <c-select v-model="model.qrdgrp.rec.msgtyp" style="width: 100%" placeholder="请选择报文类型" dbCode="MSGTP3" sort="SRT" />
               </el-form-item>
             </c-col>
             <c-col :span="8">

src/page/Frontend/Rcvsel/views/Schpnl.vue

@@ -7,7 +7,7 @@
           <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="报文标准" prop="rcvp.msgtyp" style="width: 100%">
-                <c-select v-model="model.rcvp.msgtyp" style="width: 100%" placeholder="请选择报文标准" dbCode="MSGTP3" @change="getSubtyp(model.rcvp.msgtyp, 'rcvp.subtyp')">
+                <c-select v-model="model.rcvp.msgtyp" style="width: 100%" placeholder="请选择报文标准" dbCode="MSGTP3" sort="SRT" @change="getSubtyp(model.rcvp.msgtyp, 'rcvp.subtyp')">
                 </c-select>
               </el-form-item>
             </c-col>

src/page/Frontend/Rcvselblk/views/Schpnl.vue

@@ -7,7 +7,7 @@
           <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="报文标准" prop="rcvp.msgtyp" style="width: 100%">
-                <c-select v-model="model.rcvp.msgtyp" style="width: 100%" placeholder="请选择报文标准" dbCode="MSGTP3" @change="getSubtyp(model.rcvp.msgtyp, 'rcvp.subtyp')">
+                <c-select v-model="model.rcvp.msgtyp" style="width: 100%" placeholder="请选择报文标准" dbCode="MSGTP3" sort="SRT" @change="getSubtyp(model.rcvp.msgtyp, 'rcvp.subtyp')">
                 </c-select>
               </el-form-item>
             </c-col>

src/page/Frontend/Rcvselcop/views/Schpnl.vue

@@ -7,7 +7,7 @@
           <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="报文标准" prop="rcvp.msgtyp" style="width: 100%">
-                <c-select v-model="model.rcvp.msgtyp" style="width: 100%" placeholder="请选择报文标准" dbCode="MSGTP3" @change="getSubtyp(model.rcvp.msgtyp, 'rcvp.subtyp')">
+                <c-select v-model="model.rcvp.msgtyp" style="width: 100%" placeholder="请选择报文标准" dbCode="MSGTP3" sort="SRT" @change="getSubtyp(model.rcvp.msgtyp, 'rcvp.subtyp')">
                 </c-select>
               </el-form-item>
             </c-col>

src/page/Frontend/Sndsel/views/Schpnl.vue

@@ -7,7 +7,7 @@
           <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="报文标准" prop="sndp.msgtyp" style="width: 100%">
-                <c-select v-model="model.sndp.msgtyp" style="width: 100%" placeholder="请选择报文标准" dbCode="MSGTP3"
+                <c-select v-model="model.sndp.msgtyp" style="width: 100%" placeholder="请选择报文标准" dbCode="MSGTP3" sort="SRT"
                   @change="getSubtyp(model.sndp.msgtyp, 'sndp.subtyp')">
                 </c-select>
               </el-form-item>

src/page/Frontend/Sndselcop/views/Schpnl.vue

@@ -7,7 +7,7 @@
           <c-col :span="24">
             <c-col :span="8">
               <el-form-item label="报文标准" prop="sndp.msgtyp" style="width: 100%">
-                <c-select v-model="model.sndp.msgtyp" style="width: 100%" placeholder="请选择报文标准" dbCode="MSGTP3" @change="getSubtyp(model.sndp.msgtyp, 'sndp.subtyp')">
+                <c-select v-model="model.sndp.msgtyp" style="width: 100%" placeholder="请选择报文标准" dbCode="MSGTP3" sort="SRT" @change="getSubtyp(model.sndp.msgtyp, 'sndp.subtyp')">
                 </c-select>
               </el-form-item>
             </c-col>

vue.config.js

 const path = require('path')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 const publicPath = require('./src/config/isc-publicPath.js')
- //const baseData = require('./src/config/isc-baseData-local.js')
+//const baseData = require('./src/config/isc-baseData-local.js')
 const baseData = require('./src/config/isc-baseData.js')
 let moment = require("moment")