From 6614504786635eab00d52d1944993e3f7a81230f Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Mon, 4 Nov 2024 13:19:25 +0800 Subject: [PATCH 01/72] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E5=8F=98=E6=9B=B4=20=20YT-589?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../areabasic/areabasic.data.ts | 8 ++++++++ .../itemManage/itembasic/itembasic.data.ts | 18 +++++++++--------- .../purchasereceiptRecordMain.data.ts | 15 ++++++++++++--- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts index 72b225f28..b4130fb73 100644 --- a/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/areabasic.data.ts @@ -174,6 +174,14 @@ export const Area = useCrudSchemas(reactive([ } }, }, + { + label: '描述', + field: 'description', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '备注', field: 'remark', diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index 3d52f7efb..4163cdccd 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -103,15 +103,15 @@ export const Itembasic = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '受入地', - field: 'receivedLocation', - sort: 'custom', - isSearch: true, - table: { - width: 150 - }, - }, + // { + // label: '受入地', + // field: 'receivedLocation', + // sort: 'custom', + // isSearch: true, + // table: { + // width: 150 + // }, + // }, { label: '前工程', field: 'preEngineering', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 6ff6650f4..439c1c152 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -8,7 +8,7 @@ import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' */ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ { - label: '单据号', + label: '单据号123', field: 'number', sort: 'custom', table: { @@ -466,7 +466,16 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ sortTableDefault:6, }, { - label: '数量', + label: '发货数量', + field: 'shippedQty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault:12, + }, + { + label: '收货数量', field: 'qty', sort: 'custom', table: { @@ -1526,7 +1535,7 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive< // } // }, { - label: '数量', + label: '数量123', field: 'qty', sort: 'custom', table: { From 4a3767ebef6ea37acaa755b555000f9c1860398a Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 4 Nov 2024 13:39:35 +0800 Subject: [PATCH 02/72] =?UTF-8?q?YT-659=E9=80=89=E6=8B=A9=E4=BB=93?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E5=BA=94=E4=B8=8D=E7=AD=9B=E9=80=89=E5=AF=B9?= =?UTF-8?q?=E5=BA=94=E7=9A=84=E6=9C=88=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplieDeliveryStrategy/AddForm.vue | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue index 6977ecc14..db660328b 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue @@ -509,13 +509,13 @@ const searchDockCode = () => { // return; // } let filters = [] - if (warehouseCodeObj.value?.Value) { - filters = [{ - action: warehouseCodeObj.value.ScreenOperator, - column: 'warehouseCode', - value: warehouseCodeObj.value.Value - }] - } + // if (warehouseCodeObj.value?.Value) { + // filters = [{ + // action: warehouseCodeObj.value.ScreenOperator, + // column: 'warehouseCode', + // value: warehouseCodeObj.value.Value + // }] + // } searchTableRef.value.open( '请选择月台', @@ -538,7 +538,7 @@ const searchTableSuccess = (formField, searchField, val, type, row) => { warehouseCodeObj.value = formData.value.condition.find(item => item['ParamCode'] == 'WarehouseCode') if(warehouseCodeObj.value){ warehouseCodeObj.value.Value = val.map(item => (item['code'])).join(',') - formData.value.configuration['DockCode']='' + // formData.value.configuration['DockCode']='' } }else if (formField=='Area') { let Area = formData.value.condition.find(item => item['ParamCode'] == 'Area') @@ -574,23 +574,23 @@ const blurWarehouseByCodes = async ()=>{ ].join(',') message.alert('代码' + str + '没有找到对应数据') WarehouseCode.Value = '' - formData.value.configuration.DockCode='' - formData.value.configuration.Receiver='' - formData.value.configuration.PhoneNumber='' + // formData.value.configuration.DockCode='' + // formData.value.configuration.Receiver='' + // formData.value.configuration.PhoneNumber='' return } } else { WarehouseCode.Value = '' - formData.value.configuration.DockCode='' - formData.value.configuration.Receiver='' - formData.value.configuration.PhoneNumber='' + // formData.value.configuration.DockCode='' + // formData.value.configuration.Receiver='' + // formData.value.configuration.PhoneNumber='' message.alert('暂无数据') } }else{ WarehouseCode.Value = '' - formData.value.configuration.DockCode='' - formData.value.configuration.Receiver='' - formData.value.configuration.PhoneNumber='' + // formData.value.configuration.DockCode='' + // formData.value.configuration.Receiver='' + // formData.value.configuration.PhoneNumber='' } } // 供应商失去焦点 @@ -625,13 +625,13 @@ const blurSupplierCode = async ()=>{ const blurDockCode = async () => { if (formData.value.configuration.DockCode) { let filters = [] - if (warehouseCodeObj.value?.Value) { - filters.push({ - action: warehouseCodeObj.value.ScreenOperator, - column: 'warehouseCode', - value: warehouseCodeObj.value.Value - }) - } + // if (warehouseCodeObj.value?.Value) { + // filters.push({ + // action: warehouseCodeObj.value.ScreenOperator, + // column: 'warehouseCode', + // value: warehouseCodeObj.value.Value + // }) + // } if (formData.value.configuration.DockCode) { filters.push({ action: '==', @@ -661,9 +661,9 @@ const changeWarehouseArea = (e) => { formData.value.condition[0].Value = '' WarehouseCodeOrArea.value = e if (e == 'WarehouseCode') { - formData.value.configuration.DockCode='' - formData.value.configuration.Receiver='' - formData.value.configuration.PhoneNumber='' + // formData.value.configuration.DockCode='' + // formData.value.configuration.Receiver='' + // formData.value.configuration.PhoneNumber='' } else if (e == 'Area') { // getFormSupplierList() } From ade1245c21129e8e6ae732755f05d5477d966192 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 4 Nov 2024 14:13:03 +0800 Subject: [PATCH 03/72] =?UTF-8?q?YT-663=E4=BB=8E=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=8E=BB=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 909333405..3f709f814 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -445,16 +445,22 @@ routeName.value = route.name const formHeight = ref({}) if (!wsCache.get('ShowPackingNumber')) { if (formSchema.value) { - formSchema.value = formSchema.value.filter(item => item.field != 'packingNumber') + formSchema.value = formSchema.value.filter(item => item.field != 'packingNumber' && item.field != 'fromPackingNumber') } if (rules.value && rules.value.packingNumber) { delete rules.value.packingNumber } + if (rules.value && rules.value.fromPackingNumber) { + delete rules.value.fromPackingNumber + } if (props.tableAllSchemas) { - tableAllSchemas.value.tableFormColumns = props.tableAllSchemas.tableFormColumns.filter(item => item.field != 'packingNumber') + tableAllSchemas.value.tableFormColumns = props.tableAllSchemas.tableFormColumns.filter(item => item.field != 'packingNumber' && item.field != 'fromPackingNumber') if (tableFormRules.value && tableFormRules.value.packingNumber) { delete tableFormRules.value.packingNumber } + if (tableFormRules.value && tableFormRules.value.fromPackingNumber) { + delete tableFormRules.value.fromPackingNumber + } } } @@ -840,6 +846,7 @@ const submitForm = async () => { const data = unref(formRef)?.formModel if (!wsCache.get('ShowPackingNumber') ) { data.packingNumber='' + data.fromPackingNumber='' } emit('submitForm', formType.value, data) } finally { @@ -851,6 +858,7 @@ const submitForm = async () => { const data = unref(formRef)?.formModel if (!wsCache.get('ShowPackingNumber') ) { data.packingNumber='' + data.fromPackingNumber='' } console.log(data); @@ -867,6 +875,7 @@ const submitForm = async () => { // 清空包装号 if (!wsCache.get('ShowPackingNumber') ) { data.packingNumber='' + data.fromPackingNumber='' } emit('success', formType.value, data) } finally { From 9669410102758fcc7605954146f4ff2f2c0d2af4 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 4 Nov 2024 16:21:19 +0800 Subject: [PATCH 04/72] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E6=9C=88=E5=8F=B0=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategy/supplieDeliveryStrategy/AddForm.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue index db660328b..a27e443e5 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue @@ -149,7 +149,7 @@ /> - +