From 330a5c027671566790ac8d02a6ec486ec95d1af8 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Mon, 9 Jun 2025 09:10:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?YT-2690=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4=E4=B8=BA=EF=BC=9A=E5=93=81?= =?UTF-8?q?=E7=95=AA=E3=80=81=E8=83=8C=E7=95=AA=E3=80=81=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=95=B0=E9=87=8F=E3=80=81=E5=8F=97=E5=85=A5?= =?UTF-8?q?=E5=8F=B7=E3=80=81=E9=87=87=E8=B4=AD=E8=AE=A1=E9=87=8F=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E3=80=81=E8=AE=A2=E5=8D=95=E8=A1=8C=E3=80=81=E9=87=87?= =?UTF-8?q?=E8=B4=AD=E6=A0=87=E5=8C=85=E6=95=B0=E9=87=8F=E3=80=81=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E6=94=B6=E8=B4=A7=E5=BA=93=E5=8C=BA=E3=80=81=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasePlanMain/purchasePlanMain.data.ts | 297 +++++++++--------- 1 file changed, 149 insertions(+), 148 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index a9564865c..85b7abc3d 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -715,63 +715,6 @@ export const PurchasePlanDetail = useCrudSchemas( isDetail:false, isSearch:true, }, - { - label: '订单行', - field: 'poLine', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault: 16, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - disabled: true, - isSearchList: false, - searchListPlaceholder: '请选择订单行', - searchField: 'lineNumber', - searchTitle: '采购订单信息', - searchAllSchemas: PurchaseDetail.allSchemas, - searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber, - searchCondition: [ - { - key: 'number', - value: 'poNumber', - message: '请填写订单号！', - isMainValue: true - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - } - ] - } - }, - tableForm: { - multiple: true, - disabled: true, - isInpuFocusShow: false, - searchListPlaceholder: '请选择订单行', - searchField: 'lineNumber', - searchTitle: '采购订单信息', - searchAllSchemas: PurchaseDetail.allSchemas, - searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber, - searchCondition: [ - { - key: 'number', - value: 'poNumber', - message: '请填写订单号！', - isMainValue: true - }, - { - key: 'available', - value: 'TRUE', - isMainValue: false - } - ] - } - }, { label: '品番', field: 'itemCode', @@ -827,14 +770,14 @@ export const PurchasePlanDetail = useCrudSchemas( isTableForm: false, isForm: false, isTable: true, - isDetail:false + isDetail: false }, { label: '背番', field: 'backNumber', sort: 'custom', isSearch: true, - hiddenSearchHigh:true, + hiddenSearchHigh: true, table: { width: 150 }, @@ -851,25 +794,137 @@ export const PurchasePlanDetail = useCrudSchemas( } }, { - label: '品番状态', - field: 'itemStatus', + label: '计划采购数量', + field: 'planQty', sort: 'custom', - dictType: DICT_TYPE.ITEM_STATUS, - dictClass: 'string', - isTable: true, - sortSearchDefault: 10, - sortTableDefault: 19, - hiddenInMain: true, + sortSearchDefault: 9, + sortTableDefault: 21, table: { width: 150 }, + tableForm: { + type: 'InputNumber', + precision: 6 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6 + } + } + }, + { + label: '受入号', + field: 'receivedNumber', + sort: 'custom', + sortSearchDefault: 1001, + sortTableDefault: 20, + isSearch: true, + table: { + width: 150 + }, + isTableForm: true, + hiddenInMain: true, + isForm: true, form: { componentProps: { disabled: true } }, tableForm: { - type: 'Select', + // type: 'Select', + disabled: true, + isPlaceholder: false + } + }, + { + label: '采购计量单位', + field: 'purchaseStdUom', + dictType: DICT_TYPE.UOM, + sort: 'custom', + sortSearchDefault: 9, + sortTableDefault: 25, + isForm: false, + isSearch: false, + isTableForm: true, + table: { + width: 150 + }, + tableForm: { + disabled: true + } + }, + { + label: '订单行', + field: 'poLine', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 16, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled: true, + isSearchList: false, + searchListPlaceholder: '请选择订单行', + searchField: 'lineNumber', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseDetail.allSchemas, + searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber, + searchCondition: [ + { + key: 'number', + value: 'poNumber', + message: '请填写订单号！', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] + } + }, + tableForm: { + multiple: true, + disabled: true, + isInpuFocusShow: false, + searchListPlaceholder: '请选择订单行', + searchField: 'lineNumber', + searchTitle: '采购订单信息', + searchAllSchemas: PurchaseDetail.allSchemas, + searchPage: PurchaseDetailApi.getPurchaseDetailPagePoNumber, + searchCondition: [ + { + key: 'number', + value: 'poNumber', + message: '请填写订单号！', + isMainValue: true + }, + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] + } + }, + { + label: '采购标包数量', + field: 'purchaseStdQty', + sort: 'custom', + sortSearchDefault: 8, + sortTableDefault: 24, + isForm: false, + isSearch: false, + isTableForm: true, + table: { + width: 150 + }, + tableForm: { disabled: true } }, @@ -894,27 +949,41 @@ export const PurchasePlanDetail = useCrudSchemas( sortTableDefault: 1000, }, { - label: '受入号', - field: 'receivedNumber', + label: '转换率', + field: 'convertRate', sort: 'custom', - sortSearchDefault: 1001, - sortTableDefault: 20, - isSearch:true, + sortSearchDefault: 9, + sortTableDefault: 26, + isForm: false, + isSearch: false, table: { width: 150 }, - isTableForm: true, + tableForm: { + disabled: true + } + }, + { + label: '品番状态', + field: 'itemStatus', + sort: 'custom', + dictType: DICT_TYPE.ITEM_STATUS, + dictClass: 'string', + isTable: true, + sortSearchDefault: 10, + sortTableDefault: 19, hiddenInMain: true, - isForm: true, + table: { + width: 150 + }, form: { componentProps: { disabled: true } }, tableForm: { - // type: 'Select', - disabled: true, - isPlaceholder:false + type: 'Select', + disabled: true } }, { @@ -939,27 +1008,7 @@ export const PurchasePlanDetail = useCrudSchemas( } } }, - { - label: '计划采购数量', - field: 'planQty', - sort: 'custom', - sortSearchDefault: 9, - sortTableDefault: 21, - table: { - width: 150 - }, - tableForm: { - type: 'InputNumber', - precision: 6 - }, - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 6 - } - } - }, + // { // label: '订单数量', // field: 'orderQty', @@ -978,22 +1027,7 @@ export const PurchasePlanDetail = useCrudSchemas( // disabled: true // } // }, - { - label: '采购标包数量', - field: 'purchaseStdQty', - sort: 'custom', - sortSearchDefault: 8, - sortTableDefault:24, - isForm: false, - isSearch: false, - isTableForm: true, - table: { - width: 150 - }, - tableForm: { - disabled:true - } - }, + { label: '计划采购计量单位', field: 'uom', @@ -1018,39 +1052,6 @@ export const PurchasePlanDetail = useCrudSchemas( disabled: true } }, - - { - label: '采购计量单位', - field: 'purchaseStdUom', - dictType: DICT_TYPE.UOM, - sort: 'custom', - sortSearchDefault: 9, - sortTableDefault:25, - isForm: false, - isSearch: false, - isTableForm: true, - table: { - width: 150 - }, - tableForm: { - disabled: true - } - }, - { - label: '转换率', - field: 'convertRate', - sort: 'custom', - sortSearchDefault: 9, - sortTableDefault: 26, - isForm: false, - isSearch: false, - table: { - width: 150 - }, - tableForm: { - disabled: true - } - }, { label: '已发采购数量', field: 'shippedQty', From a1b10ad97b01bc0b500e18de94a1d47f16c17198 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Tue, 10 Jun 2025 19:36:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?YT-2717:=E7=BA=B3=E5=85=A5=E5=8F=97?= =?UTF-8?q?=E9=A2=86=E4=B9=A6=E5=AF=BC=E5=85=A5=E6=B7=BB=E5=8A=A0loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ImportForm/src/ImportFormStep.vue | 13 +++-- .../deliverRecordMain.data.ts | 52 +++++++++++++------ 2 files changed, 44 insertions(+), 21 deletions(-) diff --git a/src/components/ImportForm/src/ImportFormStep.vue b/src/components/ImportForm/src/ImportFormStep.vue index aa795a718..07a7d8ca3 100644 --- a/src/components/ImportForm/src/ImportFormStep.vue +++ b/src/components/ImportForm/src/ImportFormStep.vue @@ -56,7 +56,7 @@
-
+
- {{ t('ts.下一步') }} - {{ t('ts.好的') }} + {{ t('ts.下一步') }} + {{ t('ts.好的') }}{{ t('ts.取 消') }} @@ -298,14 +298,17 @@ const open = () => { defineExpose({ open }) // 提供 open 方法，用于打开弹窗 const formRef = ref() +const isShowLoading = ref(false) /** 提交表单 */ const submitForm = async () => { // 如果当前在确认数据步骤，调用确认函数 if (active.value === 1) { - if(error.value){ + isShowLoading.value = true + if(error.value){ dialogVisible.value = false error.value = false + isShowLoading.value = false }else{ if (props.confirmFormSuccess) { await props.confirmFormSuccess(props.tableObject.tableList, @@ -313,11 +316,13 @@ const submitForm = async () => { if(msg){ message.error(msg) error.value = false + isShowLoading.value = false return }else{ message.success("导入成功！") error.value = false active.value = 2 // 设置为第三步 + isShowLoading.value = false return } } diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index 608fdca4e..3da24ff4c 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -43,24 +43,24 @@ export const DeliverRecordMain = useCrudSchemas( } } }, - { - label: '客户订单号', - field: 'customerOrderNumber', - sort: 'custom', - table: { - width: 180 - }, - isTable: true, - isForm: false, - isSearch: true, - hiddenSearchHigh: true, - search: { - component: 'Input', - componentProps: { + // { + // label: '客户订单号', + // field: 'customerOrderNumber', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isTable: true, + // isForm: false, + // isSearch: true, + // hiddenSearchHigh: true, + // search: { + // component: 'Input', + // componentProps: { - } - }, - }, + // } + // }, + // }, { label: '客户代码', field: 'customerCode', @@ -579,6 +579,24 @@ export const DeliverRecordDetail = useCrudSchemas(reactive([ isTable: false, isTableForm: false, }, + { + label: '客户订单号', + field: 'customerOrderNumber', + sort: 'custom', + table: { + width: 180 + }, + isTable: true, + isForm: false, + isSearch: true, + hiddenSearchHigh: false, + search: { + component: 'Input', + componentProps: { + + } + }, + }, { label: '品番', field: 'itemCode',