diff --git a/README.md b/README.md index 0e77af65b..f3c150968 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ ## dev发布2024-06-01-002 **xxxx.data.ts 文件配置说明** + dictType: DICT_TYPE.INVENTORY_STATUS, dictClass: 'string', dictAllOption:true,// true 字典中--下拉框中展示全选按钮 diff --git a/src/api/wms/location/index.ts b/src/api/wms/location/index.ts index df0ef46bb..4cde26921 100644 --- a/src/api/wms/location/index.ts +++ b/src/api/wms/location/index.ts @@ -128,6 +128,15 @@ export const selectBusinessTypeOutLocation = async (params) => { return request.get({ url: `/wms/location/pageBusinessTypeOutLocation`, params }) } } +export const selectBusinessTypeOutLocationAll = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/location/pageBusinessTypeOutLocationSeniorAll', data }) + } else { + return request.get({ url: `/wms/location/pageBusinessTypeOutLocationAll`, params }) + } +} export const selectPageItemAreaToLocation = async (params) => { @@ -154,3 +163,9 @@ export const selectConfigToLocation = async (params) => { export const getLocationByCodes = async (params) => { return await request.get({ url: `/wms/location/listByCodes`, params }) } + + +// 查询库位组列表 +export const getLocationByOverflowAreaTypeByConfig = async (params) => { + return await request.get({ url: `/wms/location/queryLocationByOverflowAreaTypeByConfig`, params }) +} \ No newline at end of file diff --git a/src/api/wms/productionreturnJobDetail/index.ts b/src/api/wms/productionreturnJobDetail/index.ts index f2bd6d534..50b625701 100644 --- a/src/api/wms/productionreturnJobDetail/index.ts +++ b/src/api/wms/productionreturnJobDetail/index.ts @@ -34,6 +34,27 @@ export const getProductionreturnJobDetailPage = async (params) => { return await request.get({ url: `/wms/productionreturn-job-detail/page`, params }) } } +// 查询生产退料任务子列表 +export const getProductionreturnJobDetailPageStore = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/productionreturn-job-detail-store/senior', data }) + } else { + return await request.get({ url: `/wms/productionreturn-job-detail-store/page`, params }) + } +} + +// 查询隔离退料任务子列表 +export const getProductionreturnJobDetailPageHold = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/productionreturn-job-detail-hold/senior', data }) + } else { + return await request.get({ url: `/wms/productionreturn-job-detail-hold/page`, params }) + } +} // 查询生产退料任务子详情 export const getProductionreturnJobDetail = async (id: number) => { diff --git a/src/api/wms/productionreturnJobMain/index.ts b/src/api/wms/productionreturnJobMain/index.ts index 0848605bd..74bd69d6f 100644 --- a/src/api/wms/productionreturnJobMain/index.ts +++ b/src/api/wms/productionreturnJobMain/index.ts @@ -81,6 +81,27 @@ export const exportProductionreturnJobMain = async (params) => { } } +// 导出生产退料任务主 Excel -store +export const exportProductionreturnJobMainStore = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/productionreturn-job-detail-store/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/productionreturn-job-detail-store/export-excel`, params }) + } +} + +// 导出隔离退料任务主 Excel -hold +export const exportProductionreturnJobMainHold = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/productionreturn-job-detail-hold/export-excel-senior`, data }) + } else { + return await request.download({ url: `/wms/productionreturn-job-detail-hold/export-excel`, params }) + } +} + + // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productionreturn-job-main/get-import-template' }) diff --git a/src/api/wms/productionreturnRecordMain/index.ts b/src/api/wms/productionreturnRecordMain/index.ts index 9908d416e..517717011 100644 --- a/src/api/wms/productionreturnRecordMain/index.ts +++ b/src/api/wms/productionreturnRecordMain/index.ts @@ -67,6 +67,24 @@ export const exportProductionreturnRecordMain = async (params) => { return await request.download({ url: `/wms/productionreturn-record-main/export-excel`, params }) } } +// 导出生产退料记录主 Excel -store +export const exportProductionreturnRecordMainStore = async (params) => { + if (params.isSearch){ + const data = {...params} + return await request.downloadPost({ url: `/wms/productionreturn-job-detail-store/export-excel-senior`, data }) + }else { + return await request.download({ url: `/wms/productionreturn-job-detail-store/export-excel`, params }) + } +} +// 导出隔离退料记录主 Excel -hold +export const exportProductionreturnRecordMainHold = async (params) => { + if (params.isSearch){ + const data = {...params} + return await request.downloadPost({ url: `/wms/productionreturn-job-detail-hold/export-excel-senior`, data }) + }else { + return await request.download({ url: `/wms/productionreturn-job-detail-hold/export-excel`, params }) + } +} // 下载用户导入模板 export const importTemplate = () => { diff --git a/src/api/wms/productputawayRecordMain/index.ts b/src/api/wms/productputawayRecordMain/index.ts index f411cfb30..f9a39d09e 100644 --- a/src/api/wms/productputawayRecordMain/index.ts +++ b/src/api/wms/productputawayRecordMain/index.ts @@ -74,12 +74,12 @@ export const deleteProductputawayRecordMain = async (id: number) => { // 导出制品上架记录主 Excel export const exportProductputawayRecordMain = async (params) => { - params.type = 'assemble' + if (params.isSearch) { const cmd = { 'column':'type', 'action':'==', - 'value':'assemble' + 'value':params.type } params.filters.push(cmd) delete params.isSearch diff --git a/src/api/wms/productscrapRecordMain/index.ts b/src/api/wms/productscrapRecordMain/index.ts index de4020cac..1d18efe35 100644 --- a/src/api/wms/productscrapRecordMain/index.ts +++ b/src/api/wms/productscrapRecordMain/index.ts @@ -69,4 +69,9 @@ export const exportProductscrapRecordMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/productscrap-record-main/get-import-template' }) +} + +// 撤销 +export const revoke = async (requestNumber: number, number: number) => { + return await request.get({ url: `/wms/productscrap-record-main/revoke?requestNumber=` + requestNumber + '&number=' + number}) } \ No newline at end of file diff --git a/src/api/wms/purchasePlanDetail/index.ts b/src/api/wms/purchasePlanDetail/index.ts index d09baf96a..65cae26b6 100644 --- a/src/api/wms/purchasePlanDetail/index.ts +++ b/src/api/wms/purchasePlanDetail/index.ts @@ -40,6 +40,18 @@ export const getPurchasePlanDetailPage = async (params) => { } } +// 查询要货计划子列表 -- 供应商发货申请添加明细 +export const getPurchasePlanDetailPageClcik = async (params) => { + if (params.isSearch) { + delete params.isSearch + const data = {...params} + return await request.post({ url: '/wms/purchase-plan-detail/clickDetailsSenior', data }) + } else { + params = getPageParams(params) + return await request.get({ url: `/wms/purchase-plan-detail/clickDetailsPage`, params }) + } +} + // 查询采购收货记录子列表 export const getPurchasePlanDetailList = async (params) => { return await request.get({ url: `/wms/purchase-plan-detail/allList`, params }) diff --git a/src/api/wms/purchasereceiptRequestMain/index.ts b/src/api/wms/purchasereceiptRequestMain/index.ts index fa910cb1b..dbbc615fb 100644 --- a/src/api/wms/purchasereceiptRequestMain/index.ts +++ b/src/api/wms/purchasereceiptRequestMain/index.ts @@ -88,6 +88,17 @@ export const exportPurchasereceiptRequestMain = async (params) => { } } + +// 导出采购M型收货申请主 Excel +export const exportPurchasereceiptRequestMainOrderTypeM = async (params) => { + if (params.isSearch) { + const data = {...params} + return await request.downloadPost({ url: `/wms/purchasereceipt-request-main/export-excel-senior-orderTypeM`, data }) + } else { + return await request.download({ url: `/wms/purchasereceipt-request-main/export-excel-orderTypeM`, params }) + } +} + // 导出备件收货申请 export const exportSparereceiptRequestMain = async (params) => { if (params.isSearch) { diff --git a/src/api/wms/supplierinvoiceRecordMain/index.ts b/src/api/wms/supplierinvoiceRecordMain/index.ts index 207089eb7..adf1adcd1 100644 --- a/src/api/wms/supplierinvoiceRecordMain/index.ts +++ b/src/api/wms/supplierinvoiceRecordMain/index.ts @@ -52,6 +52,12 @@ export const deleteSupplierinvoiceRecordMain = async (id: number) => { return await request.delete({ url: `/wms/supplierinvoice-record-main/delete?id=` + id }) } +// 发票回转 +export const reverseSupplierinvoiceRecordMain = async (data: SupplierinvoiceRecordMainVO) => { + return await request.post({ url: `/wms/supplierinvoice-record-main/reverse`, data }) +} + + // 导出供应商发票记录主 Excel export const exportSupplierinvoiceRecordMain = async (params) => { console.log(params) diff --git a/src/api/wms/unplannedissueRecordMain/index.ts b/src/api/wms/unplannedissueRecordMain/index.ts index 18feaf0ab..6aec7d292 100644 --- a/src/api/wms/unplannedissueRecordMain/index.ts +++ b/src/api/wms/unplannedissueRecordMain/index.ts @@ -59,3 +59,8 @@ export const exportUnplannedissueRecordMain = async (params) => { export const importTemplate = () => { return request.download({ url: '/wms/unplannedissue-record-main/get-import-template' }) } + +// 撤销 +export const revoke = async (id: number) => { + return await request.get({ url: `/wms/unplannedissue-record-main/revoke?id=` + id }) +} diff --git a/src/api/wms/unplannedreceiptRecordMain/index.ts b/src/api/wms/unplannedreceiptRecordMain/index.ts index bf684d705..482b65e7b 100644 --- a/src/api/wms/unplannedreceiptRecordMain/index.ts +++ b/src/api/wms/unplannedreceiptRecordMain/index.ts @@ -68,4 +68,9 @@ export const exportUnplannedreceiptRecordMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/unplannedreceipt-record-main/get-import-template' }) +} + +// 撤销 +export const revoke = async (id: number) => { + return await request.get({ url: `/wms/unplannedreceipt-record-main/revoke?id=` + id }) } \ No newline at end of file diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 8256576c8..101d2fb3d 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, @@ -537,11 +543,14 @@ const opensearchTable = ( return } } - filters.push({ - action: searchCondition[i].action, - column: searchCondition[i].key, - value: formRef.value.formModel[searchCondition[i].value] - }) + if(formRef.value.formModel[searchCondition[i].value]){ + filters.push({ + action: searchCondition[i].action, + column: searchCondition[i].key, + value: formRef.value.formModel[searchCondition[i].value] + }) + } + } else { filters.push({ action: searchCondition[i].action, diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue index 0bd11b607..4c175bf89 100644 --- a/src/components/Descriptions/src/Descriptions.vue +++ b/src/components/Descriptions/src/Descriptions.vue @@ -146,9 +146,10 @@ const showAll = () =>{ }} - {{ + {{ item.valueFilter(data[item.field]) }} + {{ item.valueFilter(data[item.field]) - }} + }}
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index a9b7299c6..6d45e46d5 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -209,6 +209,7 @@ import BasicForm from '@/components/BasicForm/src/BasicForm.vue' import TableHead from '@/components/TableHead/src/TableHead.vue' import DetailTable from '@/components/DetailTable/src/DetailTable.vue' import { SearchTable } from '@/components/SearchTable' +import { CACHE_KEY, useCache } from '@/hooks/web/useCache' defineOptions({ name: 'Detail' }) @@ -443,6 +444,23 @@ const props = defineProps({ default: 8 } }) +const filterPermissionAnnexTable = ()=>{ + return props.annexTable.filter(item=>{ + const { wsCache } = useCache() + const permissions = wsCache.get(CACHE_KEY.USER).permissions + const all_permission = '*:*:*' + if(item?.hasPermi&&item?.hasPermi.length > 0){ + const hasPermissions = permissions.find((permission: string) => { + return all_permission === permission || item?.hasPermi === permission + }) + if(!hasPermissions){ + console.log('hasPermi',item) + return false + } + } + return true + }) +} const isShowDrawer = ref(false) const detailLoading = ref(false) const tabsList = ref(JSON.parse(JSON.stringify(props.tabs ? props.tabs : ''))) @@ -471,7 +489,7 @@ if(props.slotDetailTabList){ } -let otherList = [...props.annexTable,{ +let otherList = [...filterPermissionAnnexTable(),{ label:props.annexAlias.label, prop:'Annex' },{ @@ -482,7 +500,7 @@ let otherList = [...props.annexTable,{ prop:'ChangeRecord' }] if(props.annexAlias.hidden){ - otherList = [...props.annexTable,{ + otherList = [...filterPermissionAnnexTable(),{ label:'备注', prop:'Remarks' },{ @@ -548,9 +566,12 @@ const getFileList = async () => { detailLoading.value = false } } + + // 获取其他附件列表篇 const getAnnexFileList = async (row) => { - props.annexTable?.forEach(async (item) => { + let annexTable = filterPermissionAnnexTable() + annexTable?.forEach(async (item) => { let requstData = {...remarksData.data,tableName: item?.tableName} if(item?.queryParams){ item?.queryParams?.forEach(queryItem => { diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index b05f796e8..2ffdbba5d 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -1283,6 +1283,10 @@ export default { '确认撤销报工吗？': 'Are you sure to cancel the job application?', '收货数量不可以大于订单数量!': 'The received quantity cannot exceed the order quantity', 撤销报工成功:'Revocation of work report successful', + 生产日期不能小于:'The date of production cannot be less than', + 生产日期不能大于当前系统日期:'The production date cannot be greater than the current system date', + 发票回转:'Return of invoice', + 发票回转成功:'The invoice has been successfully forwarded' }, diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index b3ff50bd3..7728466b0 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -1280,6 +1280,10 @@ export default { '确认撤销报工吗？': "确认撤销报工吗？", '收货数量不可以大于订单数量!':'收货数量不可以大于订单数量', 撤销报工成功:'撤销报工成功', + 生产日期不能小于:'生产日期不能小于', + 生产日期不能大于当前系统日期:'生产日期不能大于当前系统日期', + 发票回转:'发票回转', + 发票回转成功:'发票回转成功' }, } diff --git a/src/views/login/components/QRCodePDA.vue b/src/views/login/components/QRCodePDA.vue new file mode 100644 index 000000000..05d7ac92d --- /dev/null +++ b/src/views/login/components/QRCodePDA.vue @@ -0,0 +1,17 @@ + + + \ No newline at end of file diff --git a/src/views/login/components/index.ts b/src/views/login/components/index.ts index 204ad73d0..e9d56d525 100644 --- a/src/views/login/components/index.ts +++ b/src/views/login/components/index.ts @@ -4,5 +4,6 @@ import LoginFormTitle from './LoginFormTitle.vue' import RegisterForm from './RegisterForm.vue' import QrCodeForm from './QrCodeForm.vue' import SSOLoginVue from './SSOLogin.vue' +import QRCodePDA from './QRCodePDA.vue' -export { LoginForm, MobileForm, LoginFormTitle, RegisterForm, QrCodeForm, SSOLoginVue } +export { LoginForm, MobileForm, LoginFormTitle, RegisterForm, QrCodeForm, SSOLoginVue,QRCodePDA } diff --git a/src/views/login/login.vue b/src/views/login/login.vue index 6c85e902d..f75be55c6 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -43,7 +43,7 @@
-
@@ -56,7 +56,10 @@ + +
+ @@ -70,7 +73,7 @@ import { useAppStore } from '@/store/modules/app' import { ThemeSwitch } from '@/layout/components/ThemeSwitch' import { LocaleDropdown } from '@/layout/components/LocaleDropdown' -import { LoginForm, MobileForm, QrCodeForm, RegisterForm, SSOLoginVue } from './components' +import { LoginForm, MobileForm, QrCodeForm, RegisterForm, SSOLoginVue,QRCodePDA } from './components' defineOptions({ name: 'Login' }) diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index 20be438ea..c80929aae 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -49,6 +49,15 @@ { 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  const params2 = {         by: 'ASC',         filters: [{ column: 'itemCode', action: '==', value: val[0].code }], @@ -186,14 +203,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) => { @@ -239,24 +248,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) } @@ -264,6 +255,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) * @@ -272,7 +265,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) - @@ -287,17 +280,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) - @@ -307,7 +300,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) - @@ -324,6 +317,7 @@ const onChange = (field, e) => { if (field == 'supplierCode') { basicFormRef.value.formRef.formModel.supplierName = '' + basicFormRef.value.formRef.formModel.purchaseReceiptNumber = '' const paramsCustomer = { by: 'ASC', filters: [ @@ -446,6 +440,19 @@ const handleFinish = async (id: number) => { /** 添加/修改操作 */ const basicFormRef = ref() const openForm = (type: string, row?: any) => { + if (row && row.claimAddress?.trim()) { + row.filePathList = row.claimAddress.split(',') + } + + if (row && row.filePathList && row.filePathList.length > 0) { + row.filePathListView = row.filePathList.map((item) => { + return { + name: item, + url: item + } + }) + } + basicFormRef.value.open(type, row) if(!row || !row.claimAmount){ nextTick(() => { @@ -463,6 +470,24 @@ const openForm = (type: string, row?: any) => { disbursementAmount: 0 }) }) + const currentTime = new Date().getTime() + const fileId = Q2.allSchemas.formSchema.find((item) => item.field == 'fileId') + const uploadFile = Q2.allSchemas.formSchema.find( + (item) => item.field == 'claimAddress' + ) + if (fileId) { + fileId['value'] = currentTime + } + if (uploadFile) { + uploadFile['componentProps']['upData']['tableId'] = currentTime + uploadFile['componentProps']['modelValue'] = [] + } + } + else if (type == 'update') { + const uploadFile = Q2.allSchemas.formSchema.find( + (item) => item.field == 'claimAddress' + ) + uploadFile['componentProps']['modelValue'] = row.filePathListView } } @@ -482,6 +507,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 2f1c9b16f..3ef1e9b44 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' }], @@ -390,7 +390,7 @@ export const Q2 = useCrudSchemas( }, { label: '其他索赔金额', - field: 'otherclaimAmount', + field: 'otherClaimAmount', sort: 'custom', isSearch: false, isTable: true, @@ -470,7 +470,6 @@ export const Q2 = useCrudSchemas( // labelMessage: '信息提示说明！！！', componentProps: { enterSearch: true, - multiple: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本 searchField: 'number', // 查询弹窗赋值字段 @@ -597,6 +596,39 @@ export const Q2 = useCrudSchemas( } }, + { + label: '索赔单附件', + 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 + }, + form: { + component: 'UploadFile', + componentProps: { + upData: { + tableName: 'basicInspectionQ2', + tableId: '' + }, + fileType: ['doc', 'xls', 'ppt', 'txt'], + modelValue: [] + } + } + }, { label: '状态', field: 'status', 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', // 查询弹窗赋值字段 diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index 02199fe88..a5b9daf2c 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), // 删除 @@ -281,13 +281,13 @@ const buttonTableClick = async (val, row) => { // 编辑 // 评估代码值是1，接收时候，使用决策下拉列表是全部合格 if (row.estimateCode == 1) { - InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => { + InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => { if (itemColumn.field == 'useDecision') { itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value == 1) } }) } else if (row.estimateCode == 2) { - InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => { + InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => { if (itemColumn.field == 'useDecision') { itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value != 1) } @@ -338,7 +338,7 @@ const basicFormRef = ref() /** 使用决策操作操作 */ const formRef = ref() const rowData = ref() -const openUseForm = async (type: string, row?: number) => { +const openUseForm = async (type: string, row?: any) => { tableData.value = [] // 重置明细数据 rowData.value = row formRef.value.open(type, row) @@ -430,7 +430,9 @@ const submitForm = async (formType, data) => { message.success(t('common.updateSuccess')) } formRef.value.dialogVisible = false + if (!data.isPublished) { handleOrderPub(rowData.value) + } // 刷新当前列表 getList() } finally { diff --git a/src/views/qms/inspectionRecord/useAddForm.vue b/src/views/qms/inspectionRecord/useAddForm.vue index c430495c8..b533dfcf7 100644 --- a/src/views/qms/inspectionRecord/useAddForm.vue +++ b/src/views/qms/inspectionRecord/useAddForm.vue @@ -140,7 +140,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any if(row.estimateCode == 1){ data.value.useDecision = '1' }else{ - data.value.useDecision ='' + data.value.useDecision =row.useDecision||'' } // 全部合格时合格数量==数量 if(data.value.useDecision == 1){ diff --git a/src/views/qms/inspectionScheme/addForm.vue b/src/views/qms/inspectionScheme/addForm.vue index 60d97c60a..e817d31bc 100644 --- a/src/views/qms/inspectionScheme/addForm.vue +++ b/src/views/qms/inspectionScheme/addForm.vue @@ -247,450 +247,450 @@ --> - - - + +