Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs…

Merge branch 'settle-test-20230110' of http://114.115.138.98:8900/fukai/vue-gjjs into settle-test-20230110

src/business/botacc/model/check.js

@@ -77,8 +77,8 @@ let checkObj = {
     ],
     "setmod.docamt":[
         {type: "string", required: false, message: "必输项"},
-        {max: 18,message:"整数位不能超过14位"},
-        {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
+        // {max: 18,message:"整数位不能超过14位"},
+        // {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "bptbck.dscbckcur":[
         {type: "string", required: false, message: "必输项"},

src/business/botacc/views/Setp.vue

@@ -110,16 +110,16 @@
 
       <c-col :span="12">
         <el-form-item label="接受金额" prop="setmod.doccur">
-          <c-select v-model="model.setmod.doccur" style="width:100%" placeholder="请选择" :code="codes.curtxt1"
+          <c-select v-model="modelsetmoddoccur" style="width:100%" placeholder="请选择" :code="codes.curtxt1"
                     disabled>
           </c-select>
         </el-form-item>
       </c-col>
       <c-col :span="12">
         <el-form-item label-width="5px" prop="setmod.docamt">
-          <c-input v-model="model.setmod.docamt" placeholder="请输入"
+          <c-input-currency v-model="model.setmod.docamt" placeholder="请输入"
                    :disabled="model.bodgrp.rec.focflg? true:false">
-          </c-input>
+          </c-input-currency>
         </el-form-item>
       </c-col>
     </c-col>
@@ -250,6 +250,12 @@ export default {
     }
   },
   methods: {},
+  computed:{
+    modelsetmoddoccur(){
+      this.model.setmod.doccur = this.model.bodgrp.cbs.max.cur;
+      return this.model.setmod.doccur
+    }
+  }
 }
 </script>
 <style>

src/business/botset/views/Setp.vue

@@ -444,17 +444,18 @@ export default {
     },
 
     modelsetmoddoccur() {
-      this.model.setmod.doccur =this.model.bodgrp.cbs.max.cur;
+      this.model.setmod.doccur = this.model.bodgrp.cbs.max.cur;
       return this.model.setmod.doccur
     },
 
     modelsetmoddocamt() {
-      this.model.setmod.docamt =this.model.bodgrp.cbs.max.amt;
+      this.model.setmod.docamt = this.model.bodgrp.cbs.max.amt;
       return this.model.setmod.docamt
     }
 
   },
-  mounted() {},
+  mounted() {
+  },
 
   methods: {
     async change1() {

src/business/infbcd/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/infbcd/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/infbcd/getDetail', params);
+      if (res.respCode === SUCCESS) {
+        this.trnData.data = res.data;
+      }
+    },
+
+    toBotdav() {
+      // 点击开立，清空从待经办进来的时候带的行参数
+      localStorage.setItem('row_botdav', null)
+      localStorage.setItem('review_botdav',null)
+      this.$router.history.push('/business-new/bottdav');
+    },
+
+    // 关闭详情弹框
+    closeDetailsDialog(refId) {
+      this.$refs[refId].doClose();
+      console.log('close');
+    },
+
+    // 处理
+    async handler(row) {
+      this.initdialog = true;
+      this.currentHandleRow = row
+      const params = {
+        //根据xx字段 查询处理的数据
+        seaownref: row.seaownref,
+      };
+      const res = await Api.post('/service/infbcd/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/infbcd/model/index.js

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

src/business/infbcd/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>
+
+<!--      <c-tabs v-model="tabVal" v-show="showPanel" ref="elment" type="card">-->
+<!--      </c-tabs>-->
+    </el-form>
+  </div>
+</template>
+<script>
+import CodeTable from "~/config/CodeTable"
+import Infbcd from "../model"
+import Infsea from "./Infsea"
+import event from "../event";
+
+export default {
+  name: "Infbcd",
+  components: {
+    "m-infsea": Infsea,
+  },
+  provide() {
+    return {
+      root: this
+    }
+  },
+  mixins: [event],    // 里面包含了Default、Check等的公共处理
+  data() {
+    return {
+      tabVal: "infsea",
+      trnName: "infbcd",
+      model: new Infbcd().data,
+      rules: null,
+      showPanel: false,
+      codes: {
+        ...CodeTable
+      },
+    }
+  },
+  methods: {},
+  created: async function () {
+  }
+}
+</script>
+<style>
+</style>

src/business/infbod/views/index.vue

@@ -13,7 +13,6 @@
 import CodeTable from "~/config/CodeTable"
 import Infbod from "../model";
 import Infsea from "./Infsea"
-
 import event from "../event"
 
 export default {

src/routers/modules/business.js

@@ -77,6 +77,6 @@ const Business = [
   { path: 'botrad', component: () => import('~/business/botrad/views'), name: 'botrad', meta: { title: '出口托收二次寄单' } },
   { path: 'botame', component: () => import('~/business/botame/views'), name: 'botame', meta: { title: '出口托收修改' } },
   { path: 'bctdav', component: () => import('~/business/bctdav/views'), name: 'bctdav', meta: { title: '进口代收' } },
-
+  { path: 'infbcd', component: () => import('~/business/infbcd/views'), name: 'infbcd', meta: { title: '进口代收入口交易' } },
 ]
 export default Business
\ No newline at end of file