Merge branch 'settle-test-20230110' of http://192.168.0.110:11080/fukai/vue-gjjs…

Merge branch 'settle-test-20230110' of http://192.168.0.110:11080/fukai/vue-gjjs into settle-test-20230110

src/business/betdrv/model/check.js

@@ -18,11 +18,11 @@ export default {
         {type: "string", required: false, message: "必输项"},
         {max: 3,message:"长度不能超过3"}
     ],
-    "ledgrp.cbs.opn1.amt":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }//同属适用于正负数
-    ],
+    // "ledgrp.cbs.opn1.amt":[
+    //     {type: "number", required: false, message: "必输项"},
+    //     {max: 18,message:"整数位不能超过14位"},
+    //     { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }//同属适用于正负数
+    // ],
     "betp.recget.sdamod.dadsnd":[
         {type: "string", required: false, message: "必输项"},
         {max: 16,message:"长度不能超过16"}
@@ -47,11 +47,11 @@ export default {
         {type: "string", required: false, message: "必输项"},
         {max: 3,message:"长度不能超过3"}
     ],
-    "bedgrp.cbs.opn1.amt":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
-    ],
+    // "bedgrp.cbs.opn1.amt":[
+    //     {type: "number", required: false, message: "必输项"},
+    //     {max: 18,message:"整数位不能超过14位"},
+    //     {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+    // ],
     "bedgrp.prb.pts.nam":[
         {type: "string", required: false, message: "必输项"},
         {max: 40,message:"长度不能超过40"}
@@ -179,10 +179,10 @@ export default {
         {type: "number", required: false, message: "必输项"},
         {type: "number", max: 999,message:"长度不能超过3"}
     ],
-    "bedgrp.blk.docdis":[
-        {type: "string", required: true, message: "必输项"},
-        {max: 3500,message:"长度不能超过3500"}
-    ],
+        // "bedgrp.blk.docdis":[
+        //     {type: "string", required: true, message: "必输项"},
+        //     {max: 3500,message:"长度不能超过3500"}
+        // ],
     "bedgrp.blk.intdis":[
         {type: "string", required: true, message: "必输项"},
         {max: 1300,message:"长度不能超过1300"}

src/business/betdrv/model/index.js

@@ -10,6 +10,8 @@ export default class Betdrv {
             number: '',
             ledgrp: {
                 rec: {
+                    branchinr:'',
+                    inr:'',
                     ownref: '',
                     utlnbr: ''
                 },
@@ -44,6 +46,8 @@ export default class Betdrv {
                     intdis: ''
                 },
                 rec: {
+                    branchinr:'',
+                    inr:'',
                     predat: '',
                     rcvdat: '',
                     doctypcod: '',

src/business/betsnd/model/check.js

@@ -29,8 +29,8 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "ledgrp.cbs.opn1.amt":[
-        {type: "string", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
+        { required: false, message: "必输项"},
+        // {max: 18,message:"整数位不能超过14位"},
         { pattern: /(^-?\d+$)|(^\.\d{1,3}$)|(^-?\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }//同属适用于正负数
     ],
     "betp.recget.sdamod.dadsnd":[
@@ -107,10 +107,10 @@ export default {
         {type: "string", required: true, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
-    "bedgrp.oth.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
-        {max: 140,message:"长度不能超过140"}
-    ],
+    // "bedgrp.oth.pts.adrblk":[
+    //     {type: "string", required: true, message: "必输项"},
+    //     {max: 140,message:"长度不能超过140"}
+    // ],
     "bedgrp.oth.dbfadrblkcn":[
         {type: "string", required: true, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
@@ -135,10 +135,10 @@ export default {
         {type: "string", required: true, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
-    "bedgrp.prb.pts.adrblk":[
-        {type: "string", required: true, message: "必输项"},
-        {max: 140,message:"长度不能超过140"}
-    ],
+    // "bedgrp.prb.pts.adrblk":[
+    //     {type: "string", required: true, message: "必输项"},
+    //     {max: 140,message:"长度不能超过140"}
+    // ],
     "bedgrp.prb.dbfadrblkcn":[
         {type: "string", required: true, message: "必输项"},
         {max: 35,message:"长度不能超过35"}

src/business/betsnd/model/index.js

@@ -103,7 +103,8 @@ export default class Betsnd {
                     matdat: '',
                     nam: '',
                     docprbrol: '',
-                    inr: ''
+                    inr: '',
+                    branchinr: '',
                 },
                 prb: {
                     pts: new Pts().data,

src/business/betsnd/views/Rgfp.vue

@@ -176,9 +176,9 @@
 
         <c-col :span="12">
           <el-form-item label="" label-width="5px" prop="ledgrp.cbs.opn1.amt">
-            <c-input-currency v-model="model.ledgrp.cbs.opn1.amt" placeholder="请输入信用证余额" disabled
-                     class="m-input-currency">
-            </c-input-currency>
+            <c-input v-model="model.ledgrp.cbs.opn1.amt" placeholder="请输入信用证余额" disabled
+                     >
+            </c-input>
           </el-form-item>
         </c-col>
       </c-col>

src/business/infbed/event/index.js

@@ -99,7 +99,7 @@ export default {
       this.currentHandleRow = row;
       const params = {
         //根据xx字段 查询处理的数据
-        ownref: row.ownref,
+        seaownref: row.seaownref,
       };
       const res = await Api.post('/service/infbed/dealWithByOwnref', params);
       if (res.respCode === SUCCESS) {

src/business/infbed/views/BusNavbar.vue

@@ -37,7 +37,7 @@ import _ from "~/utils/Lodash"
 
 export default {
   props: {
-    ownref: {
+    seaownref: {
       required: true,
     },
     trnCode: {
@@ -46,9 +46,9 @@ export default {
     model: {
       required: true,
     },
-    ownrefPath: {
+    seaownrefPath: {
       required: false,
-      default: "didgrp",
+      default: "bedgrp",
     },
     tabIndex: {
       required: false,

src/business/infbed/views/Infsea.vue

@@ -422,12 +422,12 @@ export default {
   data() {
     return {
       // BetselModel: new BetselModel().data,
-      ownref: "",
+      seaownref: "",
       trnData: {
         columns: [
           {
             label: "单据编号",
-            prop: "ownref",
+            prop: "seaownref",
           },
           {
             label: "客户经理",
@@ -479,8 +479,8 @@ export default {
       stmData: {
         columns: [
           {
-            label: "信用证编号",
-            prop: "ownref",
+            label: "单据编号",
+            prop: "seaownref",
           },
           {
             label: "客户经理",
@@ -581,7 +581,7 @@ export default {
           route:'/business-new/betdcr'
         },
         {
-          label:'保兑',
+          label:'保兑额度释放',
           route:'/business-new/betamc'
         },
         {

src/business/infbod/event/index.js

+import Api from '~/service/Api';
+import { getTrnNameByInr } from "~/service/business/common";
+import moment from 'moment';
+
+export default {
+  methods: {
+    async handleSearch() {
+      let opndatfrom = this.model.infcon.opndatfrom;
+      if (!opndatfrom || opndatfrom == '') {
+        this.$notify.error({ title: '错误', message: '查询开始日期必输！' });
+        return;
+      }
+      let opndatto = this.model.infcon.opndatto;
+      if (!opndatto || opndatto == '') {
+        this.$notify.error({ title: '错误', message: '查询结束日期必输！' });
+        return;
+      }
+      let params = {
+        ...this.model.infcon,
+        pageIndex: this.pagination.pageIndex,
+        pageSize: this.pagination.pageSize,
+        opndatfrom:moment(opndatfrom).format('YYYY-MM-DD'),
+        opndatto:moment(opndatto).format('YYYY-MM-DD'),
+      };
+      let rtnmsg = await Api.post('/service/infbod/getList', params);
+      if (rtnmsg.respCode == SUCCESS) {
+        this.stmData.data = [];
+        this.stmData.data = rtnmsg.data.list;
+        // debugger
+        this.pagination.total = rtnmsg.data.total;
+      } else {
+        this.$notify.error({ title: '错误', message: '服务请求失败！' });
+      }
+    },
+
+    async handleReset() {
+      this.model.infcon.seaownref = '';
+      this.model.infcon.opndatfrom = new Date();
+      this.model.infcon.opndatto = new Date();
+      this.model.infcon.searef = '';
+      this.model.infcon.pty.extkey = '';
+      this.model.infcon.usr.extkey = '';
+      this.model.infcon.searol = '';
+      this.model.infcon.pty.nam = '';
+      this.model.infcon.seapty = '';
+      this.model.infcon.curtxt1 = '';
+      this.model.infcon.nam = '';
+      this.model.infcon.seaamtfr = '';
+      this.model.infcon.seaamtto = '';
+      this.model.infcon.seasta = '';
+      this.model.infcon.doctypcod = '';
+
+    },
+
+    // pageSize改变
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.pagination.pageIndex = 1;
+      this.pagination.pageSize = val;
+      this.handleSearch();
+    },
+    // 页码改变
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+      this.pagination.pageIndex = val;
+      this.handleSearch();
+    },
+
+    // 详情
+    async details(row) {
+      const params = {
+        //根据xx字段 查询详情表的数据
+        inr:row.inr,
+        userId: window.sessionStorage.userId || 'ZL',
+        ownref: row.ownref,
+      };
+      const res = await Api.post('/service/infbod/getDetail', params);
+      if (res.respCode === SUCCESS) {
+        this.trnData.data = res.data;
+      }
+    },
+
+    // 关闭详情弹框
+    closeDetailsDialog(refId) {
+      this.$refs[refId].doClose();
+      console.log('close');
+    },
+
+    // 处理
+    async handler(row) {
+      this.initdialog = true;
+      this.currentHandleRow = row
+      const params = {
+        //根据xx字段 查询处理的数据
+        ownref: row.ownref,
+      };
+      const res = await Api.post('/service/infbod/dealWithByOwnref', params);
+      if (res.respCode === SUCCESS) {
+        if (res.data) {
+          this.handlerDataList = []
+          Object.keys(res.data).map((item) => {
+            this.handlerDataList.push({
+              label: item,
+              value: res.data[item]
+            })
+          })
+        }
+      }
+    },
+
+    handleClick (btn) {
+      if (btn.value === 'N') {
+        return
+      }
+      let filterRoute = this.btnRouteMap.filter((item) => {
+        return item.label === btn.label
+      })
+      this.$router.history.push({
+        path: filterRoute[0].route,
+        query: {
+          inr: this.currentHandleRow.inr
+        }
+      });
+    },
+    // 关闭处理弹框
+    closeHandlerDialog() {
+      this.initdialog = false;
+    },
+
+    /**
+     * 打开详情页面
+     * @param {string} inr
+     */
+    display(inr) {
+      getTrnNameByInr({ inr }).then((res) => {
+        if (res.respCode == SUCCESS) {
+          const trnName = res.data.toLowerCase();
+          let viewurl = "/#/display/" + trnName + "?trn=" + inr
+          window.open(viewurl, 'newwindow', 'height=1500,width=1200,top=100,left=100,toolbar=no,resizable=no,menubar=no,location=no, status=no');
+        }
+      });
+    },
+
+  },
+};

src/business/infbod/model/index.js

+import Pts from '~/components/business/commonModel/Pts';
+import Pub from '~/components/business/commonModel/index.js';
+export default class Infbod {
+    constructor() {
+        this.data = {
+            infcon: {
+                opndatfrom: '',
+                opndatto: '',
+                seaownref: '',
+                seaamtfr: '',
+                seasta: '',
+                curtxt1: '',
+                doctypcod: '',
+                pty: {
+                    extkey: '',
+                    nam: ''
+                },
+                usr: {
+                    extkey: ''
+                },
+                seaamtto: '',
+                searol: '',
+                nam: '',
+                seapty: '',
+                searef: ''
+            },
+            pageId:'',
+        };
+    }
+}

src/business/infbod/views/index.vue

+<template>
+     <div class="eContainer-search">
+          <el-form :model="model" :rules="rules" ref="modelForm" label-width="120px" label-position="right" size="small"
+               :validate-on-rule-change="false">
+               <c-content>
+                    <m-infsea v-show="!showPanel" :model="model" :codes="codes" ref="infsea" />
+               </c-content>
+          </el-form>
+     </div>
+</template>
+<script>
+
+import CodeTable from "~/config/CodeTable"
+import Infbod from "../model";
+import Infsea from "./Infsea"
+
+import event from "../event"
+
+export default {
+     name: "Infbod",
+     components: {
+          "m-infsea": Infsea,
+     },
+     provide() {
+          return {
+               root: this
+          }
+     },
+     mixins: [event],    // 里面包含了Default、Check等的公共处理
+     data() {
+          return {
+               tabVal: "infsea",
+               trnName: "infbod",
+               model: new Infbod().data,
+               rules: null,
+               showPanel:false,
+               codes: {
+                    ...CodeTable
+               },
+          }
+     },
+     methods: {},
+     created: async function () {}
+}
+</script>
+<style>
+</style>

src/business/letcan/event/buildCommons.js

@@ -51,7 +51,7 @@ export default {
       cbsMap: {
         MAX: model.ledgrp.cbs.max,
         OPN1: model.ledgrp.cbs.opn1,
-        OPN2: model.ledgrp.cbs.opn1,
+        OPN2: model.ledgrp.cbs.opn2,
         MAC: model.ledgrp.cbs.mac,
         MAC2: model.ledgrp.cbs.mac2,
         OPC2: model.ledgrp.cbs.opc2,

src/business/letcan/model/check.js

@@ -85,7 +85,7 @@ export default {
 
   'letp0.cnftxt': [
     { type: 'string', required: false, message: '必输项' },
-    { max: 40, message: '长度不能超过40' },
+    { max: 400, message: '长度不能超过40' },
   ],
   'letcanf.strinf': [
     { type: 'string', required: false, message: '必输项' },

src/business/letcan/model/index.js

@@ -99,6 +99,20 @@ export default class Letcan {
         },
         rmbrol: '',
       },
+
+      async queryGridEtyPromptDialogData(type, ptytyp) {
+        let params = {
+          userId: window.sessionStorage.userId || 'ZL',
+          ptytyp: ptytyp,
+          extkey: this.model.ledgrp[type.toLowerCase()].pts.extkey,
+        };
+        let res = await Api.post('/service/ptspta/list', params);
+        if (res.respCode == SUCCESS) {
+          this.root.$refs['etyDialog'].show = true;
+          this.root.promptData.data = res.data.ptaInfos;
+          this.root.promptData.type = type;
+        }
+      },
       setmod: new Pub().data.Setmod,
       mtabut: new Pub().data.Mtabut,
       trnmod: new Pub().data.Trnmod,

src/business/letcan/views/Canp.vue

@@ -272,7 +272,7 @@
         <c-col :span="24">
           <el-form-item label="确认文本" prop="letp0.cnftxt">
             <c-input
-              v-model="model.letp0.cnftxt"
+              v-model="cnftxt"
               maxlength="40"
               placeholder="请输入"
               disabled
@@ -334,6 +334,13 @@ export default {
   },
   methods: {},
   created: function () {},
+  computed:{
+    cnftxt(){
+      this.model.letp0.cnftxt="The L/C was canceled  "+new Date()
+return this.model.letp0.cnftxt
+    }
+
+  }
 }
 
 </script>

src/business/letdrv/model/index.js

@@ -47,12 +47,13 @@ export default class Letdrv {
           nam: '',
           inr: '',
           opndat: '',
+          branchinr:'',
           utlnbr: ''
         },
         cbs: {
           opn1: {
             cur: '',
-            amt: ''
+            amt: '0.00'
           },
           nom1: {
             cur: '',
@@ -71,6 +72,7 @@ export default class Letdrv {
           intdis: '',
         },
         rec: {
+          branchinr:'',
           rcvdat: '',
           doctypcod: '',
           shpdat: '',

src/business/letrsv/event/buildCommons.js

@@ -52,6 +52,7 @@ export default {
     let dataObj = {
       rec: {
         objtyp: 'LED',
+        objinr: model.ledgrp.rec.objinr,
         ownref: model.ledgrp.rec.ownref,
         opndat: model.ledgrp.rec.opndat,
         expdat: model.ledgrp.rec.expdat,

src/business/letrsv/model/check.js

@@ -288,16 +288,16 @@ let checkObj = {
     ],
     "ledgrp.drw.pts.adrblk": [
         { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        { max: 350, message: "长度不能超过35" }
     ],
     "ledgrp.drw.dbfadrblkcn": [
         { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        { max: 350, message: "长度不能超过35" }
     ],
 
     "ledgrp.drw.adrelc": [
         { type: "string", required: true, message: "必输项" },
-        { max: 35, message: "长度不能超过35" }
+        { max: 350, message: "长度不能超过35" }
     ],
 
     "ledgrp.rec.shpfro": [

src/routers/modules/business.js

@@ -67,5 +67,6 @@ const Business = [
   { path: 'letdav', component: () => import('~/business/letdav/views'), name: 'letdav', meta: { title: '出口信用证预通知到单' } },
   { path: 'letrsv', component: () => import('~/business/letrsv/views'), name: 'letrsv', meta: { title: '出口信用证补通知' } },
   { path: 'betamc', component: () => import('~/business/betamc/views'), name: 'betamc', meta: { title: '出口信用证保兑额度释放' } },
+  { path: 'infbod', component: () => import('~/business/infbod/views'), name: 'infbod', meta: { title: '出口托收查询' } },
 ]
 export default Business
\ No newline at end of file

src/views/Business/Letcan/Canp.vue

@@ -198,7 +198,7 @@
               style="width: 100%"
               placeholder="请选择类型"
               disabled
-              :code="codes.lcrtyp"
+              :code="codes.lcrtyp1"
             >
             </c-select>
           </el-form-item>