From 41195e5f11adf1116973819f54e7fa640a9e2839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Thu, 15 Aug 2024 21:26:01 +0800 Subject: [PATCH 01/10] =?UTF-8?q?Q3=E9=80=9A=E7=9F=A5=E5=8D=95=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ3/index.vue | 4 +- .../qms/inspectionQ3/inspectionQ3.data.ts | 156 ++---------------- 2 files changed, 20 insertions(+), 140 deletions(-) diff --git a/src/views/qms/inspectionQ3/index.vue b/src/views/qms/inspectionQ3/index.vue index f84c2ead1..015febed4 100644 --- a/src/views/qms/inspectionQ3/index.vue +++ b/src/views/qms/inspectionQ3/index.vue @@ -340,10 +340,10 @@ const buttonTableClick = async (val, row) => { openForm('update', row) } else if (val == 'delete') { // 删除 - handleDelete(row.id) + handleDelete(row.masterId) } else if (val == 'finish') { // 完成 - handleFinish(row.id) + handleFinish(row.masterId) } } diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts index c1c8003f6..325e55fb3 100644 --- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts +++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts @@ -157,130 +157,6 @@ export const InspectionQ3Main = useCrudSchemas( } } }, - { - label: '物料代码', - field: 'itemCode', - sort: 'custom', - isSearch: true, - isForm: false - }, - { - label: '数量', - field: 'qty', - sort: 'custom', - isSearch: false, - isForm: false - }, - { - label: '计量单位', - field: 'uom', - sort: 'custom', - isSearch: false, - isForm: false - }, - { - label: '单价', - field: 'price', - sort: 'custom', - isSearch: false, - isForm: false - }, - { - label: '金额', - field: 'amount', - sort: 'custom', - isTable: true, - isForm: false, - isSearch: false, - table: { - width: 150 - }, - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 2 - } - } - }, - { - label: '成本中心代码', - field: 'costCode', - sort: 'custom', - isSearch: false, - isTable: true, - isForm: false, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择成本中心', // 输入框占位文本 - searchField: 'costcentreCode', // 查询弹窗赋值字段 - searchTitle: '成本中心信息', // 查询弹窗标题 - searchAllSchemas: QadCostcentre.allSchemas, // 查询弹窗所需类 - searchPage: QadCostcentreApi.getQadCostcentrePage, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'available', - value: 'TRUE', - isMainValue: false - } - ], - verificationParams: [ - { - key: 'costcentreCode', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true - } - ] // 失去焦点校验参数 - } - } - }, - - { - label: '缺陷编码', - field: 'defectCode', - sort: 'custom', - dictType: DICT_TYPE.QMS_Q3_CODE, - dictClass: 'string', - isSearch: false, - isForm: false, - isTable: true, - table: { - width: 180 - }, - tableForm: { - type: 'Select' - } - }, - { - label: '缺陷位置', - field: 'defectLocation', - sort: 'custom', - isSearch: false, - isForm: false - }, - { - label: '缺陷类型', - field: 'defectType', - sort: 'custom', - isSearch: false, - isForm: false, - form: { - component: 'Select' - } - }, - { - label: '问题原因', - field: 'problemReason', - sort: 'custom', - isSearch: false, - isForm: false - }, { label: '描述', field: 'desc', @@ -391,7 +267,7 @@ export const InspectionQ3Detail = useCrudSchemas( label: '物料号', field: 'itemCode', sort: 'custom', - isTable: false, + isTable: true, isDetail: true, isSearch: false, table: { @@ -460,7 +336,7 @@ export const InspectionQ3Detail = useCrudSchemas( field: 'qty', sort: 'custom', isSearch: false, - isTable: false, + isTable: true, tableForm: { type: 'InputNumber', @@ -475,7 +351,7 @@ export const InspectionQ3Detail = useCrudSchemas( dictType: DICT_TYPE.UOM, dictClass: 'string', isSearch: false, - isTable: false, + isTable: true, tableForm: { type: 'Select', disabled: true @@ -490,7 +366,7 @@ export const InspectionQ3Detail = useCrudSchemas( label: '单价', field: 'price', sort: 'custom', - isTable: false, + isTable: true, isSearch: false, tableForm: { disabled: true @@ -506,7 +382,7 @@ export const InspectionQ3Detail = useCrudSchemas( field: 'amount', sort: 'custom', isSearch: false, - isTable: false, + isTable: true, isForm: false, tableForm: { disabled: true @@ -522,7 +398,7 @@ export const InspectionQ3Detail = useCrudSchemas( field: 'costCode', sort: 'custom', isSearch: false, - isTable: false, + isTable: true, isForm: true, tableForm: { isInpuFocusShow: true, @@ -557,7 +433,7 @@ export const InspectionQ3Detail = useCrudSchemas( dictType: DICT_TYPE.QMS_Q3_CODE, dictClass: 'string', isSearch: true, - isTable: false, + isTable: true, tableForm: { type: 'Select' } @@ -568,7 +444,7 @@ export const InspectionQ3Detail = useCrudSchemas( sort: 'custom', dictClass: 'string', isSearch: false, - isTable: false, + isTable: true, form: { component: 'Select', componentProps: { @@ -591,7 +467,7 @@ export const InspectionQ3Detail = useCrudSchemas( field: 'defectType', sort: 'custom', isSearch: false, - isTable: false, + isTable: true, form: { component: 'Select' } @@ -602,7 +478,7 @@ export const InspectionQ3Detail = useCrudSchemas( hiddenInMain: true, sort: 'custom', isSearch: false, - isTable: false, + isTable: true, form: { component: 'Select' } @@ -625,8 +501,12 @@ export const InspectionQ3Detail = useCrudSchemas( //表单校验 export const InspectionQ3DetailRules = reactive({ itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }], - packingNumber: [{ required: true, message: '请输入包装号', trigger: 'blur' }], - batch: [{ required: true, message: '请输入批次', trigger: 'blur' }], - inventoryStatus: [{ required: true, message: '请选择库存状态', trigger: 'change' }], - toLocationCode: [{ required: true, message: '请输入到库位代码', trigger: 'blur' }] + qty: [{ required: true, message: '请输入数量', trigger: 'change' }], + price: [{ required: true, message: '请选择单价', trigger: 'change' }], + amount: [{ required: true, message: '请选择金额', trigger: 'change' }], + costCode: [{ required: true, message: '请选择成本中心编码', trigger: 'change' }], + defectLocation: [{ required: true, message: '请选择缺陷位置', trigger: 'change' }], + defectType: [{ required: true, message: '请选择缺陷类型', trigger: 'change' }], + problemReason: [{ required: true, message: '请选择问题原因', trigger: 'change' }], + defectCode: [{ required: true, message: '请选择缺陷编码', trigger: 'change' }] }) From 23bcc698c4cad78e5199f9523555cdbbfc3971dc Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 15 Aug 2024 21:56:34 +0800 Subject: [PATCH 02/10] =?UTF-8?q?bom=E6=8C=89=E9=92=AE=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/bomDismantle/index.ts | 13 +++++++++++-- .../productscrap/productscrapRequestMain/index.vue | 3 +++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/api/wms/bomDismantle/index.ts b/src/api/wms/bomDismantle/index.ts index 83b2da219..ac6c85ef8 100644 --- a/src/api/wms/bomDismantle/index.ts +++ b/src/api/wms/bomDismantle/index.ts @@ -16,8 +16,17 @@ export const getProductscrapBomDismantlePage = async (params) => { } -export const getProductscrapBomRecordPage = async (params) => { - return await request.get({ url: `/wms/productscrap-request-main/bomRecordPage`, params }) +export const getProductscrapBomRecordPage = async (params1) => { + console.log('getProductscrapBomRecordPage',params1) + let params = {...params1} + if(params.isRecord){ + delete params.isRecord + return await request.get({ url: `/wms/productscrap-request-main/bomRecordPage`, params }) + }else{ + delete params.isRecord + return await request.get({ url: `/wms/productscrap-request-main/bomPage`, params }) + + } } diff --git a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue index 4ad831bb4..425c09ee3 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue @@ -169,6 +169,7 @@ const { tableObject: detatableDataBom, tableMethods: detatableMethodsBom } =useT getListApi: BomDismantleApi.getProductscrapBomRecordPage }) const { getList:getDetailListBom } = detatableMethodsBom +detatableDataBom.params.isRecord = false /** bom 列表 表单 按钮 */ const ButttondataBom = ref([ defaultButtons.formSaveBtn(null), // 保存 @@ -255,6 +256,7 @@ const buttonOperationClick = async (row, label, index,isSave = false)=> { detatableDataBom.params.bomVersion = row.bomVersion detailQty.value = row.qty bomModelVisible.value = true + detatableDataBom.params.isRecord = false await getDetailListBom() console.log(row.fromLocationCode); detatableDataBom.tableList.forEach(async (item) => { @@ -351,6 +353,7 @@ const tableFormButton = async (val , row) => { } rowId.value = row.masterId detailQty.value = row.qty + detatableDataBom.params.isRecord = true await getDetailListBom() //详情 isShowFooterButtton.value = false From de4810f116e5ce2a80f5d7a867a539eed1834a5c Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 16 Aug 2024 07:49:47 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5291=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 42 ++++++++++++++++++- 1 file changed, 40 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 3ea07b778..8b5d11c5f 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -406,7 +406,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ activeValue: 'TRUE' } } - }, + }, { label: '操作', field: 'action', @@ -639,6 +639,44 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, isSearch: true }, + { + label: '是否已发送检验申请', + field: 'inspectRequestFlag', + dictType: DICT_TYPE.TRUE_FALSE, + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + isTableForm:false, + isForm:false, + form: { + value: 'ALL', + componentProps: { + disabled: true + } + }, + isSearch: true, + }, + { + label: '是否已生成上架申请', + field: 'putawayRequestFlag', + dictType: DICT_TYPE.TRUE_FALSE, + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + isTableForm:false, + isForm:false, + form: { + value: 'ALL', + componentProps: { + disabled: true + } + }, + isSearch: true, + }, { label: '物料名称', field: 'itemName', @@ -1951,5 +1989,5 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive< tableForm: { disabled: true, } - } + }, ])) From 9fd5f0f110315b786f67b3cbfaf02ec016ca6d3c Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Fri, 16 Aug 2024 08:13:33 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E7=BC=BA=E9=99=B7:HL-5291=E5=A4=87?= =?UTF-8?q?=E6=B3=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index b17ee1579..89fd1cf7c 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -40,7 +40,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, { label: '备注', - field: 'remark', + field: 'mainRemark', sort: 'custom', table: { width: 180 @@ -648,6 +648,44 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, isSearch: true }, + { + label: '是否已发送检验申请', + field: 'inspectRequestFlag', + dictType: DICT_TYPE.TRUE_FALSE, + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + isTableForm:false, + isForm:false, + form: { + value: 'ALL', + componentProps: { + disabled: true + } + }, + isSearch: true, + }, + { + label: '是否已生成上架申请', + field: 'putawayRequestFlag', + dictType: DICT_TYPE.TRUE_FALSE, + sort: 'custom', + table: { + width: 150 + }, + isTable:false, + isTableForm:false, + isForm:false, + form: { + value: 'ALL', + componentProps: { + disabled: true + } + }, + isSearch: true, + }, { label: '物料名称', field: 'itemName', From 62b53e78b9bbef5c1850b74168e2ae0a6a2dc9b9 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 16 Aug 2024 08:55:57 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E5=8D=95=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereturnRequestMainNew/index.vue | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue index e134c3774..ab994d604 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue @@ -281,12 +281,6 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro } }) } - }else if(formField=='hahaha'){ - // 选择收货单明细 - setV['poNumber'] = val[0]['poNumber'] - setV['poLine'] = val[0]['poLine'] - setV['receiptNumber'] = val[0]['receiptNumber'] - setV['asnNumber'] = val[0]['asnNumber'] } formRef.setValues(setV) @@ -628,11 +622,18 @@ const chooseReceiptList = ()=>{ } // 选择收货单明细 -const searchTableSuccess1 = (formField, searchField, selections, type, row) => { - console.log('searchTableSuccess1',formField, searchField, selections, type, row) - formRef.value.formRef.setValues({ - poNumber:111 - }) +const searchTableSuccess1 = (formField, searchField, val, type, row) => { + console.log('searchTableSuccess1',formField, searchField, val, type, row) + + if(formField=='hahaha'){ + // 选择收货单明细 + const setV = {} + setV['poNumber'] = val[0]['poNumber'] + setV['poLine'] = val[0]['poLine'] + setV['receiptNumber'] = val[0]['receiptNumber'] + setV['asnNumber'] = val[0]['asnNumber'] + formRef.value.formRef.setValues(setV) + } } // 删除明细 const handleDeleteTable = (item, index, formRef) => { From 2d3e5c4b3341adcc4bfe62fcf6c6ce421b873789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Fri, 16 Aug 2024 09:01:43 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9Q3=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ3/index.vue | 40 ++++++++++++---------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/src/views/qms/inspectionQ3/index.vue b/src/views/qms/inspectionQ3/index.vue index 015febed4..e414ef0b7 100644 --- a/src/views/qms/inspectionQ3/index.vue +++ b/src/views/qms/inspectionQ3/index.vue @@ -450,31 +450,25 @@ const submitForm = async (formType, submitData) => { } data.responUser = userStore.getUser.nickname data.subList = tableData.value // 拼接子表数据参数 - if (tableData.value.find((item) => item.qty <= 0)) { - message.warning('数量必须大于0') - formRef.value.formLoading = false - return - } - // 判断子表中，是否有不同的生产线和工位 - // if (tableData.value.length > 0) { - // let productionLineCode = tableData.value[0].productionLineCode - // let workStationCode = tableData.value[0].workStationCode - // for(var i=0;i { + if(item.qty == 0){ + message.warning("数量不能为0") + flag = true; + return; + } + }) + if(flag){ + return + } + formRef.value.formLoading = true await InspectionQ3MainApi.createInspectionQ3Main(data) message.success(t('common.createSuccess')) } else { From 4f081edd52b192b923ccc6d3437d74b7d654bba4 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 16 Aug 2024 09:00:49 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scrap/scrapRequestMain/index.vue | 356 ++++++++++++------ 1 file changed, 246 insertions(+), 110 deletions(-) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index 831ecf7ed..76fc6168f 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -1,23 +1,31 @@