diff --git a/src/views/manage/message/index.vue b/src/views/manage/message/index.vue index 88ca6df..4367f72 100644 --- a/src/views/manage/message/index.vue +++ b/src/views/manage/message/index.vue @@ -237,7 +237,7 @@ /> - + diff --git a/src/views/manage/projectgroup/index.vue b/src/views/manage/projectgroup/index.vue index 017b7e5..6515b74 100644 --- a/src/views/manage/projectgroup/index.vue +++ b/src/views/manage/projectgroup/index.vue @@ -117,7 +117,12 @@ - + - + - + { diff --git a/src/views/manage/script/index.vue b/src/views/manage/script/index.vue index 5349fba..54fc331 100644 --- a/src/views/manage/script/index.vue +++ b/src/views/manage/script/index.vue @@ -259,6 +259,7 @@ - {{ formdetail.packageName }} +
+ + {{ formdetail.packageName }} + + + +
+ + +
@@ -355,7 +355,7 @@ @@ -364,6 +364,7 @@ @@ -553,6 +555,41 @@ export default { this.mentlist(); }, methods: { + /**只能输入数字且有小数点最多保留两位*/ + checkPrice() { + let checkPlan = "" + this.form.serviceFrequencyStart; + checkPlan = checkPlan + .replace(/[^\d.]/g, "") // 清除“数字”和“.”以外的字符 + .replace(/\.{2,}/g, ".") // 只保留第一个. 清除多余的 + .replace(/^\./g, "") // 保证第一个为数字而不是. + .replace(".", "$#$") + .replace(/\./g, "") + .replace("$#$", "."); + if (checkPlan.indexOf(".") < 0 && checkPlan !== "") { + // 以上已经过滤,此处控制的是如果没有小数点,首位不能为类似于 01、02的金额 + checkPlan = parseFloat(checkPlan) + ""; + } else if (checkPlan.indexOf(".") >= 0) { + checkPlan = checkPlan.replace(/^()*(\d+)\.(\d\d).*$/, "$1$2.$3"); // 只能输入两个小数 + } + this.form.serviceFrequencyStart = checkPlan; + }, + checkPricemax() { + let checkPlan = "" + this.form.serviceFrequencyEnd; + checkPlan = checkPlan + .replace(/[^\d.]/g, "") // 清除“数字”和“.”以外的字符 + .replace(/\.{2,}/g, ".") // 只保留第一个. 清除多余的 + .replace(/^\./g, "") // 保证第一个为数字而不是. + .replace(".", "$#$") + .replace(/\./g, "") + .replace("$#$", "."); + if (checkPlan.indexOf(".") < 0 && checkPlan !== "") { + // 以上已经过滤,此处控制的是如果没有小数点,首位不能为类似于 01、02的金额 + checkPlan = parseFloat(checkPlan) + ""; + } else if (checkPlan.indexOf(".") >= 0) { + checkPlan = checkPlan.replace(/^()*(\d+)\.(\d\d).*$/, "$1$2.$3"); // 只能输入两个小数 + } + this.form.serviceFrequencyEnd = checkPlan; + }, // getSuppliers(e) { // console.log(e); // }, @@ -733,7 +770,6 @@ export default { this.disableda = false; this.disabledb = false; this.disabled = true; //文本 - this.form.serviceFrequencyType = "DIGIT"; console.log(this.itemname, "itemname"); if (this.itemname) { @@ -741,10 +777,6 @@ export default { this.form.serviceWayId = this.itemname; console.log(this.form, " this.form"); } - - // else if (this.itemname == null) { - // this.form.serviceWayId = "请选择服务方式" - // } this.open = true; this.title = "添加服务方式内容"; }, @@ -757,7 +789,12 @@ export default { this.reset(); getServicewaycontent(row.id).then((response) => { this.form = response.data; - // this.form.serviceWayId=row.serviceWayId + if (response.data.serviceFrequencySort) { + this.form.serviceSort = response.data.serviceFrequencySort; + } + else { + this.form.serviceSort = undefined; + } this.form.id = response.data.serviceFrequencyId; if (response.data.serviceWayId) { this.form.serviceWayId = response.data.serviceWayId; @@ -996,4 +1033,4 @@ export default { .el-button--success.is-plain { font-size: 10px; } - \ No newline at end of file + diff --git a/src/views/manage/template/index.vue b/src/views/manage/template/index.vue index 98360fa..c2610ac 100644 --- a/src/views/manage/template/index.vue +++ b/src/views/manage/template/index.vue @@ -23,6 +23,7 @@ - + diff --git a/src/views/system/agency/index.vue b/src/views/system/agency/index.vue index 61bb73b..c6736ee 100644 --- a/src/views/system/agency/index.vue +++ b/src/views/system/agency/index.vue @@ -379,6 +379,7 @@ maxlength="20" v-model="form.agencyCode" style="width: 205px" + onKeyUp="value=value.replace(/[\W]/g,'')" placeholder="请输入机构代码" /> @@ -765,6 +766,7 @@ export default { this.infolist(); }, methods: { + // 节点类型 info() { var dictType = "node_type"; diff --git a/src/views/system/department/index.vue b/src/views/system/department/index.vue index cb0983d..4bc983e 100644 --- a/src/views/system/department/index.vue +++ b/src/views/system/department/index.vue @@ -351,6 +351,7 @@ diff --git a/src/views/system/taskExecuteRecord/index.vue b/src/views/system/taskExecuteRecord/index.vue index 232096d..07f4210 100644 --- a/src/views/system/taskExecuteRecord/index.vue +++ b/src/views/system/taskExecuteRecord/index.vue @@ -1,10 +1,5 @@ @@ -380,16 +240,7 @@ - - - +