From af2a4c807314d1002e91ab93fced55cee1d57c01 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 23 Aug 2024 13:54:54 +0800 Subject: [PATCH 01/13] =?UTF-8?q?HL-5618WMS=E9=A2=84=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E8=AE=B0=E5=BD=95=E5=92=8C=E8=A3=85=E9=85=8D?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E8=AE=B0=E5=BD=95=E4=B8=AD=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E6=92=A4=E9=94=80=E6=8A=A5=E5=B7=A5=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceipt/productreceiptRecordMain/index.vue | 2 +- .../productreceiptAssembleRecordMain/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index 294fb6096..1bd9e00ec 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -200,7 +200,7 @@ const butttondata = (row,$index) => { // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainListPointBtn(null), // 标签打印 - defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 + // defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 ] } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index 195e1dab4..6228531c7 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -237,7 +237,7 @@ const butttondata = (row,$index) => { defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请 defaultButtons.mainListPointBtn(null), // 标签打印 - defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 + // defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示 ] } From a806c40fa89a2ce5664d7ec556150390da429386 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 23 Aug 2024 13:57:08 +0800 Subject: [PATCH 02/13] =?UTF-8?q?HL-5603=E5=8F=91=E6=96=99=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E5=8C=85=E8=A3=85=E5=8F=B7=E5=90=8E=E9=9D=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8F=91=E6=96=99=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E5=8F=96=E5=80=BC=E4=B8=BA=E6=98=8E=E7=BB=86=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../issue/issueRecordMain/issueRecordMain.data.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts index 718af8ea1..e56e76c67 100644 --- a/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts +++ b/src/views/wms/issueManage/issue/issueRecordMain/issueRecordMain.data.ts @@ -356,6 +356,15 @@ export const IssueRecordMain = useCrudSchemas( }, sortTableDefault: 6 }, + { + label: '发料数量', // 子表数据 只是为了展示 + field: 'qty', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 6 + }, { label: '批次', // 子表数据 只是为了展示 field: 'fromBatch', From 439a0afb41b185001f48236dc7e85ea7be4f0dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Fri, 23 Aug 2024 14:37:21 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9Q2=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=8D=95=E9=99=84=E4=BB=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ2/index.vue | 4 ++-- .../qms/inspectionQ2/inspectionQ2.data.ts | 2 +- .../purchasereturnRequestMainNew/index.vue | 18 ++++++++++++++++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index a624b9859..518e78a42 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -466,7 +466,8 @@ const openForm = (type: string, row?: any) => { } }) } - + + basicFormRef.value.open(type, row) if(!row || !row.claimAmount){ nextTick(() => { basicFormRef.value.formRef.setValues({ @@ -502,7 +503,6 @@ const openForm = (type: string, row?: any) => { ) uploadFile['componentProps']['modelValue'] = row.filePathListView } - basicFormRef.value.open(type, row) } // form表单提交 diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 408786daf..39e526e7e 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -25,7 +25,7 @@ export const Q2Rules = reactive({ supplierCode: [{ required: true, message: '请选择供应商代码', trigger: 'change' }], purchaseReceiptNumber: [ { required: true, message: '请选择采购收货单号', trigger: 'change' }, - { max: 50, message: '不得超过50个字符', trigger: 'blur' } + { max: 255, message: '不得超过255个字符', trigger: 'blur' } ], claimTime: [{ required: true, message: '请选择索赔日期', trigger: 'change' }], lightItemCode: [{ required: true, message: '请选择整灯物料代码', trigger: 'change' }], diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue index 0a32f2981..5b99c542c 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue @@ -465,7 +465,10 @@ const butttondata = (row, $index) => { defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:purchasereturn-request-main:update' - }) // 编辑 + }),// 编辑 + defaultButtons.mainListDocumentPrintBtn({ + hide: isShowMainButton(row, ['8']) + })// 打印标签 // { // label: '生成标签', // name: 'ssbq', @@ -511,12 +514,23 @@ const buttonTableClick = async (val, row) => { genLabelId.value = row.masterId await getDetailList() formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题 - } else if (val == 'point') { + } + else if (val == 'documentPrint') { + // 单据打印 + handleDocumentPrint(row.number,row.itemCode) + }else if (val == 'point') { // 标签打印 labelPrint(row) } } +// 单据打印 +const BASE_URL2 = getJmreportBaseUrl() +const documentSrc = ref(BASE_URL2 + '/jmreport/view/920874172025987072?token=' + getAccessToken()) +const handleDocumentPrint = async (number,itemCode) => { + window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode) +} + /** 添加/修改操作 */ const formRef = ref() const openForm = async (type: string, row?: Object) => { From 5afbc4e389c04363b2117d52d6dcc7503f7a7a5b Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 23 Aug 2024 15:40:03 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E9=9A=94=E7=A6=BB=E9=80=80=E6=96=99?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BB=A3=E7=A0=81=E9=80=80=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionreturnJobMain/index.vue | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue index 5e738580e..91a117d47 100644 --- a/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue +++ b/src/views/wms/issueManage/productionreturn/productionreturnJobMain/index.vue @@ -117,7 +117,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => } const { tableObject, tableMethods } = useTable({ - getListApi: 'ProductionreturnJobMain'==routeName.value?ProductionreturnJobDetailApi.getProductionreturnJobDetailPageStore:ProductionreturnJobDetailApi.getProductionreturnJobDetailPageHold // 分页接口 + // getListApi: 'ProductionreturnJobMain'==routeName.value?ProductionreturnJobDetailApi.getProductionreturnJobDetailPageStore:ProductionreturnJobDetailApi.getProductionreturnJobDetailPageHold // 分页接口 + getListApi: ProductionreturnJobDetailApi.getProductionreturnJobDetailPage // 分页接口 + }) @@ -275,16 +277,17 @@ const handleExport = async () => { // 发起导出 loadStart() const excelTitle = ref(route.meta.title) - if('ProductionreturnJobMain'==routeName.value){ - //生产退料任务导出 - const data = await ProductionreturnJobMainApi.exportProductionreturnJobMainStore(tableObject.params) - download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) - }else{ - // 隔离退料任务导出 - const data = await ProductionreturnJobMainApi.exportProductionreturnJobMainHold(tableObject.params) - download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) - } - + // if('ProductionreturnJobMain'==routeName.value){ + // //生产退料任务导出 + // const data = await ProductionreturnJobMainApi.exportProductionreturnJobMainStore(tableObject.params) + // download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) + // }else{ + // // 隔离退料任务导出 + // const data = await ProductionreturnJobMainApi.exportProductionreturnJobMainHold(tableObject.params) + // download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) + // } + const data = await ProductionreturnJobMainApi.exportProductionreturnJobMain(tableObject.params) + download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`) } catch { } finally { From 2e09c9b04e72de04378d4cf16584f74275a1f5e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Fri, 23 Aug 2024 15:59:16 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9Q2=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=8D=95=E5=AD=97=E6=AE=B5=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ2/index.vue | 16 ++++++++++------ src/views/qms/inspectionQ2/inspectionQ2.data.ts | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index 518e78a42..dfa5503f9 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -197,7 +197,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { setV['standardCostPrice'] = '' setV['lightQty'] = 0 setV['claimAmount'] = '' - setV['otherclaimAmount'] = 0 + setV['otherClaimAmount'] = 0 setV['summaryAmount'] = 0 setV['disbursementAmount'] = 0 setV['remainingAmount'] = 0 @@ -280,7 +280,7 @@ const onChange = (field, e) => { ).toFixed(6) basicFormRef.value.formRef.formModel.summaryAmount = ( parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + - parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount) + parseFloat(basicFormRef.value.formRef.formModel.otherClaimAmount) ).toFixed(6) basicFormRef.value.formRef.formModel.remainingAmount = ( parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) - @@ -295,17 +295,17 @@ const onChange = (field, e) => { ).toFixed(6) basicFormRef.value.formRef.formModel.summaryAmount = ( parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + - parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount) + parseFloat(basicFormRef.value.formRef.formModel.otherClaimAmount) ).toFixed(6) basicFormRef.value.formRef.formModel.remainingAmount = ( parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) - parseFloat(basicFormRef.value.formRef.formModel.disbursementAmount) ).toFixed(6) } - if (field == 'otherclaimAmount') { + if (field == 'otherClaimAmount') { basicFormRef.value.formRef.formModel.summaryAmount = ( parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + - parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount) + parseFloat(basicFormRef.value.formRef.formModel.otherClaimAmount) ).toFixed(6) basicFormRef.value.formRef.formModel.remainingAmount = ( parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) - @@ -315,7 +315,7 @@ const onChange = (field, e) => { if (field == 'claimAmount') { basicFormRef.value.formRef.formModel.summaryAmount = ( parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + - parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount) + parseFloat(basicFormRef.value.formRef.formModel.otherClaimAmount) ).toFixed(6) basicFormRef.value.formRef.formModel.remainingAmount = ( parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) - @@ -521,6 +521,10 @@ const formsSuccess = async (formType, data) => { message.error('整灯数量不能为0') return } + if (!data.standardCostPrice) { + message.error('整灯数量不能为0或空数据') + return + } if (data.activeTime == 0) data.activeTime = null if (data.expireTime == 0) data.expireTime = null diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 39e526e7e..98d642deb 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -390,7 +390,7 @@ export const Q2 = useCrudSchemas( }, { label: '其他索赔金额', - field: 'otherclaimAmount', + field: 'otherClaimAmount', sort: 'custom', isSearch: false, isTable: true, From c633ba07c90c9916b6af8d58bc2e66a5118e09ca Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 23 Aug 2024 16:25:23 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E4=BD=B3=E5=85=B4=20---=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E7=AD=9B=E9=80=89=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 6 ++++++ src/views/qms/inspectionQ2/index.vue | 1 + 2 files changed, 7 insertions(+) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 8256576c8..3ed923d32 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -150,6 +150,7 @@ @@ -359,6 +360,11 @@ const props = defineProps({ required: false, default: [] }, + hiddenFilterBtnFields:{ + type: Array, + required: false, + default: [] + }, // 失去焦点之后是否进行校验， isJiaoyan: { type: Boolean, diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index dfa5503f9..869e719b5 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -57,6 +57,7 @@ }) } " + :hiddenFilterBtnFields="['purchaseReceiptNumber']" :rules="Q2Rules" :formAllSchemas="Q2.allSchemas" :apiUpdate="Q2Api.updateQ2" From 6d5f2f7ba8065c399f238b92e32a13a71f7ff1fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Fri, 23 Aug 2024 16:49:56 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9Q2=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ2/inspectionQ2.data.ts | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 98d642deb..b62242d67 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -596,11 +596,25 @@ export const Q2 = useCrudSchemas( } } }, + { label: '索赔单附件', - field: 'claimAddress', + field: 'claimAddressName', sort: 'custom', + isSearch: false, + isForm: false, isTable: true, + isDetail: false, + table: { + width: 150 + } + }, + + { + label: '索赔单附件', + field: 'claimAddress', + sort: 'custom', + isTable: false, table: { width: 150 }, From 87639f2b8866b97594f580dcba26baeca95365ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Sat, 24 Aug 2024 10:26:33 +0800 Subject: [PATCH 08/13] =?UTF-8?q?Q2=E4=BF=AE=E6=94=B9=E4=BB=B7=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ2/index.vue | 42 +++++++------------ .../qms/inspectionQ2/inspectionQ2.data.ts | 1 - 2 files changed, 14 insertions(+), 29 deletions(-) diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index 869e719b5..61eda8fc7 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -159,6 +159,15 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { if (formField == 'lightItemCode') { setV['lightItemCode'] = val[0].code setV['lightItemName'] = val[0].name + + setV['standardCostPrice'] = '' + setV['lightQty'] = 0 + setV['claimAmount'] = '' + setV['otherClaimAmount'] = 0 + setV['summaryAmount'] = 0 + setV['disbursementAmount'] = 0 + setV['remainingAmount'] = 0 + setV['purchaseReceiptNumber'] = ''  const params2 = {         by: 'ASC',         filters: [{ column: 'itemCode', action: '==', value: val[0].code }], @@ -195,14 +204,6 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { setV['SupplierCode'] = '' setV['SupplierName'] = '' setV['itemName'] = '' - setV['standardCostPrice'] = '' - setV['lightQty'] = 0 - setV['claimAmount'] = '' - setV['otherClaimAmount'] = 0 - setV['summaryAmount'] = 0 - setV['disbursementAmount'] = 0 - setV['remainingAmount'] = 0 - setV['purchaseReceiptNumber'] = '' setV['uom'] = val[0].supplierUom Q2Api.getEmail().then((res) => { @@ -248,24 +249,6 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { }) } }) - - // const params2 = { - // by: 'ASC', - // filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode }], - // pageNo: 1, - // pageSize: 500, - // sort: '' - // } - // params2.isSearch = true - // StdcostpriceApi.getStdcostpricePage(params2).then((res) => { - // if (res.list?.length > 0) { - // priceObj.value = res.list[0] - // formRef.setValues({ - // standardCostPrice: priceObj.value.price - // }) - // } - // }) - setV[formField] = val[0][searchField] formRef.setValues(setV) } @@ -273,6 +256,8 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { } const onChange = (field, e) => { + console.log('onChange',field) + console.log(basicFormRef.value.formRef.formModel) if (field == 'lightQty') { basicFormRef.value.formRef.formModel.claimAmount = ( parseFloat(basicFormRef.value.formRef.formModel.lightQty) * @@ -281,7 +266,7 @@ const onChange = (field, e) => { ).toFixed(6) basicFormRef.value.formRef.formModel.summaryAmount = ( parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + - parseFloat(basicFormRef.value.formRef.formModel.otherClaimAmount) + parseFloat(basicFormRef.value.formRef.formModel.otherClaimAmount||0) ).toFixed(6) basicFormRef.value.formRef.formModel.remainingAmount = ( parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) - @@ -333,6 +318,7 @@ const onChange = (field, e) => { if (field == 'supplierCode') { basicFormRef.value.formRef.formModel.supplierName = '' + basicFormRef.value.formRef.formModel.purchaseReceiptNumber = '' const paramsCustomer = { by: 'ASC', filters: [ @@ -523,7 +509,7 @@ const formsSuccess = async (formType, data) => { return } if (!data.standardCostPrice) { - message.error('整灯数量不能为0或空数据') + message.error('标准成本价格不能为0或空') return } if (data.activeTime == 0) data.activeTime = null diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index b62242d67..3ef1e9b44 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -470,7 +470,6 @@ export const Q2 = useCrudSchemas( // labelMessage: '信息提示说明！！！', componentProps: { enterSearch: true, - multiple: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段 From 1822114a81f83ecfc198b3e52ece40508fdf8c02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Sat, 24 Aug 2024 10:42:43 +0800 Subject: [PATCH 09/13] =?UTF-8?q?Q2=E4=BF=AE=E6=94=B9=E6=95=B4=E7=81=AF?= =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BB=A3=E7=A0=81=E7=9A=84=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ2/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index 61eda8fc7..c80929aae 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -167,7 +167,6 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { setV['summaryAmount'] = 0 setV['disbursementAmount'] = 0 setV['remainingAmount'] = 0 - setV['purchaseReceiptNumber'] = ''  const params2 = {         by: 'ASC',         filters: [{ column: 'itemCode', action: '==', value: val[0].code }], From 0d7f2f6c56341d5d3c2c52d41d3cb7ff97414c85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Sat, 24 Aug 2024 10:58:24 +0800 Subject: [PATCH 10/13] =?UTF-8?q?Q3=E9=80=9A=E7=9F=A5=E5=8D=95=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ3/inspectionQ3.data.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts index 3a3bea419..0f1e65eaf 100644 --- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts +++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts @@ -126,7 +126,6 @@ export const InspectionQ3Main = useCrudSchemas( // labelMessage: '信息提示说明！！！', componentProps: { enterSearch: true, - multiple: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段 From 2d2dc382cb610a86d4fc074631d163a41cc623da Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Sat, 24 Aug 2024 11:20:15 +0800 Subject: [PATCH 11/13] =?UTF-8?q?HL-5565=E6=8A=A5=E5=BA=9F=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E7=94=B3=E8=AF=B7=E9=80=89=E5=AE=8CQ1=E3=80=81Q2\Q3?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=8D=95=E5=8F=B7=E5=90=8E=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=B8=A6=E5=87=BA=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryjobManage/scrap/scrapRequestMain/index.vue | 9 +++++++++ .../scrap/scrapRequestMain/scrapRequestMain.data.ts | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index 50518741e..174db20e9 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -248,6 +248,9 @@ const clearSearchInput = (field) => { item.componentProps.disabled = false } }) + formRef.value.formRef.setValues({ + remark:'' + }) } if (field == 'q2Number') { ScrapRequestMain.allSchemas.formSchema.forEach((item) => { @@ -257,6 +260,9 @@ const clearSearchInput = (field) => { item.componentProps.disabled = false } }) + formRef.value.formRef.setValues({ + remark:'' + }) } if (field == 'q3Number') { ScrapRequestMain.allSchemas.formSchema.forEach((item) => { @@ -266,6 +272,9 @@ const clearSearchInput = (field) => { item.componentProps.disabled = false } }) + formRef.value.formRef.setValues({ + remark:'' + }) } } // 查询页面返回——详情 diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts index 8960f82cc..4e9cd950e 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts @@ -620,7 +620,6 @@ export const ScrapRequestMain = useCrudSchemas( label: '通知单描述', field: 'remark', sort: 'custom', - isTable: false, table: { width: 150 } From 3b517fd9d5d4e8b9dd4bab7d73642647151947e1 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Sat, 24 Aug 2024 11:57:49 +0800 Subject: [PATCH 12/13] =?UTF-8?q?SCP=E5=8E=BB=E6=8E=89=E8=A1=A5=E6=89=93?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=A3=80=E9=AA=8C=E6=8C=87=E5=BC=95=E5=8D=95?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceipt/purchasereceiptRecordMain/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index a7e9b2013..249d3082a 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -183,14 +183,14 @@ const isShowSourceTypeButton = (row) => { const butttondata = (row,$index) => { const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1 if(findIndex>-1&&findIndex<$index){ - return [defaultButtons.mainListPrintInspectionBtn(null)] + return [defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')})] } return [ defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 defaultButtons.mainPutawayRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请 //defaultButtons.mainListPlanCheckQualityReportBtn({hide:row.orderTypeM == "2"}), // 查看质检报告 defaultButtons.mainListPlanCheckQualityReportBtn({hide:isShowSourceTypeButton(row)}), // 查看质检报告 - defaultButtons.mainListPrintInspectionBtn(null), + defaultButtons.mainListPrintInspectionBtn({hide:routeName.value.includes('SCP')}) ] } From 6b92160aef0ceca62f74662ffe5e92b305947a57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Sat, 24 Aug 2024 16:39:54 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=B8=AD=E7=9A=84=E4=BD=BF=E7=94=A8=E5=86=B3?= =?UTF-8?q?=E7=AD=96=E6=8C=89=E9=92=AE=E9=AA=8C=E8=AF=81=20HL-5544?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionRecord/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index 02199fe88..a9765dd5b 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -247,7 +247,7 @@ const butttondata = (row) => { // defaultButtons.mainListOrderCOMPLETEBtn({ hide: isShowMainButton(row, ['INCOMPLETE']) }), // 完成 defaultButtons.mainApplyDecisionBtn({ - hide: isShowMainButton(row, null), + // hide: isShowMainButton(row, null), hasPermi: 'qms:inspection-recode-main:edit' }), // 使用决策 // defaultButtons.mainListDeleteBtn(null), // 删除