diff --git a/.env.wyf b/.env.wyf index 323d8245a..e797b754c 100644 --- a/.env.wyf +++ b/.env.wyf @@ -7,7 +7,7 @@ VITE_DEV=false # SCP 28040 # WMS 28050 -# # 请求路径 +# 请求路径 VITE_BASE_URL='http://dev.ccwin-in.com:28050/api' # 上传路径 diff --git a/package.json b/package.json index 03129b88d..e2fe74cd1 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "private": false, "scripts": { "dev": "vite", + "wyf": "vite --mode wyf", "test": "vite build --mode test", "prod": "vite build --mode prod", "preview": "vite preview", diff --git a/src/api/wms/purchaseClaimRecordDetail/index.ts b/src/api/wms/purchaseClaimRecordDetail/index.ts new file mode 100644 index 000000000..3566d0afe --- /dev/null +++ b/src/api/wms/purchaseClaimRecordDetail/index.ts @@ -0,0 +1,41 @@ +import request from '@/config/axios' +// 获得采购索赔子分页 +export const getPurchaseClaimRecordDetailPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchaseClaim-record-detail/senior', data }) + } else { + return await request.get({ url: `/wms/purchaseClaim-record-detail/page`, params }) + } +} + +// 创建采购索赔子 +export const createPurchaseClaimRecordDetail = async (data) => { + return await request.post({ url: `/wms/purchaseClaim-record-detail/create`, data }) +} + +// 修改采购索赔子 +export const updatePurchaseClaimRecordDetail = async (data) => { + return await request.put({ url: `/wms/purchaseClaim-record-detail/update`, data }) +} +// 删除采购索赔子 +export const deletePurchaseClaimRecordDetail = async (id) => { + return await request.delete({ url: `/wms/purchaseClaim-record-detail/delete?id=` + id }) +} + +// 获得采购索赔子 +export const getPurchaseClaimRecordDetail = async (id) => { + return await request.get({ url: `/wms/purchaseClaim-record-detail/get?id=` + id }) +} + + +// 导出采购索赔子 Excel +export const exportPurchaseClaimRecordDetailExcel = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({url: `/wms/purchaseClaim-record-detail/export-excel-senior`, data}) + } else { + return await request.download({ url: `/wms/purchaseClaim-record-detail/export-excel`, params }) + } +} diff --git a/src/api/wms/purchaseClaimRecordMain/index.ts b/src/api/wms/purchaseClaimRecordMain/index.ts new file mode 100644 index 000000000..257144e5c --- /dev/null +++ b/src/api/wms/purchaseClaimRecordMain/index.ts @@ -0,0 +1,69 @@ +import request from '@/config/axios' +export interface PurchaseClaimRecordMainVO { + id: number + number: string + supplierCode: string + claimTime: Date + status: string + supplierinvoiceNumber: string + remark: string + available: string + siteId: string + concurrencyStamp: string +} + +// 查询采购索赔主列表 +export const getPurchaseClaimRecordMainPage = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchaseClaim-record-main/senior', data }) + } else { + return await request.get({ url: `/wms/purchaseClaim-record-main/page`, params }) + } +} + +// 查询采购索赔主详情 +export const getPurchaseClaimRecordMain = async (id: number) => { + return await request.get({ url: `/wms/purchaseClaim-record-main/get?id=` + id }) +} + +// 新增采购索赔主 +export const createPurchaseClaimRecordMain = async (data: PurchaseClaimRecordMainVO) => { + return await request.post({ url: `/wms/purchaseClaim-record-main/create`, data }) +} + +// 修改采购索赔主 +export const updatePurchaseClaimRecordMain = async (data: PurchaseClaimRecordMainVO) => { + return await request.put({ url: `/wms/purchaseClaim-record-main/update`, data }) +} + +// 删除采购索赔主 +export const deletePurchaseClaimRecordMain = async (id: number) => { + return await request.delete({ url: `/wms/purchaseClaim-record-main/delete?id=` + id }) +} + +// 提交审批采购索赔 +export const subPurchaseClaimRecordMain = async (id: number) => { + return await request.delete({ url: `/wms/purchaseClaim-record-main/subPurchaseClaimRecordMain?id=` + id }) +} + +// 审批通过采购索赔 +export const agreePurchaseClaimRecordMain = async (id: number) => { + return await request.delete({ url: `/wms/purchaseClaim-record-main/agreePurchaseClaimRecordMain?id=` + id }) +} + +// 审批驳回采购索赔 +export const rejectPurchaseClaimRecordMain = async (id: number) => { + return await request.delete({ url: `/wms/purchaseClaim-record-main/rejectPurchaseClaimRecordMain?id=` + id }) +} + +// 导出采购索赔主 Excel +export const exportPurchaseClaimRecordMain = async (params) => { + return await request.download({ url: `/wms/purchaseClaim-record-main/export-excel`, params }) +} + +// 下载用户导入模板 +export const importTemplate = () => { + return request.download({ url: '/wms/purchaseClaim-record-main/get-import-template' }) +} \ No newline at end of file diff --git a/src/api/wms/purchaseClaimRequestDetail/index.ts b/src/api/wms/purchaseClaimRequestDetail/index.ts index c2242cf33..49edb64be 100644 --- a/src/api/wms/purchaseClaimRequestDetail/index.ts +++ b/src/api/wms/purchaseClaimRequestDetail/index.ts @@ -29,7 +29,6 @@ export const getPurchaseClaimRequestDetail = async (id) => { return await request.get({ url: `/wms/purchase-claim-request-detail/get?id=` + id }) } - // 导出采购索赔子 Excel export const exportPurchaseClaimRequestDetailExcel = async (params) => { if (params.isSearch) { diff --git a/src/api/wms/purchaseClaimRequestMain/index.ts b/src/api/wms/purchaseClaimRequestMain/index.ts index 6836bb2cd..9a7356333 100644 --- a/src/api/wms/purchaseClaimRequestMain/index.ts +++ b/src/api/wms/purchaseClaimRequestMain/index.ts @@ -46,17 +46,17 @@ export const deletePurchaseClaimRequestMain = async (id: number) => { // 提交审批采购索赔 export const subPurchaseClaimRequestMain = async (id: number) => { - return await request.delete({ url: `/wms/purchaseClaim-request-main/subPurchaseClaimRequestMain?id=` + id }) + return await request.post({ url: `/wms/purchaseClaim-request-main/sub?id=` + id }) } // 审批通过采购索赔 export const agreePurchaseClaimRequestMain = async (id: number) => { - return await request.delete({ url: `/wms/purchaseClaim-request-main/agreePurchaseClaimRequestMain?id=` + id }) + return await request.post({ url: `/wms/purchaseClaim-request-main/agree?id=` + id }) } // 审批驳回采购索赔 export const rejectPurchaseClaimRequestMain = async (id: number) => { - return await request.delete({ url: `/wms/purchaseClaim-request-main/rejectPurchaseClaimRequestMain?id=` + id }) + return await request.post({ url: `/wms/purchaseClaim-request-main/reject?id=` + id }) } // 导出采购索赔主 Excel diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts index ecc2cce07..ad2840351 100644 --- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts +++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts @@ -347,7 +347,10 @@ export const Itembasic = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', - isTable: false + isTable: true, + table: { + width: 180 + }, }, { label: '创建者', diff --git a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue index a1ec4351f..a888d8fbe 100644 --- a/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue +++ b/src/views/wms/basicDataManage/labelManage/purchasePackage/index.vue @@ -133,7 +133,10 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row } if (formField == 'toDockCode') { setV['receivedLocation'] = val[0]['name'] - setV['defaultReceivingArea'] = val[0]['remark'] + setV['defaultReceivingArea'] = val[0]['areaCode'] + } + if (formField == 'packUnit') { + setV['packQty'] = val[0]['packQty'] } basicFormRef.setValues(setV) }) @@ -229,7 +232,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'delete') { // 删除 handleDelete(row.id) } else if (val == 'point') { // 标签打印 - handlePoint(row) + handleDocumentPrint(row.id) } else if (val == 'enable') { handleEnable(row.id) } else if (val == 'disable') { @@ -306,6 +309,12 @@ const handleExport = async () => { } const BASE_URL = getJmreportBaseUrl() +const documentSrc = ref(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()) +const handleDocumentPrint = async (id) => { + window.open(documentSrc.value + '&id=' + id) +} + + const labelType = ref('') // 标签类别 采购还是制造等 const handlePoint = async (row) => { PackageApi.getBalanceToPackage(row.relateNumber).then(res => { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue index 34ed4b862..1b9035c0a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/arrivalInspectionStrategy/AddForm.vue @@ -25,22 +25,22 @@ - + - + - + - + @@ -60,7 +60,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue index f2bb3979e..743fc5996 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/AddForm.vue @@ -25,22 +25,22 @@ - + - + - + - + @@ -58,7 +58,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeSupplierCustomer" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue index 7942a9f07..0158f9739 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/batchStrategy/index.vue @@ -144,8 +144,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue new file mode 100644 index 000000000..2c3204eea --- /dev/null +++ b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/AddForm.vue @@ -0,0 +1,1208 @@ + + + + diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/index.vue new file mode 100644 index 000000000..96e297849 --- /dev/null +++ b/src/views/wms/basicDataManage/strategySetting/strategy/deliverStrategy/index.vue @@ -0,0 +1,170 @@ + + + + diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue index f638c1143..c1d18040e 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue @@ -26,22 +26,22 @@ - + - + - + - + @@ -54,53 +54,53 @@ - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + @@ -544,91 +557,91 @@ - - - - - + + + + + + + + + - - -
- - {{ cur.label }} - -
- - + + + + + + + + + + + + + + - - - - - + + + + + + + + + - - - - - + + + + + + + + + - - - 小时 - - + + + + + + + + + + - - - - - + + + + + + + + + - - - - - + + + + + + + + + - - - - - + + + + + + + + + @@ -665,9 +678,8 @@ import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/l import { isString } from '@/utils/is' import { DICT_TYPE, getStrDictOptions } from '@/utils/dict' import * as TransactiontypeApi from '@/api/wms/transactiontype' -import { Transactiontype } from '@/views/wms/basicDataManage/documentSetting/transactiontype/transactiontype.data' - - +import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data' +import * as ProductionlineApi from '@/api/wms/productionline' const { t } = useI18n() // 国际化 @@ -693,18 +705,10 @@ const formData = ref({ status: true, //状态 //规则条件集合 condition: [ - // 供应商 - { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }, // 物料类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemType', Operator: 'IN', Value: '' }, - // 重量/体积/面积 - { ParamCode: 'Weight', Operator: '>', Value: [] }, - // 库存状态 - { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] }, - // 存储类型 - { ParamCode: 'StorageType', Operator: 'IN', Value: [] }, - // 库存事务 - { ParamCode: 'TransactionType', Operator: 'IN', Value: '' } + // 生产线 + { ParamCode: 'Productionline', Operator: 'IN', Value: '' } ], configuration: { // 仓库代码 @@ -789,7 +793,8 @@ const options = reactive({ { value: 'ItemGroup', label: '物料分组' }, { value: 'ItemCode', label: '物料' }, { value: 'Project', label: '项目' }, - { value: 'AbcClass', label: 'ABC类' } + { value: 'AbcClass', label: 'ABC类' }, + { value: 'ItemStatus', label: '物料状态' } ], // 重量体积面积类型列表 calculationTypeOptions: [ @@ -1007,10 +1012,10 @@ const blurWarehouse = async ()=>{ //事务类型 const searchTransactionType = ()=>{ searchTableRef.value.open( - '请选择事务类型', - Transactiontype.allSchemas, - TransactiontypeApi.getTransactiontypePage, - 'TransactionType', + '请选择生产线', + Productionline.allSchemas, + ProductionlineApi.getProductionlinePage, + 'Productionline', 'code', true, undefined, @@ -1096,8 +1101,8 @@ const searchWarehouse = ()=>{ } const searchTableSuccess = (formField, searchField, val, type, row) => { - if(formField=='TransactionType'){ - let transactionType = formData.value.condition.find(item=>item['ParamCode']=='TransactionType') + if(formField=='Productionline'){ + let transactionType = formData.value.condition.find(item=>item['ParamCode']=='Productionline') if(transactionType){ transactionType.Value = val.map(item=>(item['code'])).join(',') } @@ -1164,11 +1169,14 @@ const open = async (type: string, strategyCode: string, id?: number) => { if (data.condition) { formData.value.condition = JSON.parse(data.condition) formData.value.condition.forEach((item, index) => { + console.log(item) if ((item.Operator == 'IN' || item.Operator == 'NOT IN')&& Array.isArray(item.Value)) { + console.log(item.Value) item.Value = item.Value.split(',') } }) } + console.log(formData.value.condition) if (data.configuration) { formData.value.configuration = JSON.parse(data.configuration) } @@ -1298,8 +1306,8 @@ const resetForm = () => { { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] }, // 存储类型 { ParamCode: 'StorageType', Operator: 'IN', Value: [] }, - // 库存事务 - { ParamCode: 'TransactionType', Operator: 'IN', Value: '' } + // 生产线 + { ParamCode: 'Productionline', Operator: 'IN', Value: '' } ], configuration: { diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue index 9bcc87580..93abbd89f 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/index.vue @@ -148,8 +148,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue index f77dfc73c..0ffb8fa97 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/AddForm.vue @@ -26,22 +26,22 @@ - + - + - + - + @@ -57,7 +57,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue index 8c438ce6b..f682d1037 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/inspectStrategy/index.vue @@ -142,8 +142,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue index 2fab0b936..36f91fdf6 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/AddForm.vue @@ -25,17 +25,17 @@ - + - + - + @@ -58,6 +58,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeSupplierCustomer" + :disabled="formData.priority==0&&formType=='update'" > @@ -182,6 +192,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeWarehouse" + :disabled="formData.priority==0&&formType=='update'" > @@ -257,6 +272,7 @@ v-model="item.Operator" placeholder="请选择范围" style="width: 110px; margin-right: 10px" + :disabled="formData.priority==0&&formType=='update'" > diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue index 19298f953..68b336052 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/manageAccuracyStrategy/index.vue @@ -150,8 +150,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue index 7e869a6bd..19381acca 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/AddForm.vue @@ -36,7 +36,7 @@ - + diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue index a68e7d65a..2030179d0 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/purchaseReceiptStrategy/index.vue @@ -145,8 +145,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue index 99c769ab7..9390c60b5 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/repairMaterialStrategy/AddForm.vue @@ -25,17 +25,17 @@ - + - + - + @@ -57,6 +57,7 @@ v-model="item.ParamCode" placeholder="" @change="changeItemsType" + :disabled="formData.priority==0&&formType=='update'" style="width: 110px; margin-right: 10px" > @@ -85,6 +87,7 @@ clearable multiple collapse-tags + :disabled="formData.priority==0&&formType=='update'" v-if="item.ParamCode == 'ItemType'" > @@ -139,6 +146,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeWarehouse" + :disabled="formData.priority==0&&formType=='update'" > { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue index 058b73c13..c47e39274 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/storageCapacityStrategy/AddForm.vue @@ -25,22 +25,22 @@ - + - + - + - + @@ -58,7 +58,7 @@ placeholder="" @change="changeItemsType" style="width: 110px; margin-right: 10px" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > @@ -146,7 +146,7 @@ placeholder="" style="width: 110px; margin-right: 10px" @change="changeWarehouse" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue index 0fae5ae31..e3f868382 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/AddForm.vue @@ -37,7 +37,7 @@ - + @@ -58,8 +58,8 @@ v-model="item.ParamCode" placeholder="" style="width: 110px; margin-right: 10px" + :disabled="formData.priority==0&&formType=='update'" @change="changeWarehouseArea" - :disabled="formData.name=='默认规则'&&formType=='update'" > - - + + @@ -97,7 +97,7 @@ v-model="item.Operator" :placeholder="t('ts.请选择范围').replace('ts.','')" style="width: 110px; margin-right: 10px" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" @change="OperatorChange($event,item)" > - - + + @@ -146,7 +146,7 @@ - + diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue index c07e8e033..e1a3268ee 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/supplieDeliveryStrategy/index.vue @@ -173,8 +173,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:strategy:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:strategy:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index bd3ad9794..3b751646a 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -25,22 +25,22 @@ - + - + - + - + @@ -53,12 +53,76 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + @@ -373,36 +437,36 @@ - + - + - + - + @@ -566,7 +630,7 @@ - + - + - + @@ -674,16 +738,18 @@ const formData = ref({ status: true, //状态 //规则条件集合 condition: [ - // 供应商 - { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }, + // 仓库 + { ParamCode: 'WarehouseCode', Operator: 'IN', Value: '' }, + // // 供应商 + // { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }, // 物料类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemType', Operator: 'IN', Value: '' }, - // 重量/体积/面积 - { ParamCode: 'Weight', Operator: '>', Value: [] }, - // 库存状态 - { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] }, - // 存储类型 - { ParamCode: 'StorageType', Operator: 'IN', Value: [] }, + // // 重量/体积/面积 + // { ParamCode: 'Weight', Operator: '>', Value: [] }, + // // 库存状态 + // { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] }, + // // 存储类型 + // { ParamCode: 'StorageType', Operator: 'IN', Value: [] }, // 库存事务 // 业务类型 { ParamCode: 'TransactionType', Operator: 'IN', Value: '' }, ], @@ -893,10 +959,11 @@ const filterMethodWarehouseList = (query: string) => { const searchTableRef = ref() -const searchWarehouse = ()=>{ - - - if(warehouseType.value == 'WarehouseCode'){ +const searchTableModule = ref('') // 条件 / 配置 +const searchWarehouse = ({module='config',type})=>{ + searchTableModule.value = module + // module: config 配置 condition 条件 + if( module=='condition'&&type=='WarehouseCode' || module=='config'&&warehouseType.value == 'WarehouseCode'){ // 仓库 searchTableRef.value.open( '请选择仓库', @@ -909,7 +976,7 @@ const searchWarehouse = ()=>{ undefined, undefined ) - }else if(warehouseType.value == 'AreaCode'){ + }else if(module=='condition'&&type=='AreaCode' || module=='config'&&warehouseType.value == 'AreaCode'){ searchTableRef.value.open( '请选择库区', Area.allSchemas, @@ -922,7 +989,7 @@ const searchWarehouse = ()=>{ undefined ) - }else if(warehouseType.value == 'LocationGroupCode'){ + }else if(module=='condition'&&type=='LocationGroupCode' || module=='config'&&warehouseType.value == 'LocationGroupCode'){ searchTableRef.value.open( '请选择库位组', @@ -936,7 +1003,7 @@ const searchWarehouse = ()=>{ undefined ) - }else if(warehouseType.value == 'LocationCode'){ + }else if(module=='condition'&&type=='LocationCode' || module=='config'&&warehouseType.value == 'LocationCode'){ searchTableRef.value.open( '请选择库位', Location.allSchemas, @@ -952,75 +1019,79 @@ const searchWarehouse = ()=>{ } } -const blurWarehouse = async ()=>{ +const blurWarehouse = async ({module='config',type})=>{ + // 校验的值 let warehouseValue = formData.value.configuration[warehouseType.value] + let conditionObj = null + if(module=='condition'){ + // 规则条件 + conditionObj = formData.value.condition.find(item=>item['ParamCode']==type) + if(conditionObj){ + warehouseValue = conditionObj['Value'] + } + // { value: 'WarehouseCode', label: '仓库' }, + // { value: 'AreaCode', label: '库区' }, + // { value: 'LocationGroupCode', label: '库位组' }, + // { value: 'LocationCode', label: '库位' } + } if(!warehouseValue){ return } - if(warehouseType.value == 'WarehouseCode'){ + let verifyRes = [] + if(module=='condition'&&type=='WarehouseCode' || module=='config'&&warehouseType.value == 'WarehouseCode'){ // 仓库 - let verifyRes = await WarehouseApi.verifyWarehouse({ + verifyRes = await WarehouseApi.verifyWarehouse({ code:warehouseValue }) console.log('仓库verifyRes',verifyRes) - if(verifyRes&&verifyRes.length>0){ - // formData.value.configuration[warehouseType.value] = verifyRes.map(item=>(item['code'])).join(',') - let verifyList = verifyRes.map(item=>(item['code'])) - let codeList = formData.value.configuration[warehouseType.value].split(',') - formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',') - }else{ - formData.value.configuration[warehouseType.value] = '' - } - }else if(warehouseType.value == 'AreaCode'){ + }else if(module=='condition'&&type=='AreaCode' || module=='config'&&warehouseType.value == 'AreaCode'){ // 库区 - let verifyRes = await AreaApi.verifyAreaList({ + verifyRes = await AreaApi.verifyAreaList({ code:warehouseValue }) console.log('库区verifyRes',verifyRes) - if(verifyRes&&verifyRes.length>0){ - let verifyList = verifyRes.map(item=>(item['code'])) - let codeList = formData.value.configuration[warehouseType.value].split(',') - formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',') - }else{ - formData.value.configuration[warehouseType.value] = '' - } - }else if(warehouseType.value == 'LocationGroupCode'){ + }else if(module=='condition'&&type=='LocationGroupCode' || module=='config'&&warehouseType.value == 'LocationGroupCode'){ // 库位组 let verifyRes = await LocationgroupApi.verifyLocationgroup({ code:warehouseValue }) console.log('库位组verifyRes',verifyRes) - if(verifyRes&&verifyRes.length>0){ - let verifyList = verifyRes.map(item=>(item['code'])) - let codeList = formData.value.configuration[warehouseType.value].split(',') - formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',') - }else{ - formData.value.configuration[warehouseType.value] = '' - } - - }else if(warehouseType.value == 'LocationCode'){ + }else if(module=='condition'&&type=='LocationCode' || module=='config'&&warehouseType.value == 'LocationCode'){ // 库位 let verifyRes = await LocationApi.verifyLocation({ code:warehouseValue }) console.log('库位verifyRes',verifyRes) - if(verifyRes&&verifyRes.length>0){ - let verifyList = verifyRes.map(item=>(item['code'])) + } + if(verifyRes&&verifyRes.length>0){ + let verifyList = verifyRes.map(item=>(item['code'])) + if(module=='condition'){ + // 条件 + let codeList = warehouseValue.split(',') + conditionObj['Value'] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',') + }else{ + // 配置 let codeList = formData.value.configuration[warehouseType.value].split(',') formData.value.configuration[warehouseType.value] = codeList.filter(item=>verifyList.indexOf(item)>-1).join(',') + } + + }else{ + if(module=='condition'){ + // 条件 + conditionObj['Value'] = '' }else{ formData.value.configuration[warehouseType.value] = '' } } - - let fields = ['WarehouseCode','AreaCode','LocationGroupCode','LocationCode'] - fields.forEach(item=>{ - if(item!=warehouseType.value){ - formData.value.configuration[item] = '' - } - }) - + if(module!='condition'){ + let fields = ['WarehouseCode','AreaCode','LocationGroupCode','LocationCode'] + fields.forEach(item=>{ + if(item!=warehouseType.value){ + formData.value.configuration[item] = '' + } + }) + } } // 业务类型 const searchBusinessType = ()=>{ @@ -1085,14 +1156,24 @@ const searchTableSuccess = (formField, searchField, val, type, row) => { businessType.Value = val.map(item=>(item['code'])).join(',') } return + }else if(searchTableModule.value == 'condition'){ + // module: config 配置 condition 条件 + // 仓库 库区 库位 库位组 + let conditionObj = formData.value.condition.find(item=>['WarehouseCode','AreaCode','LocationGroupCode','LocationCode'].includes(item['ParamCode'])) + conditionObj['Value'] = val.map(item=>(item['code'])).join(',') + }else{ + // 配置 + // 仓库 库区 库位 库位组 + formData.value.configuration[warehouseType.value] = val.map(item=>(item['code'])).join(',') + let fields = ['WarehouseCode','AreaCode','LocationGroupCode','LocationCode'] + fields.forEach(item=>{ + if(item!=warehouseType.value){ + formData.value.configuration[item] = '' + } + }) + } - formData.value.configuration[warehouseType.value] = val.map(item=>(item['code'])).join(',') - let fields = ['WarehouseCode','AreaCode','LocationGroupCode','LocationCode'] - fields.forEach(item=>{ - if(item!=warehouseType.value){ - formData.value.configuration[item] = '' - } - }) + } // 选择仓库/库位/库位组/库区 const changeWarehouse = (e) => { @@ -1160,12 +1241,12 @@ const open = async (type: string, strategyCode: string, id?: number) => { } } - // 判断是获取客户列表还是供应上列表 - if (formData.value.condition[0].ParamCode == 'SupplierCode') { - getFormSupplierList() - } else { - getFormCustomerList() - } + // // 判断是获取客户列表还是供应上列表 + // if (formData.value.condition[0].ParamCode == 'SupplierCode') { + // getFormSupplierList() + // } else { + // getFormCustomerList() + // } // 判断是获取仓库/库位/库位组/库区列表 if ( 'WarehouseCode' in formData.value.configuration && @@ -1210,7 +1291,7 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗 /** 提交表单 */ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调 const submitForm = async () => { - let TransactionType = formData.value.condition[5]['Value'] + let TransactionType = formData.value.condition[2]['Value'] if(Array.isArray(TransactionType)){ TransactionType = TransactionType.join(',') } @@ -1241,7 +1322,7 @@ const submitForm = async () => { return } } - await blurWarehouse() + await blurWarehouse({module:'config',type:warehouseType.value}) // await blurTransactionType() if(warehouseType.value == 'WarehouseCode' && !formData.value.configuration.WarehouseCode){ // 仓库 @@ -1332,16 +1413,18 @@ const resetForm = () => { status: true, //状态 //规则条件集合 condition: [ - // 供应商 - { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }, + // 仓库 + { ParamCode: 'WarehouseCode', Operator: 'IN', Value: '' }, + // // 供应商 + // { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' }, // 物料类型/物料分组/物料/abc类/项目/ { ParamCode: 'ItemType', Operator: 'IN', Value: '' }, - // /重量/体积/面积 - { ParamCode: 'Weight', Operator: '>', Value: [] }, - // 库存状态 - { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] }, - // 存储类型 - { ParamCode: 'StorageType', Operator: 'IN', Value: [] }, + // // /重量/体积/面积 + // { ParamCode: 'Weight', Operator: '>', Value: [] }, + // // 库存状态 + // { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] }, + // // 存储类型 + // { ParamCode: 'StorageType', Operator: 'IN', Value: [] }, // 库存事务 // 业务类型 { ParamCode: 'TransactionType', Operator: 'IN', Value: '' }, ], diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue index 24f349a80..c96629754 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/index.vue @@ -198,8 +198,8 @@ const importSuccess = () => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue index cdfd8cadf..265c80d97 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/AddForm.vue @@ -35,7 +35,7 @@ - + diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue index d2e046e4e..757e3b14f 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/utensilCapacityStrategy/index.vue @@ -144,8 +144,8 @@ const isShowMainButton = (row,val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue index 48e3166a1..fe72ef1c1 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/warehouseStorageStrategy/AddForm.vue @@ -25,22 +25,22 @@ - + - + - + - + @@ -59,7 +59,7 @@ placeholder="" style="width: 120px; margin-right: 10px" @change="changeWarehouse" - :disabled="formData.name=='默认规则'&&formType=='update'" + :disabled="formData.priority==0&&formType=='update'" > { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi: 'wms:itembasic:update' }), // 编辑 - defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0), hasPermi: 'wms:itembasic:delete' }), // 删除 + defaultButtons.mainListEditBtn(null), // 编辑 + defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,0)}), // 删除 ] } diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index b579f0938..fe8b22b0b 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -681,6 +681,86 @@ export const UnplannedreceiptRequestMainRules = reactive({ ], }) +export const ItembasicShow = useCrudSchemas( +   reactive([ + { + label: '品番', + field: 'code', + sort: 'custom', + isSearch: true, + table: { + }, + }, + + { + label: '品名', + field: 'name', + sort: 'custom', + isSearch: true, + table: { + }, + }, + { + label: '描述1', + field: 'desc1', + sort: 'custom', + table: { + } , + // isTableForm:false + }, + { + label: '描述2', + field: 'desc2', + sort: 'custom', + table: { + } , + }, + { + label: '物料状态', + field: 'status', + sort: 'custom', + dictType: DICT_TYPE.ITEM_STATUS, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + } + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: true, + isTable: true, + table: { + } + }, + { + label: '种类', + field: 'category', + sort: 'custom', + dictType: DICT_TYPE.ITEM_CATEGORY, + dictClass: 'string', + isTable: false, + isDetail:false, + table: { + } , + }, + { + label: '类型', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.ITEM_TYPE, + dictClass: 'string', + isTable: true, + table: { + } , + }, +   ]) + ) + /** * @returns {Array} 计划外入库申请子表 */ @@ -713,7 +793,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive( table: { width: 150 }, - tableForm: { - disabled: true, - }, - form: { - componentProps: { - disabled: true - } - } }, { label: '数量', @@ -1840,8 +1832,55 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive( table: { width: 150 }, + isTable: false, tableForm: { - disabled: true + enterSearch: true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择生产线代码', + searchField: 'code', + searchTitle: '生产线信息', + searchAllSchemas: Productionline.allSchemas, + searchPage: ProductionlineApi.getProductionlinePage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }, { + key: 'workshopCode', + value: 'workshopCode', + message: '请填写车间代码！', + isMainValue: true + }] + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + enterSearch: true, + isSearchList: true, + searchListPlaceholder: '请选择生产线代码', + searchField: 'code', + searchTitle: '生产线信息', + searchAllSchemas: Productionline.allSchemas, + searchPage: ProductionlineApi.getProductionlinePage, + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }, { + key: 'workshopCode', + value: 'workshopCode', + message: '请填写车间代码！', + isMainValue: true + }], + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + } } }, { diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue index 2f3801adb..7bb9ebeb1 100644 --- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/index.vue @@ -161,7 +161,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({ hasPermi: 'wms:amv-purchasereceipt-record-main:export' }), // 导出 + defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchasereceipt-record-main:export' }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -235,15 +235,14 @@ const butttondata = (row, $index) => { } return [ defaultButtons.mainInspectRequestBtn({ - hasPermi: 'wms:amv-purchasereceipt-record-main:createInspectRequest', + hasPermi: 'wms:purchasereceipt-record-main:createInspectRequest', hide: isShowputawayRequestFlagButton(row) }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ - hasPermi: 'wms:amv-purchasereceipt-record-main:createPutawayRequest', - hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' + hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ - hasPermi: 'wms:amv-purchasereceipt-record-main:createPurchasereturnRecord', + hasPermi: 'wms:purchasereceipt-record-main:createPurchasereturnRecord', hide: row.purchasereturnRecordFlag == 'FALSE' }), // 生成采购退后记录申请 //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告 diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 45c51ab89..fbfcee548 100644 --- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -483,6 +483,25 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:12, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '创建时间', field: 'createTime', @@ -710,8 +729,10 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', isSearch: true, - isTable:false, isDetail:false, + table: { + width: 150 + }, search:{ componentProps:{ multiple:true, diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue index 9c07d4d43..263095103 100644 --- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/index.vue @@ -161,7 +161,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({ hasPermi: 'wms:bs-purchasereceipt-record-main:export' }), // 导出 + defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchasereceipt-record-main:export' }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -235,15 +235,14 @@ const butttondata = (row, $index) => { } return [ defaultButtons.mainInspectRequestBtn({ - hasPermi: 'wms:bs-purchasereceipt-record-main:createInspectRequest', + hasPermi: 'wms:purchasereceipt-record-main:createInspectRequest', hide: isShowputawayRequestFlagButton(row) }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ - hasPermi: 'wms:bs-purchasereceipt-record-main:createPutawayRequest', - hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' + hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ - hasPermi: 'wms:bs-purchasereceipt-record-main:createPurchasereturnRecord', + hasPermi: 'wms:purchasereceipt-record-main:createPurchasereturnRecord', hide: row.purchasereturnRecordFlag == 'FALSE' }), // 生成采购退后记录申请 //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告 diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 45c51ab89..fbfcee548 100644 --- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -483,6 +483,25 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:12, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '创建时间', field: 'createTime', @@ -710,8 +729,10 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', isSearch: true, - isTable:false, isDetail:false, + table: { + width: 150 + }, search:{ componentProps:{ multiple:true, diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/index.vue index 9d57dd1f6..f6d897888 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/index.vue @@ -189,7 +189,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({ hasPermi: 'wms:develop-purchasereceipt-job-main:export' }), // 导出 + defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchasereceipt-job-main:export' }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -252,7 +252,7 @@ const butttondata = (row, $index) => { defaultButtons.mainListJobAccBtn({ hide: isShowMainButton(row, ['1']) }), // 承接 defaultButtons.mainListJobCloBtn({ hide: isShowMainButton(row, ['1']), - hasPermi: 'wms:develop-purchasereceipt-job-main:close' + hasPermi: 'wms:purchasereceipt-job-main:close' }), // 关闭 defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // 放弃 // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 @@ -263,7 +263,7 @@ const butttondata = (row, $index) => { type: 'primary', icon: '', color: '', - hasPermi: 'wms:develop-purchasereceipt-job-main:refusal', + hasPermi: 'wms:purchasereceipt-job-main:refusal', link: true // 文本展现按钮 }, defaultButtons.mainListPlanCheckQualityReportBtn({ hide: isShowSourceTypeButton(row) }) // 查看质检报告 diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts index 46842c9f4..c80caf5a0 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -375,6 +375,25 @@ export const PurchasereceiptJobMain = useCrudSchemas( }, isTable: false }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '备注', field: 'remark', @@ -996,7 +1015,12 @@ export const PurchasereceiptJobDetail = useCrudSchemas( dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', sortTableDefault: 7, - isSearch: true + isSearch: true, + search:{ + componentProps:{ + multiple:true, + } + } }, { label: '物料描述1', diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue index 8dcc305fe..81df8c479 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/index.vue @@ -161,7 +161,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({ hasPermi: 'wms:develop-purchasereceipt-record-main:export' }), // 导出 + defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchasereceipt-record-main:export' }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -235,16 +235,15 @@ const butttondata = (row, $index) => { } return [ defaultButtons.mainInspectRequestBtn({ - hasPermi: 'wms:develop-purchasereceipt-record-main:createInspectRequest', + hasPermi: 'wms:purchasereceipt-record-main:createInspectRequest', hide: isShowputawayRequestFlagButton(row) }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ - hasPermi: 'wms:develop-purchasereceipt-record-main:createPutawayRequest', + hasPermi: 'wms:purchasereceipt-record-main:createPutawayRequest', hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ - hasPermi: 'wms:develop-purchasereceipt-record-main:createPurchasereturnRecord', - hide: row.purchasereturnRecordFlag == 'FALSE' + hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true }), // 生成采购退后记录申请 //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告 defaultButtons.mainListPlanCheckQualityReportBtn({ hide: isShowSourceTypeButton(row) }), // 查看质检报告 diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 45c51ab89..fbfcee548 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -483,6 +483,25 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:12, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '创建时间', field: 'createTime', @@ -710,8 +729,10 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', isSearch: true, - isTable:false, isDetail:false, + table: { + width: 150 + }, search:{ componentProps:{ multiple:true, diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue index de3fdfd3c..58df96c81 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue @@ -318,9 +318,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 + // defaultButtons.defaultAddBtn(null), // 新增 defaultButtons.defaultImportBtn(null), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:develop-purchasereceipt-request-main:export'}), // 导出 + defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-request-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -403,10 +403,10 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:develop-purchasereceipt-request-main:reAdd'}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:develop-purchasereceipt-request-main:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:develop-purchasereceipt-request-main:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:develop-purchasereceipt-request-main:agree'}), // 审批通过 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:purchasereceipt-request-main:reAdd'}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:submit'}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过 // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑 { label: '生成标签', @@ -419,8 +419,8 @@ const butttondata = (row,$index) => { link: true // 文本展现按钮 }, defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','6','8']) }), // 标签打印 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:develop-purchasereceipt-request-main:handle'}), // 处理 - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:develop-purchasereceipt-request-main:close'}), // 关闭 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭 defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 ] } @@ -462,6 +462,10 @@ const buttonTableClick = async (val, row) => { }) } await getDetailList() + detatableData.tableList.forEach(item=>{ + item.packQty = item.defaultPackQty + item.packUnit = item.defaultPackUnit + }) formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题 }else if (val == 'point') { // 标签打印 diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index ecbfbdb58..0ebde31e5 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -564,6 +564,25 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isTable: false, isSearch: false, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '操作', field: 'action', @@ -785,6 +804,11 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive { } return [ defaultButtons.mainInspectRequestBtn({ - hasPermi: 'wms:jis-purchasereceipt-record-main:createInspectRequest', + hasPermi: 'wms:purchasereceipt-record-main:createInspectRequest', hide: isShowputawayRequestFlagButton(row) }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ - hasPermi: 'wms:jis-purchasereceipt-record-main:createPutawayRequest', - hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' + hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ - hasPermi: 'wms:jis-purchasereceipt-record-main:createPurchasereturnRecord', + hasPermi: 'wms:purchasereceipt-record-main:createPurchasereturnRecord', hide: row.purchasereturnRecordFlag == 'FALSE' }), // 生成采购退后记录申请 //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告 diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 45c51ab89..fbfcee548 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -483,6 +483,25 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:12, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '创建时间', field: 'createTime', @@ -710,8 +729,10 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', isSearch: true, - isTable:false, isDetail:false, + table: { + width: 150 + }, search:{ componentProps:{ multiple:true, diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue index f9cfe89a9..b58ee094b 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/index.vue @@ -92,7 +92,7 @@ { return [] } return [ - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:jis-purchasereceipt-request-main:reAdd'}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:jis-purchasereceipt-request-main:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:jis-purchasereceipt-request-main:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:jis-purchasereceipt-request-main:agree'}), // 审批通过 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:purchasereceipt-request-main:reAdd'}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:submit'}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过 // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑 { label: '生成标签', @@ -419,8 +419,8 @@ const butttondata = (row,$index) => { link: true // 文本展现按钮 }, defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','6','8']) }), // 标签打印 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:jis-purchasereceipt-request-main:handle'}), // 处理 - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:jis-purchasereceipt-request-main:close'}), // 关闭 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭 defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 ] } @@ -462,6 +462,10 @@ const buttonTableClick = async (val, row) => { }) } await getDetailList() + detatableData.tableList.forEach(item=>{ + item.packQty = item.defaultPackQty + item.packUnit = item.defaultPackUnit + }) formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题 }else if (val == 'point') { // 标签打印 diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index ecbfbdb58..0ebde31e5 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -564,6 +564,25 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isTable: false, isSearch: false, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '操作', field: 'action', @@ -785,6 +804,11 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '备注', field: 'remark', @@ -996,7 +1015,12 @@ export const PurchasereceiptJobDetail = useCrudSchemas( dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', sortTableDefault: 7, - isSearch: true + isSearch: true, + search:{ + componentProps:{ + multiple:true, + } + } }, { label: '物料描述1', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index 3dba46e9e..1fc6cbe04 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -248,8 +248,7 @@ const butttondata = (row, $index) => { hide: isShowputawayRequestFlagButton(row) }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ - hasPermi: 'wms:purchasereceipt-record-main:createPutawayRequest', - hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' + hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ hasPermi: 'wms:purchasereceipt-record-main:createPurchasereturnRecord', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 45c51ab89..fbfcee548 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -483,6 +483,25 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:12, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '创建时间', field: 'createTime', @@ -710,8 +729,10 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', isSearch: true, - isTable:false, isDetail:false, + table: { + width: 150 + }, search:{ componentProps:{ multiple:true, diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 9e91e01e5..953b58f20 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -462,6 +462,10 @@ const buttonTableClick = async (val, row) => { }) } await getDetailList() + detatableData.tableList.forEach(item=>{ + item.packQty = item.defaultPackQty + item.packUnit = item.defaultPackUnit + }) formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题 }else if (val == 'point') { // 标签打印 diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 6d613711f..fe463a7a0 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -564,6 +564,25 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isTable: false, isSearch: false, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '操作', field: 'action', @@ -785,6 +804,11 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive { } const BASE_URL = getJmreportBaseUrl() -const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken()) +const src = ref(BASE_URL + '/jmreport/view/1016548504713515008?token=' + getAccessToken()) getListApi: PurchasePlanDetailApi.getPurchasePlanDetailPage // 分页接口 // 标签打印 diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/index.vue b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/index.vue index 66df6c739..29c8049ae 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/index.vue @@ -189,7 +189,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({ hasPermi: 'wms:tool-purchasereceipt-job-main:export' }), // 导出 + defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchasereceipt-job-main:export' }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -252,7 +252,7 @@ const butttondata = (row, $index) => { defaultButtons.mainListJobAccBtn({ hide: isShowMainButton(row, ['1']) }), // 承接 defaultButtons.mainListJobCloBtn({ hide: isShowMainButton(row, ['1']), - hasPermi: 'wms:tool-purchasereceipt-job-main:close' + hasPermi: 'wms:purchasereceipt-job-main:close' }), // 关闭 defaultButtons.mainListJobAbaBtn({ hide: isShowMainButton(row, ['2']) }), // 放弃 // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行 @@ -263,7 +263,7 @@ const butttondata = (row, $index) => { type: 'primary', icon: '', color: '', - hasPermi: 'wms:tool-purchasereceipt-job-main:refusal', + hasPermi: 'wms:purchasereceipt-job-main:refusal', link: true // 文本展现按钮 }, defaultButtons.mainListPlanCheckQualityReportBtn({ hide: isShowSourceTypeButton(row) }) // 查看质检报告 diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts index 46842c9f4..c80caf5a0 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -375,6 +375,25 @@ export const PurchasereceiptJobMain = useCrudSchemas( }, isTable: false }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '备注', field: 'remark', @@ -996,7 +1015,12 @@ export const PurchasereceiptJobDetail = useCrudSchemas( dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', sortTableDefault: 7, - isSearch: true + isSearch: true, + search:{ + componentProps:{ + multiple:true, + } + } }, { label: '物料描述1', diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue index a15a8fc31..2ff8e1048 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/index.vue @@ -161,7 +161,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultExportBtn({ hasPermi: 'wms:tool-purchasereceipt-record-main:export' }), // 导出 + defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchasereceipt-record-main:export' }), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null) // 设置 @@ -235,15 +235,15 @@ const butttondata = (row, $index) => { } return [ defaultButtons.mainInspectRequestBtn({ - hasPermi: 'wms:tool-purchasereceipt-record-main:createInspectRequest', + hasPermi: 'wms:purchasereceipt-record-main:createInspectRequest', hide: isShowputawayRequestFlagButton(row) }), // 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({ - hasPermi: 'wms:tool-purchasereceipt-record-main:createPutawayRequest', - hide: row.isPutaway==1?row.putawayRequestFlag == 'FALSE':'TRUE' + // hasPermi: 'wms:tool-purchasereceipt-record-main:createPutawayRequest', + hide: (row.isPutaway==1 || row.putawayRequestFlag == 'FALSE')?false:true }), // 生成采购上架申请 defaultButtons.mainPurchasereturnRecordBtn({ - hasPermi: 'wms:tool-purchasereceipt-record-main:createPurchasereturnRecord', + hasPermi: true, hide: row.purchasereturnRecordFlag == 'FALSE' }), // 生成采购退后记录申请 //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告 diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 45c51ab89..fbfcee548 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -483,6 +483,25 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:12, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '创建时间', field: 'createTime', @@ -710,8 +729,10 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive dictType: DICT_TYPE.ITEM_TYPE, dictClass: 'string', isSearch: true, - isTable:false, isDetail:false, + table: { + width: 150 + }, search:{ componentProps:{ multiple:true, diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue index a28a602d9..a575b3724 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue @@ -318,9 +318,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn(null), // 新增 + // defaultButtons.defaultAddBtn(null), // 新增 defaultButtons.defaultImportBtn(null), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:tool-purchasereceipt-request-main:export'}), // 导出 + defaultButtons.defaultExportBtn({hasPermi:'wms:purchasereceipt-request-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -403,10 +403,10 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:tool-purchasereceipt-request-main:reAdd'}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:tool-purchasereceipt-request-main:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:tool-purchasereceipt-request-main:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:tool-purchasereceipt-request-main:agree'}), // 审批通过 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:purchasereceipt-request-main:reAdd'}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:submit'}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:refused'}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:purchasereceipt-request-main:agree'}), // 审批通过 // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-request-main:update'}), // 编辑 { label: '生成标签', @@ -419,8 +419,8 @@ const butttondata = (row,$index) => { link: true // 文本展现按钮 }, defaultButtons.mainListPointBtn({ hide: isASNShowMainButton(row, ['3','6','8']) }), // 标签打印 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:tool-purchasereceipt-request-main:handle'}), // 处理 - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:tool-purchasereceipt-request-main:close'}), // 关闭 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:purchasereceipt-request-main:handle'}), // 处理 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:purchasereceipt-request-main:close'}), // 关闭 defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 ] } @@ -462,6 +462,10 @@ const buttonTableClick = async (val, row) => { }) } await getDetailList() + detatableData.tableList.forEach(item=>{ + item.packQty = item.defaultPackQty + item.packUnit = item.defaultPackUnit + }) formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题 }else if (val == 'point') { // 标签打印 diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index ecbfbdb58..0ebde31e5 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -564,6 +564,25 @@ export const PurchasereceiptRequestMain = useCrudSchemas(reactive( isTable: false, isSearch: false, }, + { + label: '是否上架', + field: 'isPutaway', + sort: 'custom', + dictClass: 'string', + isForm: false, + isTableForm: false, + isTable: false, + detail:{ + dictType:'primary', + valueFilter:(value)=>{ + if(value==1){ + return `是` + }else{ + return '否' + } + } + } + }, { label: '操作', field: 'action', @@ -785,6 +804,11 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive([ + { + label: '单据号', + field: 'number', + sort: 'custom', + isSearch: true, + isForm: false, + table: { + width: 150 + }, + }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: {     + enterSearch:true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择供应商代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '供应商信息', // 查询弹窗标题 + searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 + searchPage: SupplierApi.getSupplierPageSCP, // 查询弹窗所需分页方法 + verificationParams: [{ + key: 'code', + action: '==', + value: '', + isMainValue: false, + isSearch: 'true', + isFormModel: true + }], // 失去焦点校验参数 + } + } + }, + { + label: '供应商名称', + field: 'supplierName', + isDetail: true, + isSearch: true, + table: { + width: 180 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled:true, + } + } + }, + { + label: '索赔时间', + field: 'claimTime', + sort: 'custom', + formatter: dateFormatter, + table: { + width: 180 + }, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, + }, + { + label: '供应商发票申请单号', + field: 'supplierinvoiceNumber', + sort: 'custom', + isSearch: true, + isForm:false, + form: { + componentProps: { + disabled: true + } + }, + table: { + width: 180 + }, + }, + { + label: '状态', + field: 'status', + dictType: DICT_TYPE.PURCHASECLAIM_REQUEST_STATUS, + dictClass: 'string', + isTable: true, + isForm:false, + sort: 'custom', + table: { + width: 150 + }, + isSearch: true, + form: { + value: '1', + componentProps: { + disabled: true + } + } + }, + { + label: '创建时间', + field: 'createTime', + formatter: dateFormatter, + isForm:false, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, + isSearch: false, + search: { + component: 'DatePicker', + componentProps: { + valueFormat: 'YYYY-MM-DD HH:mm:ss', + type: 'daterange', + defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] + } + }, + }, + { + label: '创建者', + field: 'creator', + sort: 'custom', + isForm:false, + table: { + width: 150 + }, + }, + { + label: '操作', + field: 'action', + isForm: false, + isDetail: false, + table: { + width: 150, + fixed: 'right' + } + } +])) +// 表单校验 +export const PurchaseClaimRecordDetailRules = reactive({ + itemCode: [ + { required: true, message: '请输入物料代码', trigger: 'blur' } + ], + claimQty: [ + { required: true, message: '请输入索赔数量', trigger: 'blur' } + ], + claimAmount: [ + { required: true, message: '请输入索赔金额', trigger: 'blur' } + ], +}) + +export const PurchaseClaimRecordDetail = useCrudSchemas(reactive([ + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + isSearch: false, + table: { + width: 150, + + }, + tableForm:{ + multiple:false,//多选 + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码',// 输入框占位文本 + searchField: 'itemCode', // 查询弹窗赋值字段 + searchTitle: '供应商物料信息', // 查询弹窗标题 + searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类 + searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + action: '==', + isSearch: true, + isMainValue: false + },{ + key: 'supplierCode', + value: 'supplierCode', + action: '==', + message: '供应商代码不能为空!', + isFormModel:true, // filters中添加筛选的数据--取于formModel + required:true, // 前置添加必有，和isFormModel结合使用 + isSearch: true, + isMainValue: false + }], + verificationPage: ItembasicApi.getItemListByCodes, // tableForm下方输入框校验失去焦点之后是否正确的方法 + isShowTableFormSearch: false, //tableForm下方是否出现输入框 + verificationParams: [{ + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true, + }], // 失去焦点校验参数 + }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled:true, + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchField: 'itemCode', // 查询弹窗赋值字段 + searchTitle: '供应商物料信息', // 查询弹窗标题 + searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类 + searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + },{ + key: 'supplierCode', + value: 'supplierCode', + message: '供应商代码不能为空!', + isMainValue:true + } + ], + verificationParams: [ + { + key: 'itemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 + } + } + }, + + { + label: '物料名称', + field: 'itemName', + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled:true, + type: 'Select' + }, + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + isSearch: false, + isTable: true, + table: { + width: 110 + }, + tableForm: { + disabled:true, + type: 'Select' + }, + }, + { + label: '索赔数量', + field: 'claimQty', + sort: 'custom', + isSearch: false, + isTable: true, + table: { + width: 110 + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 0 + } + }, + { + label: '索赔金额', + field: 'claimAmount', + sort: 'custom', + isSearch: false, + isTable: true, + table: { + width: 110 + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 5 + } + }, + { + label: '操作', + field: 'action', + isDetail: false, + isForm: false, + hiddenInMain:true, + table: { + width: 150, + fixed: 'right' + }, + isTableForm: false, + } +])) diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue new file mode 100644 index 000000000..9da9ec473 --- /dev/null +++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue @@ -0,0 +1,453 @@ + + + diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts index 37bf58137..d9c899cb3 100644 --- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts +++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/PurchaseClaimRequestMain.data.ts @@ -66,6 +66,12 @@ export const PurchaseClaimRequestMain = useCrudSchemas(reactive([ table: { width: 180 }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + disabled:true, + } + } }, { label: '索赔时间', @@ -170,7 +176,7 @@ export const PurchaseClaimRequestMain = useCrudSchemas(reactive([ isForm: false, isDetail: false, table: { - width: 150, + width: 250, fixed: 'right' } } @@ -195,8 +201,6 @@ export const PurchaseClaimRequestDetail = useCrudSchemas(reactive( sort: 'custom', isSearch: false, table: { - width: 150, - }, tableForm:{ multiple:false,//多选 @@ -275,7 +279,10 @@ export const PurchaseClaimRequestDetail = useCrudSchemas(reactive( field: 'itemName', sort: 'custom', table: { - width: 150 + }, + tableForm: { + disabled:true, + type: 'Select' }, }, { @@ -287,11 +294,11 @@ export const PurchaseClaimRequestDetail = useCrudSchemas(reactive( isSearch: false, isTable: true, table: { - width: 110 }, tableForm: { + disabled:true, type: 'Select' - } + }, }, { label: '索赔数量', @@ -300,7 +307,6 @@ export const PurchaseClaimRequestDetail = useCrudSchemas(reactive( isSearch: false, isTable: true, table: { - width: 110 }, tableForm: { type: 'InputNumber', @@ -315,7 +321,6 @@ export const PurchaseClaimRequestDetail = useCrudSchemas(reactive( isSearch: false, isTable: true, table: { - width: 110 }, tableForm: { type: 'InputNumber', @@ -330,7 +335,6 @@ export const PurchaseClaimRequestDetail = useCrudSchemas(reactive( isForm: false, hiddenInMain:true, table: { - width: 150, fixed: 'right' }, isTableForm: false, diff --git a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue index e123e8d56..c1b32b578 100644 --- a/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue +++ b/src/views/wms/supplierManage/purchaseClaim/purchaseClaimRequest/index.vue @@ -242,16 +242,16 @@ const butttondata = (row, $index) => { hide: isShowMainButton(row, ['0']), hasPermi: `wms:purchaseClaimRequest:sub` }), // 提交审批 - defaultButtons.mainListPlanTurBtn({ - hide: isShowMainButton(row, ['3']), - hasPermi: `wms:purchaseClaimRequest:reject` - }), // 驳回 defaultButtons.mainListPlanAppBtn({ - hide: isShowMainButton(row, ['3']), + hide: isShowMainButton(row, ['2']), hasPermi: `wms:purchaseClaimRequest:agree` }), // 审批通过 + defaultButtons.mainListPlanTurBtn({ + hide: isShowMainButton(row, ['2']), + hasPermi: `wms:purchaseClaimRequest:reject` + }), // 驳回 defaultButtons.mainListEditBtn({ - hide: isShowMainButton(row, ['0']), + hide: isShowMainButton(row, ['0','2']), hasPermi: `wms:purchaseClaimRequest:update` }) // 编辑 ] @@ -266,6 +266,14 @@ const buttonTableClick = async (val, row) => { // 提交审批 handleSub(row.masterId) } + else if (val == 'mainPlanApp') { + // 审批通过 + handleAgree(row.masterId) + } + else if (val == 'mainPlanTur') { + // 审批驳回 + handleReject(row.masterId) + } else if (val == 'delete') { // 删除 handleDelete(row.masterId) @@ -291,6 +299,42 @@ const handleSub = async (masterId: number) => { } } +/** 审批通过按钮操作 */ +const handleAgree = async (masterId: number) => { + try { + // 关闭的二次确认 + await message.confirm(t('ts.是否审批通过所选中数据？')) + tableObject.loading = true + // 发起关闭 + await PurchaseClaimRequestMainApi.agreePurchaseClaimRequestMain(masterId) + message.success(t('ts.审批通过成功!')) + tableObject.loading = false + // 刷新列表 + await getList() + } catch { + } finally { + tableObject.loading = false + } +} + +/** 审批驳回按钮操作 */ +const handleReject = async (masterId: number) => { + try { + // 关闭的二次确认 + await message.confirm(t('是否审批驳回所选中数据？')) + tableObject.loading = true + // 发起关闭 + await PurchaseClaimRequestMainApi.rejectPurchaseClaimRequestMain(masterId) + message.success(t('审批驳回成功!')) + tableObject.loading = false + // 刷新列表 + await getList() + } catch { + } finally { + tableObject.loading = false + } +} + /** 添加/修改操作 */ const formRef = ref()