From 187a65a834a79e47429177a5e357b43cb60a7e32 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 22 Jul 2024 10:27:01 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=B6=E4=BB=96?= =?UTF-8?q?=E8=B4=A6=E6=88=B7=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicDataManage/subject/mstr/mstr.data.ts | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts b/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts index d992fe302..953bd7515 100644 --- a/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts +++ b/src/views/wms/basicDataManage/subject/mstr/mstr.data.ts @@ -52,6 +52,26 @@ export const Mstr = useCrudSchemas(reactive([ sort: 'custom', isSearch: true, }, + { + label: '物料差异账户成本中心', + field: 'plMvarCc', + sort: 'custom', + }, + { + label: '废品账户成本中心', + field: 'plScrpCc', + sort: 'custom', + }, + { + label: '成本重估账户成本中心', + field: 'plCchgCc', + sort: 'custom', + }, + { + label: '盘点差异账户成本中心', + field: 'plDscrCc', + sort: 'custom', + }, { label: '创建时间', field: 'createTime', From c95d0ee3ae288fed50914e966dba61f50227b656 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Mon, 22 Jul 2024 10:44:21 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E8=AE=A1=E9=87=8F=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptReport/index.vue | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue index 7a452dd16..61b9e431b 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue @@ -3,7 +3,7 @@ + > + + @@ -30,7 +34,7 @@ import { DictTag } from '@/components/DictTag' import { TableColumn } from '@/types/table' -// 查看质检报告 +// 查看质检报告 purchasereceiptReport import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import {queryQualityInspection} from '@/api/wms/supplierdeliverInspectionDetail' import Annex from '@/components/Annex/src/Annex.vue' @@ -101,15 +105,7 @@ const getAnnexList = async () => { { "width": 150, "label": "计量单位", - "field": "uom", - "dictType": "uom", - "dictClass": "string", - formatter : (_: Recordable, __: TableColumn, cellValue: any) => { - return h(DictTag, { - type: "uom", // ! 表示一定不为空 - value: cellValue - }) - }, + "field": "uomName", "isTable": true, "isForm": false, "sort": "custom", From 5518b96f1753af2a89082f5176168602cd240349 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 22 Jul 2024 11:16:43 +0800 Subject: [PATCH 03/13] =?UTF-8?q?SCP=20=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=20=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=20=E5=BD=93=E6=95=B0=E9=87=8F=E5=A4=A7?= =?UTF-8?q?=E4=BA=8E=E5=8F=91=E8=B4=A7=E6=95=B0=E9=87=8F=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=8F=90=E7=A4=BA=E7=9A=84=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E4=B8=8D=E5=AF=B9=EF=BC=8C=E4=B8=8D=E8=83=BD=E5=9C=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=A4=96=E3=80=82=E5=BA=94=E8=AF=A5=E5=9C=A8=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/labelForm.vue | 75 ++++++++++++------- 1 file changed, 47 insertions(+), 28 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue index 6e02b6fb0..8221156b3 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue @@ -139,7 +139,9 @@ 移出 @@ -177,7 +179,7 @@