Merge branch 'master' of http://192.168.0.110:11080/fukai/vue-gjjs

src/model/Detsel/Pattern.js

@@ -129,7 +129,7 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "bfdgrp.cbs.max.amt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
@@ -228,7 +228,7 @@ export default {
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "bfdgrp.cbs.opn1.amt":[
-        {type: "number", required: false, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 18,message:"整数位不能超过14位"},
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],

src/views/Business/Detdrv/index.vue

@@ -129,14 +129,14 @@ export default {
     mixins: [commonProcess],    // 里面包含了Default、Check等的公共处理
     data(){
         return {
-            tabVal: "",
+            tabVal: "drv",
             trnName: "detdrv",
             model: new Detdrv().data,
             checkRules: Check,
             defaultRules: Default,
             pattern: Pattern,
             rules: null,
-            codes: {
+            codes: {...CodeTable
             },
         }
     },

src/views/Business/Detsel/SelMune.vue

 <template>
     <el-table
-    :data="data"
+        :data="tableData"
         border
         stripe
         :show-header="false"
         :cell-style="cellSttyle"
     >
-    <el-table-column prop="title" align="center">
+        <el-table-column prop="label" align="center">
             <template slot-scope="scope">
                 <c-button
-          @click.native="onNarBtnClick(scope.row.url, scope.row.hotsubx)"
-          :title="scope.row.title"
+                    @click="onNarBtnClick(scope.row.url, scope.row.label)"
+                    :label="scope.row.label"
                     :disabled="scope.row.disabled"
-          >{{ scope.row.title }}</c-button
+                    >{{ scope.row.label }}</c-button
                 >
                 <!-- <el-link
           :disabled="scope.row.disabled"
@@ -34,18 +34,58 @@ export default {
     data() {
         return {
             cellSttyle: { height: "25px" },
+            meumItem: [],
         };
     },
     methods: {
         //各入口按钮请求
-    async onNarBtnClick(href, hotsubx) {
-      let rtnmsg = await this.executeRule(`cfgfil.hotsub${hotsubx}`);
-      console.log("cfgfil.code:" + this.model.cfgfil[`subtrn${hotsubx}`]);
-      if ((rtnmsg.respCode == SUCCESS)) {
-        this.$router.history.push(href);
+        async onNarBtnClick(url, label) {
+            let key = 0;
+            
+            for(let i = 1; i <= 11 ; i++){
+                let temp_label = this.model.cfgfil['subtxt'+i];
+                if(temp_label == label){
+                    key = i;
+                    break;
+                }
+            }
+            let rtnmsg = await this.executeRule("cfgfil.hotsub"+key);
+            if (rtnmsg.respCode == SUCCESS) {
+                this.updateModel(rtnmsg.data);
+                this.$router.history.push("/business/" + url);
             } else {
-        this.$notify.error({ title: "错误", message: "服务请求失败！" });
+                this.$notify.error({
+                    title: "错误",
+                    message: "服务请求失败！",
+                });
+            }
+            // let rtnmsg = await this.executeRule(`cfgfil.hotsub${hotsubx}`);
+            // console.log("cfgfil.code:" + this.model.cfgfil[`subtrn${hotsubx}`]);
+            // if (rtnmsg.respCode == SUCCESS) {
+            //     this.$router.history.push(href);
+            // } else {
+            //     this.$notify.error({
+            //         title: "错误",
+            //         message: "服务请求失败！",
+            //     });
+            // }
+        },
+    },
+    computed: {
+        tableData() {
+            const arr = [];
+            var data = this.data;
+            for (let i = 0; i < data.length; i++) {
+                const items = data[i].split("\t");
+                arr.push({
+                    url: items[0],
+                    label: items[1],
+                    disabled: items[2] == "N" ? true : false,
+                    other: items[3],
+                });
             }
+            console.log(arr);
+            return arr;
         },
     },
 };

src/views/Business/Detsel/index.vue

 <template>
-<c-page title="出口信用证查询">
+    <c-page title="出口信用证查询">
         <!-- <div class="eContainer"> -->
-    <el-form :model="model" :rules="rules" ref="modelForm" label-width="150px" label-position="right" size="small" :validate-on-rule-change="false">
-       <c-tabs v-model="tabVal" ref="elment" type="card" @tab-click="myTabClick">
-        
+        <el-form
+            :model="model"
+            :rules="rules"
+            ref="modelForm"
+            label-width="150px"
+            label-position="right"
+            size="small"
+            :validate-on-rule-change="false"
+        >
+            <c-tabs
+                v-model="tabVal"
+                ref="elment"
+                type="card"
+                @tab-click="myTabClick"
+            >
                 <!--PD000035 -->
                 <el-tab-pane label="查询" name="sel">
-                <m-sel :model="model" :codes="codes"/>
+                    <m-sel :model="model" :codes="codes" />
                 </el-tab-pane>
             </c-tabs>
         </el-form>
@@ -20,28 +32,27 @@
     </c-page>
 </template>
 <script>
-import Api from "~/service/Api"
-import CodeTable from "~/config/CodeTable"
-import Detsel from "~/model/Detsel"
-import commonProcess from "~/mixin/commonProcess"
-import Check from "~/model/Detsel/Check"
-import Default from "~/model/Detsel/Default"
-import Pattern from "~/model/Detsel/Pattern"
-import Sel from "./Sel"
-
+import Api from "~/service/Api";
+import CodeTable from "~/config/CodeTable";
+import Detsel from "~/model/Detsel";
+import commonProcess from "~/mixin/commonProcess";
+import Check from "~/model/Detsel/Check";
+import Default from "~/model/Detsel/Default";
+import Pattern from "~/model/Detsel/Pattern";
+import Sel from "./Sel";
 
 export default {
     name: "Detsel",
-    components:{
-        "m-sel" : Sel,
+    components: {
+        "m-sel": Sel,
     },
     provide() {
         return {
-            root: this
-        }
+            root: this,
+        };
     },
     mixins: [commonProcess], // 里面包含了Default、Check等的公共处理
-    data(){
+    data() {
         return {
             tabVal: "sel",
             trnName: "detsel",
@@ -50,32 +61,28 @@ export default {
             defaultRules: Default,
             pattern: Pattern,
             rules: null,
-            codes: {
-            },
-        }
+            codes: {},
+        };
     },
-    methods:{
-        myTabClick(tab){
-            this.tabClick(tab)
+    methods: {
+        myTabClick(tab) {
+            this.tabClick(tab);
             /**
              *  do it yourself
              **/
-        }
         },
-    created:async function(){
+    },
+    created: async function () {
         console.log("进入detsel交易");
-        let rtnmsg = await this.init({})
-        if(rtnmsg.respCode == SUCCESS)
-        {
-           this.updateModel(rtnmsg.data)
-        }
-        else
-        {
-            this.$notify.error({title: '错误',message: '服务请求失败！'});
+        let rtnmsg = await this.init({});
+        if (rtnmsg.respCode == SUCCESS) {
+            //TODO 处理数据逻辑
+            this.updateModel(rtnmsg.data);
+        } else {
+            this.$notify.error({ title: "错误", message: "服务请求失败！" });
         }
-    }
-}
+    },
+};
 </script>
 <style>
-
 </style>

src/views/Public/Ptsmsg.vue

 <template>
-  <div class="eibs-tab">
+  <!-- <div class="eibs-tab"> -->
+  <div>
     <c-col :span="24">
-      <el-form-item :label="argadr.title + '编号'" :prop="argadr.url + 'ref'">
+      <el-form-item :label="argadr.title + '编号'" :prop="'${argadr.grp}.${argadr.rol}.pts.ref'">
         <c-input
-          v-model="model[argadr.url + 'ref']"
+          v-model="model[argadr.grp][argadr.rol].pts.ref"
           maxlength="16"
           :placeholder="'请输入' + argadr.title + '编号'"
           :disabled="disabled"
@@ -12,9 +13,9 @@
     </c-col>
 
     <c-col :span="24">
-      <el-form-item :label="argadr.title + '名称'" :prop="argadr.url + 'nam'">
+      <el-form-item :label="argadr.title + '名称'" :prop="'${argadr.grp}.${argadr.rol}.pts.nam'">
         <c-input
-          v-model="model[argadr.url + 'nam']"
+          v-model="model[argadr.grp][argadr.rol].pts.nam"
           maxlength="40"
           :placeholder="'请输入' + argadr.title + '名称'"
           :disabled="disabled"