From d825d6cb6ef1790948a50cd44ae9a37ef6540790 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 8 Jan 2024 14:48:37 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=96=B0=E5=A2=9E=EF=BC=8C=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=89=A9=E6=96=99=20=E7=AD=9B=E9=80=89=20=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain.data.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 558667642..53ffbdb00 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -494,10 +494,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive searchAllSchemas: Balance.allSchemas, searchPage: BalanceApi.getBalancePageReturn, searchCondition:[{ - key: 'available', - value: 'TRUE', - isMainValue: false - },{ key: 'workshopCode', value: 'workshopCode', isMainValue: true From 2eec6817ab3a052bd7ea0ba2b66f074ae69fb5f3 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 8 Jan 2024 15:08:35 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7---?= =?UTF-8?q?=E7=BC=96=E8=BE=91=EF=BC=8C=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8D=95=E5=8F=B7=E5=8F=AF=E4=BB=A5=E6=8D=A2?= =?UTF-8?q?=E6=88=90=E5=88=AB=E7=9A=84=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain/index.vue | 29 +++++++++++++++---- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 1e2c76356..9b17eaccd 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -103,7 +103,7 @@ import * as PurchasereturnRequestMainApi from '@/api/wms/purchasereturnRequestMa import * as PurchasereturnRequestDetailApi from '@/api/wms/purchasereturnRequestDetail' import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail' import * as defaultButtons from '@/utils/disposition/defaultButtons' -import { log } from 'console' + // 采购退货申请 defineOptions({ name: 'PurchasereturnRequestMain' }) @@ -346,11 +346,28 @@ const formRef = ref() const openForm = async (type: string, row?: number) => { tableData.value = [] // 重置明细数据 isShowButton.value = true - PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => { - if (item.field == 'supplierCode') { - item.componentProps.disabled = false - } - }) + if(type == 'create'){ + PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => { + if (item.field == 'supplierCode') { + item.componentProps.disabled = false + } + if(item.field == 'purchaseReceiptRecordNumber'){ + item.componentProps.disabled = true + item.componentProps.isSearchList = true + } + }) + } + if(type == 'update'){ + PurchasereturnRequestMain.allSchemas.formSchema.forEach((item) => { + if (item.field == 'supplierCode') { + item.componentProps.disabled = false + } + if(item.field == 'purchaseReceiptRecordNumber'){ + item.componentProps.disabled = true + item.componentProps.isSearchList = false + } + }) + } formRef.value.open(type, row) } From 328e45f71b36562eae2324d4e64ba294f42276f6 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 8 Jan 2024 16:09:24 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=B7=BB=E5=8A=A0=E9=A1=B5=E9=9D=A2=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=80=89=E6=8B=A9=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspect/inspectRequestMain/index.vue | 20 +++++++++++++------ .../inspectRequestMain.data.ts | 13 ++---------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue index ffa85fa80..6babf91e1 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/index.vue @@ -71,25 +71,33 @@ // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef, type, row) => { nextTick(() => { + const setV = {} if (type == 'tableForm') { // 明细查询页赋值 - row[formField] = val[0][searchField] - row['itemCode'] = val[0]['code'] + if(formField == 'fromLocationCode'){ + row['fromLocationCode'] = val[0]['code'] + }else if(formField == 'itemCode'){ + row['itemCode'] = val[0]['itemCode'] + } } else { - const setV = {} setV[formField] = val[0][searchField] setV['purchaseReceiptRecordNumber'] = val[0]['number'] // setV['supplierCode'] = val[0]['supplierCode'] - formRef.setValues(setV) } + formRef.setValues(setV) }) } // 查询页面返回——详情 const searchTableSuccessDetail = (formField, searchField, val, formRef) => { nextTick(() => { const setV = {} - setV[formField] = val[0][searchField] - setV['itemCode'] = val[0]['code'] + if(formField == 'fromLocationCode'){ + setV['fromLocationCode'] = val[0]['code'] + }else if(formField == 'itemCode'){ + setV['itemCode'] = val[0]['itemCode'] + }else { + setV[formField] = val[0][searchField] + } formRef.setValues(setV) }) } diff --git a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts index 0b039f48a..c84385ac9 100644 --- a/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/inspect/inspectRequestMain/inspectRequestMain.data.ts @@ -591,19 +591,10 @@ export const InspectRequestDetail = useCrudSchemas(reactive([ disabled: true, isInpuFocusShow: true, earchListPlaceholder: '请选择包装号', - searchField: 'packingNumber', + searchField: 'itemCode', searchTitle: '库存余额信息', searchAllSchemas: Balance.allSchemas, - searchPage: BalanceApi.getBalancePagePutaway, - searchCondition: [{ - key: 'available', - value: 'TRUE', - isMainValue: false - }, { - key: 'workshopCode', - value: 'workshopCode', - isMainValue: true - }] + searchPage: BalanceApi.getBalancePagePutaway }, }, { From 833d1df95df323efac71aa822b6990f7b9111d9b Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Mon, 8 Jan 2024 17:22:01 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E6=96=B0=E5=A2=9E=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRequestMain/index.vue | 4 ++++ .../supplierinvoiceRequestMain.data.ts | 18 +----------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 72ff44a08..0e33360e9 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -90,6 +90,10 @@ row['poNumber'] = val[0]['poNumber'] row['poLine'] = val[0]['poLine'] row['itemCode'] = val[0]['itemCode'] + row['ownerCode'] = val[0]['ownerCode'] + row['batch'] = val[0]['batch'] + row['singlePrice'] = val[0]['singlePrice'] + row['amount'] = val[0]['amount'] } } else { const setV = {} diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 2e1cc7f72..a6e7517bb 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -576,10 +576,6 @@ export const SupplierinvoiceRequestDetailRules = reactive({ packingNumber: [ { required: true, message: '请输入包装号', trigger: 'blur' } ], - batch: [ - { required: true, message: '请输入批次', trigger: 'blur' }, - { max: 50, message: '不得超过50个字符', trigger: 'blur' } - ], poNumber: [ { required: true, message: '请输入订单号', trigger: 'blur' } ], @@ -597,17 +593,5 @@ export const SupplierinvoiceRequestDetailRules = reactive({ ], itemCode: [ { required: true, message: '请输入物品代码', trigger: 'blur' } - ], - ownerCode: [ - { max: 50, message: '不得超过50个字符', trigger: 'blur' } - ], - singlePrice: [ - { max: 50, message: '不得超过50个字符', trigger: 'blur' } - ], - amount: [ - { max: 50, message: '不得超过50个字符', trigger: 'blur' } - ], - remark: [ - { max: 50, message: '不得超过50个字符', trigger: 'blur' } - ], + ] }) From 8dbb6e0a15df3ad9873893c75dac6904fce6749f Mon Sep 17 00:00:00 2001 From: chenfang Date: Tue, 9 Jan 2024 08:46:30 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E5=88=B0=E5=BA=93=E4=BD=8D=E9=AB=98=E7=BA=A7=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E5=8A=9F=E8=83=BDapi=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/location/index.ts | 8 ++++- .../inventorymoveJobMain.data.ts | 24 +++++++------- .../inventorymoveRequestMain/index.vue | 31 +++++++++++++------ .../inventorymoveRequestMain.data.ts | 14 ++++++--- .../demandforecastingMain.data.ts | 2 +- .../purchaseMain/purchaseMain.data.ts | 4 +++ 6 files changed, 55 insertions(+), 28 deletions(-) diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts index 2165af0e6..1960d423a 100644 --- a/src/api/wms/location/index.ts +++ b/src/api/wms/location/index.ts @@ -76,5 +76,11 @@ export const importTemplate = () => { } export const selectBusinessTypeToLocation = async (params) => { - return request.get({ url: `/wms/location/pageBusinessTypeToLocation`, params }) + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/location/pageBusinessTypeToLocationSenior', data }) + } else { + return request.get({ url: `/wms/location/pageBusinessTypeToLocation`, params }) + } } \ No newline at end of file diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts index fedb5042f..452d235fc 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveJobMain/inventorymoveJobMain.data.ts @@ -700,7 +700,7 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive([ }, }, { - label: '从库存状态', + label: '库存状态', field: 'inventoryStatus', dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', @@ -710,17 +710,17 @@ export const InventorymoveJobDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '到库存状态', - field: 'toInventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - }, + // { + // label: '到库存状态', + // field: 'toInventoryStatus', + // dictType: DICT_TYPE.INVENTORY_STATUS, + // dictClass: 'string', + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // }, { label: '订单号', field: 'poNumber', diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 6309cde4c..f82635cc1 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -151,6 +151,11 @@ const { tableObject, tableMethods } = useTable({ fromInventoryStatus.value = null businessType.value = 'InventorymoveRequest' console.log(146 , businessType.value) +}else { + tableObject.params = { + fromInventoryStatus: 'OK', + toInventoryStatus:'SCRAP' + } } // 修改 tableform 属性 @@ -186,13 +191,6 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { delete item.tableForm.searchCondition } } - if(item.field == "toInventoryStatus"){ - if (fromInventoryStatus.value) { - item.tableForm.disabled = true - } else { - item.tableForm.disabled = false - } - } if(item.field == "toLocationCode"){ if (toInventoryStatus.value) { item.tableForm.searchCondition = [ @@ -252,7 +250,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => }else if ( routeName.value == 'ScraptoholdRequestMain') { row['toInventoryStatus'] = "HOLD" }else{ - row['toInventoryStatus'] = null + row['toInventoryStatus'] = val[0]['inventoryStatus'] } } else { row[formField] = val[0][searchField] @@ -287,7 +285,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { }else if ( routeName.value == 'ScraptoholdRequestMain') { setV['toInventoryStatus'] = "HOLD" }else{ - setV['toInventoryStatus'] = null + setV['toInventoryStatus'] = val[0]['inventoryStatus'] } } else { setV[formField] = val[0][searchField] @@ -454,7 +452,20 @@ const handleExport = async () => { // 发起导出 exportLoading.value = true const data = await InventorymoveRequestMainApi.exportInventorymoveRequestMain(setSearchParams) - download.excel(data, '库存转移申请主.xlsx') + if(routeName.value == 'OktoholdRequestMain'){ + download.excel(data, '合格转隔离申请主.xlsx') + }else if ( routeName.value == 'HoldtookRequestMain') { + download.excel(data, '隔离转合格申请主.xlsx') + }else if ( routeName.value == 'HoldtoscrapRequestMain') { + download.excel(data, '隔离转报废申请主.xlsx') + }else if ( routeName.value == 'OktoscrapRequestMain') { + download.excel(data, '合格转报废申请主.xlsx') + }else if ( routeName.value == 'ScraptoholdRequestMain') { + download.excel(data, '报废转隔离申请主.xlsx') + }else{ + download.excel(data, '库存转移申请主.xlsx') + } + } catch { } finally { exportLoading.value = false diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts index c216fd1b0..23e25d46b 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts @@ -152,8 +152,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ { label: '从库位类型范围', field: 'fromLocationTypes', - dictType: DICT_TYPE.LOCATION_TYPE, - dictClass: 'string', + // dictType: DICT_TYPE.LOCATION_TYPE, + // dictClass: 'string', isTable: true, sort: 'custom', table: { @@ -182,8 +182,8 @@ export const InventorymoveRequestMain = useCrudSchemas(reactive([ { label: '到库位类型范围', field: 'toLocationTypes', - dictType: DICT_TYPE.LOCATION_TYPE, - dictClass: 'string', + // dictType: DICT_TYPE.LOCATION_TYPE, + // dictClass: 'string', isTable: true, sort: 'custom', table: { @@ -726,8 +726,14 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( width: 150 }, tableForm: { + disabled: true, type: 'Select' }, + form: { + componentProps: { + disabled: true + } + } }, { label: '从货主代码', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index 2fc257724..eeee47d31 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -115,7 +115,7 @@ export const DemandforecastingMain = useCrudSchemas(reactive([ isForm: false, }, { - label: '单据号11', + label: '单据号', field: 'number', sort: 'custom', table: { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index fc91b560b..493e6c950 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -396,6 +396,10 @@ export const PurchaseDetail = useCrudSchemas(reactive([ key: 'available', value: 'TRUE', isMainValue: false + },{ + key: 'available', + value: 'TRUE', + isMainValue: false }] }, form: { From 46f11ce5bde39dda27f06e687996aff68ac3ec1e Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 9 Jan 2024 09:10:32 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E6=94=B9=E6=88=90=E5=8D=95=E6=8D=AE=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseclaim/purchaseclaimRequestMain/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue index cb5121f73..59aa208fb 100644 --- a/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue +++ b/src/views/wms/supplierManage/purchaseclaim/purchaseclaimRequestMain/index.vue @@ -61,6 +61,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import BasicForm from '@/components/BasicForm/src/BasicForm.vue' import TableHead from '@/components/TableHead/src/TableHead.vue' + import {mainListDocumentPrintBtn} from "@/utils/disposition/defaultButtons"; // 供应商索赔申请 defineOptions({ name: 'PurchaseclaimRequestMain' }) @@ -191,7 +192,7 @@ defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮 defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchaseclaim-request-main:update' }), // 编辑 defaultButtons.mainListDeleteBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchaseclaim-request-main:delete' }), // 删除 - defaultButtons.mainListPointBtn(null), // 打印 + defaultButtons.mainListDocumentPrintBtn(null), // 打印 // 生成记录 { label: '处理', @@ -234,7 +235,7 @@ openForm('update', row) } else if (val == 'delete') { // 删除 handleDelete(row.id) - } else if (val == 'point') { // 打印 + } else if (val == 'documentPrint') { // 打印 handlePoint(row.id) } }