From 9cac4972e5cbf06ff74c5001add546036d036583 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 3 Jun 2024 11:14:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=8D=A1=E9=A1=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/components/material.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/home/components/material.vue b/src/views/home/components/material.vue index aa32fce7b..3931be20c 100644 --- a/src/views/home/components/material.vue +++ b/src/views/home/components/material.vue @@ -222,8 +222,8 @@ const lineIndex = ref(0) const materialData = ref() // 获取原料管理员数据 -const getMaterialData = async () => { - await IndexApi.getMaterialData().then((res) => { +const getMaterialData = () => { + IndexApi.getMaterialData().then((res) => { materialData.value = res getJobCharts() }) From 197b81b8a44e8ce377edfb7abe6e1e09aa70207f Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 3 Jun 2024 11:58:26 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E5=8D=95=E4=BD=8D=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryinitial/inventoryinitRequestMain/index.vue | 2 +- .../inventoryinitRequestMain/inventoryinitRequestMain.data.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index 6d1591bfa..058db56ef 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -109,10 +109,10 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => if (type == 'tableForm') { // 明细查询页赋值 row[formField] = val[0][searchField] + row['uom'] = val[0]['uom'] } else { const setV = {} setV[formField] = val[0][searchField] - //setV['ppNumber'] = val[0]['ppNumber'] //setV['supplierCode'] = val[0]['supplierCode'] formRef.setValues(setV) } diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts index 840c0033d..2034b0454 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts @@ -501,7 +501,8 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm: { - type: 'Select' + type: 'Select', + disabled: true } }, { From ebc36e3255eb83f7c278b8a4e18488d10dfaf6d4 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 3 Jun 2024 15:02:37 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptscrapRequestMain/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index d736db5ee..12036ffa0 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -114,7 +114,7 @@ + @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend="'scrap'"/> @@ -729,4 +729,4 @@ onMounted(async () => { getList() importTemplateData.templateUrl = await ProductreceiptRequestMainApi.importTemplate() }) - \ No newline at end of file + From 834768cc3244a49ecd20e97bb1a18e2db7c75d8c Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 3 Jun 2024 15:11:04 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=AD=A3=E5=BC=8F=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8D=A1=E9=A1=BF=E9=97=AE=E9=A2=98--?= =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=B3=A8=E9=87=8A=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/components/material.vue | 62 ++++++++++++++++++++- src/views/home/components/produce.vue | 2 +- src/views/home/components/product.vue | 8 ++- src/views/home/components/supplierIndex.vue | 2 +- src/views/home/index.vue | 13 +++-- 5 files changed, 77 insertions(+), 10 deletions(-) diff --git a/src/views/home/components/material.vue b/src/views/home/components/material.vue index 3931be20c..efe37218d 100644 --- a/src/views/home/components/material.vue +++ b/src/views/home/components/material.vue @@ -32,7 +32,8 @@
-
+
+
{{ t('home.slack_stock_warning')}}
+
+
{{ t('home.overstock_warning') }}
+
+
{{ t('home.high_and_low_storage_warning') }}
+
+
{{ t('home.waiting_tasks') }}
@@ -251,8 +285,32 @@ const getJobCharts = async () => { lineIndex.value++ } onMounted(() => { - getMaterialData() + // getMaterialData() }) + +// 呆滞库存预警 +const currentPage_stagnantBalance = ref(1) +const pageSize_stagnantBalance = ref(10) +const total_stagnantBalance= ref(100) +const handleCurrentChange_stagnantBalance = (val)=>{ + console.log('呆滞库存预警',val) +} + +// 超期库存预警 +const currentPage_overdueBalance = ref(1) +const pageSize_overdueBalance = ref(10) +const total_overdueBalance= ref(100) +const handleCurrentChange_overdueBalance = (val)=>{ + console.log('超期库存预警',val) +} + +// 高低储预警 +const currentPage_warningBalance = ref(1) +const pageSize_warningBalance = ref(10) +const total_warningBalance= ref(100) +const handleCurrentChange_warningBalance = (val)=>{ + console.log('高低储预警',val) +}