diff --git a/.env.wyf b/.env.wyf index 7ee319b35..10790b758 100644 --- a/.env.wyf +++ b/.env.wyf @@ -15,11 +15,11 @@ VITE_DEV=false # # 上传路径 # VITE_UPLOAD_URL='http://192.168.0.216:12080/admin-api/infra/file/upload' -# # 雪冰 +# 雪冰 # # # 请求路径 -# VITE_BASE_URL='http://192.168.1.68:12080' +# VITE_BASE_URL='http://192.168.0.34:12080' # # 上传路径 -# VITE_UPLOAD_URL='http://192.168.1.68:12080/admin-api/infra/file/upload' +# VITE_UPLOAD_URL='http://192.168.0.34:12080/admin-api/infra/file/upload' # # 依然 # # # 请求路径 # VITE_BASE_URL='http://192.168.1.253:12080' @@ -33,6 +33,11 @@ VITE_DEV=false # VITE_UPLOAD_URL='http:// 192.168.0.106:12080/admin-api/infra/file/upload' +# # 陈放 +# # 请求路径 +# VITE_BASE_URL='http://192.168.0.26:12080' +# # 上传路径 +# VITE_UPLOAD_URL='http:// 192.168.0.26:12080/admin-api/infra/file/upload' # 佳兴 @@ -46,10 +51,10 @@ VITE_DEV=false # # 上传路径 # VITE_UPLOAD_URL='http://192.168.0.37:12080/admin-api/infra/file/upload' -# 81 WMS请求路径 82 SCP -VITE_BASE_URL='http://172.22.32.9/api' -# 上传路径 -VITE_UPLOAD_URL='http://172.22.32.9/api/admin-api/infra/file/upload' +# # 81 WMS请求路径 82 SCP +# VITE_BASE_URL='https://wmscdtest.faway-hella.com/api' +# # 上传路径 +# VITE_UPLOAD_URL='https://wmscdtest.faway-hella.com/api/admin-api/infra/file/upload' @@ -63,10 +68,10 @@ VITE_UPLOAD_URL='http://172.22.32.9/api/admin-api/infra/file/upload' # # 上传路径 # VITE_UPLOAD_URL='https://scptest.faway-hella.com/api/admin-api/infra/file/upload' -# # scptest -# VITE_BASE_URL='http://172.21.32.16/api' -# # 上传路径 -# VITE_UPLOAD_URL='http://172.21.32.16/api/admin-api/infra/file/upload' +# scptest +VITE_BASE_URL='http://172.21.32.16/api' +# 上传路径 +VITE_UPLOAD_URL='http://172.21.32.16/api/admin-api/infra/file/upload' diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index 2a2445c38..a3b9fff17 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -120,6 +120,18 @@ export const getBalancePageByBusinessTypeByItemType = async (params) => { } } + +// 查询库存余额列表根据业务类型的物料类型--制品回收 +export const getBalancePageByBusinessTypeByItemTypeProductredress = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/balance/seniorBusinessTypeByItemTypeProductredress', data }) + } else { + return await request.get({ url: `/wms/balance/pageBusinessTypeByItemTypeProductredress`, params }) + } +} + // 备件出库查询库存余额列表 export const getBalancePageSpare = async (params) => { if (params.isSearch) { 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/assets/imgs/logo1.png b/src/assets/imgs/logo1.png index 0dcd2fa03..8a49dd46c 100644 Binary files a/src/assets/imgs/logo1.png and b/src/assets/imgs/logo1.png differ diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts index 93b4a8b26..b2d91cfc1 100644 --- a/src/router/modules/remaining.ts +++ b/src/router/modules/remaining.ts @@ -36,7 +36,7 @@ const remainingRouter: AppRouteRecordRaw[] = [ { path: '/redirect', component: Layout, - name: 'Redirect', + name: 'redirectNew', children: [ { path: '/redirect/:path(.*)', diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue index eed1bd1e9..ce73c88de 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue @@ -191,14 +191,17 @@ const formsSuccess = async (formType,data) => { if(data.activeTime==0)data.activeTime = null; if(data.expireTime==0)data.expireTime = null; basicFormRef.value.formLoading = true - if (formType === 'create') { - await CustomerdockApi.createCustomerdock(data) - message.success(t('common.createSuccess')) - } else { - await CustomerdockApi.updateCustomerdock(data) - message.success(t('common.updateSuccess')) + try { + if (formType === 'create') { + await CustomerdockApi.createCustomerdock(data) + message.success(t('common.createSuccess')) + } else { + await CustomerdockApi.updateCustomerdock(data) + message.success(t('common.updateSuccess')) + } + } finally { + basicFormRef.value.formLoading = false } - basicFormRef.value.formLoading = false basicFormRef.value.dialogVisible = false if (formType === 'create') { getList() diff --git a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts index 06e5da55d..29b55c41a 100644 --- a/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts +++ b/src/views/wms/countManage/count/countPlanMain/countPlanMain.data.ts @@ -257,7 +257,7 @@ export const CountPlanMain = useCrudSchemas(reactive([ table: { width: 150 }, - isTable: false + isTable: true }, { label: '创建者', 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..562e6723a 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 @@