From ea334ac082f89a1dd82bdd9c976eaad21b383f81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Tue, 27 Aug 2024 16:44:19 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/filters/status.js | 8 +++--- fe/PC/src/utils/tableColumns/index.js | 4 +-- fe/PC/src/utils/tabsDesTions/index.js | 4 +-- fe/PC/src/views/basicData/ItemsManage/AQL.vue | 28 +++++++++---------- .../src/views/systemManage/userWorkGroup.vue | 8 +++++- 5 files changed, 29 insertions(+), 23 deletions(-) diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js index 16195f590..ed8cbd944 100644 --- a/fe/PC/src/filters/status.js +++ b/fe/PC/src/filters/status.js @@ -2272,10 +2272,10 @@ export function SupplierAsnCtypeStaBack(name){ value: '不合格', label: '不合格' }, - '不涉及': { - value: '不涉及', - label: '不涉及' - }, + // '不涉及': { + // value: '不涉及', + // label: '不涉及' + // }, } return Enum(type, index, prop) } diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 63f1ef8a8..a306cac3c 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -130,8 +130,8 @@ export const AQL = [ { label: _Names.abcClass, prop: 'abcClass', type: "filter", filters: "abcClass" }, { label: _Names.ceilingQty, prop: 'ceilingQty',isNumber:true }, { label: _Names.floorQty, prop: "floorQty",isNumber:true}, - { label: _Names.isUsePercent, prop: 'isUsePercent', type: "filter", filters: "whetherOrNot" }, - { label: _Names.samplePercent, prop: 'samplePercent' }, + // { label: _Names.isUsePercent, prop: 'isUsePercent', type: "filter", filters: "whetherOrNot" }, + // { label: _Names.samplePercent, prop: 'samplePercent' }, { label: _Names.sampleQty, prop: 'sampleQty',isNumber:true }, { label: _Public.remark, prop: "remark" }, { label: _Public.creationTime, prop: "creationTime", type:'dateTime' }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index dc00ff791..ec90fc28e 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -89,8 +89,8 @@ export const AQL = [ { label: _Names.abcClass, prop: 'abcClass', type: "filter", filters: "abcClass" }, { label: _Names.ceilingQty, prop: 'ceilingQty',isNumber:true }, { label: _Names.floorQty, prop: "floorQty",isNumber:true}, - { label: _Names.isUsePercent, prop: 'isUsePercent', type: "filter", filters: "whetherOrNot" }, - { label: _Names.samplePercent, prop: 'samplePercent' }, + // { label: _Names.isUsePercent, prop: 'isUsePercent', type: "filter", filters: "whetherOrNot" }, + // { label: _Names.samplePercent, prop: 'samplePercent' }, { label: _Names.sampleQty, prop: 'sampleQty',isNumber:true }, { label: _Public.remark, prop: "remark" }, { label: _Public.creationTime, prop: "creationTime", type:'dateTime' }, diff --git a/fe/PC/src/views/basicData/ItemsManage/AQL.vue b/fe/PC/src/views/basicData/ItemsManage/AQL.vue index 33e6f53a3..4ad6bd4d7 100644 --- a/fe/PC/src/views/basicData/ItemsManage/AQL.vue +++ b/fe/PC/src/views/basicData/ItemsManage/AQL.vue @@ -199,8 +199,8 @@ export default { { type: "input", label: "数量上限", prop: "ceilingQty", validType:'number', colSpan: 12 }, { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 }, { type: "input", label: "抽检数量", prop: "sampleQty", validType:'pointNumber', colSpan: 12 }, - { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 }, - { type: "number", label: "抽检百分比", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 }, + // { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 }, + // { type: "number", label: "抽检百分比", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 }, { type: "input", label: "备注", prop: "remark", colSpan: 12 }, ], editForm: [ @@ -214,8 +214,8 @@ export default { { type: "input", label: "数量上限", prop: "ceilingQty", validType:'number', colSpan: 12 }, { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 }, { type: "input", label: "抽检数量", prop: "sampleQty", validType:'pointNumber', colSpan: 12 }, - { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 }, - { type: "number", label: "抽检百分比", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 }, + // { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 }, + // { type: "number", label: "抽检百分比", prop: "samplePercent", validType:'number', colSpan: 12, precision:0, min: 0 ,max:100 }, { type: "input", label: "备注", prop: "remark", colSpan: 12 }, ], editRules: { @@ -224,24 +224,24 @@ export default { supplierCode: [{ required: true, trigger: "change", message: "不可为空" }], ceilingQty: [{ required: true, trigger: "blur", message: "不可为空" }], floorQty: [{ required: true, trigger: "blur", message: "不可为空" }], - samplePercent: [ - // { validator:numberValidate, trigger: "blur"}, - { required: true, trigger: "blur",message: "不可为空"}, - ], + // samplePercent: [ + // // { validator:numberValidate, trigger: "blur"}, + // { required: true, trigger: "blur",message: "不可为空"}, + // ], sampleQty: [{ required: true, trigger: "blur", message: "不可为空" }], - isUsePercent: [{ required: true, trigger: "blur", message: "不可为空" }], + // isUsePercent: [{ required: true, trigger: "blur", message: "不可为空" }], }, editRule: { itemCode: [{ required: true, trigger: "change", message: "不可为空" },], supplierCode: [{ required: true, trigger: "change", message: "不可为空" }], ceilingQty: [{ required: true, trigger: "blur", message: "不可为空" }], floorQty: [{ required: true, trigger: "blur", message: "不可为空" }], - samplePercent: [ - // { validator:numberValidate, trigger: "blur"}, - { required: true, trigger: "blur",message: "不可为空"}, - ], + // samplePercent: [ + // // { validator:numberValidate, trigger: "blur"}, + // { required: true, trigger: "blur",message: "不可为空"}, + // ], sampleQty: [{ required: true, trigger: "blur", message: "不可为空" }], - isUsePercent: [{ required: true, trigger: "blur", message: "不可为空" }], + // isUsePercent: [{ required: true, trigger: "blur", message: "不可为空" }], } }, }; diff --git a/fe/PC/src/views/systemManage/userWorkGroup.vue b/fe/PC/src/views/systemManage/userWorkGroup.vue index c35f54e3f..35d420d6b 100644 --- a/fe/PC/src/views/systemManage/userWorkGroup.vue +++ b/fe/PC/src/views/systemManage/userWorkGroup.vue @@ -58,6 +58,12 @@ sortable="custom" /> +