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',