diff --git a/src/api/wms/countadjustRequestMain/index.ts b/src/api/wms/countadjustRequestMain/index.ts index d1612bd5e..903e29a00 100644 --- a/src/api/wms/countadjustRequestMain/index.ts +++ b/src/api/wms/countadjustRequestMain/index.ts @@ -94,6 +94,6 @@ export const refused = async (id) => { } // 处理盘点申请主 Excel -export const handle = async (id) => { - return await request.put({ url: `/wms/countadjust-request-main/handle?id=` + id }) +export const handle = async ({id,remark}) => { + return await request.put({ url: `/wms/countadjust-request-main/handle?id=` + id + '&remark='+remark }) } diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts index d1f6cd14c..554eda0b0 100644 --- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts @@ -175,14 +175,6 @@ export const CountadjustRecordMain = useCrudSchemas(reactive([ // width: 150 // }, // }, - { - label: '备注', - field: 'remark', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '创建时间', field: 'createTime', @@ -248,6 +240,14 @@ export const CountadjustRecordMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 150 + }, + }, ])) //表单校验 diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts index b8a8b0e8b..ef8cbceb1 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts @@ -679,3 +679,24 @@ export const CountadjustRequestDetailRules = reactive({ { required: true, message: '请选择物料代码', trigger: 'change' } ], }) + +export const CountadjustHandle = useCrudSchemas(reactive([ + { + label: '备注', + field: 'remark', + sort: 'custom', + isTable:false, + form: { + component: 'Input', + componentProps:{ + type: 'textarea' + } + }, + }, +])) + +export const CountadjustHandleRules = reactive({ + // remark: [ + // { max: 50, message: '不得超过50个字符', trigger: 'blur' } + // ], +}) \ No newline at end of file diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue index cf39ad414..0d3b3dbad 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue @@ -78,6 +78,16 @@ @searchTableSuccessDetail="searchTableSuccessDetail" /> + + + @@ -86,7 +96,7 @@