Skip to content

V
vue-gjjs
Commit a2275547 by zhoutian
Options

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

parents ea15a1f8 805f649f
Showing with 9 additions and 20 deletions
src/config/CodeTable/index.js
...@@ -1244,8 +1244,8 @@ const CodeTable = { ...@@ -1244,8 +1244,8 @@ const CodeTable = {
{ label: "YES", value: "Y" }, { label: "YES", value: "Y" },
], ],
bppnttyp: [ bppnttyp: [
{ label: "Transfer Document Set", value: "BTD" }, { label: "Transfer Document Set", value: "MTD" },
{ label: "Document Set", value: "BED" }, { label: "Document Set", value: "BFD" },
], ],
brtselflg: [ brtselflg: [
{ label: "单据修改", value: "4" }, { label: "单据修改", value: "4" },
......
src/model/Detsel/Pattern.js
...@@ -302,7 +302,7 @@ export default { ...@@ -302,7 +302,7 @@ export default {
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
"bpdgrp.cbs.max.amt":[ "bpdgrp.cbs.max.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -358,7 +358,7 @@ export default { ...@@ -358,7 +358,7 @@ export default {
{max: 3,message:"长度不能超过3"} {max: 3,message:"长度不能超过3"}
], ],
"bpdgrp.cbs.opn1.amt":[ "bpdgrp.cbs.opn1.amt":[
{type: "number", required: false, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 18,message:"整数位不能超过14位"}, {max: 18,message:"整数位不能超过14位"},
{pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" } {pattern: /(^\d+$)|(^\.\d{1,3}$)|(^\d+\.\d{1,3}$)/, message: "小数位不能超过3位" }
], ],
...@@ -435,7 +435,7 @@ export default { ...@@ -435,7 +435,7 @@ export default {
{type: "date", required: false, message: "输入正确的日期"} {type: "date", required: false, message: "输入正确的日期"}
], ],
"dedgrp.rec.expplc":[ "dedgrp.rec.expplc":[
{type: "string", required: true, message: "必输项"}, {type: "string", required: false, message: "必输项"},
{max: 35,message:"长度不能超过35"} {max: 35,message:"长度不能超过35"}
], ],
"bpdgrp.rec.opndat":[ "bpdgrp.rec.opndat":[
......
src/views/Business/Detsel/SelMune.vue
...@@ -41,7 +41,6 @@ export default { ...@@ -41,7 +41,6 @@ export default {
//各入口按钮请求 //各入口按钮请求
async onNarBtnClick(url, label) { async onNarBtnClick(url, label) {
let key = 0; let key = 0;
for(let i = 1; i <= 11 ; i++){ for(let i = 1; i <= 11 ; i++){
let temp_label = this.model.cfgfil['subtxt'+i]; let temp_label = this.model.cfgfil['subtxt'+i];
if(temp_label == label){ if(temp_label == label){
...@@ -52,6 +51,7 @@ export default { ...@@ -52,6 +51,7 @@ export default {
let rtnmsg = await this.executeRule("cfgfil.hotsub"+key); let rtnmsg = await this.executeRule("cfgfil.hotsub"+key);
if (rtnmsg.respCode == SUCCESS) { if (rtnmsg.respCode == SUCCESS) {
this.updateModel(rtnmsg.data); this.updateModel(rtnmsg.data);
url = url.toLowerCase();
this.$router.history.push("/business/" + url); this.$router.history.push("/business/" + url);
} else { } else {
this.$notify.error({ this.$notify.error({
...@@ -59,16 +59,6 @@ export default { ...@@ -59,16 +59,6 @@ export default {
message: "服务请求失败！", 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: { computed: {
...@@ -84,7 +74,6 @@ export default { ...@@ -84,7 +74,6 @@ export default {
other: items[3], other: items[3],
}); });
} }
console.log(arr);
return arr; return arr;
}, },
}, },
......
src/views/Business/Detsel/index.vue
...@@ -61,7 +61,7 @@ export default { ...@@ -61,7 +61,7 @@ export default {
defaultRules: Default, defaultRules: Default,
pattern: Pattern, pattern: Pattern,
rules: null, rules: null,
codes: {}, codes: {...CodeTable},
}; };
}, },
methods: { methods: {
......
src/views/Public/Ptsmsg.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<!-- <div class="eibs-tab"> --> <!-- <div class="eibs-tab"> -->
<div> <div>
<c-col :span="24"> <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 <c-input
v-model="model[argadr.grp][argadr.rol].pts.ref" v-model="model[argadr.grp][argadr.rol].pts.ref"
maxlength="16" maxlength="16"
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</c-col> </c-col>
<c-col :span="24"> <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 <c-input
v-model="model[argadr.grp][argadr.rol].pts.nam" v-model="model[argadr.grp][argadr.rol].pts.nam"
maxlength="40" maxlength="40"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment