From bd99594a4d98d5730152aff6632d10347e790f7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com> Date: Mon, 19 Aug 2024 18:34:41 +0800 Subject: [PATCH 01/42] =?UTF-8?q?Q1=20Q2=E9=80=9A=E7=9F=A5=E5=8D=95?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=93=8D=E4=BD=9C=E8=BF=87=E7=A8=8B=20=20HL-?= =?UTF-8?q?5387?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionQ1/index.vue | 87 ++++- .../qms/inspectionQ1/inspectionQ1.data.ts | 237 ++++++------ src/views/qms/inspectionQ2/index.vue | 136 +++++-- .../qms/inspectionQ2/inspectionQ2.data.ts | 343 +++++++++++------- .../scrap/scrapRequestMain/index.vue | 2 +- 5 files changed, 530 insertions(+), 275 deletions(-) diff --git a/src/views/qms/inspectionQ1/index.vue b/src/views/qms/inspectionQ1/index.vue index 2d2dbde68..6092df882 100644 --- a/src/views/qms/inspectionQ1/index.vue +++ b/src/views/qms/inspectionQ1/index.vue @@ -74,12 +74,15 @@ import download from '@/utils/download' import { Q1, Q1Rules } from './inspectionQ1.data' import * as Q1Api from '@/api/qms/inspectionQ1' +import * as ItembasicApi from '@/api/wms/itembasic' 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 * as StdcostpriceApi from '@/api/wms/stdcostprice' import { formatDate } from '@/utils/formatTime' +import * as CustomeritemApi from '@/api/wms/customeritem' +import * as CustomerApi from '@/api/wms/customer' import { useUserStore } from '@/store/modules/user' const userStore = useUserStore() @@ -97,30 +100,64 @@ const tableColumns = ref(Q1.allSchemas.tableColumns) // 查询页面返回 const priceObj = ref() const searchTableSuccess = (formField, searchField, val, formRef) => { - nextTick(async () => { + nextTick(async () => { const setV = {} - if (formField == 'customerCode') { - setV['itemCode'] = '' - } + if (formField == 'itemCode') { + setV['customerCode'] = '' + setV['customerName'] = '' + setV['itemName'] = '' + setV['standardCostPrice'] = '' + setV['qty'] = '' + setV['claimAmount'] = '' + setV['uom'] = val[0]['customerUom'] - console.log(333,val[0].code) - const params = { - by: "ASC", - filters: [{column: "itemCode", action: "==", value: val[0].itemCode}], + CustomeritemApi.getCustomerItemListByCodes({ + itemCodes: val[0].itemCode, + customerCode: '' + }).then((res) => { + if (res?.length > 0) { + formRef.formModel.customerCode = res[0].customerCode + formRef.formModel.customerName = res[0].customerName + Q1.allSchemas.formSchema.forEach((item) => { + if (item.field == 'customerCode') { + item.componentProps.options = res + } + }) + } + }) + const paramsItembasic = { + by: 'ASC', + filters: [{ column: 'code', action: '==', value: val[0].itemCode }], + pageNo: 1, + pageSize: 500, + sort: '' + } + paramsItembasic.isSearch = true + ItembasicApi.getItembasicPage(paramsItembasic).then((res) => { + if (res.list?.length > 0) { + priceObj.value = res.list[0] + formRef.setValues({ + itemName: priceObj.value.name + }) + } + }) + + const paramsStdcostprice = { + by: 'ASC', + filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode }], pageNo: 1, pageSize: 500, - sort: "" + sort: '' } - params.isSearch = true - StdcostpriceApi.getStdcostpricePage(params).then((res) => { + paramsStdcostprice.isSearch = true + StdcostpriceApi.getStdcostpricePage(paramsStdcostprice).then((res) => { if (res.list?.length > 0) { priceObj.value = res.list[0] formRef.setValues({ - claimAmount: (parseFloat(formRef.formModel.qty) * parseFloat(priceObj.value.price)).toFixed(6) + standardCostPrice: priceObj.value.price }) } - }) } setV[formField] = val[0][searchField] @@ -128,10 +165,28 @@ const searchTableSuccess = (formField, searchField, val, formRef) => { }) } -const onChange =(field,e)=>{ +const onChange = (field, e) => { if (field == 'qty') { - basicFormRef.value.formRef.formModel.claimAmount = (parseFloat( basicFormRef.value.formRef.formModel.qty) * parseFloat( priceObj.value.price)).toFixed(6) -} + basicFormRef.value.formRef.formModel.claimAmount = ( + parseFloat(basicFormRef.value.formRef.formModel.qty) * parseFloat(basicFormRef.value.formRef.formModel.standardCostPrice) + ).toFixed(6) + } + if (field == 'customerCode') { + basicFormRef.value.formRef.formModel.customerName = '' + const paramsCustomer = { + by: 'ASC', + filters: [{ column: 'code', action: '==', value: basicFormRef.value.formRef.formModel.customerCode }], + pageNo: 1, + pageSize: 500, + sort: '' + } + paramsCustomer.isSearch = true + CustomerApi.getCustomerPage(paramsCustomer).then((res) => { + if (res.list?.length > 0) { + basicFormRef.value.formRef.formModel.customerName = res.list[0].name + } + }) + } } // 字段设置 更新主列表字段 diff --git a/src/views/qms/inspectionQ1/inspectionQ1.data.ts b/src/views/qms/inspectionQ1/inspectionQ1.data.ts index dd3461b55..a1f37b292 100644 --- a/src/views/qms/inspectionQ1/inspectionQ1.data.ts +++ b/src/views/qms/inspectionQ1/inspectionQ1.data.ts @@ -15,16 +15,15 @@ const userStore = useUserStore() // 表单校验 export const Q1Rules = reactive({ - customerCode: [required], - costCode: [required], - itemCode: [required], - qty: [required], - code: [required], - priority: [required], - claimAmount: [required], - claimReason: [required], - claimTime: [required], - handleTime: [required] + itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }], + customerCode: [{ required: true, message: '请选择客户代码', trigger: 'change' }], + qty: [{ required: true, message: '请输入数量', trigger: 'change' }], + claimAmount: [{ required: true, message: '请输入索赔金额', trigger: 'change' }], + code: [{ required: true, message: '请选择缺陷代码', trigger: 'change' }], + priority: [{ required: true, message: '请选择优先级', trigger: 'change' }], + costCode: [{ required: true, message: '请选择选择成本中心代码', trigger: 'change' }], + claimTime: [{ required: true, message: '请选择选择索赔日期', trigger: 'change' }], + handleTime: [{ required: true, message: '请选择选择处理时间', trigger: 'change' }] }) export const Q1 = useCrudSchemas( @@ -40,62 +39,6 @@ export const Q1 = useCrudSchemas( fixed: 'left' } }, - { - label: '状态', - field: 'status', - sort: 'custom', - dictType: DICT_TYPE.PUBLISHE_STATUS, - dictClass: 'string', - isForm: false, - isSearch: false, - tableForm: { - type: 'Select', - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '客户代码', - field: 'customerCode', - sort: 'custom', - table: { - width: 150 - }, - form: { - // labelMessage: '信息提示说明！！！', - componentProps: { - enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择客户代码', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '客户信息', // 查询弹窗标题 - searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类 - searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'available', - value: 'TRUE', - isMainValue: false - } - ], - verificationParams: [ - { - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true - } - ] // 失去焦点校验参数 - } - }, - isSearch: true - }, { label: '物料代码', field: 'itemCode', @@ -119,12 +62,6 @@ export const Q1 = useCrudSchemas( key: 'available', value: 'TRUE', isMainValue: false - }, - { - key: 'customerCode', - value: 'customerCode', - message: '请填写客户代码！', - isMainValue: true } ], verificationParams: [ @@ -141,76 +78,107 @@ export const Q1 = useCrudSchemas( } }, { - label: '数量', - field: 'qty', + label: '物料名称', + field: 'itemName', sort: 'custom', - isTable: true, + dictClass: 'string', isSearch: false, - table: { - width: 150 + isTable: true, + tableForm: { + disabled: true }, form: { - component: 'InputNumber', componentProps: { - min: 0, - precision: 2 + disabled: true } } }, { - label: '单位', - field: 'uom', + label: '客户代码', + field: 'customerCode', sort: 'custom', - dictType: DICT_TYPE.UOM, dictClass: 'string', isSearch: false, isTable: true, tableForm: { - type: 'Select', disabled: true }, form: { + component: 'Select', componentProps: { - disabled: true + options: [], + optionsAlias: { + labelField: 'customerCode', + valueField: 'customerCode' + }, + filterable: true } } }, { - label: '编码', - field: 'code', + label: '客户名称', + field: 'customerName', sort: 'custom', - dictType: DICT_TYPE.QMS_Q1_CODE, dictClass: 'string', isSearch: false, isTable: true, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '数量', + field: 'qty', + sort: 'custom', + isTable: true, + isSearch: false, table: { - width: 180 + width: 150 }, - tableForm: { - type: 'Select' + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 2 + } } }, { - label: '优先级', - field: 'priority', + label: '单位', + field: 'uom', sort: 'custom', - dictType: DICT_TYPE.QUALITY_NOTIFICATION_PRIORITY, + dictType: DICT_TYPE.UOM, dictClass: 'string', isSearch: false, - isTable: false, + isTable: true, tableForm: { - type: 'Select' + type: 'Select', + disabled: true + }, + form: { + componentProps: { + disabled: true + } } }, { - label: '负责用户', - field: 'responUser', + label: '标准成本价格', + field: 'standardCostPrice', sort: 'custom', isSearch: false, - isForm: false, + table: { + width: 150 + }, form: { + component: 'InputNumber', componentProps: { - value: userStore.getUser.nickname, + min: 0, + precision: 6, disabled: true } } @@ -232,6 +200,33 @@ export const Q1 = useCrudSchemas( } } }, + { + label: '缺陷编码', + field: 'code', + sort: 'custom', + dictType: DICT_TYPE.QMS_Q1_CODE, + dictClass: 'string', + isSearch: false, + isTable: true, + table: { + width: 180 + }, + tableForm: { + type: 'Select' + } + }, + { + label: '优先级', + field: 'priority', + sort: 'custom', + dictType: DICT_TYPE.QUALITY_NOTIFICATION_PRIORITY, + dictClass: 'string', + isSearch: false, + isTable: false, + tableForm: { + type: 'Select' + } + }, { label: '成本中心代码', @@ -303,6 +298,19 @@ export const Q1 = useCrudSchemas( } } }, + { + label: '负责用户', + field: 'responUser', + sort: 'custom', + isSearch: false, + isForm: true, + form: { + componentProps: { + value: userStore.getUser.nickname, + disabled: true + } + } + }, { label: '处理时间', field: 'handleTime', @@ -325,6 +333,24 @@ export const Q1 = useCrudSchemas( } } }, + { + label: '状态', + field: 'status', + sort: 'custom', + dictType: DICT_TYPE.PUBLISHE_STATUS, + dictClass: 'string', + isForm: false, + isSearch: false, + tableForm: { + type: 'Select', + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '描述', field: 'desc', @@ -392,8 +418,17 @@ export const Q1 = useCrudSchemas( valueFormat: 'YYYY-MM-DD HH:mm:ss', type: 'daterange', defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] - }, + } + } + }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 }, + isForm: false, + isTable: true }, { label: '操作', diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index fd8aa94b0..13e5fc996 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -55,6 +55,7 @@ :apiCreate="Q2Api.createQ2" @searchTableSuccess="searchTableSuccess" :isBusiness="false" + @onChange="onChange" /> @@ -77,7 +78,11 @@ 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 * as StdcostpriceApi from '@/api/wms/stdcostprice' import { formatDate } from '@/utils/formatTime' +import * as SupplieritemApi from '@/api/wms/supplieritem' +import * as SupplierApi from '@/api/wms/supplier' +import * as ItembasicApi from '@/api/wms/itembasic' import { useUserStore } from '@/store/modules/user' const userStore = useUserStore() @@ -93,37 +98,126 @@ routeName.value = route.name const tableColumns = ref(Q2.allSchemas.tableColumns) // 查询页面返回 +const priceObj = ref() const searchTableSuccess = (formField, searchField, val, formRef) => { - nextTick(() => { + nextTick(async () => { const setV = {} if (formField == 'supplierCode') { - setV['itemCode'] = '' + const supplierParams = { + by: 'ASC', + filters: [{ column: 'code', action: '==', value: val[0].supplierCode }], + pageNo: 1, + pageSize: 500, + sort: '' + } + supplierParams.isSearch = true + SupplierApi.getSupplierPage(supplierParams).then((res) => { + if (res.list?.length > 0) { + formRef.setValues({ + supplierName: res.list[0].name + }) + } + }) } if (formField == 'itemCode') { - setV['uom'] = val[0]['supplierUom'] - } - // if (formField == 'q1Number') { - // console.log(123) - // setV['q1Number'] = val[0]['number'] - // } - if (formField == 'purchaseReceiptNumber') { - setV['wmsQty'] = val[0]['qty'] - } - if (formField == 'q1Number') { - //Q1通知单号 - let list = [] - val.forEach((item) => { - list.push(item[searchField]) + setV['SupplierCode'] = '' + setV['SupplierName'] = '' + setV['itemName'] = '' + setV['standardCostPrice'] = '' + setV['qty'] = '' + setV['claimAmount'] = '' + + setV['uom'] = val[0].supplierUom + const supplieritemParams = { + by: 'ASC', + filters: [{ column: 'itemCode', action: '==', value: val[0].itemCode}], + pageNo: 1, + pageSize: 500, + sort: '' + } + supplieritemParams.isSearch = true + SupplieritemApi.getSupplieritemPage(supplieritemParams).then((res) => { + if (res.list?.length > 0) { + formRef.formModel.supplierCode = res.list[0].supplierCode + formRef.formModel.supplierName = res.list[0].supplierName + Q2.allSchemas.formSchema.forEach((item) => { + if (item.field == 'supplierCode') { + item.componentProps.options = res.list + } + }) + } + }) + const itembasicParams = { + by: 'ASC', + filters: [{ column: 'code', action: '==', value: val[0].itemCode }], + pageNo: 1, + pageSize: 500, + sort: '' + } + itembasicParams.isSearch = true + ItembasicApi.getItembasicPage(itembasicParams).then((res) => { + if (res.list?.length > 0) { + formRef.setValues({ + itemName: res.list[0].name + }) + } + }) + + 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] = list.join(',') - formRef.setValues(setV) - } else { - setV[formField] = val[0][searchField] - formRef.setValues(setV) } + setV[formField] = val[0][searchField] + formRef.setValues(setV) }) } +const onChange = (field, e) => { + if (field == 'qty') { + basicFormRef.value.formRef.formModel.claimAmount = ( + parseFloat(basicFormRef.value.formRef.formModel.qty) * parseFloat(basicFormRef.value.formRef.formModel.standardCostPrice) + ).toFixed(6) + 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) + + ).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 + } + }) + } +} + // 字段设置 更新主列表字段 const updataTableColumns = (val) => { tableColumns.value = val diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts index 2e2f6a883..342e3f3c9 100644 --- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts +++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts @@ -49,70 +49,14 @@ export const Q2 = useCrudSchemas( fixed: 'left' } }, - - { - label: '状态', - field: 'status', - sort: 'custom', - dictType: DICT_TYPE.PUBLISHE_STATUS, - dictClass: 'string', - isForm: false, - isSearch: false, - tableForm: { - type: 'Select', - disabled: true - }, - form: { - componentProps: { - disabled: true - } - } - }, - { - label: '供应商代码', - field: 'supplierCode', - sort: 'custom', - isSearch: true, - table: { - width: 175 - }, - form: { - componentProps: { - enterSearch: true, - isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择供应商', // 输入框占位文本 - searchField: 'code', // 查询弹窗赋值字段 - searchTitle: '供应商信息', // 查询弹窗标题 - searchAllSchemas: Supplier.allSchemas, // 查询弹窗所需类 - searchPage: SupplierApi.getSupplierPage, // 查询弹窗所需分页方法 - searchCondition: [ - { - key: 'available', - value: 'TRUE', - isMainValue: false - } - ], - verificationParams: [ - { - key: 'code', - action: '==', - value: '', - isMainValue: false, - isSearch: true, - isFormModel: true - } - ] // 失去焦点校验参数 - } - } - }, { label: '物料代码', field: 'itemCode', sort: 'custom', - isSearch: true, table: { - width: 190 + width: 150 }, + isSearch: true, form: { // labelMessage: '信息提示说明！！！', componentProps: { @@ -124,12 +68,6 @@ export const Q2 = useCrudSchemas( searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类 searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法 searchCondition: [ - { - key: 'supplierCode', - value: 'supplierCode', - message: '请填写供应商代码！', - isMainValue: true - }, { key: 'available', value: 'TRUE', @@ -150,32 +88,51 @@ export const Q2 = useCrudSchemas( } }, { - label: '数量', - field: 'qty', + label: '物料名称', + field: 'itemName', sort: 'custom', + dictClass: 'string', + isSearch: false, isTable: true, + tableForm: { + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, + { + label: '供应商代码', + field: 'supplierCode', + sort: 'custom', + dictClass: 'string', isSearch: false, - table: { - width: 150 + isTable: true, + tableForm: { + disabled: true }, form: { - component: 'InputNumber', + component: 'Select', componentProps: { - min: 0, - precision: 2 + options: [], + optionsAlias: { + labelField: 'supplierCode', + valueField: 'supplierCode' + }, + filterable: true } } }, { - label: '单位', - field: 'uom', + label: '供应商名称', + field: 'supplierName', sort: 'custom', - dictType: DICT_TYPE.UOM, dictClass: 'string', isSearch: false, isTable: true, tableForm: { - type: 'Select', disabled: true }, form: { @@ -188,7 +145,7 @@ export const Q2 = useCrudSchemas( label: '采购收货单号', field: 'purchaseReceiptNumber', sort: 'custom', - isTable: false, + isTable: true, table: { width: 180 }, @@ -228,19 +185,99 @@ export const Q2 = useCrudSchemas( } } }, + { + label: '索赔日期', + field: 'claimTime', + isTable: true, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, { - label: '采购收货数量', - field: 'wmsQty', + label: '数量', + field: 'qty', sort: 'custom', + isTable: true, isSearch: false, - isForm: false, + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 2 + } + } + }, + { + label: '单位', + field: 'uom', + 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 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 6, + disabled: true + } + } + }, + { + label: '索赔金额', + field: 'claimAmount', + sort: 'custom', isTable: false, - isDetail: false + isSearch: false, + table: { + width: 150 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 2 + } + } }, - { - label: '编码', + label: '缺陷编码', field: 'code', sort: 'custom', dictType: DICT_TYPE.QMS_Q2_CODE, @@ -254,7 +291,6 @@ export const Q2 = useCrudSchemas( type: 'Select' } }, - { label: '优先级', field: 'priority', @@ -268,26 +304,38 @@ export const Q2 = useCrudSchemas( } }, { - label: '负责用户', - field: 'responUser', + label: '其他索赔描述', + field: 'otherClaimDesc', sort: 'custom', isSearch: false, - isForm: true, table: { - width: 120 + width: '150' + }, + form: { + component: 'Input', + componentProps: {} + } + }, + { + label: '其他索赔金额', + field: 'otherclaimAmount', + sort: 'custom', + isSearch: false, + table: { + width: 150 }, form: { + component: 'InputNumber', componentProps: { - value: userStore.getUser.nickname, - disabled: true + min: 0, + precision: 6, } } }, { - label: '索赔金额', - field: 'claimAmount', + label: '汇总金额', + field: 'summaryAmount', sort: 'custom', - isTable: false, isSearch: false, table: { width: 150 @@ -296,7 +344,8 @@ export const Q2 = useCrudSchemas( component: 'InputNumber', componentProps: { min: 0, - precision: 2 + precision: 6, + disabled: true } } }, @@ -337,49 +386,6 @@ export const Q2 = useCrudSchemas( } } }, - - { - label: '索赔日期', - field: 'claimTime', - isTable: true, - table: { - width: 180 - }, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, - { - label: '处理时间', - field: 'handleTime', - isTable: false, - table: { - width: 180 - }, - formatter: dateFormatter, - detail: { - dateFormat: 'YYYY-MM-DD HH:mm:ss' - }, - form: { - component: 'DatePicker', - componentProps: { - style: { width: '100%' }, - type: 'datetime', - dateFormat: 'YYYY-MM-DD HH:mm:ss', - valueFormat: 'x' - } - } - }, { label: 'Q1通知单号', field: 'q1Number', @@ -424,6 +430,62 @@ export const Q2 = useCrudSchemas( }, isSearch: true }, + { + label: '负责用户', + field: 'responUser', + sort: 'custom', + isSearch: false, + isForm: true, + table: { + width: 120 + }, + form: { + componentProps: { + value: userStore.getUser.nickname, + disabled: true + } + } + }, + { + label: '处理时间', + field: 'handleTime', + isTable: false, + table: { + width: 180 + }, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + form: { + component: 'DatePicker', + componentProps: { + style: { width: '100%' }, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'x' + } + } + }, + + { + label: '状态', + field: 'status', + sort: 'custom', + dictType: DICT_TYPE.PUBLISHE_STATUS, + dictClass: 'string', + isForm: false, + isSearch: false, + tableForm: { + type: 'Select', + disabled: true + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '描述', field: 'desc', @@ -478,6 +540,15 @@ export const Q2 = useCrudSchemas( } } }, + { + label: '创建者', + field: 'creator', + table: { + width: 130 + }, + isForm: false, + isTable: true + }, { label: '操作', field: 'action', diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index 56d170f54..ec6a457db 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -240,7 +240,7 @@ const clearSearchInput = (field) => { } if (field == 'q3Number') { ScrapRequestMain.allSchemas.formSchema.forEach((item) => { - if (item.field == 'q1Number' || item.field == 'q1Number') { + if (item.field == 'q1Number' || item.field == 'q2Number') { item.componentProps.enterSearch = true item.componentProps.isSearchList = true item.componentProps.disabled = false From 866dc6882c32ba75cf1275922a2803e08f39c02a Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Mon, 19 Aug 2024 18:57:58 +0800 Subject: [PATCH 02/42] =?UTF-8?q?WMS=20=E9=9C=80=E6=B1=82=EF=BC=9AHL-5264?= =?UTF-8?q?=20=20=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6=E9=80=80=E5=BA=93=20?= =?UTF-8?q?=E5=A4=8D=E6=B5=8B=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparepartReturnRecordMain.data.ts | 2 +- .../sparepartReturnRequestMain.data.ts | 62 +++++++++++++++++-- 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts index 32c7b00bf..660fbb2e3 100644 --- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRecordMain/sparepartReturnRecordMain.data.ts @@ -42,7 +42,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( table: { width: 180 }, - isSearch: true + isSearch: false }, { label: '申请时间', diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts index 761dbda4f..62fe54e2d 100644 --- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/sparepartReturnRequestMain.data.ts @@ -801,12 +801,66 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive Date: Mon, 19 Aug 2024 19:05:31 +0800 Subject: [PATCH 03/42] =?UTF-8?q?HL-5445=E6=A0=B9=E6=8D=AEasnNumber?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E8=B4=A8=E6=A3=80=E6=8A=A5=E5=91=8A=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionJob/index.vue | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/views/qms/inspectionJob/index.vue b/src/views/qms/inspectionJob/index.vue index a4d7aaa94..16c5c260d 100644 --- a/src/views/qms/inspectionJob/index.vue +++ b/src/views/qms/inspectionJob/index.vue @@ -238,6 +238,14 @@ const isShowMainButton = (row, val) => { } } +const isShowMainButton3 = (row) => { + if (row.asnNumber) { + return false + } else { + return true + } +} + // 根据状态返回该按钮是否显示 const isShowMainButton2 = (row, val) => { if (val.indexOf(row.isStaging) > -1) { @@ -283,7 +291,9 @@ const butttondata = (row) => { hasPermi: 'qms:inspection-job-main:execute' }), // 发布 defaultButtons.mainListPackageBtn(null), // 包装 - defaultButtons.mainListPlanCheckQualityReportBtn({}) // 查看质检报告 + defaultButtons.mainListPlanCheckQualityReportBtn({ + hide: isShowMainButton3(row) + }) // 查看质检报告 ] } const listTableRef = ref() From c23c661f4cc89eec41aaeea06d6cc1148a854fcb Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 19 Aug 2024 19:23:56 +0800 Subject: [PATCH 04/42] =?UTF-8?q?HL-5449:SCP=E6=AD=A3=E5=BC=8F=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=EF=BC=8C=E5=B0=86=E7=94=B3=E8=AF=B7=E3=80=81=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=AD=E4=B8=BB=E6=95=B0=E6=8D=AE=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=B0=BE=E5=B7=AE=E9=83=A8=E5=88=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E8=BF=9B=E8=A1=8C=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 8 ++++---- .../supplierinvoiceRequestMain.data.ts | 8 ++++---- .../supplierinvoiceRequestMainDifference.data.ts | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 615b53c71..997a8518e 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -1102,7 +1102,7 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive Date: Tue, 20 Aug 2024 08:49:27 +0800 Subject: [PATCH 05/42] =?UTF-8?q?HL-5448=20=E8=BF=90=E8=BE=93=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E9=83=BD=E5=BA=94=E8=AF=A5=E6=98=AF=E4=B8=AD=E6=96=87?= =?UTF-8?q?=EF=BC=88=E6=89=B9=E9=87=8F=E4=BF=AE=E6=94=B9=EF=BC=89=EF=BC=8C?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerreceiptRecordMain.data.ts | 1 + .../customerreceiptRequestMain.data.ts | 1 + .../customerreturnRecordMain.data.ts | 3 ++- .../deliver/deliverRecordMain/deliverRecordMain.data.ts | 1 + .../transferissueRecordMain/transferissueRecordMain.data.ts | 1 + .../transferreceiptJobMain/transferreceiptJobMain.data.ts | 1 + .../transferreceiptRecordMain.data.ts | 1 + .../transferreceiptRequestMain.data.ts | 1 + .../purchasereceiptRecordMain.data.ts | 1 + .../purchasereturnJobMain/purchasereturnJobMain.data.ts | 1 + .../sparereceiptJobMain/sparereceiptJobMain.data.ts | 5 +++-- .../sparereceiptRecordMain/sparereceiptRecordMain.data.ts | 1 + 12 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts index a5e8701cb..c85779a32 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRecordMain/customerreceiptRecordMain.data.ts @@ -84,6 +84,7 @@ export const CustomerreceiptRecordMain = useCrudSchemas(reactive([ label: '运输方式', field: 'transferMode', sort: 'custom', + dictType: DICT_TYPE.TRANSFER_MODE, table: { width: 150 }, diff --git a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts index 0b25a3b59..c1d9a38db 100644 --- a/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreceipt/customerreceiptRequestMain/customerreceiptRequestMain.data.ts @@ -98,6 +98,7 @@ export const CustomerreceiptRequestMain = useCrudSchemas(reactive( label: '运输方式', field: 'transferMode', sort: 'custom', + dictType: DICT_TYPE.TRANSFER_MODE, table: { width: 150 }, diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts index 72c5ffb1a..f11e49080 100644 --- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRecordMain/customerreturnRecordMain.data.ts @@ -51,7 +51,7 @@ export const CustomerreturnRecordMain = useCrudSchemas( width: 150 } }, - + { label: '发货记录单号', field: 'deliverRecordNumber', @@ -149,6 +149,7 @@ export const CustomerreturnRecordMain = useCrudSchemas( { label: '运输方式', field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts index f02abe45b..74fedc839 100644 --- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts @@ -118,6 +118,7 @@ export const DeliverRecordMain = useCrudSchemas( { label: '运输方式', field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts index 386c0bc16..04d5e3e02 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRecordMain/transferissueRecordMain.data.ts @@ -45,6 +45,7 @@ export const TransferissueRecordMain = useCrudSchemas(reactive([ { label: '运输方式', field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts index 61664b19e..ea2dc1572 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts @@ -48,6 +48,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive([ { label: '运输方式', field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts index 449334325..bbc5e5fb9 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts @@ -53,6 +53,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive([ { label: '运输方式', field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts index 246d16e93..8c372733c 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts @@ -66,6 +66,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive( { label: '运输方式', field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts index b5c0fbd48..e5b387127 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordRefuseMain/purchasereceiptRecordMain.data.ts @@ -145,6 +145,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ { label: '运输方式', field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts index 6eafe4f71..eaf2e2a4e 100644 --- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts @@ -140,6 +140,7 @@ export const PurchasereturnJobMain = useCrudSchemas( { label: '运输方式', field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, sort: 'custom', table: { width: 150 diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts index c1db0f98c..05d025955 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptJobMain/sparereceiptJobMain.data.ts @@ -92,6 +92,7 @@ export const PurchasereceiptJobMain = useCrudSchemas(reactive([ { label: '运输方式', field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, sort: 'custom', table: { width: 150 @@ -901,7 +902,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ disabled: true } }, - + { label: '供应商计量数量', field: 'supplierQty', @@ -1119,7 +1120,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas(reactive([ }, isTableForm:true, }, - + ])) //表单校验 diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts index 63841eb29..65c83c25e 100644 --- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/sparereceiptRecordMain.data.ts @@ -108,6 +108,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ { label: '运输方式', field: 'transferMode', + dictType: DICT_TYPE.TRANSFER_MODE, sort: 'custom', table: { width: 150 From 5d491dc7e04ec42249e8433b38dd2bafcb79fed6 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 20 Aug 2024 10:17:23 +0800 Subject: [PATCH 06/42] =?UTF-8?q?HL-5421=20=E4=BF=AE=E6=94=B9=E7=89=A9?= =?UTF-8?q?=E6=96=99=E9=9A=94=E7=A6=BB=E7=94=B3=E8=AF=B7=E7=9A=84=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E8=A1=A8=E5=8D=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E9=A1=B5=EF=BC=8C=E4=BB=A5=E4=BE=BF=E4=BA=8E=E5=BF=AB?= =?UTF-8?q?=E9=80=9F=E6=9F=A5=E7=9C=8B=E5=B7=B2=E9=80=89=E6=8B=A9=E7=9A=84?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=BA=93=E5=AD=98=E7=9A=84=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRequestMainOKHOLD/index.vue | 8 ++++++++ .../inventorymoveRequestMain.data.ts | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue index f3cd23330..edd2f3133 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue @@ -90,6 +90,7 @@ import * as InventorymoveRequestDetailApi from '@/api/wms/inventorymoveRequestDe import * as defaultButtons from '@/utils/disposition/defaultButtons' import * as LocationApi from '@/api/wms/location' import { formatDate } from '@/utils/formatTime' +import dayjs from 'dayjs' // 库存转移申请 defineOptions({ name: 'InventorymoveRequestMain' }) @@ -615,6 +616,13 @@ const buttonTableClick = async (val, row) => { /** 添加/修改操作 */ const formRef = ref() const openForm =async (type: string, row?: number) => { + if(type=='create'){ + InventorymoveRequestMain.allSchemas.formSchema.forEach(item =>{ + if(item.field == 'dueTime') { + item.value = dayjs().add(1, 'hour') + } + }) + } tableData.value = [] // 重置明细数据 formRef.value.open(type, row) } diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts index 6f6e21b82..ba810d477 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts @@ -584,7 +584,8 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive( }, tableForm:{ multiple:true, - isInpuFocusShow: true, // 开启查询弹窗 + disabled:true, + isInpuFocusShow: false, // 开启查询弹窗 searchListPlaceholder: '请选择从包装号', searchField: 'packingNumber', searchTitle: '库存余额信息', From dcbee8966b44028868e1dbd6a0377567bae67752 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 20 Aug 2024 10:26:42 +0800 Subject: [PATCH 07/42] =?UTF-8?q?HL-5491M=E5=9E=8B=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B2=A1=E6=9C=89=E6=9F=A5=E5=88=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=88=E5=9B=A0=E4=B8=BA=E5=88=97=E8=A1=A8=E6=9C=89?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E8=AE=A2=E5=8D=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E8=A1=8C=E5=8F=AF=E4=BB=A5=E6=94=B6=E8=B4=A7=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E9=87=8F=20=E8=AE=A2=E5=8D=95=E6=95=B0-=E5=B7=B2?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=95=B0-=E7=94=B3=E8=AF=B7=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E9=87=8F=EF=BC=89=E8=BF=99=E6=A0=B7=E7=9A=84?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8D=E8=BF=94=E5=9B=9E=EF=BC=8C=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=8F=90=E7=A4=BA=E8=AF=A5=E8=AE=A2=E5=8D=95=E5=B7=B2?= =?UTF-8?q?=E5=AD=98=E5=9C=A8=E7=94=B3=E8=AF=B7=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRequestOrderMTypeMain/index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue index 44b1f1c94..b59b95f10 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestOrderMTypeMain/index.vue @@ -534,6 +534,10 @@ const getSearchTableData = async (number,isEnter=false)=>{ item.width = item.table?.width || 150 }) tableData.value = [] + if(tableObject.tableList.length==0){ + message.error(`此订单${number}已存在M类型申请的数据`) + return + } updateTableData(tableObject.tableList) const itemCodes = [] tableObject.tableList.forEach(row=>{ From 57602257266beb60b93a560629f0a0bc1d5bf2eb Mon Sep 17 00:00:00 2001 From: gaojs <757918719@qq.com> Date: Tue, 20 Aug 2024 10:32:58 +0800 Subject: [PATCH 08/42] =?UTF-8?q?WMS=20=E9=9C=80=E6=B1=82=EF=BC=9AHL-5264?= =?UTF-8?q?=20=20=E7=BB=B4=E4=BF=AE=E5=A4=87=E4=BB=B6=E9=80=80=E5=BA=93=20?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparepartReturn/sparepartReturnRequestMain/index.vue | 2 +- .../unplannedreceipt/unplannedreceiptRequestMain/index.vue | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue index 1d8e63db0..8611480fe 100644 --- a/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartReturn/sparepartReturnRequestMain/index.vue @@ -252,7 +252,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'wms:unplannedreceipt-request-main:create'}), // 新增 - //defaultButtons.defaultImportBtn({hasPermi:'wms:unplannedreceipt-request-main:import'}), // 导入 + defaultButtons.defaultImportBtn({hasPermi:'wms:unplannedreceipt-request-main:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:unplannedreceipt-request-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 9cb708a64..a6e26c386 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -734,10 +734,12 @@ const submitForm = async (formType, submitData) => { if(flag){ return } + data.dataType='1' formRef.value.formLoading = true await UnplannedreceiptRequestMainApi.createUnplannedreceiptRequestMain(data) message.success(t('common.createSuccess')) } else { + data.dataType='1' formRef.value.formLoading = true await UnplannedreceiptRequestMainApi.updateUnplannedreceiptRequestMain(data) message.success(t('common.updateSuccess')) From cae2a034c13a92facf49fda3635e8666a7509225 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 20 Aug 2024 10:53:37 +0800 Subject: [PATCH 09/42] =?UTF-8?q?HL-5465=E9=A2=84=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=92=8C=E8=A3=85=E9=85=8D=E6=8A=A5=E5=B7=A5=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E4=B8=AD=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productreceiptRequestMain/index.vue | 737 ++++++++++-------- .../productreceiptRequestMain.data.ts | 203 ++--- .../index.vue | 61 +- .../productreceiptAssembleRequestMain.data.ts | 42 +- 4 files changed, 578 insertions(+), 465 deletions(-) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index f5706b3e0..ae2cdc531 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -1,23 +1,31 @@