From ff25df75456e9f31ef857f7060f8f3c933ae0b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Mon, 3 Jun 2024 14:24:45 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=B7=BB=E5=8A=A0=E7=94=9F=E4=BA=A7=E9=80=80?= =?UTF-8?q?=E5=BA=93=E5=8E=9F=E5=9B=A0+=E9=AB=98=E7=BA=A7=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E5=AD=97=E5=85=B8=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/components/searchOverall/index.vue | 3 +++ fe/PC/src/filters/status.js | 10 ++++++---- .../RecycledMaterialsLabel.vue | 6 ++++-- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/fe/PC/src/components/searchOverall/index.vue b/fe/PC/src/components/searchOverall/index.vue index 34c3ab986..c007c26b2 100644 --- a/fe/PC/src/components/searchOverall/index.vue +++ b/fe/PC/src/components/searchOverall/index.vue @@ -448,6 +448,9 @@ export default { if (val == key.prop) { if (key.filters) { data = key + if(key.filters == 'getDict'){ + data.filters = key.dictType + } } else { data = {} } diff --git a/fe/PC/src/filters/status.js b/fe/PC/src/filters/status.js index 90240036f..e150a8be5 100644 --- a/fe/PC/src/filters/status.js +++ b/fe/PC/src/filters/status.js @@ -2369,10 +2369,7 @@ export function SupplierAsnCtypeStaBack(name){ return Enum(store.getters.dictionaries.CaseCode, index, prop) } -// 专案代码 -/** - * @returns {object} '专案代码' - */ +// 器具规格 export function ContainerSpecificationsType(index, prop) { return Enum(store.getters.dictionaries.ContainerSpecificationsType, index, prop) } @@ -2475,6 +2472,11 @@ export function positionCodeType(index, prop) { return Enum(type, index, prop) } +// 生产退库原因 +export function ProductionReturnReason(index, prop) { + return Enum(store.getters.dictionaries.ProductionReturnReason, index, prop) +} + // 器具类型 export function utensilType(index, prop) { let type = { diff --git a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue index 284316aba..9c49edf61 100644 --- a/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue +++ b/fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue @@ -148,7 +148,8 @@ export default { { type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 }, { type: "dateTime", label: "生产时间", prop: "produceDate", colSpan: 12 }, { type: "dateTime", label: "到货时间", prop: "arriveDate", colSpan: 12 }, - { type: "input", label: "备注", prop: "remark", colSpan: 12 }, + // { type: "input", label: "备注", prop: "remark", colSpan: 12 }, + { type: "select",prop: "remark",options: "ProductionReturnReason", label: "生产退库原因", colSpan: 12 }, { hide:false,type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true, beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入'+_Names.itemCode); return false}else{return true}}, @@ -186,7 +187,8 @@ export default { { width:"auto",label: "供应商零件号", prop: "supplierItemCode", }, { width:"auto",label: "供应商零件名", prop: "supplierItemName", }, { width:"auto",label: "采购订单号", prop: "poNumber",type: "dateTime" }, - { width:"auto",label: "备注", prop: "remark", }, + // { width:"auto",label: "备注", prop: "remark", }, + { label: "生产退库原因", prop: "remark",type: "filter", filters: "getDict", dictType:"ProductionReturnReason"}, { width:"auto",label: "箱标签", prop: "packingCode",fixed:"right" }, ], // 已选数据信息