From 4e06a3d65953e79b5a5bf1b64b982fcc3482e086 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 23 Dec 2024 15:02:14 +0800 Subject: [PATCH 1/6] =?UTF-8?q?YT-1744=E3=80=90=E5=BA=93=E5=AD=98=E8=BD=AC?= =?UTF-8?q?=E7=A7=BB=E7=94=B3=E8=AF=B7=E3=80=91=E5=A2=9E=E5=8A=A0=E5=88=B0?= =?UTF-8?q?=E6=89=B9=E6=AC=A1=E7=9A=84=E9=80=89=E6=8B=A9=EF=BC=8C=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=BD=93=E5=A4=A9=EF=BC=8C=E5=8F=AF=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=EF=BC=8C=E9=9D=9E=E5=BF=85=E5=A1=AB=E9=A1=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMainMOVE/index.vue | 2 + .../inventorymoveRequestMain.data.ts | 37 +++++++++++-------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue index b98e2a26d..fecfaaad5 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/index.vue @@ -95,6 +95,7 @@ import * as LocationApi from '@/api/wms/location' import { formatDate } from '@/utils/formatTime' import { usePageLoading } from '@/hooks/web/usePageLoading' import * as ruleApi from '@/api/wms/rule/index' +import { formatTime } from '@/utils/index' const { loadStart, loadDone } = usePageLoading() // 库存转移申请 // 只有库存转移申请在使用的 @@ -327,6 +328,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['uom'] = item['uom'] newRow['qty'] = item['qty'] newRow['toInventoryStatus'] = item['inventoryStatus']//库存移动申请 + newRow['toBatch'] = formatTime(new Date(), 'yyyyMMdd') tableData.value.push(newRow) }) }else if (formField == 'toLocationCode') { diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts index caf3af137..87aed3ab1 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts @@ -588,22 +588,27 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( } }, }, - // { - // label: '到批次', - // field: 'toBatch', - // sort: 'custom', - // table: { - // width: 150 - // }, - // isTableForm: true, - // isForm: false, - // tableForm: { - // disabled: true, - // placeholder: '请选择从批次', - // valueFormat: 'YYYYMMDD', - // format: 'YYYYMMDD', - // }, - // }, + { + label: '到批次', + field: 'toBatch', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: false, + type:'FormDate', + placeholder: '请选择到批次', + valueFormat: 'YYYYMMDD', + format: 'YYYYMMDD', + }, + form: { + componentProps: { + disabled: false, + valueFormat: 'YYYYMMDD', + } + } + }, { label: '从包装号', field: 'fromPackingNumber', From b26ac465a1b040703798348de26ec512012da135 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 23 Dec 2024 15:18:27 +0800 Subject: [PATCH 2/6] =?UTF-8?q?YT-1764=E5=88=B6=E9=80=A0=E4=BB=B6=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E4=B8=AD=EF=BC=8C=E9=9A=90=E8=97=8F=E3=80=90=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E6=A8=A1=E6=9D=BF=E3=80=91=E5=92=8C=E3=80=90=E6=A0=87?= =?UTF-8?q?=E7=AD=BE=E7=8A=B6=E6=80=81=E3=80=91=E8=BF=99=E4=B8=A4=E5=88=97?= =?UTF-8?q?=E5=88=B6=E9=80=A0=E4=BB=B6=E6=A0=87=E7=AD=BE=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E3=80=90=E6=A0=87=E7=AD=BE=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E3=80=91=E5=92=8C=E3=80=90=E6=A0=87=E7=AD=BE=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E3=80=91=E8=BF=99=E4=B8=A4=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labelManage/manufacturePackage/manufacturePackage.data.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts index 63073c4ab..c2e2dabf7 100644 --- a/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts +++ b/src/views/wms/basicDataManage/labelManage/manufacturePackage/manufacturePackage.data.ts @@ -43,6 +43,7 @@ export const Package = useCrudSchemas(reactive([ label: '标签模板', field: 'template', sort: 'custom', + isTable:false, table: { width: 180 } @@ -51,6 +52,7 @@ export const Package = useCrudSchemas(reactive([ label: '标签状态', field: 'status', sort: 'custom', + isTable:false, isSearch: true, dictType: DICT_TYPE.LABEL_STATUS, dictClass: 'string', From 894629487446f0bb14667be69f7184f541e4e896 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 23 Dec 2024 16:59:16 +0800 Subject: [PATCH 3/6] =?UTF-8?q?YT-1758=E4=BF=AE=E6=94=B9=E8=A6=81=E8=B4=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=96=B0=E5=A2=9E=E6=97=B6=E5=8F=97=E5=85=A5?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E6=98=BE=E7=A4=BA=E3=80=82=E5=8F=97=E5=85=A5?= =?UTF-8?q?=E5=8F=B7=E6=98=AF=E7=89=A9=E6=96=99=E5=9F=BA=E7=A1=80=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=B8=AD=E5=B1=9E=E6=80=A7=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E9=80=89=E6=8B=A9=EF=BC=8C=E5=A6=82=E6=9E=9C=E5=8F=97=E5=85=A5?= =?UTF-8?q?=E5=8F=B7=E4=B8=BA=E7=A9=BA=E5=88=99=E7=9B=B4=E6=8E=A5=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableForm/src/TableForm.vue | 2 +- .../supplierdeliver/purchasePlanMain/index.vue | 12 +++++++++++- .../purchasePlanMain/purchasePlanMain.data.ts | 5 +++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index f24522097..35c8ffc4d 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -97,7 +97,7 @@ :type="headerItem?.tableForm?.inputType" :placeholder=" t( - `ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}` + `ts.${headerItem?.tableForm?.isPlaceholder === false ? '' :( headerItem?.tableForm?.placeholder || '请输入' + headerItem.label)}` ).replace('ts.', '') " :disabled="itemIsDisabled(headerItem, row)" diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 5a5676cdc..19bef105e 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -203,7 +203,7 @@ const { loadStart, loadDone } = usePageLoading() val.forEach(item=>{ if(tableData.value.find(item1=>item1['id'] == item['id'])) return const newRow = JSON.parse(JSON.stringify({...tableFormKeys,...row})) - + newRow[formField] = item[searchField] newRow['itemCode'] = item['code'] newRow['poNumber'] = item['number'] @@ -232,6 +232,16 @@ const { loadStart, loadDone } = usePageLoading() setV['itemCode'] = val[0]['code'] setV['poNumber'] = val[0]['number'] setV['poLine'] = val[0]['lineNumber'] + setV['receivedNumber'] = val[0]['receivedNumber'] + console.log(PurchasePlanDetail.allSchemas.tableFormColumns); + + PurchasePlanDetail.allSchemas.tableFormColumns.forEach(item =>{ + if(item.value == ''){ + if(item.field == 'receivedNumber'){ + item.tableForm.placeholder = '' + } + } + }) if(formField == 'supplierCode'){ setV['supplierCode'] = val[0]['code'] diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 34b72cab6..030754ab9 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -843,8 +843,9 @@ export const PurchasePlanDetail = useCrudSchemas( } }, tableForm: { - type: 'Select', - disabled: true + // type: 'Select', + disabled: true, + isPlaceholder:true } }, { From 24e94e35ff753ab92f5421c077ab1ea5006a4efe Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 23 Dec 2024 17:05:22 +0800 Subject: [PATCH 4/6] YT-1758 --- .../supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 030754ab9..502b88c69 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -845,7 +845,7 @@ export const PurchasePlanDetail = useCrudSchemas( tableForm: { // type: 'Select', disabled: true, - isPlaceholder:true + isPlaceholder:false } }, { From 02fdf836b559d56badc542bc5c296bdfcedc547e Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 23 Dec 2024 17:27:48 +0800 Subject: [PATCH 5/6] =?UTF-8?q?YT-1760=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E8=B4=A7=E7=94=B3=E8=AF=B7=E6=96=B0=E5=A2=9E=EF=BC=8C=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92=E5=88=97=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E3=80=90=E4=BE=BF=E6=AC=A1=E3=80=91=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasePlanMain/purchasePlanMain.data.ts | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 502b88c69..23da582f9 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -653,6 +653,18 @@ export const PurchasePlanDetail = useCrudSchemas( // } // } // }, + { + label: '便次', + field: 'deliNo', + table: { + width: 150 + }, + sortTableDefault: 3, + isTableForm: false, + isForm: false, + isTable: true, + isDetail:false + }, { label: '订单行', field: 'poLine', From 2bc2c1791d65bdce3d9058dc4b1355a38ceb46a7 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Mon, 23 Dec 2024 19:37:21 +0800 Subject: [PATCH 6/6] =?UTF-8?q?YT-1771=E5=B7=B2=E5=AE=8C=E6=88=90=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E7=9A=84=E9=87=87=E8=B4=AD=E6=8D=A2=E8=B4=A7=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E6=97=A0=E6=B3=95=E5=85=B3=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseBarter/purchaseBarterRequest/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue index 47660d900..b38e59460 100644 --- a/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue +++ b/src/views/wms/purchasereceiptManage/purchaseBarter/purchaseBarterRequest/index.vue @@ -253,7 +253,7 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3']),hasPermi:'wms:purchase-barter-request-main:close'}), // 关闭 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','8']),hasPermi:'wms:purchase-barter-request-main:close'}), // 关闭 defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:purchase-barter-request-main:reAdd'}), // 重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-barter-request-main:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchase-barter-request-main:refused'}), // 驳回