From cc3141372bb6042705663b6daf30dac4ed2c2526 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 21 Aug 2024 13:19:06 +0800 Subject: [PATCH 1/7] =?UTF-8?q?HL-5484=20scp=E4=BF=AE=E6=94=B9=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E6=95=B0=E5=8A=9F=E8=83=BD=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/supplierdeliverRequestMain/labelForm.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue index cea9e2c05..87d493a03 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue @@ -448,6 +448,11 @@ const addX = (oneRow, oneIndex, twoRow, twoIndex, type) => { // 有父级托的时候 if (type == 1) { // 在托下添加箱 + // 在托下添加箱 + if (parseFloat(twoRow.xNumber) == parseFloat(oneRow.otherNumber)) { + message.warning('每托箱个数最多' + oneRow.otherNumber + '箱') + return + } twoRow.children.push({ id: twoId.value, // xPoNumber: From c5c3ab465754744c939afbc25ef68452757b9fc2 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 21 Aug 2024 14:13:16 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9C=AA=E5=BC=80?= =?UTF-8?q?=E5=8F=91=E5=AE=8C=E6=88=90=EF=BC=8C=E6=92=A4=E9=94=80=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E6=8C=89=E9=92=AE=E6=9A=82=E6=97=B6=E5=8E=BB=E6=8E=89?= 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 ca527db82..fa7d5c65c 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -198,7 +198,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(null), // 制品回收 + // defaultButtons.mainListRecoveryBtn(null), // 制品回收 ] } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue index 3fa05b7aa..d827f1408 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/index.vue @@ -236,7 +236,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(null), // 制品回收 + // defaultButtons.mainListRecoveryBtn(null), // 制品回收 ] } From 1b96671e580e963a01e70bacceef507eb4fd3a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Wed, 21 Aug 2024 14:14:28 +0800 Subject: [PATCH 3/7] =?UTF-8?q?Q2=E9=80=9A=E7=9F=A5=E5=8D=95=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B9=B6?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=93=8D=E4=BD=9C=E8=BF=87=E7=A8=8B=EF=BC=8C?= =?UTF-8?q?=20=20HL-5385?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/qms/inspectionQ2/index.ts | 5 + src/views/qms/inspectionQ2/index.vue | 103 +++++-- .../qms/inspectionQ2/inspectionQ2.data.ts | 285 +++++++++++++----- 3 files changed, 287 insertions(+), 106 deletions(-) diff --git a/src/api/qms/inspectionQ2/index.ts b/src/api/qms/inspectionQ2/index.ts index 36c186445..d2220bd6d 100644 --- a/src/api/qms/inspectionQ2/index.ts +++ b/src/api/qms/inspectionQ2/index.ts @@ -71,3 +71,8 @@ export const importTemplate = () => { export const finishQ2 = async (id: number) => { return await request.get({ url: `/qms/inspectionQ2/finish?id=` + id }) } + +// 获取系统中的email地址 +export const getEmail = () => { + return request.get({ url: `/qms/inspectionQ2/getEmail`}) +} diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index 13e5fc996..3e4efc71d 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -119,18 +119,44 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { } }) } + + if (formField == 'purchaseReceiptNumber') { + console.log("wolaile", + val[0].qty + ); + + setV['wmsQty'] = val[0].qty + } + + if (formField == 'lightItemCode') { + setV['lightItemCode'] = val[0].code + setV['lightItemName'] = val[0].name + } + if (formField == 'itemCode') { setV['SupplierCode'] = '' setV['SupplierName'] = '' setV['itemName'] = '' setV['standardCostPrice'] = '' - setV['qty'] = '' + setV['lightQty'] = '' setV['claimAmount'] = '' - + setV['otherclaimAmount'] = '' + setV['summaryAmount'] = '' + setV['disbursementAmount'] = '' + setV['remainingAmount'] = '' setV['uom'] = val[0].supplierUom + + Q2Api.getEmail().then((res) => { + if (res) { + formRef.setValues({ + cashierEmail: res + }) + } + }) + const supplieritemParams = { by: 'ASC', - filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode}], + filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode }], pageNo: 1, pageSize: 500, sort: '' @@ -154,6 +180,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { pageSize: 500, sort: '' } + itembasicParams.isSearch = true ItembasicApi.getItembasicPage(itembasicParams).then((res) => { if (res.list?.length > 0) { @@ -186,36 +213,60 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { } const onChange = (field, e) => { - if (field == 'qty') { + if (field == 'lightQty') { + basicFormRef.value.formRef.formModel.claimAmount = ( + parseFloat(basicFormRef.value.formRef.formModel.lightQty) * + parseFloat(basicFormRef.value.formRef.formModel.standardCostPrice) * + parseFloat(basicFormRef.value.formRef.formModel.claimMultiple) + ).toFixed(6) + basicFormRef.value.formRef.formModel.summaryAmount = ( + parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + + parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount) + ).toFixed(6) + } + if (field == 'claimMultiple') { basicFormRef.value.formRef.formModel.claimAmount = ( - parseFloat(basicFormRef.value.formRef.formModel.qty) * parseFloat(basicFormRef.value.formRef.formModel.standardCostPrice) + parseFloat(basicFormRef.value.formRef.formModel.lightQty) * + parseFloat(basicFormRef.value.formRef.formModel.standardCostPrice) * + parseFloat(basicFormRef.value.formRef.formModel.claimMultiple) ).toFixed(6) - basicFormRef.value.formRef.formModel.summaryAmount = ( - parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount) + basicFormRef.value.formRef.formModel.summaryAmount = ( + parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + + parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount) ).toFixed(6) } 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.claimAmount) + + parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount) ).toFixed(6) } - if (field == 'supplierCode') { - basicFormRef.value.formRef.formModel.supplierName = '' - const paramsCustomer = { - by: 'ASC', - filters: [{ column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.supplierCode }], - pageNo: 1, - pageSize: 500, - sort: '' - } - paramsCustomer.isSearch = true - SupplierApi.getSupplierPage(paramsCustomer).then((res) => { - if (res.list?.length > 0) { - basicFormRef.value.formRef.formModel.supplierName = res.list[0].name - } - }) + + if (field == 'disbursementAmount') { + basicFormRef.value.formRef.formModel.remainingAmount = ( + parseFloat(basicFormRef.value.formRef.formModel.summaryAmount) - + parseFloat(basicFormRef.value.formRef.formModel.disbursementAmount) + ).toFixed(6) + } + + if (field == 'supplierCode') { + basicFormRef.value.formRef.formModel.supplierName = '' + const paramsCustomer = { + by: 'ASC', + filters: [ + { column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.supplierCode } + ], + pageNo: 1, + pageSize: 500, + sort: '' } + paramsCustomer.isSearch = true + SupplierApi.getSupplierPage(paramsCustomer).then((res) => { + if (res.list?.length > 0) { + basicFormRef.value.formRef.formModel.supplierName = res.list[0].name + } + }) + } } // 字段设置 更新主列表字段 @@ -346,11 +397,11 @@ const formsSuccess = async (formType, data) => { return } } - if (data.qty > data.wmsQty) { + if (data.lightQty > data.wmsQty) { message.error('数量不能大于记录中的收货数量') return } - if (data.qty == 0) { + if (data.lightQty == 0) { message.error('数量不能为0') return } diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 342e3f3c9..067a5a8ef 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -10,30 +10,30 @@ import { Q1 } from '@/views/qms/inspectionQ1/inspectionQ1.data' import * as SupplieritemApi from '@/api/wms/supplieritem' import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data' -import * as SupplierApi from '@/api/wms/supplier' -import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data' - import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail' import { PurchasereceiptRecordDetail } from '@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data' +import * as ItembasicApi from '@/api/wms/itembasic' +import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' + import { useUserStore } from '@/store/modules/user' const userStore = useUserStore() // 表单校验 export const Q2Rules = reactive({ - number: [required], - supplierCode: [required], - itemCode: [required], - purchaseReceiptNumber: [required], - qty: [required], - code: [required], - priority: [required], - claimAmount: [required], - costCode: [required], - claimTime: [required], - handleTime: [required], - available: [required], - concurrencyStamp: [required] + itemCode: [{ required: true, message: '请选择供应商物料代码', trigger: 'change' }], + supplierCode: [{ required: true, message: '请选择供应商代码', trigger: 'change' }], + purchaseReceiptNumber: [{ required: true, message: '请选择采购收货单号', trigger: 'change' }], + claimTime: [{ required: true, message: '请选择索赔日期', trigger: 'change' }], + lightItemCode: [{ required: true, message: '请选择整灯物料代码', trigger: 'change' }], + lightQty: [{ required: true, message: '请选择整灯数量', trigger: 'change' }], + code: [{ required: true, message: '请选择缺陷代码', trigger: 'change' }], + priority: [{ required: true, message: '请选择优先级', trigger: 'change' }], + claimMultiple: [{ required: true, message: '请选择索赔倍数', trigger: 'change' }], + claimAmount: [{ required: true, message: '请输入索赔金额', trigger: 'change' }], + costCode: [{ required: true, message: '请选择选择成本中心代码', trigger: 'change' }], + cashierEmail: [{ required: true, message: '请选择选择出纳邮件地址', trigger: 'change' }], + handleTime: [{ required: true, message: '请选择选择处理时间', trigger: 'change' }] }) export const Q2 = useCrudSchemas( @@ -50,7 +50,7 @@ export const Q2 = useCrudSchemas( } }, { - label: '物料代码', + label: '供应商物料代码', field: 'itemCode', sort: 'custom', table: { @@ -72,6 +72,11 @@ export const Q2 = useCrudSchemas( key: 'available', value: 'TRUE', isMainValue: false + }, + { + key: 'type', + value: 'Q2', + isMainValue: false } ], verificationParams: [ @@ -88,7 +93,7 @@ export const Q2 = useCrudSchemas( } }, { - label: '物料名称', + label: '供应商物料名称', field: 'itemName', sort: 'custom', dictClass: 'string', @@ -97,6 +102,9 @@ export const Q2 = useCrudSchemas( tableForm: { disabled: true }, + table: { + width: 150 + }, form: { componentProps: { disabled: true @@ -113,6 +121,9 @@ export const Q2 = useCrudSchemas( tableForm: { disabled: true }, + table: { + width: 120 + }, form: { component: 'Select', componentProps: { @@ -132,6 +143,9 @@ export const Q2 = useCrudSchemas( dictClass: 'string', isSearch: false, isTable: true, + table: { + width: 180 + }, tableForm: { disabled: true }, @@ -154,6 +168,7 @@ export const Q2 = useCrudSchemas( componentProps: { enterSearch: true, disabled: true, + multiple: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段 @@ -206,64 +221,73 @@ export const Q2 = useCrudSchemas( } } }, - { - label: '数量', - field: 'qty', + label: '整灯物料代码', + field: 'lightItemCode', sort: 'custom', - isTable: true, - isSearch: false, table: { width: 150 }, + isSearch: true, form: { - component: 'InputNumber', + // labelMessage: '信息提示说明！！！', componentProps: { - min: 0, - precision: 2 + enterSearch: true, + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '物料基础信息', // 查询弹窗标题 + searchAllSchemas: Itembasic.allSchemas, // 查询弹窗所需类 + searchPage: ItembasicApi.getItembasicPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + }, + { + key: 'type', + value: 'CCP', + isMainValue: false + } + ], + verificationParams: [ + { + key: 'lightItemCode', + action: '==', + value: '', + isMainValue: false, + isSearch: true, + isFormModel: true + } + ] // 失去焦点校验参数 } } }, { - label: '单位', - field: 'uom', + label: '整灯物料名称', + field: 'lightItemName', sort: 'custom', - dictType: DICT_TYPE.UOM, dictClass: 'string', isSearch: false, isTable: true, - tableForm: { - type: 'Select', - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '标准成本价格', - field: 'standardCostPrice', - sort: 'custom', - isSearch: false, table: { width: 150 }, + tableForm: { + disabled: true + }, form: { - component: 'InputNumber', componentProps: { - min: 0, - precision: 6, disabled: true } } }, { - label: '索赔金额', - field: 'claimAmount', + label: '整灯数量', + field: 'lightQty', sort: 'custom', - isTable: false, + isTable: true, isSearch: false, table: { width: 150 @@ -303,6 +327,60 @@ export const Q2 = useCrudSchemas( type: 'Select' } }, + { + label: '索赔倍数', + field: 'claimMultiple', + sort: 'custom', + dictType: DICT_TYPE.QMS_CLAIM_MULTIPLE, + dictClass: 'string', + isTable: true, + isSearch: false, + table: { + width: 100 + }, + tableForm: { + type: 'Select', + disabled: true + }, + form: { + componentProps: {} + } + }, + { + label: '标准成本价格', + field: 'standardCostPrice', + sort: 'custom', + isSearch: false, + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6, + disabled: true + } + } + }, + { + label: '索赔金额', + field: 'claimAmount', + sort: 'custom', + isTable: false, + isSearch: false, + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 2 + } + } + }, + { label: '其他索赔描述', field: 'otherClaimDesc', @@ -328,7 +406,7 @@ export const Q2 = useCrudSchemas( component: 'InputNumber', componentProps: { min: 0, - precision: 6, + precision: 6 } } }, @@ -350,39 +428,35 @@ export const Q2 = useCrudSchemas( } }, { - label: '成本中心代码', - field: 'costCode', + label: '抛账金额', + field: 'disbursementAmount', sort: 'custom', isSearch: false, - isTable: false, - isForm: true, + table: { + width: 150 + }, form: { - // labelMessage: '信息提示说明！！！', + component: 'InputNumber', 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 - } - ] // 失去焦点校验参数 + min: 0, + precision: 6 + } + } + }, + { + label: '剩余金额', + field: 'remainingAmount', + sort: 'custom', + isSearch: false, + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6, + disabled: true } } }, @@ -430,6 +504,57 @@ export const Q2 = useCrudSchemas( }, isSearch: true }, + { + label: '成本中心代码', + field: 'costCode', + sort: 'custom', + isSearch: false, + isTable: false, + isForm: true, + 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: 'cashierEmail', + sort: 'custom', + isSearch: false, + table: { + width: '150' + }, + form: { + component: 'Input', + componentProps: {} + } + }, + { label: '负责用户', field: 'responUser', From 2de470c5881b60ef91171340848a6f144887a7a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Wed, 21 Aug 2024 14:16:23 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/dict.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 7f6ceb033..800462d54 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -329,6 +329,7 @@ export enum DICT_TYPE { DEFECT_LOCATION = 'defect_location', // 质量通知缺陷位置 DEFECT_TYPE = 'defect_type', // 质量通知缺陷类型 PROBLEM_REASON = 'problem_reason', // 质量通知问题原因 + QMS_CLAIM_MULTIPLE = 'qms_claim_multiple', //质量通知索赔倍数 // ========== 业务 - mes -gaojs ========== QUALIFY_STATUS = 'qualify_status', //质检状态 From 8a2f0831679985fe763ddaa06fc24299921eaf23 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Wed, 21 Aug 2024 14:22:03 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E9=A6=96=E4=BB=B6=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E9=87=8D=E7=BD=AE=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionRecordFirst/index.vue | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/views/qms/inspectionRecordFirst/index.vue b/src/views/qms/inspectionRecordFirst/index.vue index b3ee003d1..75180396d 100644 --- a/src/views/qms/inspectionRecordFirst/index.vue +++ b/src/views/qms/inspectionRecordFirst/index.vue @@ -2,10 +2,7 @@ @@ -306,7 +303,7 @@ const searchFormClick = (searchData) => { /** 初始化 **/ onMounted(async () => { tableObject.params = { - available: true, + available: 'TRUE', inspectionType:'11' } getList() From 3e04c9b9fe1b7ffdf7a536ffda8fe02a648ad5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Wed, 21 Aug 2024 16:10:07 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9Q2=E6=96=B0=E5=A2=9EBUG?= =?UTF-8?q?=20HL-5385?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ2/index.vue | 45 +++++++++++++------ .../qms/inspectionQ2/inspectionQ2.data.ts | 35 +++++++-------- 2 files changed, 48 insertions(+), 32 deletions(-) diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index 3e4efc71d..9adee6bbb 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -103,6 +103,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(async () => { const setV = {} if (formField == 'supplierCode') { + setV['purchaseReceiptNumber'] = '' const supplierParams = { by: 'ASC', filters: [{ column: 'code', action: '==', value: val[0].supplierCode }], @@ -119,13 +120,16 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { } }) } - + if (formField == 'purchaseReceiptNumber') { - console.log("wolaile", - val[0].qty - ); - - setV['wmsQty'] = val[0].qty + let result = '' + for (var i = 0; i < val.length; i++) { + result += val[i].number + ',' + } + if (result.endsWith(',')) { + result = result.substring(0, result.length - 1) + } + setV['purchaseReceiptNumber'] = '123' } if (formField == 'lightItemCode') { @@ -138,12 +142,13 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { setV['SupplierName'] = '' setV['itemName'] = '' setV['standardCostPrice'] = '' - setV['lightQty'] = '' - setV['claimAmount'] = '' - setV['otherclaimAmount'] = '' - setV['summaryAmount'] = '' - setV['disbursementAmount'] = '' - setV['remainingAmount'] = '' + setV['lightQty'] = 0 + setV['claimAmount'] = 0 + setV['otherclaimAmount'] = 0 + setV['summaryAmount'] = 0 + setV['disbursementAmount'] = 0 + setV['remainingAmount'] = 0 + setV['purchaseReceiptNumber'] = '' setV['uom'] = val[0].supplierUom Q2Api.getEmail().then((res) => { @@ -153,7 +158,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { }) } }) - + const supplieritemParams = { by: 'ASC', filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode }], @@ -223,6 +228,7 @@ const onChange = (field, e) => { parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount) ).toFixed(6) + } if (field == 'claimMultiple') { basicFormRef.value.formRef.formModel.claimAmount = ( @@ -241,6 +247,16 @@ const onChange = (field, e) => { parseFloat(basicFormRef.value.formRef.formModel.otherclaimAmount) ).toFixed(6) } + if (field == 'claimAmount') { + basicFormRef.value.formRef.formModel.summaryAmount = ( + parseFloat(basicFormRef.value.formRef.formModel.claimAmount) + + 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 == 'disbursementAmount') { basicFormRef.value.formRef.formModel.remainingAmount = ( @@ -379,7 +395,8 @@ const openForm = (type: string, row?: any) => { basicFormRef.value.formRef.setValues({ handleTime: new Date().getTime(), claimTime: new Date().getTime(), - priority: '3' + priority: '3', + disbursementAmount: 0 }) }) } diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 067a5a8ef..e6b366611 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -166,7 +166,6 @@ export const Q2 = useCrudSchemas( form: { // labelMessage: '信息提示说明！！！', componentProps: { - enterSearch: true, disabled: true, multiple: true, isSearchList: true, // 开启查询弹窗 @@ -186,17 +185,7 @@ export const Q2 = useCrudSchemas( value: 'itemCode', isMainValue: true } - ], - verificationParams: [ - { - key: 'number', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true - } - ] // 失去焦点校验参数 + ] } } }, @@ -253,7 +242,7 @@ export const Q2 = useCrudSchemas( ], verificationParams: [ { - key: 'lightItemCode', + key: 'code', action: '==', value: '', isMainValue: false, @@ -322,7 +311,7 @@ export const Q2 = useCrudSchemas( dictType: DICT_TYPE.QUALITY_NOTIFICATION_PRIORITY, dictClass: 'string', isSearch: false, - isTable: false, + isTable: true, tableForm: { type: 'Select' } @@ -351,6 +340,7 @@ export const Q2 = useCrudSchemas( field: 'standardCostPrice', sort: 'custom', isSearch: false, + isTable: true, table: { width: 150 }, @@ -367,7 +357,7 @@ export const Q2 = useCrudSchemas( label: '索赔金额', field: 'claimAmount', sort: 'custom', - isTable: false, + isTable: true, isSearch: false, table: { width: 150 @@ -376,7 +366,7 @@ export const Q2 = useCrudSchemas( component: 'InputNumber', componentProps: { min: 0, - precision: 2 + precision: 6 } } }, @@ -386,6 +376,7 @@ export const Q2 = useCrudSchemas( field: 'otherClaimDesc', sort: 'custom', isSearch: false, + isTable: true, table: { width: '150' }, @@ -399,6 +390,7 @@ export const Q2 = useCrudSchemas( field: 'otherclaimAmount', sort: 'custom', isSearch: false, + isTable: true, table: { width: 150 }, @@ -415,6 +407,7 @@ export const Q2 = useCrudSchemas( field: 'summaryAmount', sort: 'custom', isSearch: false, + isTable: true, table: { width: 150 }, @@ -432,6 +425,7 @@ export const Q2 = useCrudSchemas( field: 'disbursementAmount', sort: 'custom', isSearch: false, + isTable: true, table: { width: 150 }, @@ -448,6 +442,7 @@ export const Q2 = useCrudSchemas( field: 'remainingAmount', sort: 'custom', isSearch: false, + isTable: true, table: { width: 150 }, @@ -509,7 +504,7 @@ export const Q2 = useCrudSchemas( field: 'costCode', sort: 'custom', isSearch: false, - isTable: false, + isTable: true, isForm: true, form: { // labelMessage: '信息提示说明！！！', @@ -560,6 +555,7 @@ export const Q2 = useCrudSchemas( field: 'responUser', sort: 'custom', isSearch: false, + isTable: true, isForm: true, table: { width: 120 @@ -574,7 +570,7 @@ export const Q2 = useCrudSchemas( { label: '处理时间', field: 'handleTime', - isTable: false, + isTable: true, table: { width: 180 }, @@ -600,6 +596,7 @@ export const Q2 = useCrudSchemas( dictType: DICT_TYPE.PUBLISHE_STATUS, dictClass: 'string', isForm: false, + isTable: true, isSearch: false, tableForm: { type: 'Select', @@ -616,6 +613,7 @@ export const Q2 = useCrudSchemas( field: 'desc', sort: 'custom', isSearch: false, + isTable: true, table: { width: '150' }, @@ -639,6 +637,7 @@ export const Q2 = useCrudSchemas( label: '创建时间', field: 'createTime', isForm: false, + isTable: true, table: { width: 180 }, From e4b7ca8202abeaa8d06666f077ae4d45f1205a99 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 21 Aug 2024 16:21:24 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E5=8A=A0loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliverRequestMain/labelForm.vue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue index 87d493a03..fff1df0d1 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/labelForm.vue @@ -1,12 +1,13 @@