diff --git a/src/components/DialogWithMenu.vue b/src/components/DialogWithMenu.vue index 1231e93..55e78a7 100644 --- a/src/components/DialogWithMenu.vue +++ b/src/components/DialogWithMenu.vue @@ -60,8 +60,8 @@ - -
+ +
{{ dataForm[col.prop] || "-" }}
@@ -715,8 +715,9 @@ export default { extraIds[key] = value; }); } - + // 实际发送请求 + this.btnLoading = true this.$http({ url: this.urls.base, method, @@ -726,7 +727,7 @@ export default { }, }) .then(({ data: res }) => { - this.btnLoading = true + this.btnLoading = false this.loadingStatus = false; console.log("[add&update] res is: ", res); if (res.code === 0) { @@ -761,13 +762,15 @@ export default { type: "error", duration: 2000, }); + if (this.btnLoading) this.btnLoading = false } }) .catch((errMsg) => { this.$message.error("参数错误:" + errMsg); if (this.loadingStatus) this.loadingStatus = false; + if (this.btnLoading) this.btnLoading = false }); - } else { + } else { this.$message.error("请核查字段信息"); } }); diff --git a/src/views/atomViews/ListViewWithHead.vue b/src/views/atomViews/ListViewWithHead.vue index db74a1f..b977f7d 100644 --- a/src/views/atomViews/ListViewWithHead.vue +++ b/src/views/atomViews/ListViewWithHead.vue @@ -292,7 +292,7 @@ export default { break; } case "view-recipe": { - this.openDialog(data, false, { key: "attr" }); + this.openDialog(data, true, { key: "attr" }); break; } case "copy": { diff --git a/src/views/modules/pms/bom/config.js b/src/views/modules/pms/bom/config.js index da91708..70f6a66 100644 --- a/src/views/modules/pms/bom/config.js +++ b/src/views/modules/pms/bom/config.js @@ -109,7 +109,7 @@ export default function () { input: true, label: "版本号", prop: "externalCode", - // rules: { required: true, message: "必填项不能为空", trigger: "blur" }, + rules: { required: true, message: "必填项不能为空", trigger: "blur" }, elparams: { placeholder: "请输入版本号" }, }, { input: true, label: "物料销售文本(短)", prop: "shortDesc", elparams: { placeholder: "物料销售文本" } }