From 38735f196b677aedfb5803986656104f2fcf82ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Mon, 18 Mar 2024 14:36:05 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8F=91=E8=B4=A7=E8=AE=B0=E5=BD=95=20?= =?UTF-8?q?=E9=80=80=E8=B4=A7=E8=AE=B0=E5=BD=95=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreturnRecordMain/index.vue | 17 ++++++++++++++--- .../deliver/deliverRecordMain/index.vue | 17 ++++++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue index 7ebd79ee1..ad56e650d 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/index.vue @@ -62,6 +62,7 @@ From 103008495e282f88c3b19159a30f39460a8e25ee Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 18 Mar 2024 16:58:57 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/supplierdeliverRequestMain/index.ts | 1 + .../supplierdeliverRequestMain/index.vue | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts index 1c4a4d2de..dddc0c3a1 100644 --- a/src/api/wms/supplierdeliverRequestMain/index.ts +++ b/src/api/wms/supplierdeliverRequestMain/index.ts @@ -31,6 +31,7 @@ export interface SupplierdeliverRequestMainVO { autoAgree: string autoExecute: string directCreateRecord: string + labelStatus: string } // 查询供应商发货申请主列表 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 4d7405fbd..94e827a47 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -264,6 +264,20 @@ const isShowMainButton = (row, val) => { } } + +// 根据状态返回该按钮是否显示 +const isShowMainButtonLabel = (row, val) => { + if (val.indexOf(row.status) > -1) { + if(row.labelStatus == '2'){ + return true + }else{ + return false + } + } else { + return true + } +} + // 列表-操作按钮 const butttondata = (row) => { return [ @@ -280,7 +294,7 @@ const butttondata = (row) => { { label: '生成标签', name: 'ssbq', - hide: isShowMainButton(row, ['3']), + hide: isShowMainButtonLabel(row, ['3']), type: 'primary', icon: '', color: '', From e9a90b0bb635474ac6861b443c982bca869ee0a9 Mon Sep 17 00:00:00 2001 From: chenfang Date: Mon, 18 Mar 2024 17:14:21 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E7=89=A9=E6=96=99=E5=BA=93=E5=8C=BA=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AD=90=E8=A1=A8=E5=85=81=E8=AE=B8=E4=B8=8D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 8 +++++++- .../wms/basicDataManage/itemManage/itemarea/index.vue | 5 ++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index dd189cf7d..3a5aa7429 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -245,6 +245,12 @@ const props = defineProps({ type: Boolean, required: false, default: true + }, + // 明细数据长度校验 + tableFormDataLength: { + type: Boolean, + required: false, + default: true } }) @@ -432,7 +438,7 @@ const submitForm = async () => { formLoading.value = true if (formType.value == 'create') { const validateForm = await tableFormRef.value.validateForm() - if (!validateForm) { + if (!validateForm && props.tableFormDataLength) { if (props.tableData.length == 0) { message.warning('请填写明细信息！') formLoading.value = false diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index db7184c0c..c55ae9007 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -57,6 +57,7 @@ @submitForm="submitForm" :isShowButton = isShowButton :basicFormWidth="75" + :tableFormDataLength="false" /> @@ -130,6 +131,8 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => setV['inPackUnit'] = val[0]['code'] }else if(formField == 'outPackUnit') { setV['outPackUnit'] = val[0]['code'] + }else if(formField == 'itemCode') { + setV['itemCode'] = val[0]['code'] }else{ setV[formField] = setV[0][searchField] } @@ -285,7 +288,7 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await ItemareaApi.exportItemarea(tableObject.params) - download.excel(data, '发货申请主.xlsx') + download.excel(data, '物料库区配置管理主.xlsx') } catch { } finally { exportLoading.value = false From 8e6bbaeba2b1f466263446093e614451d49f5ba5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Tue, 19 Mar 2024 08:34:54 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packageoverJobMain/index.vue | 4 +- .../packageoverJobMain.data.ts | 32 +-- .../packageoverRecordMain/index.vue | 4 +- .../packageoverRecordMain.data.ts | 199 +++++++++--------- 4 files changed, 125 insertions(+), 114 deletions(-) diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue index 913b97264..014d06d9f 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/index.vue @@ -106,8 +106,8 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:packageover-job-main:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:packageover-job-main:import'}), // 导入 + // defaultButtons.defaultAddBtn({hasPermi:'wms:packageover-job-main:create'}), // 新增 + // defaultButtons.defaultImportBtn({hasPermi:'wms:packageover-job-main:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:packageover-job-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts index e888b4335..a66d844e0 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverJobMain/packageoverJobMain.data.ts @@ -603,22 +603,22 @@ export const PackageoverJobDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '从包装号', - field: 'fromPackingNumber', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到包装号', - field: 'toPackingNumber', - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '从包装号', + // field: 'fromPackingNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到包装号', + // field: 'toPackingNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '从包装规格', field: 'fromPackUnit', diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue index c66bbf94a..a7421c788 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/index.vue @@ -92,7 +92,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({hasPermi:'wms:packageover-main:export'}), // 导出 + defaultButtons.defaultExportBtn({hasPermi:'wms:packageover-record-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -139,7 +139,7 @@ const handleExport = async () => { await message.exportConfirm() // 发起导出 exportLoading.value = true - const data = await PackageoverRecordMainApi.exportPackageoverMainApi(tableObject.params) + const data = await PackageoverRecordMainApi.exportPackageoverMain(tableObject.params) download.excel(data, '翻包记录.xlsx') } catch { } finally { diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts index 7a222f7c2..88921406d 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts @@ -11,6 +11,15 @@ export const PackageoverMain = useCrudSchemas(reactive([ width: 180 }, }, + { + label: '任务单据号', + field: 'jobNumber', + sort: 'custom', + isSearch: true, + table: { + width: 180 + }, + }, { label: '仓库代码', field: 'warehouseCode', @@ -129,12 +138,6 @@ export const PackageoverMain = useCrudSchemas(reactive([ sort: 'custom', isTable:false }, - { - label: '用户组', - field: 'userGroupCode', - sort: 'custom', - isTable:false - }, { label: '接口类型', field: 'interfaceType', @@ -154,7 +157,6 @@ export const PackageoverMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', isTable: true, - isSearch: true, sort: 'custom', table: { width: 150 @@ -214,173 +216,182 @@ export const PackageoverDetail = useCrudSchemas(reactive([ }, }, { - label: '库位代码', - field: 'locationCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '库位组代码', - field: 'locationGroupCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '库区代码', - field: 'areaCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '从包装号', - field: 'fromPackingNumber', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '到包装号', - field: 'toPackingNumber', + label: '物料代码', + field: 'itemCode', sort: 'custom', table: { width: 150 }, }, { - label: '从数量', - field: 'fromQty', + label: '物料名称', + field: 'itemName', sort: 'custom', table: { width: 150 }, }, { - label: '到数量', - field: 'toQty', + label: '物料描述1', + field: 'itemDesc1', sort: 'custom', table: { width: 150 }, }, { - label: '从批次', - field: 'fromBatch', + label: '物料描述2', + field: 'itemDesc2', sort: 'custom', table: { width: 150 }, }, { - label: '到批次', - field: 'toBatch', + label: '项目代码', + field: 'projectCode', sort: 'custom', table: { width: 150 }, }, { - label: '从库存状态', - field: 'fromInventoryStatus', + label: '计量单位', + field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '到库存状态', - field: 'toInventoryStatus', + label: '从数量', + field: 'fromQty', sort: 'custom', table: { width: 150 }, }, { - label: '从器具号', - field: 'fromContainerNumber', + label: '到数量', + field: 'toQty', sort: 'custom', table: { width: 150 }, }, { - label: '到器具号', - field: 'toContainerNumber', + label: '从包装号', + field: 'fromPackingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '从货主代码', - field: 'fromOwnerCode', + label: '到包装号', + field: 'toPackingNumber', sort: 'custom', table: { width: 150 }, }, { - label: '到货主代码', - field: 'toOwnerCode', + label: '库位代码', + field: 'locationCode', sort: 'custom', table: { width: 150 }, }, { - label: '物料代码', - field: 'itemCode', + label: '库位组代码', + field: 'locationGroupCode', sort: 'custom', table: { width: 150 }, }, { - label: '物料名称', - field: 'itemName', + label: '库区代码', + field: 'areaCode', sort: 'custom', table: { width: 150 }, }, { - label: '物料描述1', - field: 'itemDesc1', + label: '从批次', + field: 'fromBatch', sort: 'custom', table: { width: 150 }, }, { - label: '物料描述2', - field: 'itemDesc2', + label: '到批次', + field: 'toBatch', sort: 'custom', table: { width: 150 }, }, { - label: '项目代码', - field: 'projectCode', + label: '从库存状态', + field: 'fromInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, { - label: '计量单位', - field: 'uom', + label: '到库存状态', + field: 'toInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, sort: 'custom', table: { width: 150 }, }, + // { + // label: '从器具号', + // field: 'fromContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到器具号', + // field: 'toContainerNumber', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '从货主代码', + // field: 'fromOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, + // { + // label: '到货主代码', + // field: 'toOwnerCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '备注', field: 'remark', @@ -389,27 +400,27 @@ export const PackageoverDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '创建时间', - field: 'createTime', - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - table: { - width: 180 - }, - form: { - component: 'DatePicker', - componentProps: { - style: {width:'100%'}, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x', - } - }, - isForm: false - }, + // { + // label: '创建时间', + // field: 'createTime', + // formatter: dateFormatter, + // detail: { + // dateFormat: 'YYYY-MM-DD HH:mm:ss' + // }, + // table: { + // width: 180 + // }, + // form: { + // component: 'DatePicker', + // componentProps: { + // style: {width:'100%'}, + // type: 'datetime', + // dateFormat: 'YYYY-MM-DD HH:mm:ss', + // valueFormat: 'x', + // } + // }, + // isForm: false + // }, ])) // 表单校验 From 7db097bdccbd60f26b43d2424f5060466eb241cc Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 19 Mar 2024 11:25:31 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factoryModeling/workstation/index.vue | 16 ++++++++-------- .../itemManage/itemarea/index.vue | 17 +++++++++++++++++ 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue index 232885f92..7002ebef5 100644 --- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue @@ -210,10 +210,10 @@ const formsSuccess = async (formType,data) => { Workstation.allSchemas.tableFormColumns.map(item => { if(item.field == 'rawLocationCode') { item.form.componentProps.searchCondition = [ - // { - // key: 'areaType', - // value: 'RAW', - // }, + { + key: 'areaType', + value: 'RAW', + }, { key: 'available', value: 'TRUE', @@ -222,10 +222,10 @@ Workstation.allSchemas.tableFormColumns.map(item => { } if(item.field == 'fgLocationCode') { item.form.componentProps.searchCondition = [ - // { - // key: 'areaType', - // value: 'FG', - // }, + { + key: 'areaType', + value: 'FG', + }, { key: 'available', value: 'TRUE', diff --git a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue index c55ae9007..e78f9d9cb 100644 --- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue @@ -174,6 +174,23 @@ const HeadButttondata = [ // }, ] +// /** +// * 监听改变事件 +// * @param field 当前操作字段 +// * @param cur 改变后值 +// */ +// const onChangeArea = (field, cur) => { +// console.log(field,cur); +// if(field == "maxQty" && cur == "0"){ +// Itemarea.allSchemas.formSchema.forEach((item) => { +// if (item.field == 'allowIssueRequest') { +// cur.value = "FALSE" +// item.componentProps.disabled = true +// }}) +// } +// } + + // 头部按钮事件 const buttonBaseClick = (val, item) => { if (val == 'add') { // 新增