From 1562ee7fc027401cda97d930ca74de65ba7f02be Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Wed, 29 May 2024 13:16:59 +0800 Subject: [PATCH 001/111] 404 --- src/locales/zh-CN.ts | 2 +- src/views/error/404.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 54594706f..ea7b03a7d 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -79,7 +79,7 @@ export default { }, error: { noPermission: `抱歉，您无权访问此页面。`, - pageError: '抱歉，您访问的页面不存在。', + pageError: '抱歉，您访问的页面不存在', networkError: '抱歉，服务器报告错误。', returnToHome: '返回首页' }, diff --git a/src/views/error/404.vue b/src/views/error/404.vue index 2e3f078a2..f6a08de2f 100644 --- a/src/views/error/404.vue +++ b/src/views/error/404.vue @@ -1,6 +1,5 @@ + + diff --git a/src/views/eam/equipmentMaintenanceMain/DetailEam.vue b/src/views/eam/equipmentMaintenanceMain/DetailEam.vue index 98d3c3939..401ae4c61 100644 --- a/src/views/eam/equipmentMaintenanceMain/DetailEam.vue +++ b/src/views/eam/equipmentMaintenanceMain/DetailEam.vue @@ -862,7 +862,6 @@ const openForm = async (type: string, row?: number) => { row.actualMinutes = row.actualMinutes.toString() EquipmentMaintenanceDetail.allSchemas.formSchema.forEach((item) => { if(item.field == 'peoples'){ - console.log(item); item.componentProps.disabled = false EquipmentMaintenanceDetailRules.peoples[0].required = true } diff --git a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts index baa6e75c2..83ed676a5 100644 --- a/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts +++ b/src/views/eam/equipmentMaintenanceMain/equipmentMaintenanceMain.data.ts @@ -383,13 +383,12 @@ export const EquipmentMaintenanceDetailRules = reactive({ validator:validateroundNumber, message: '请输入正确的正整数', trigger: 'blur'}], - completionTime: [required], - // [ - // { - // required:false , - // message:'该项为必填项', - // tagger:['blur'] - // }], + // completionTime: [ + // { + // required:false , + // message:'该项为必填项', + // tagger:['blur'] + // }], result: [ { required:false , diff --git a/src/views/eam/equipmentMaintenanceMain/index.vue b/src/views/eam/equipmentMaintenanceMain/index.vue index f0606d3fb..7c8d057c1 100644 --- a/src/views/eam/equipmentMaintenanceMain/index.vue +++ b/src/views/eam/equipmentMaintenanceMain/index.vue @@ -195,7 +195,7 @@ const buttonTableClick = async (val, row) => { handleExecute(row.id) } else if (val == 'finish') { // 完成 handleFinish(row.id) - } else if (val == 'validate') { // 完成 + } else if (val == 'validate') { // 验证 handleValidate(row.id) } } From 4aee31a3b9ea14d1a9b483b2472c1afda7e01b0c Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Thu, 30 May 2024 09:00:30 +0800 Subject: [PATCH 011/111] =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../strategySetting/strategy/upShelfStrategy/AddForm.vue | 2 +- .../unplannedissueRequestMain.data.ts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue index 48fa418c5..25caa4ea5 100644 --- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue +++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue @@ -686,7 +686,7 @@ const getFormCustomerList = async () => { const filterMethod = (query: string) => { if (query) { options.supplierList = options.originSupplierList.filter((item) => { - if(item.name==''){ + if(!item.name||item.name==''){ return item.code.includes(query) }else{ return item.name.includes(query) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts index 73bda1c1a..9c8261214 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/unplannedissueRequestMain.data.ts @@ -457,7 +457,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive }, tableForm:{ isInpuFocusShow: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装号', + searchListPlaceholder: '请输入包装号', searchField: 'packingNumber', searchTitle: '库存余额信息', searchAllSchemas: Balance.allSchemas, @@ -467,7 +467,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive // labelMessage: '信息提示说明！！！', componentProps: { isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择包装号', + searchListPlaceholder: '请输入包装号', searchField: 'packingNumber', searchTitle: '库存余额信息', searchAllSchemas: Balance.allSchemas, @@ -793,7 +793,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive //表单校验 export const UnplannedissueRequestDetailRules = reactive({ packingNumber: [ - { required: true, message: '请选择包装号', trigger: 'change' }, + { required: true, message: '请输入包装号', trigger: 'change' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], batch: [ From 8fa3024cf9044eae0dea2e3c5ad92a7092a8bc01 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 30 May 2024 10:36:26 +0800 Subject: [PATCH 012/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnRequestMain.data.ts | 52 +++++++++++++------ 1 file changed, 35 insertions(+), 17 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts index 9b5a2daed..2cda5fd8b 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts @@ -603,7 +603,26 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive Date: Thu, 30 May 2024 11:42:25 +0800 Subject: [PATCH 013/111] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E4=BB=8E=E5=BA=93=E4=BD=8D=E4=BB=A3=E7=A0=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0=E5=B9=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=BA=93=E5=AD=98=E4=BD=99=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/balance/index.ts | 5 +++ src/api/wms/location/index.ts | 11 +++++ .../purchasereturnRequestMain/index.vue | 18 ++++++-- .../purchasereturnRequestMain.data.ts | 43 ++++++++++++++++++- 4 files changed, 72 insertions(+), 5 deletions(-) diff --git a/src/api/wms/balance/index.ts b/src/api/wms/balance/index.ts index cb17a3200..68161dc16 100644 --- a/src/api/wms/balance/index.ts +++ b/src/api/wms/balance/index.ts @@ -105,6 +105,11 @@ export const getBalancePageSpare = async (params) => { } } +// 根据物料code 批次 和库位码查询库存余额总数 +export const getSumByConditions= async (params) => { + return await request.get({ url: `/wms/balance/getSumByConditions`, params }) +} + // 查询库存余额详情 export const getBalance = async (id: number) => { return await request.get({ url: `/wms/balance/get?id=` + id }) diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts index 3c40f283d..3870b46d7 100644 --- a/src/api/wms/location/index.ts +++ b/src/api/wms/location/index.ts @@ -68,6 +68,17 @@ export const deleteLocation = async (id: number) => { return await request.delete({ url: `/wms/location/delete?id=` + id }) } +// 根据业务类型以及库区查询库位列表 +export const getLocationListByAreaAndBusinesstype = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return request.post({ url: '/wms/location/pageBusinessTypeToLocationSenior1', data }) + } else { + return await request.get({ url: `/wms/location/pageBusinessTypeToLocation1`, params }) + } +} + // 导出库位 Excel export const exportLocation = async (params) => { if (params.isSearch) { diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 5d1ef6233..0c46c5e11 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -134,7 +134,8 @@ import { } from '../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data' import * as PackageApi from '@/api/wms/package' import { getAccessToken } from '@/utils/auth' - +import * as BalanceApi from '@/api/wms/balance' +import { async } from '@antv/x6/lib/registry/marker/async' // 采购退货申请 defineOptions({ name: 'PurchasereturnRequestMain' }) @@ -206,8 +207,10 @@ const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row } // 查询页面返回 -const searchTableSuccess = (formField, searchField, val, formRef, type, row) => { - nextTick(() => { +const searchTableSuccess = async(formField, searchField, val, formRef, type, row) => { + console.log('searchTableSuccess',) + + nextTick(async () => { if (type == 'tableForm') { // 明细查询页赋值 row[formField] = val[0][searchField] @@ -254,6 +257,15 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => row['containerNumber'] = val[0]['containerNumber'] // row['fromLocationCode'] = val[0]['fromLocationCode'] row['toLocationCode'] = val[0]['toLocationCode'] + }else if(formField=='fromLocationCode'){ + let params = { + itemCode: row.itemCode, + batch: row.batch, + locationCode:val.code + } + let aa = await BalanceApi.getSumByConditions(params); + console.log('23423423',aa); + row['inventoryBalance'] = aa//库存余额 } } else { const setV = {} diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index fa9ea5ee8..f5f5aae59 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -8,6 +8,9 @@ import { Supplier } from "@/views/wms/basicDataManage/supplierManage/supplier/su import * as SupplierApi from "@/api/wms/supplier"; import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' import * as ItemPackageApi from '@/api/wms/itempackage/index' +import * as LocationApi from "@/api/wms/location"; +import {Location} from "@/views/wms/basicDataManage/factoryModeling/location/location.data"; + // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值 @@ -118,7 +121,7 @@ export const PurchasereceiptRecordMain1 = useCrudSchemas(reactive( }, }, { - label: '从库位代码', + label: '从库位代码2', field: 'fromLocationCode', sort: 'custom', table: { @@ -877,6 +880,27 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive disabled:false } }, + { + label: '库存余额', + field: 'inventoryBalance', + sort: 'custom', + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6 + } + }, + isForm:false, + tableForm:{ + type:'InputNumber', + min:0, + precision: 6 + } + }, { label: '退货数量', field: 'qty', @@ -943,6 +967,21 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive table: { width: 150 }, + tableForm:{ + // labelMessage: '信息提示说明！！！', + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择从库位代码', + searchField: 'code', + searchTitle: '库位代码信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.getLocationListByAreaAndBusinesstype, + searchCondition: [{ + key: 'businessType', + value: 'PurchaseReturn', + message: '请填写业务类型', + isMainValue: false + }] + }, hiddenInMain: true, isTable: false, }, @@ -1389,7 +1428,7 @@ export const PurchasereReturnRequestDetailLabel = useCrudSchemas(reactive Date: Thu, 30 May 2024 11:57:20 +0800 Subject: [PATCH 014/111] =?UTF-8?q?=E5=8A=A0Referer1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/axios/index.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/config/axios/index.ts b/src/config/axios/index.ts index ad0fd2f8c..1c49f58e7 100644 --- a/src/config/axios/index.ts +++ b/src/config/axios/index.ts @@ -2,6 +2,7 @@ import { service } from './service' import { config } from './config' import { useCache } from '@/hooks/web/useCache' +import router from '@/router' const { default_headers } = config const { wsCache } = useCache() @@ -18,7 +19,8 @@ const request = (option: any) => { responseType: responseType, headers: { 'Content-Type': headersType || default_headers, - 'language': language + 'language': language, + 'Referer1': router.currentRoute.value.fullPath.split('?')[0] } }) } From 8ce306b63f703c6ea4cb2863fb526e61145252c8 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Thu, 30 May 2024 13:49:42 +0800 Subject: [PATCH 015/111] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain/index.vue | 80 ++++++++++--------- 1 file changed, 41 insertions(+), 39 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 0c46c5e11..47f9ad915 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -208,49 +208,51 @@ const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row // 查询页面返回 const searchTableSuccess = async(formField, searchField, val, formRef, type, row) => { - console.log('searchTableSuccess',) - nextTick(async () => { + console.log('searchTableSuccess',formField, searchField, val, formRef, type, row) + + nextTick( async () => { + if (type == 'tableForm') { // 明细查询页赋值 row[formField] = val[0][searchField] - row['supplierCode'] = val[0]['supplierCode'] - row['poNumber'] = val[0]['poNumber'] - row['poLine'] = val[0]['poLine'] - row['itemCode'] = val[0]['itemCode'] - row['itemName'] = val[0]['itemName'] - row['itemDesc1'] = val[0]['itemDesc1'] - row['itemDesc2'] = val[0]['itemDesc2'] - row['batch'] = val[0]['batch'] - row['altBatch'] = val[0]['altBatch'] - row['containerNumber'] = val[0]['containerNumber'] - row['qty'] = val[0]['qty'] - row['uom'] = val[0]['uom'] - row['supplierQty'] = val[0]['supplierQty'] - row['supplierUom'] = val[0]['supplierUom'] - row['inventoryStatus'] = val[0]['inventoryStatus'] - // row['fromLocationCode'] = val[0]['toLocationCode'] - row['toLocationCode'] = val[0]['toLocationCode'] - row['fromLocationGroupCode'] = val[0]['locationGroupCode'] - row['toLocationGroupCode'] = null - row['toWarehouseCode'] = null - row['toAreaTypes'] = null - row['fromAreaCode'] = val[0]['areaCode'] - row['toAreaCode'] = val[0]['toAreaCode'] - row['fromQwnerCode'] = val[0]['fromQwnerCode'] - row['toOwnerCode'] = val[0]['toOwnerCode'] - row['arriveDate'] = val[0]['arriveDate'] - row['produceDate'] = val[0]['produceDate'] - row['expireDate'] = val[0]['expireDate'] - row['convertRate'] = val[0]['convertRate'] - row['visualInspectResult'] = val[0]['visualInspectResult'] - row['visualInspectPhotos'] = val[0]['visualInspectPhotos'] - row['failedReason'] = val[0]['failedReason'] - row['singlePrice'] = val[0]['singlePrice'] - row['amount'] = val[0]['amount'] - row['projectCode'] = val[0]['projectCode'] - - if(formField == 'itemCode'){ + if(formField=='purchaseReceiptRecordNumber'){ + row['supplierCode'] = val[0]['supplierCode'] + row['poNumber'] = val[0]['poNumber'] + row['poLine'] = val[0]['poLine'] + row['itemCode'] = val[0]['itemCode'] + row['itemName'] = val[0]['itemName'] + row['itemDesc1'] = val[0]['itemDesc1'] + row['itemDesc2'] = val[0]['itemDesc2'] + row['batch'] = val[0]['batch'] + row['altBatch'] = val[0]['altBatch'] + row['containerNumber'] = val[0]['containerNumber'] + row['qty'] = val[0]['qty'] + row['uom'] = val[0]['uom'] + row['supplierQty'] = val[0]['supplierQty'] + row['supplierUom'] = val[0]['supplierUom'] + row['inventoryStatus'] = val[0]['inventoryStatus'] + // row['fromLocationCode'] = val[0]['toLocationCode'] + row['toLocationCode'] = val[0]['toLocationCode'] + row['fromLocationGroupCode'] = val[0]['locationGroupCode'] + row['toLocationGroupCode'] = null + row['toWarehouseCode'] = null + row['toAreaTypes'] = null + row['fromAreaCode'] = val[0]['areaCode'] + row['toAreaCode'] = val[0]['toAreaCode'] + row['fromQwnerCode'] = val[0]['fromQwnerCode'] + row['toOwnerCode'] = val[0]['toOwnerCode'] + row['arriveDate'] = val[0]['arriveDate'] + row['produceDate'] = val[0]['produceDate'] + row['expireDate'] = val[0]['expireDate'] + row['convertRate'] = val[0]['convertRate'] + row['visualInspectResult'] = val[0]['visualInspectResult'] + row['visualInspectPhotos'] = val[0]['visualInspectPhotos'] + row['failedReason'] = val[0]['failedReason'] + row['singlePrice'] = val[0]['singlePrice'] + row['amount'] = val[0]['amount'] + row['projectCode'] = val[0]['projectCode'] + }else if(formField == 'itemCode'){ row['batch'] = val[0]['toBatch'] row['containerNumber'] = val[0]['toContainerNumber'] row['containerNumber'] = val[0]['containerNumber'] From 2c81bd73df9a0cf41a2187ab7e104b7e052bea57 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 30 May 2024 13:52:35 +0800 Subject: [PATCH 016/111] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8E=BB=E6=8E=89erp=E5=BA=93=E4=BD=8D=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factoryModeling/location/location.data.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts index 507cd83f6..6992fab16 100644 --- a/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts +++ b/src/views/wms/basicDataManage/factoryModeling/location/location.data.ts @@ -405,9 +405,9 @@ export const LocationRules = reactive({ locationGroupCode: [ { required: true, message: '请输入库位组代码', trigger: 'change' } ], - erpLocationCode: [ - { required: true, message: '请选择ERP库位类型', trigger: 'change' } - ], + // erpLocationCode: [ + // { required: true, message: '请选择ERP库位类型', trigger: 'change' } + // ], // type: [ // { required: true, message: '请选择类型', trigger: 'change' } // ], From 92b6591c7fc8d37f45b8544f6b7e455ce807f9cd Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 30 May 2024 14:02:04 +0800 Subject: [PATCH 017/111] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/inventorymoveRecordMain/index.ts | 7 +++- .../wms/inventoryManage/balance/index.vue | 22 ++++++------- .../inventorymoveRecordMain/index.vue | 27 +++++++++++++++ .../inventorymoveRequestMain/index.vue | 33 +++---------------- .../demandforecastingMain.data.ts | 4 +-- 5 files changed, 51 insertions(+), 42 deletions(-) diff --git a/src/api/wms/inventorymoveRecordMain/index.ts b/src/api/wms/inventorymoveRecordMain/index.ts index 2f351b719..18bb292e3 100644 --- a/src/api/wms/inventorymoveRecordMain/index.ts +++ b/src/api/wms/inventorymoveRecordMain/index.ts @@ -125,4 +125,9 @@ export const exportScrapToHoldRecordMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/inventorymove-record-main/get-import-template' }) -} \ No newline at end of file +} + +// 下载用户导入模板（除库存移动外） +export const importTemplateExceptMove = () => { + return request.download({ url: '/wms/inventorymove-record-main/get-import-template-exceptMove' }) +} diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index bc9a950bc..d7fd2b8da 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -193,17 +193,17 @@ const handleSelectionPoint = async ()=>{ } // 列表-操作按钮 const butttondata = [ - // { - // label: '标签信息', - // name: 'bqxx', - // hide: false, - // type: 'primary', - // icon: '', - // color: '', - // link: true, - // float:'right', - // hasPermi: '' - // }, + { + label: '标签信息', + name: 'bqxx', + hide: false, + type: 'primary', + icon: '', + color: '', + link: true, + float:'right', + hasPermi: '' + }, defaultButtons.mainListPointBtn(null), // 标签打印 // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除 diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue index 1cb0ba47e..abd19c83a 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRecordMain/index.vue @@ -59,6 +59,9 @@ :detailAllSchemasRules="InventorymoveRecordDetailRules" :apiPage="InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage" /> + + diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 5a343df14..a69cb90f4 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -177,50 +177,27 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => { key: 'businessType', value: businessType.value , isMainValue: false - }, - { - key: 'fromWarehouseCode', - value: 'fromWarehouseCode', - message: '请选择从仓库代码！', - isMainValue: true - }] + }] item.form.componentProps.searchCondition = [ { key: 'businessType', value: businessType.value, isMainValue: false - }, - { - key: 'fromWarehouseCode', - value: 'fromWarehouseCode', - message: '请选择从仓库代码！', - isMainValue: true - }] + } + ] } else if (fromInventoryStatus.value == null) { item.tableForm.searchCondition = [ { key: 'businessType', value: businessType.value , isMainValue: false - }, - { - key: 'fromWarehouseCode', - value: 'fromWarehouseCode', - message: '请选择从仓库代码！', - isMainValue: true - }] + }] item.form.componentProps.searchCondition = [ { key: 'businessType', value: businessType.value, isMainValue: false - }, - { - key: 'fromWarehouseCode', - value: 'fromWarehouseCode', - message: '请选择从仓库代码！', - isMainValue: true - }] + }] } else { delete item.tableForm.searchCondition } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index 2b473703b..801001d62 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -236,8 +236,8 @@ export const DemandforecastingMainRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], - status: [ - { required: true, message: '请选择状态', trigger: 'change' } + supplierCode: [ + { required: true, message: '请选择供应商代码', trigger: 'change' } ], version: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } From 023ba7c88f3ee4f9aa13daa3ef310d1cbff7da25 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Thu, 30 May 2024 14:07:38 +0800 Subject: [PATCH 018/111] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/inventoryManage/balance/index.vue | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/wms/inventoryManage/balance/index.vue b/src/views/wms/inventoryManage/balance/index.vue index d7fd2b8da..bc9a950bc 100644 --- a/src/views/wms/inventoryManage/balance/index.vue +++ b/src/views/wms/inventoryManage/balance/index.vue @@ -193,17 +193,17 @@ const handleSelectionPoint = async ()=>{ } // 列表-操作按钮 const butttondata = [ - { - label: '标签信息', - name: 'bqxx', - hide: false, - type: 'primary', - icon: '', - color: '', - link: true, - float:'right', - hasPermi: '' - }, + // { + // label: '标签信息', + // name: 'bqxx', + // hide: false, + // type: 'primary', + // icon: '', + // color: '', + // link: true, + // float:'right', + // hasPermi: '' + // }, defaultButtons.mainListPointBtn(null), // 标签打印 // defaultButtons.mainListEditBtn({hasPermi:'wms:balance:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:balance:delete'}), // 删除 From ab3258ec820cd64ab50ec24d970b0295d9d89e7e Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Thu, 30 May 2024 14:14:45 +0800 Subject: [PATCH 019/111] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9C=88=E5=8F=B0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerdock/customerdock.data.ts | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts index 6b7ee3498..b633331ea 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts @@ -138,25 +138,25 @@ export const Customerdock = useCrudSchemas(reactive([ table: { width: 150 }, - isForm:false - // form: { - // // labelMessage: '信息提示说明！！！', - // componentProps: { - // isSearchList: true, // 开启查询弹窗 - // searchListPlaceholder: '请选择库位代码', // 输入框占位文本 - // searchField: 'code', // 查询弹窗赋值字段 - // searchTitle: '库位基础信息', // 查询弹窗标题 - // searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 - // searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 - // searchCondition: [{ - // key: 'available', - // value: 'TRUE', - // action: '==', - // isSearch: true, - // isMainValue: false - // }] - // } - // } + isForm:true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择库位代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '库位基础信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + action: '==', + isSearch: true, + isMainValue: false + }] + } + } }, { label: '是否可用', @@ -284,6 +284,9 @@ export const CustomerdockRules = reactive({ { max: 50, message: '不得超过50个字符', trigger: 'blur' }, { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'} ], + defaultLocationCode:[ + { required: true, message: '请选择库位代码', trigger: 'blur' }, + ], name: [ { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], From cacd3e9930220bab9bc9feea84d41e125a3ec714 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 30 May 2024 14:23:13 +0800 Subject: [PATCH 020/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../saleShipmentMainRequest/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue index 879bc53fd..d26b868f1 100644 --- a/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue +++ b/src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue @@ -221,14 +221,14 @@ const butttondata = (row,$index) => { } return [ defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:sale-shipment-main-request:update'}), // 编辑 - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:sale-shipment-main-request:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:sale-shipment-main-request:reAdd'}), //重新添加 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']),hasPermi:'wms:sale-shipment-main-request:close'}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:sale-shipment-main-request:reAdd'}), //重新添加 defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:sale-shipment-main-request:submit'}), // 提交审批 defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:refused'}), // 驳回 defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:sale-shipment-main-request:handle'}), // 处理 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3','8']),hasPermi:'wms:sale-shipment-main-request:handle'}), // 处理 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-request:delete'}), // 删除 - ] + ] } const tableData = ref([]) From d2456ce5c0953d7f997da465fba18ab27b7dee05 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Thu, 30 May 2024 14:27:49 +0800 Subject: [PATCH 021/111] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9C=88=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerdock/customerdock.data.ts | 29 ++++++++++--------- .../customerManage/customerdock/index.vue | 3 ++ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts index b633331ea..3c0c61dd3 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts +++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts @@ -140,21 +140,22 @@ export const Customerdock = useCrudSchemas(reactive([ }, isForm:true, form: { - // labelMessage: '信息提示说明！！！', + // // labelMessage: '信息提示说明！！！', componentProps: { - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择库位代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '库位基础信息', // 查询弹窗标题 - searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 - searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 - searchCondition: [{ - key: 'available', - value: 'TRUE', - action: '==', - isSearch: true, - isMainValue: false - }] + disabled:true + // isSearchList: true, // 开启查询弹窗 + // searchListPlaceholder: '请选择库位代码', // 输入框占位文本 + // searchField: 'code', // 查询弹窗赋值字段 + // searchTitle: '库位基础信息', // 查询弹窗标题 + // searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + // searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + // searchCondition: [{ + // key: 'available', + // value: 'TRUE', + // action: '==', + // isSearch: true, + // isMainValue: false + // }] } } }, diff --git a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue index b34b2e065..a5436fa5c 100644 --- a/src/views/wms/basicDataManage/customerManage/customerdock/index.vue +++ b/src/views/wms/basicDataManage/customerManage/customerdock/index.vue @@ -204,6 +204,9 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { const setV = {} setV[formField] = val[0][searchField] + if(formField=='code'){ + setV['defaultLocationCode'] = val[0]['defaultLocationCode'] + } formRef.setValues(setV) }) } From 27433c9f0add7a9ea2e5de61fe4e077d31123bfd Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Thu, 30 May 2024 15:40:09 +0800 Subject: [PATCH 022/111] =?UTF-8?q?=20=E9=80=80=E8=B4=A7=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E5=A4=A7=E4=BA=8E=E5=BA=93=E5=AD=98=E4=BD=99?= =?UTF-8?q?=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRequestMain/index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 47f9ad915..453320ce8 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -830,6 +830,10 @@ const submitForm = async (formType, data) => { message.warning("退货数量不能大于收获数量") return; } + if(tableData.value.find(item=>Number(item.returnedQty)>Number(item.inventoryBalance))){ + message.warning("退货数量不能大于库存余额") + return; + } data.subList = tableData.value // 拼接子表数据参数 try { if (formType === 'create') { From b83c7832929587541121d99a20e16862d1ceb657 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Thu, 30 May 2024 15:52:44 +0800 Subject: [PATCH 023/111] =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain/index.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 453320ce8..28800293d 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -826,11 +826,12 @@ const tableSelectionDelete = (selection) => { // 主子数据 提交 const submitForm = async (formType, data) => { - if(tableData.value.find(item=>Number(item.returnedQty)>Number(item.receiptQty))){ - message.warning("退货数量不能大于收获数量") - return; - } - if(tableData.value.find(item=>Number(item.returnedQty)>Number(item.inventoryBalance))){ + console.log('submitForm',tableData.value) + // if(tableData.value.find(item=>Number(item.returnedQty)>Number(item.receiptQty))){ + // message.warning("退货数量不能大于收获数量") + // return; + // } + if(tableData.value.find(item=>Number(item.qty)>Number(item.inventoryBalance))){ message.warning("退货数量不能大于库存余额") return; } From c603f8b97fb89ea60a34077891ce387ab8a52ed0 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Thu, 30 May 2024 16:00:25 +0800 Subject: [PATCH 024/111] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=AD=90=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturn/purchasereturnRequestMain/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue index 28800293d..f364551b9 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue @@ -210,7 +210,7 @@ const searchTableSuccessLabel = (formField, searchField, val, formRef, type, row const searchTableSuccess = async(formField, searchField, val, formRef, type, row) => { console.log('searchTableSuccess',formField, searchField, val, formRef, type, row) - + console.log('searchTableSuccess123',val) nextTick( async () => { if (type == 'tableForm') { @@ -263,7 +263,7 @@ const searchTableSuccess = async(formField, searchField, val, formRef, type, row let params = { itemCode: row.itemCode, batch: row.batch, - locationCode:val.code + locationCode:val[0]['code'] } let aa = await BalanceApi.getSumByConditions(params); console.log('23423423',aa); From 6f89369e01ff7aeed5d179c957e7030bb50332c0 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 30 May 2024 16:05:54 +0800 Subject: [PATCH 025/111] =?UTF-8?q?=E5=B0=8F=E6=95=B0=E7=82=B9=E5=90=8E?= =?UTF-8?q?=E5=85=AD=E4=BD=8D=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qms/inspectionRecord/inspectionRecordMain.data.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts index 01de70af0..90263f8d8 100644 --- a/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts +++ b/src/views/qms/inspectionRecord/inspectionRecordMain.data.ts @@ -2,7 +2,7 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter2 } from '@/utils/formatTime' import { validateHanset, validateEmail } from '@/utils/validator' import { dateFormatter } from '@/utils/formatTime' -import {validateTwoNum } from '@/utils/validator' +import {validateTwoNum,validateSixNum } from '@/utils/validator' const { t } = useI18n() // 国际化 /** @@ -716,18 +716,18 @@ export const InspectionRecordPackage = useCrudSchemas(reactive([ export const InspectionRecordPackageRules = reactive({ qualifiedAmount: [ required, - { validator:validateTwoNum, message: '小数点后最多6位', trigger: 'blur'} + { validator:validateSixNum, message: '小数点后最多6位', trigger: 'blur'} ], frozenAmount: [ required, - { validator:validateTwoNum, message: '小数点后最多6位', trigger: 'blur'} + { validator:validateSixNum, message: '小数点后最多6位', trigger: 'blur'} ], destroyAmount: [ required, - { validator:validateTwoNum, message: '小数点后最多6位', trigger: 'blur'} + { validator:validateSixNum, message: '小数点后最多6位', trigger: 'blur'} ], noQualifiedAmount: [ required, - { validator:validateTwoNum, message: '小数点后最多6位', trigger: 'blur'} + { validator:validateSixNum, message: '小数点后最多6位', trigger: 'blur'} ], }) From aba9b3ca5dffc95a3ff30a28bf5b1ac032968f2f Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 30 May 2024 16:18:50 +0800 Subject: [PATCH 026/111] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/supplierdeliverRequestMain/index.ts | 6 +++++ src/locales/en-US.ts | 1 + src/locales/zh-CN.ts | 1 + .../supplierdeliverRequestMain/index.vue | 26 +++++++++++++++---- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/src/api/wms/supplierdeliverRequestMain/index.ts b/src/api/wms/supplierdeliverRequestMain/index.ts index dddc0c3a1..b85ae51c6 100644 --- a/src/api/wms/supplierdeliverRequestMain/index.ts +++ b/src/api/wms/supplierdeliverRequestMain/index.ts @@ -96,6 +96,12 @@ export const genLabel = async (data:SupplierdeliverRequestMainVO) => { return await request.post({ url: `/wms/supplierdeliver-request-main/genLabel`,data }) } +// 校验是否修改了包装数量 +export const checkPackQty = async (data:SupplierdeliverRequestMainVO) => { + return await request.post({ url: `/wms/supplierdeliver-request-main/checkPackQty`,data }) +} + + // 生成记录 export const genRecordsSupplierdeliverRequestMain = async (id) => { return await request.post({ url: `/wms/supplierdeliver-request-main/genRecords?id=` + id }) diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index 8716cb4cf..a1b887cfa 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -774,6 +774,7 @@ export default { 物品包装信息:'Item packaging information', 系统提示:'System Prompt', 是否为此数据生成标签:'Do you generate labels for this data?', + 是否修改物料包装标包数量:'Do you want to modify the quantity of material packaging?', 是否处理所选中数据:'Do you process the selected data?', 发货:'shipments', 标签信息:'Label information', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index ea7b03a7d..285b29a13 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -774,6 +774,7 @@ export default { 物品包装信息:'物品包装信息', 系统提示:'系统提示', 是否为此数据生成标签:'是否为此数据生成标签', + 是否修改物料包装标包数量:'是否修改物料包装标包数量', 是否处理所选中数据:'是否处理所选中数据', 发货:'发货', 标签信息:'标签信息', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index feda09164..58ebb27b9 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -788,11 +788,27 @@ const submitFormLabel = async (formType, data) => { console.log("formType==",formType) console.log("data==",data) data.subList = detatableData.tableList - console.log("detatableData",detatableData) - await message.confirm(t('ts.是否为此数据生成标签？')) - await SupplierdeliverRequestMainApi.genLabel(data) - isCreateLabel.value = true - message.success(t('ts.创建标签成功')) + // 校验物料包装规格数量是否修改 + let flag = false; + await SupplierdeliverRequestMainApi.checkPackQty(data).then(async res => { + if(res){ + await message.confirm(t('ts.是否修改物料包装标包数量')+'?').then(()=>{ + flag = true; //修改标包数量 + }).catch(() =>{ + flag = false + }) + }else{ + flag = true; //修改标包数量 + } + }) + console.log("返回结果",flag); + if(flag){ + console.log("detatableData",detatableData) + await message.confirm(t('ts.是否为此数据生成标签？')) + await SupplierdeliverRequestMainApi.genLabel(data) + isCreateLabel.value = true + message.success(t('ts.创建标签成功')) + } getList() } finally { formLabelRef.value.formLoading = false From ddd761f74df474fa37d78f600ea4eac3506da4a7 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Thu, 30 May 2024 16:41:05 +0800 Subject: [PATCH 027/111] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRequestMain.data.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index 502d4cfe0..c6ca17db8 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -1013,7 +1013,10 @@ export const UnplannedreceiptRequestDetailRules = reactive({ ], qadProjectCode:[ { required: true, message: '请选择科目代码', trigger: 'change' } - ] + ], + singlePrice:[ + { required: true, message: '请维护标准成本价格', trigger: 'blur' } + ], }) From d81f21832b21a92328895fbc0eee40426cd6f7e5 Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Thu, 30 May 2024 16:54:39 +0800 Subject: [PATCH 028/111] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20?= =?UTF-8?q?=E4=BF=9D=E5=85=BB=E6=96=B9=E6=A1=88=20=E5=8F=8A=20=E4=BF=9D?= =?UTF-8?q?=E5=85=BB=E6=96=B9=E6=A1=88=E4=B8=8E=E4=BF=9D=E5=85=BB=E9=A1=B9?= =?UTF-8?q?=E5=85=B3=E8=81=94=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/basicMaintenanceOption/index.ts | 4 +- .../itemSelectSetForm.vue | 174 ++++++++++-------- 2 files changed, 100 insertions(+), 78 deletions(-) diff --git a/src/api/eam/basicMaintenanceOption/index.ts b/src/api/eam/basicMaintenanceOption/index.ts index 1fa280e6d..96cca69a3 100644 --- a/src/api/eam/basicMaintenanceOption/index.ts +++ b/src/api/eam/basicMaintenanceOption/index.ts @@ -1,10 +1,10 @@ import request from '@/config/axios' -import {EquipmentMainPartVO} from "@/api/eam/equipmentMainPart"; export interface BasicMaintenanceOptionVO { id: number code: string name: string + selectId: string describing: string isUpdated: boolean type: string @@ -34,7 +34,7 @@ export const getBasicMaintenanceOption = async (id: number) => { } // 新增保养方案 -export const createBasicMaintenanceOption = async (data: BasicMaintenanceOptionVO) => { +export const createBasicMaintenanceOption = async (data) => { return await request.post({ url: `/eam/basic-maintenance-option/create`, data }) } diff --git a/src/views/eam/basicMaintenanceOption/itemSelectSetForm.vue b/src/views/eam/basicMaintenanceOption/itemSelectSetForm.vue index 51600f17d..81917dc99 100644 --- a/src/views/eam/basicMaintenanceOption/itemSelectSetForm.vue +++ b/src/views/eam/basicMaintenanceOption/itemSelectSetForm.vue @@ -21,35 +21,39 @@ - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + +
- + {{ ent.selectId}} @@ -61,17 +65,17 @@ - - - - - + + + + + From 258873383befeac29f47f6810c699af6d631ffdf Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Sat, 1 Jun 2024 08:30:59 +0800 Subject: [PATCH 051/111] =?UTF-8?q?dev=E5=8F=91=E5=B8=832024-06-01-001?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 52d41693e..871612b43 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -## dev发布2024-05-23-002 +## dev发布2024-06-01-001 **xxxx.data.ts 文件配置说明** **form表单查询弹窗配置** form: { From 4872f5498cf73a952c0afc805f8d5fa8c7daad1c Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Sat, 1 Jun 2024 10:37:12 +0800 Subject: [PATCH 052/111] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86--=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../factoryModeling/productionline/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue index 7defa8b4c..7c32a3771 100644 --- a/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/productionline/index.vue @@ -67,7 +67,7 @@ import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' -// 生产线 +// 生产线管理 defineOptions({ name: 'Productionline' }) const message = useMessage() // 消息弹窗 @@ -154,10 +154,10 @@ const openForm = (type: string, row?: any) => { if (item.field == 'code') { item.componentProps.disabled = true } - if (item.field == 'workshopCode') { - item.componentProps.disabled = true - item.componentProps.isSearchList = false - } + // if (item.field == 'workshopCode') { + // item.componentProps.disabled = true + // item.componentProps.isSearchList = false + // } }) }else { From ef6c976405a87e2d614617f52226b75742520381 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Sat, 1 Jun 2024 14:47:01 +0800 Subject: [PATCH 053/111] =?UTF-8?q?=E8=AF=B7=E8=BE=93=E5=85=A5=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMain.data.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts index 26962e000..35528de62 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts @@ -1344,9 +1344,9 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive //表单校验 export const PurchasereturnRequestDetailRules = reactive({ - // packingNumber: [ - // { required: true, message: '请输入包装号', trigger: 'blur' } - // ], + packingNumber: [ + { required: true, message: '请输入包装号', trigger: 'blur' } + ], // batch: [ // { required: true, message: '请输入批次', trigger: 'blur' } // ], From 597dec6c0edf4ae2eb39188165f4e5f25d12c47e Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Sat, 1 Jun 2024 18:59:34 +0800 Subject: [PATCH 054/111] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturn/productionreturnRequestMainNo/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue index 1c0ce5e05..94db7444d 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/index.vue @@ -590,7 +590,7 @@ const submitForm = async (formType, data) => { const submitFormLabel = async (formType, data) => { try { detatableData.tableList.forEach(async (item) => { - await PackageApi.createPackageLabel(item).then(res => { + await PackageApi.createPackageLabel({...item,toLocationCode:item.fromLocationCode}).then(res => { isCreateLabel.value = true message.success('创建标签成功') }).catch(err => { From 33252d2a2b4c3361ee2acd4b1f98933e0b198529 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Sat, 1 Jun 2024 22:52:25 +0800 Subject: [PATCH 055/111] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=B8=B2=E6=9F=93?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=8D=A1=E6=AD=BB=20=E6=9A=82=E6=97=B6?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/home/components/material.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/home/components/material.vue b/src/views/home/components/material.vue index 841bab035..2649ab4b3 100644 --- a/src/views/home/components/material.vue +++ b/src/views/home/components/material.vue @@ -251,7 +251,7 @@ const getJobCharts = async () => { lineIndex.value++ } onMounted(async () => { - await getMaterialData() + // await getMaterialData() }) diff --git a/src/views/eam/equipmentMaintenanceMain/index.vue b/src/views/eam/equipmentMaintenanceMain/index.vue index fb244e15a..4db1801b9 100644 --- a/src/views/eam/equipmentMaintenanceMain/index.vue +++ b/src/views/eam/equipmentMaintenanceMain/index.vue @@ -63,7 +63,8 @@ @onChange="onChange" /> - + + { const butttondata = (row) => { return [ defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentMaintenanceMain:update'}), // 编辑 - defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:maintenance:update'}), // 接单 - defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:maintenance:update'}), // 执行 - defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:maintenance:update'}), // 完成保养 - defaultButtons.mainListValidateBtn({hide: isShowStatusButton(row,['6']),hasPermi:'eam:maintenance:update'}), // 验证 - defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:maintenance:update'}), - defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:maintenance:update'}), + defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 接单 + defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 执行 + defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 完成保养 + defaultButtons.mainListValidateBtn({hide: isShowStatusButton(row,['6']),hasPermi:'eam:equipmentMaintenanceMain:update'}), // 验证 + defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:equipmentMaintenanceMain:update'}), + defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:equipmentMaintenanceMain:update'}), ] } @@ -212,7 +213,7 @@ const buttonTableClick = async (val, row) => { } else if (val == 'finish') { // 完成 handleFinish(row) } else if (val == 'validate') { // 验证 - handleValidate(row.id) + handleValidate(row) } } @@ -345,66 +346,68 @@ const handleExecute = async (id: number) => { } /** 完成按钮操作 */ -const finishFormRef = ref() +const finishForm2Ref = ref() const handleFinish = async (row) => { - let res = await EquipmentMaintenanceMainApi.getMaintenanceOrderConfig(); - //系统配置需要验证 - if(res.remark === 'TRUE'){ - try { - // 中止的二次确认 - await message.delConfirm('是否完成所选中工单？'); - const params = ref({ - id: '', - status:'', - }) - params.value.id = row.id - params.value.status = '5' - // 发起 - await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value) - message.success(t('工单已完成')) - // 刷新列表 - await getList() - } catch {} - } - //系统配置不需要验证 - if(res.remark === 'FALSE'){ - try { - // 中止的二次确认 - await message.delConfirm('是否完成所选中工单？'); + // 二次确认 + await message.delConfirm('是否完成所选中工单？'); - //打开提交表单 - finishFormRef.value.open('update', row); + //打开提交表单 + finishForm2Ref.value.open('update', row); - } catch {} - } + //let res = await EquipmentMaintenanceMainApi.getMaintenanceOrderConfig(); + //系统配置需要验证 + // if(res.remark === 'TRUE'){ + // try { + // + // + // // // 二次确认 + // // await message.delConfirm('是否完成所选中工单？'); + // // const params = ref({ + // // id: '', + // // status:'', + // // }) + // // params.value.id = row.id + // // params.value.status = '5' + // // // 发起 + // // await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value) + // // message.success(t('工单已完成')) + // // // 刷新列表 + // // await getList() + // } catch {} + // } + // //系统配置不需要验证 + // if(res.remark === 'FALSE'){ + // try { + // // 二次确认 + // await message.delConfirm('是否完成所选中工单？'); + // + // //打开提交表单 + // finishForm2Ref.value.open('update', row); + // + // } catch {} + // } } /** 验证按钮操作 */ -const handleValidate = async (id: number) => { - try { - const params = ref({ - id: '', - status:'', - }) - // 中止的二次确认 - message.confirmPassword(t('')).then(async () => { - params.value.id = id - params.value.status = '7' - await EquipmentMaintenanceMainApi.updateMaintenanceOrder(params.value) - message.success(t('工单已流转')) - // 刷新列表 - await getList() - }).catch (async () => { - params.value.id = id - params.value.status = '5' - await EquipmentMaintenanceMainApi.updateMaintenanceOrder(params.value) - message.success(t('工单已流转')) - // 刷新列表 - await getList() - }) +const finishForm1Ref = ref() +const handleValidate = async (row) => { + await message.delConfirm('是否验证所选中工单？'); + message.confirmPassword(t('')).then(async () => { + // 二次确认 + //打开提交表单 + finishForm1Ref.value.open('update', row); + }).catch (async () => { + const params = ref({id: '', status:''}) + params.value.id = row.id + params.value.status = '5' + await EquipmentMaintenanceMainApi.backMaintenanceOrder(params.value) + message.success(t('工单已打回')) + // 刷新列表 + await getList() + }) + - } catch {} } /** 启用 */ @@ -529,28 +532,60 @@ const searchFormClick = (searchData) => { getList() // 刷新当前列表 } -const getClosed=(val)=> { - //console.log('orderday-publishClosed-200',val) +//finishForm1 关闭按钮回传 +const getClosed1=(val)=> { nextTick?.(() => { console.log(val) getList() }) } -const getData=(val)=> { - nextTick?.(async () => { - console.log(val) - const params = ref({ - id: '', - status: '', +//finishForm1 提交按钮回传 +const getData1=(val)=> { + nextTick?.(async () => { + console.log(val) + + try { + const params = ref({ + id: '', + status:'', + }) + params.value.id = val + params.value.status = '7' + await EquipmentMaintenanceMainApi.updateMaintenanceOrder(params.value) + message.success(t('工单已流转')) + // 刷新列表 + await getList() + } catch {} + + } + ) +} + +//finishForm2 关闭按钮回传 +const getClosed2=(val)=> { + nextTick?.(() => { + console.log(val) + getList() + }) +} + +//finishForm2 提交按钮回传 +const getData2=(val)=> { + nextTick?.(async () => { + console.log(val) + const params = ref({ + id: '', + status: '', + }) + params.value.id = val + params.value.status = '5' + // 发起 + await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value) + message.success(t('工单已完成')) + // 刷新列表 + await getList() }) - params.value.id = val - params.value.status = '5' - // 发起 - await EquipmentMaintenanceMainApi.executeMaintenanceOrder(params.value) - message.success(t('工单已完成')) - // 刷新列表 - await getList()}) } /** 初始化 **/ diff --git a/src/views/eam/maintenance/audiForm.vue b/src/views/eam/maintenance/audiForm.vue new file mode 100644 index 000000000..fa8044e86 --- /dev/null +++ b/src/views/eam/maintenance/audiForm.vue @@ -0,0 +1,142 @@ + + + + diff --git a/src/views/eam/maintenance/index.vue b/src/views/eam/maintenance/index.vue index 4f958cab5..53e6c4c68 100644 --- a/src/views/eam/maintenance/index.vue +++ b/src/views/eam/maintenance/index.vue @@ -54,6 +54,8 @@ + + @@ -66,11 +68,13 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons' import TableHead from '@/components/TableHead/src/TableHead.vue' import ImportForm from '@/components/ImportForm/src/ImportForm.vue' import Detail from '@/components/Detail/src/Detail.vue' +import AudiForm from '@/views/eam/maintenance/audiForm.vue' import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts.data"; import * as EquipmentItemApi from "@/api/eam/equipmentAccounts"; import { ToolAccounts } from "@/views/eam/toolAccounts/toolAccounts.data"; import * as ToolItemApi from "@/api/eam/toolAccounts"; + defineOptions({ name: 'Maintenance' }) const message = useMessage() // 消息弹窗 @@ -144,11 +148,20 @@ const isShowMainButton = (row,val) => { } } +const isShowStatusButton = (row,val) => { + if (val.indexOf(row.status) > -1) { + return false + } else { + return true + } +} + // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({hasPermi:'eam:maintenance:update'}), // 编辑 - //defaultButtons.mainListDeleteBtn({hasPermi:'eam:basicInspectionOption:delete'}), // 删除 + defaultButtons.mainListEditBtn({hide: isShowStatusButton(row,['0']),hasPermi:'eam:maintenance:update'}), // 编辑 + defaultButtons.mainListAuditingBtn({hide: isShowStatusButton(row,['0']),hasPermi:'eam:maintenance:update'}), // 审核 + defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:maintenance:update'}), // 完成保养 defaultButtons.mainListEnableBtn({hide:isShowMainButton(row,['FALSE']),hasPermi:'eam:maintenance:update'}), defaultButtons.mainListDisableBtn({hide:isShowMainButton(row,['TRUE']),hasPermi:'eam:maintenance:update'}), ] @@ -164,12 +177,29 @@ const buttonTableClick = async (val, row) => { handleEnable(row.id) } else if (val == 'disable') { handleDisable(row.id) + } else if (val == 'auditing') { // 审核 + handleAuditing(row.id) + } else if (val == 'finish') { // 完成 + handleFinish(row) } } /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { + if(type == "create"){ + Maintenance.allSchemas.formSchema.forEach((item) => { + if(item.field == 'status'){ + item.componentProps.disabled = true + } + }) + }else{ + Maintenance.allSchemas.formSchema.forEach((item) => { + if(item.field == 'status'){ + item.componentProps.disabled = false + } + }) + } basicFormRef.value.open(type, row) } @@ -216,6 +246,45 @@ const handleDelete = async (id: number) => { } catch {} } +//完成按钮 +const handleFinish = async (row) => { + message.confirmAudi(t('')).then(async () => { + //打开提交表单 + audiFormRef.value.open('update', row); + }).catch(async (action: Action) => { + if(action === 'cancel'){ + const params = ref({ + id: '', + status:'', + }) + params.value.id = row.id + params.value.status = '5' + await MaintenanceApi.updateMaintenancePlan(params.value) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } + }) +} + +//审核按钮 +const audiFormRef = ref() +const handleAuditing = async (id: number) => { + await message.delConfirm('是否审核所选中工单？'); + try { + const params = ref({ + id: '', + status:'', + }) + params.value.id = id + params.value.status = '3' + await MaintenanceApi.updateMaintenancePlan(params.value) + message.success(t('common.updateSuccess')) + // 刷新列表 + await getList() + } catch {} +} + /** 启用 */ const handleEnable = async (id: number) => { try { @@ -314,6 +383,34 @@ const searchFormClick = (searchData) => { getList() // 刷新当前列表 } +//audiForm 关闭按钮回传 +const getClosed=(val)=> { + nextTick?.(() => { + getList() + }) +} + +//audiForm 提交按钮回传 +const getData=(val)=> { + nextTick?.(async () => { + + try { + const params = ref({ + id: '', + status:'', + }) + params.value.id = val + params.value.status = '4' + await MaintenanceApi.updateMaintenancePlan(params.value) + message.success(t('计划已流转')) + // 刷新列表 + await getList() + } catch {} + + } + ) +} + /** 初始化 **/ onMounted(async () => { getList() diff --git a/src/views/eam/maintenance/maintenance.data.ts b/src/views/eam/maintenance/maintenance.data.ts index 92afca62c..9bfea7d37 100644 --- a/src/views/eam/maintenance/maintenance.data.ts +++ b/src/views/eam/maintenance/maintenance.data.ts @@ -47,7 +47,7 @@ export const Maintenance = useCrudSchemas(reactive([ dictType: DICT_TYPE.DEVICE_TYPE, dictClass: 'string', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '设备工装编号', @@ -112,7 +112,7 @@ export const Maintenance = useCrudSchemas(reactive([ field: 'startTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -134,7 +134,7 @@ export const Maintenance = useCrudSchemas(reactive([ field: 'endTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -156,26 +156,27 @@ export const Maintenance = useCrudSchemas(reactive([ field: 'status', sort: 'custom', isSearch: true, - + dictType: DICT_TYPE.EAM_PLAN_STATUS, + dictClass: 'string', }, { label: '审核人', field: 'approver', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '审核内容', field: 'approveContent', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '审核时间', field: 'approveTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -214,7 +215,7 @@ export const Maintenance = useCrudSchemas(reactive([ label: '直接生成记录', field: 'directCreateRecord', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '所属厂区编号', @@ -229,7 +230,7 @@ export const Maintenance = useCrudSchemas(reactive([ label: '车间编号', field: 'workshopCode', sort: 'custom', - isSearch: true, + isSearch: false, required: true, form: { // labelMessage: '信息提示说明！！！', @@ -253,7 +254,7 @@ export const Maintenance = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -277,7 +278,7 @@ export const Maintenance = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', - isSearch: true, + isSearch: false, }, { label: '地点ID', From 093924c320a7591e93a605ac3c85d478266972e3 Mon Sep 17 00:00:00 2001 From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com> Date: Mon, 3 Jun 2024 17:03:14 +0800 Subject: [PATCH 074/111] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/index.vue | 4 ++ .../supplierinvoiceRequestMain.data.ts | 47 ++++++++++++++++++- 2 files changed, 49 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index e73881f59..bda6f6835 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -747,7 +747,11 @@ const genRecords = async (id: number) => { // 单据打印 handleDocumentPrint(res) + }).catch(err=>{ + console.log("发起处理",err) + getLoading?.close() }) + } }).catch(err => { console.log("自检报告校验异常",err) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 1ed0e3075..a5ca1b66f 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1,5 +1,5 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' -import { dateFormatter } from '@/utils/formatTime' +import { dateFormatter,dateFormatter2 } from '@/utils/formatTime' import { accountantFormart } from '@/utils/formatter' import * as SupplierApi from '@/api/wms/supplier' @@ -138,6 +138,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:1, isSearch: true, form: { // labelMessage: '信息提示说明！！！', @@ -169,6 +170,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 180, }, + sortTableDefault:2, isForm: false }, { @@ -177,6 +179,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS, dictClass: 'string', isTable: true, + sortTableDefault:10, isForm:false, sort: 'custom', table: { @@ -801,6 +804,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive Date: Mon, 3 Jun 2024 19:20:24 +0800 Subject: [PATCH 075/111] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E5=8E=BB=E6=8E=89=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/UserForm.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/views/system/user/UserForm.vue b/src/views/system/user/UserForm.vue index d673cdc96..c6ec91013 100644 --- a/src/views/system/user/UserForm.vue +++ b/src/views/system/user/UserForm.vue @@ -138,13 +138,13 @@ const formRules = reactive({ trigger: ['blur', 'change'] } ], - mobile: [ - { - pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/, - message: '请输入正确的手机号码', - trigger: 'blur' - } - ] + // mobile: [ + // { + // pattern: /^(?:(?:\+|00)86)?1(?:3[\d]|4[5-79]|5[0-35-9]|6[5-7]|7[0-8]|8[\d]|9[189])\d{8}$/, + // message: '请输入正确的手机号码', + // trigger: 'blur' + // } + // ] }) const formRef = ref() // 表单 Ref const deptList = ref([]) // 树形结构 From 5080f247c9e428df9e342878b3c739a28cd19594 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Tue, 4 Jun 2024 08:27:21 +0800 Subject: [PATCH 076/111] =?UTF-8?q?scp=E7=AD=9B=E9=80=89=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierUser/supplierUser.data.ts | 9 +++++++ .../supplierinvoiceRecordMain.data.ts | 9 +++++++ .../supplierinvoiceInvoiced.data.ts | 27 +++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts index 81a8bcc3c..7358be064 100644 --- a/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts +++ b/src/views/wms/basicDataManage/systemSetting/supplierUser/supplierUser.data.ts @@ -170,6 +170,15 @@ export const SupplierUser = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, isForm: false, }, { diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index d4870f42d..33c1ce108 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -687,6 +687,15 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive table: { width: 180 }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + } }, { label: '开票数量', diff --git a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts index da35415d0..89c1358c3 100644 --- a/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts +++ b/src/views/wms/supplierManage/supplierinvoiceInvoiced/supplierinvoiceInvoiced.data.ts @@ -23,6 +23,15 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD', + valueFormat: 'x', + } + }, table: { width: 150 }, @@ -41,6 +50,15 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, table: { width: 150 }, @@ -183,6 +201,15 @@ export const SupplierinvoiceInvoiced = useCrudSchemas(reactive([ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + form: { + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x', + } + }, table: { width: 150 }, From 9433b7015381b94857eb6ea90849c6e2e062cf21 Mon Sep 17 00:00:00 2001 From: lidm0086 Date: Tue, 4 Jun 2024 10:32:57 +0800 Subject: [PATCH 077/111] =?UTF-8?q?=E7=8F=AD=E7=BB=84=20=20=E5=8E=BB?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=89=E6=9D=A1=E4=BB=B6=20=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E6=97=B6=E9=97=B4=E5=92=8C=E7=BB=93=E6=9D=9F=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basicDataManage/orderManage/shift/shift.data.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts index f48755d9e..a4b7220b0 100644 --- a/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts +++ b/src/views/wms/basicDataManage/orderManage/shift/shift.data.ts @@ -34,7 +34,7 @@ export const Shift = useCrudSchemas(reactive([ detail: { dateFormat: 'HH:mm:ss' }, - sort: 'custom', + sort: 'custom', table: { width: 180, }, @@ -47,9 +47,9 @@ export const Shift = useCrudSchemas(reactive([ valueFormat: 'x', } }, - isSearch: true, + isSearch: false, search: { - show: true, + show: false, component: 'TimePicker', componentProps: { valueFormat: 'HH:mm:ss', @@ -78,9 +78,9 @@ export const Shift = useCrudSchemas(reactive([ valueFormat: 'x', } }, - isSearch: true, + isSearch: false, search: { - show: true, + show: false, component: 'TimePicker', componentProps: { valueFormat: 'HH:mm:ss', @@ -249,4 +249,4 @@ export const ShiftRules = reactive({ available: [ { required: true, message: '请选择是否可用', trigger: 'change' } ], -}) \ No newline at end of file +}) From 5f6d993d846364efca304f1bbf5130ebabd13cfb Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Tue, 4 Jun 2024 10:41:07 +0800 Subject: [PATCH 078/111] =?UTF-8?q?EAM=20=E2=80=94=E2=80=94>=20=20?= =?UTF-8?q?=E4=BF=9D=E5=85=BB=E8=AE=B0=E5=BD=95=20=E4=B8=BB=E5=AD=90?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipmentMaintenanceRecordMain.data.ts | 383 ++++++++++++++---- .../equipmentMaintenanceRecordMain/index.vue | 30 +- 2 files changed, 315 insertions(+), 98 deletions(-) diff --git a/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts b/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts index 199b71234..3541eeece 100644 --- a/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts +++ b/src/views/eam/equipmentMaintenanceRecordMain/equipmentMaintenanceRecordMain.data.ts @@ -4,138 +4,229 @@ import { dateFormatter } from '@/utils/formatTime' // 表单校验 export const EquipmentMaintenanceRecordMainRules = reactive({ number: [required], + sources: [required], equipmentCode: [required], - planNumber: [required], - status: [required], - factoryAreaCode: [required], - concurrencyStamp: [required] + type: [required], + planStartTime: [required], + planEndTime: [required], + startTime: [required], + endTime: [required], }) export const EquipmentMaintenanceRecordMain = useCrudSchemas(reactive([ { - label: '保养编号', - field: 'number', + label: 'id', + field: 'id', + sort: 'custom', + isForm: false, + }, + { + label: '记录编号', + field: 'recordNo', sort: 'custom', - isSearch: true + isSearch: true, }, { label: '描述', field: 'describing', sort: 'custom', - isSearch: true + isSearch: true, + isSearch: false, + }, + { + label: '保养工单', + field: 'number', + sort: 'custom', + isSearch: true, + }, + { + label: '来源字典', + field: 'sources', + sort: 'custom', + isSearch: true, + isSearch: false, }, { label: '设备编号', field: 'equipmentCode', sort: 'custom', - isSearch: true + isSearch: true, }, { - label: '设备类别', - field: 'category', + label: '故障类型枚举', + field: 'faultType', sort: 'custom', - dictType: DICT_TYPE.DEVICE_TYPE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 isSearch: true, - form: { - component: 'SelectV2' - } + isSearch: false, + }, { - label: '班次枚举', - field: 'classes', + label: '工装或设备字典', + field: 'type', sort: 'custom', - // dictType: DICT_TYPE.SHIFT_TYPE, - // dictClass: 'string', // 默认都是字符串类型其他暂不考虑 isSearch: true, + dictType: DICT_TYPE.DEVICE_TYPE, + dictClass: 'string', }, { - label: '保养计划工单', + label: '保养计划工单号', field: 'planNumber', sort: 'custom', - isSearch: true + isSearch: true, }, { - label: '故障类型枚举', - field: 'faultType', + label: '计划开始时间', + field: 'planStartTime', sort: 'custom', - dictType: DICT_TYPE.FAILURE_REASON, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: true, + formatter: dateFormatter, + 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')] + } + }, form: { - component: 'SelectV2' - } + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, }, { - label: '保养周期', - field: 'cycle', + label: '计划结束时间', + field: 'planEndTime', sort: 'custom', - dictType: DICT_TYPE.MAINTENANCE_CYCLE, - dictClass: 'string', // 默认都是字符串类型其他暂不考虑 - isSearch: true + formatter: dateFormatter, + 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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, }, { - label: '保养次数', - field: 'times', + label: '保养开始时间', + field: 'startTime', sort: 'custom', - isSearch: true + formatter: dateFormatter, + 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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, }, { - label: '验证人', - field: 'verifyer2', + label: '保养结束时间', + field: 'endTime', sort: 'custom', - isSearch: true, + formatter: dateFormatter, + 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')] + } + }, form: { - component: 'InputNumber', - value: 0 - } + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, }, { - label: '验证内容', - field: 'verifyContent2', + label: '保养班组', + field: 'classType', sort: 'custom', - isSearch: true + isSearch: false, }, { - label: '验证时间', - field: 'verifyTime2', + label: '验证人', + field: 'verifyer', sort: 'custom', - isSearch: true + isSearch: false, }, { - label: '保养人', - field: 'maintenancer', + label: '验证内容', + field: 'verifyContent', sort: 'custom', - isSearch: true, + isSearch: false, form: { - component: 'InputNumber', - value: 0 - } + component: 'Editor', + componentProps: { + valueHtml: '', + height: 200 + } + }, }, { - label: '保养人联系电话', - field: 'maintenancePhone', + label: '验证时间', + field: 'verifyTime', sort: 'custom', - isSearch: true + formatter: dateFormatter, + 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')] + } + }, + form: { + component: 'DatePicker', + componentProps: { + type: 'datetime', + valueFormat: 'x' + } + }, }, { - label: '结果枚举', - field: 'completeResult', + label: '保养人id', + field: 'maintenancer', sort: 'custom', - isSearch: true + isSearch: false, }, { - label: '完成时间', - field: 'completionTime2', + label: '保养人联系电话', + field: 'maintenancePhone', sort: 'custom', - isSearch: true + isSearch: false, }, { - label: '保养时间', - field: 'maintenanceTime', + label: '完成时间', + field: 'completionTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + isSearch: false, search: { component: 'DatePicker', componentProps: { @@ -150,58 +241,172 @@ export const EquipmentMaintenanceRecordMain = useCrudSchemas(reactive -