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

src/config/CodeTable/index.js

@@ -1244,8 +1244,8 @@ const CodeTable = {
 		{ label: "YES", value: "Y" },
 	],
 	bppnttyp: [
-		{ label: "Transfer Document Set", value: "BTD" },
-		{ label: "Document Set", value: "BED" },
+		{ label: "Transfer Document Set", value: "MTD" },
+		{ label: "Document Set", value: "BFD" },
 	],
 	brtselflg: [
 		{ label: "单据修改", value: "4" },

src/model/Detsel/Pattern.js

@@ -302,7 +302,7 @@ export default {
         {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
     ],
     "bpdgrp.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位" }
     ],
@@ -358,7 +358,7 @@ export default {
         {max: 3,message:"长度不能超过3"}
     ],
     "bpdgrp.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位" }
     ],
@@ -435,7 +435,7 @@ export default {
         {type: "date", required: false, message: "输入正确的日期"}
     ],
     "dedgrp.rec.expplc":[
-        {type: "string", required: true, message: "必输项"},
+        {type: "string", required: false, message: "必输项"},
         {max: 35,message:"长度不能超过35"}
     ],
     "bpdgrp.rec.opndat":[

src/views/Business/Detsel/SelMune.vue

@@ -41,7 +41,6 @@ export default {
         //各入口按钮请求
         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){
@@ -52,6 +51,7 @@ export default {
             let rtnmsg = await this.executeRule("cfgfil.hotsub"+key);
             if (rtnmsg.respCode == SUCCESS) {
                 this.updateModel(rtnmsg.data);
+                url = url.toLowerCase();
                 this.$router.history.push("/business/" + url);
             } else {
                 this.$notify.error({
@@ -59,16 +59,6 @@ export default {
                     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: {
@@ -84,7 +74,6 @@ export default {
                     other: items[3],
                 });
             }
-            console.log(arr);
             return arr;
         },
     },

src/views/Business/Detsel/index.vue

@@ -61,7 +61,7 @@ export default {
             defaultRules: Default,
             pattern: Pattern,
             rules: null,
-            codes: {},
+            codes: {...CodeTable},
         };
     },
     methods: {

src/views/Public/Ptsmsg.vue

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