diff --git a/src/api/wms/countJobMain/index.ts b/src/api/wms/countJobMain/index.ts index 2f685a8cf..c5f532bd9 100644 --- a/src/api/wms/countJobMain/index.ts +++ b/src/api/wms/countJobMain/index.ts @@ -76,7 +76,7 @@ export const exportCountJobMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/count-job-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/count-job-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/count-job-main/export-excel`, params }) } @@ -98,4 +98,4 @@ export const handleExportCountJob = async (id: number) => { masterId:id } return await request.download({ url: `/wms/count-job-main/export-excel-single`, params }) -} \ No newline at end of file +} diff --git a/src/api/wms/countPlanMain/index.ts b/src/api/wms/countPlanMain/index.ts index 0e3bc85fb..69cc8d502 100644 --- a/src/api/wms/countPlanMain/index.ts +++ b/src/api/wms/countPlanMain/index.ts @@ -63,7 +63,7 @@ export const exportCountPlanMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/count-plan-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/count-plan-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/count-plan-main/export-excel`, params }) } @@ -107,4 +107,4 @@ export const publish = (id) => { // 重置 export const resetting = (id) => { return request.put({ url: '/wms/count-plan-main/resetting?id=' + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/countRecordMain/index.ts b/src/api/wms/countRecordMain/index.ts index 35d2ef3db..71012a8e2 100644 --- a/src/api/wms/countRecordMain/index.ts +++ b/src/api/wms/countRecordMain/index.ts @@ -59,7 +59,7 @@ export const exportCountRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/count-record-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/count-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/count-record-main/export-excel`, params }) } @@ -73,4 +73,4 @@ export const importTemplate = () => { // 生成盘点调整 export const generateCountRecordMain = async (id) => { return await request.put({ url: `/wms/count-record-main/generate?id=` + id}) -} \ No newline at end of file +} diff --git a/src/api/wms/countRequestMain/index.ts b/src/api/wms/countRequestMain/index.ts index b353bf0f9..77ff0c03d 100644 --- a/src/api/wms/countRequestMain/index.ts +++ b/src/api/wms/countRequestMain/index.ts @@ -58,7 +58,7 @@ export const exportCountRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/count-request-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/count-request-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/count-request-main/export-excel`, params }) } @@ -115,4 +115,4 @@ export const generateCountadjustRequest = async (id) => { //解冻 export const thaw = async (id) => { return await request.put({ url: `/wms/count-request-main/thaw?id=` + id }) -} \ No newline at end of file +} diff --git a/src/api/wms/countadjustRecordMain/index.ts b/src/api/wms/countadjustRecordMain/index.ts index 02dc4ed60..8cb6da3f7 100644 --- a/src/api/wms/countadjustRecordMain/index.ts +++ b/src/api/wms/countadjustRecordMain/index.ts @@ -57,7 +57,7 @@ export const exportCountadjustRecordMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/countadjust-record-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/countadjust-record-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/countadjust-record-main/export-excel`, params }) } @@ -66,4 +66,4 @@ export const exportCountadjustRecordMain = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/wms/countadjust-record-main/get-import-template' }) -} \ No newline at end of file +} diff --git a/src/api/wms/countadjustRequestMain/index.ts b/src/api/wms/countadjustRequestMain/index.ts index 4cc19ee4d..d1612bd5e 100644 --- a/src/api/wms/countadjustRequestMain/index.ts +++ b/src/api/wms/countadjustRequestMain/index.ts @@ -57,7 +57,7 @@ export const exportCountadjustRequestMain = async (params) => { if (params.isSearch) { delete params.isSearch const data = {...params} - return request.post({ url: '/wms/countadjust-request-main/export-excel-senior', data }) + return request.downloadPost({ url: '/wms/countadjust-request-main/export-excel-senior', data }) } else { return await request.download({ url: `/wms/countadjust-request-main/export-excel`, params }) } diff --git a/src/api/wms/productreceiptRequestDetail/index.ts b/src/api/wms/productreceiptRequestDetail/index.ts index 0b1b75cf3..5301001fc 100644 --- a/src/api/wms/productreceiptRequestDetail/index.ts +++ b/src/api/wms/productreceiptRequestDetail/index.ts @@ -65,6 +65,10 @@ export const getProductreceiptRequestDetailPageScrap = async (params) => { return await request.get({ url: `/wms/productreceipt-request-detail/page`, params }) } } +// 根据物料代码查计量单位 +export const getQueryItemCodeInfo = async (data) => { + return await request.post({ url: 'wms/itembasic/queryItemCodeInfo', data }) +} // 查询制品收货申请子详情 export const getProductreceiptRequestDetail = async (id: number) => { diff --git a/src/api/wms/supplierinvoiceRequestDetail/index.ts b/src/api/wms/supplierinvoiceRequestDetail/index.ts index 7cbc9a250..0dd4c5343 100644 --- a/src/api/wms/supplierinvoiceRequestDetail/index.ts +++ b/src/api/wms/supplierinvoiceRequestDetail/index.ts @@ -51,7 +51,7 @@ export const getSupplierinvoiceRequestDetail = async (id: number) => { } // 新增供应商发票申请子 -export const createSupplierinvoiceRequestDetail = async (data: SupplierinvoiceRequestDetailVO) => { +export const createSupplierinvoiceRequestDetail = async (data) => { return await request.post({ url: `/wms/supplierinvoice-request-detail/create`, data }) } diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index 8b6a0636c..1477668af 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -384,12 +384,23 @@ const props = defineProps({ required: false, default: false }, + fieldTableColumn:{ + type: String, + required: false, + default: '' + }, //扩展其他按钮 otherHeadButttonData:{ type:Array, required: false, default: () => [] - } + }, + //主表单独操作--明细左上角新增按钮 + mainSubmitCreateApi:{ + type: Boolean, + required: false, + default: false + }, }) const isShowDrawer = ref(false) const detailLoading = ref(false) @@ -671,7 +682,10 @@ const openDetail = async (row: any, titleName: any, titleValue: any, tableName: } } } -defineExpose({ openDetail, formRef }) // 提供 open 方法，用于打开弹窗 +const updateList = ()=>{ + getList() +} +defineExpose({ openDetail, formRef ,updateList}) // 提供 open 方法，用于打开弹窗 // 获取备注列表 const getRemarkList = async () => { @@ -728,16 +742,19 @@ const buttonBaseClick = (val, item) => { masterId: masterParmas.value.masterId, number: masterParmas.value.number }) - const item = props.detailAllSchemas.formSchema[0] - opensearchTable( - item.field, item?.componentProps?.searchField, - item?.componentProps?.searchTitle, - item?.componentProps?.searchAllSchemas, - item?.componentProps?.searchPage, - item?.componentProps?.searchCondition, - item?.componentProps?.multiple, - undefined,undefined - ) + if(props.fieldTableColumn!=''){ + const item = props.detailAllSchemas.formSchema.find(item=>item.field == props.fieldTableColumn) + opensearchTable( + item.field, item?.componentProps?.searchField, + item?.componentProps?.searchTitle, + item?.componentProps?.searchAllSchemas, + item?.componentProps?.searchPage, + item?.componentProps?.searchCondition, + item?.componentProps?.multiple, + undefined,undefined + ) + } + }else{ openForm('create') } @@ -867,13 +884,19 @@ const submitForm = async (formType, data) => { const searchTableSuccess1 = (formField, searchField, val, formRef) => { searchTableFormModel.value[formField] = val.map(item=>item[searchField]).join(',') console.log('searchTableSuccess1',searchTableFormModel) - submitForm(searchTableFormType.value,searchTableFormModel.value) - emit('searchTableSuccessDetail', formField, searchField, val, formRef) + if(props.mainSubmitCreateApi){ + emit('searchTableSuccessDetail', formField, searchField, val, formRef,searchTableFormModel.value) + }else{ + submitForm(searchTableFormType.value,searchTableFormModel.value) + emit('searchTableSuccessDetail', formField, searchField, val, formRef) + + } } // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { emit('searchTableSuccessDetail', formField, searchField, val, formRef) } + // 传递给父类 const emit = defineEmits([ 'searchTableSuccessDetail', @@ -885,7 +908,7 @@ const emit = defineEmits([ 'onBlur', 'detailBasicFormOnChange', 'formFormDateChange', - 'buttonBaseClick' + 'buttonBaseClick', ]) /** 删除按钮操作 */ const handleDelete = async (id: number) => { diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 64754649a..3b08a2073 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -367,4 +367,5 @@ export enum DICT_TYPE { OFF_BACK_STATUS = 'off_back_status', SPAREPARTS_APPLY_STATUS_ENUM = 'spareparts_apply_status_enum',// 流程状态 IS_LINE_ITEM = 'is_line_item', // 是否是线边 + PUT_IN_TYPE = 'put_in_type',// 入库类型 } diff --git a/src/utils/disposition/defaultButtons.ts b/src/utils/disposition/defaultButtons.ts index 8081b48ef..c5c2ec237 100644 --- a/src/utils/disposition/defaultButtons.ts +++ b/src/utils/disposition/defaultButtons.ts @@ -389,6 +389,19 @@ export function mainListExecuteBtn(option:any) { }) } +// 主列表-转办按钮 +export function mainListTransferBtn(option:any) { + return __defaultBtnOption(option,{ + label: t(`ts.转办`).replace('ts.', ''), + name: 'transfer', + hide: false, + type: 'primary', + color: '', + link: true, // 文本展现按钮 + hasPermi: '' + }) +} + // 主列表-完成按钮 export function mainListFinishBtn(option:any) { return __defaultBtnOption(option,{ diff --git a/src/views/eam/basicInspectionOption/index.vue b/src/views/eam/basicInspectionOption/index.vue index 1098f0ef9..e99246247 100644 --- a/src/views/eam/basicInspectionOption/index.vue +++ b/src/views/eam/basicInspectionOption/index.vue @@ -39,16 +39,17 @@ - + + + + + + + + + + + @@ -65,6 +66,7 @@ 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 ItemForm from "@/views/eam/basicInspectionOption/itemSelectSetForm.vue"; defineOptions({ name: 'BasicInspectionOption' }) @@ -205,6 +207,11 @@ const formsSuccess = async (formType,data) => { getList() } +//刷新页面 +const getData = async() => { + getList(); +} + /** 详情操作 */ const detailRef = ref() const openDetail = (row: any, titleName: any, titleValue: any) => { diff --git a/src/views/eam/basicInspectionOption/itemSelectSetForm.vue b/src/views/eam/basicInspectionOption/itemSelectSetForm.vue new file mode 100644 index 000000000..0aed31571 --- /dev/null +++ b/src/views/eam/basicInspectionOption/itemSelectSetForm.vue @@ -0,0 +1,388 @@ + + + + diff --git a/src/views/eam/basicMaintenanceOption/itemSelectSetForm.vue b/src/views/eam/basicMaintenanceOption/itemSelectSetForm.vue index 81917dc99..7b9018259 100644 --- a/src/views/eam/basicMaintenanceOption/itemSelectSetForm.vue +++ b/src/views/eam/basicMaintenanceOption/itemSelectSetForm.vue @@ -101,10 +101,6 @@ import { SearchTable } from '@/components/SearchTable' import { BasicMaintenanceItemSelectSet} from "@/views/eam/maintenanceItemSelectSet/maintenanceItemSelectSet.data"; import * as maintenanceItemSelectSetApi from "@/api/eam/maintenanceItemSelectSet"; import {ElInput} from "element-plus"; -import { - BasicMaintenanceOptionVO, - createBasicMaintenanceOption, updateBasicMaintenanceOption -} from "@/api/eam/basicMaintenanceOption"; defineOptions({ name: 'TeamForm' }) diff --git a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts index e6e3a50f6..e15b32625 100644 --- a/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts +++ b/src/views/eam/equipmentRepairJobMain/equipmentRepairJobMain.data.ts @@ -4,6 +4,10 @@ import {EquipmentAccounts} from "@/views/eam/equipmentAccounts/equipmentAccounts import * as EquipmentItemApi from "@/api/eam/equipmentAccounts"; import {BasicFaultCause} from "@/views/eam/basicFaultCause/basicFaultCause.data"; import * as ItemApi from "@/api/eam/basicFaultCause"; +import {Workshop} from "@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data"; +import * as WorkshopApi from "@/api/wms/workshop"; +import {BasicFaultType} from "@/views/eam/basicFaultType/basicFaultType.data"; +import * as BasicFaultTypeApi from "@/api/eam/basicFaultType"; // 表单校验 export const EquipmentRepairJobMainRules = reactive({ @@ -388,10 +392,23 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ { label: '故障类型', field: 'faultType', - dictType: DICT_TYPE.FAILURE_REASON, - dictClass: 'string', sort: 'custom', isSearch: true, + form: { + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择故障类型', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '车间信息', // 查询弹窗标题 + searchAllSchemas: BasicFaultType.allSchemas, // 查询弹窗所需类 + searchPage: BasicFaultTypeApi.getBasicFaultTypePage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, }, { label: '流程状态', @@ -442,6 +459,23 @@ export const EquipmentRepairJobMain = useCrudSchemas(reactive([ field: 'workshopCode', sort: 'custom', isSearch: false, + required: true, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择车间', // 输入框占位文本 + searchField: 'code', // 查询弹窗赋值字段 + searchTitle: '车间信息', // 查询弹窗标题 + searchAllSchemas: Workshop.allSchemas, // 查询弹窗所需类 + searchPage: WorkshopApi.getWorkshopPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key: 'available', + value: 'TRUE', + isMainValue: false + }] + } + }, }, // { // label: '产线编号', diff --git a/src/views/eam/equipmentRepairJobMain/index.vue b/src/views/eam/equipmentRepairJobMain/index.vue index 71dd0c1f4..d11441bf7 100644 --- a/src/views/eam/equipmentRepairJobMain/index.vue +++ b/src/views/eam/equipmentRepairJobMain/index.vue @@ -54,6 +54,7 @@ + { defaultButtons.mainListEditBtn({hasPermi:'eam:equipmentRepairJobMain:update'}), // 编辑 defaultButtons.mainListReceiveOrderBtn({hide: isShowStatusButton(row,['3']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 接单 defaultButtons.mainListExecuteBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 执行 + defaultButtons.mainListTransferBtn({hide: isShowStatusButton(row,['4']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 转办 defaultButtons.mainListFinishBtn({hide: isShowStatusButton(row,['5']),hasPermi:'eam:equipmentRepairJobMain:update'}), //完成 defaultButtons.mainListValidateRepairBtn({hide: isShowStatusButton(row,['6']),hasPermi:'eam:equipmentRepairJobMain:update'}), // 维修验证 defaultButtons.mainListValidateReportBtn({hide: isShowBaoXiuButton(row),hasPermi:'eam:equipmentRepairJobMain:update'}), // 报修验证 @@ -206,6 +209,8 @@ const buttonTableClick = async (val, row) => { handleValidateRepair(row) } else if (val == 'validate_report') { // 报修验证 handleValidateReport(row) + } else if (val == 'transfer') { // 转办 + handleTransferReport(row) } @@ -296,6 +301,14 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { }) } +/** 转办按钮操作 */ +const transferForm = ref() +const handleTransferReport = async (row) => { + await message.delConfirm('是否转办所选中工单？'); + transferForm.value.open('update', row); + +} + /** 报修验证按钮操作 */ const finishForm3Ref = ref() @@ -500,6 +513,36 @@ const getData3=(val)=> { ) } + +//finishForm4 关闭按钮回传 +const getClosed4=(val)=> { + nextTick?.(() => { + console.log(val) + getList() + }) +} + +//finishForm4 提交按钮回传 +const getData4=(val)=> { + nextTick?.(async () => { + console.log(val) + try { + const params = ref({ + id: '', + status:'', + }) + params.value.id = val + params.value.status = '3' + await EquipmentRepairJobMainApi.updateEquipmentRepairOrder(params.value) + message.success(t('工单已流转')) + // 刷新列表 + await getList() + } catch {} + + } + ) +} + const onChange = (field, item) => { //设备 if(field == 'type' && item == 'DEVICE'){ diff --git a/src/views/eam/equipmentRepairJobMain/transferForm.vue b/src/views/eam/equipmentRepairJobMain/transferForm.vue new file mode 100644 index 000000000..e6fe8bfec --- /dev/null +++ b/src/views/eam/equipmentRepairJobMain/transferForm.vue @@ -0,0 +1,344 @@ + + + + diff --git a/src/views/eam/inspectionItem/inspectionItem.data.ts b/src/views/eam/inspectionItem/inspectionItem.data.ts index e652e6091..be37928b8 100644 --- a/src/views/eam/inspectionItem/inspectionItem.data.ts +++ b/src/views/eam/inspectionItem/inspectionItem.data.ts @@ -27,6 +27,12 @@ export const InspectionItem = useCrudSchemas(reactive([ component:'InputNumber' }, }, + { + label: '巡检名称', + field: 'name', + sort: 'custom', + isSearch: true + }, { label: '巡检内容', field: 'content', @@ -40,7 +46,7 @@ export const InspectionItem = useCrudSchemas(reactive([ } }, { - label: '保养部位', + label: '巡检部位', field: 'equipmentParts', sort: 'custom', isSearch: true diff --git a/src/views/eam/sparepartsinlocation/index.vue b/src/views/eam/sparepartsinlocation/index.vue index 5507d516f..a931b9e36 100644 --- a/src/views/eam/sparepartsinlocation/index.vue +++ b/src/views/eam/sparepartsinlocation/index.vue @@ -82,7 +82,7 @@ @@ -131,6 +131,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => row['areaCode'] = val[0].areaCode row['sparePartsCode'] = val[0].sparePartsCode row['currentQty'] = val[0].qty + row['isRadeIn'] = val[0].isRadeIn } } else { if (formField == 'locationCode') { @@ -138,6 +139,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => setV['areaCode'] = val[0].areaCode setV['sparePartsCode'] = val[0].sparePartsCode setV['currentQty'] = val[0].qty + setV['isRadeIn'] = val[0].isRadeIn } } @@ -149,9 +151,12 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => const searchTableSuccessDetail = (formField, searchField, val, formRef) => { nextTick(async () => { const setV = {} - if (formField == 'sparePartsCode') { - setV['sparePartsCode'] = val[0].itemNumber - setV['currentQty'] = val[0].qty + if (formField == 'locationCode') { + setV['locationCode'] = val[0].code + setV['areaCode'] = val[0].areaCode + setV['sparePartsCode'] = val[0].sparePartsCode + setV['currentQty'] = val[0].qty + setV['isRadeIn'] = val[0].isRadeIn } formRef.setValues(setV) }) @@ -218,8 +223,8 @@ const isShowMainButton = (row, val) => { // 列表-操作按钮 const butttondata = (row) => { return [ - defaultButtons.mainListEditBtn({ hasPermi: 'eam:spare-parts-in-location-main:update' }) // 编辑 - // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:sparePartsInLocationMain:delete' }) // 删除 + defaultButtons.mainListEditBtn({ hasPermi: 'eam:spare-parts-in-location-main:update' }), // 编辑 + defaultButtons.mainListDeleteBtn({ hasPermi: 'eam:spare-parts-in-location-main:delete' }) // 删除 ] } diff --git a/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts b/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts index d5c6cf39c..e0f238228 100644 --- a/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts +++ b/src/views/eam/sparepartsinlocation/sparePartsInLocationMain.data.ts @@ -10,10 +10,7 @@ import { ItemAccounts } from '@/views/eam/itemAccounts/itemAccounts.data' export const SparePartsInLocationMainRules = reactive({ number: [required], theme: [required], - // status: [required], - // areaCode: [required], - // locationCode: [required], - concurrencyStamp: [required], + type: [required], }) // 备件入库主表 export const SparePartsInLocationMain = useCrudSchemas(reactive([ @@ -38,6 +35,13 @@ export const SparePartsInLocationMain = useCrudSchemas(reactive([ field: 'theme', sort: 'custom', isSearch: true, + },{ + label: '入库类型', + field: 'type', + sort: 'custom', + dictType: DICT_TYPE.PUT_IN_TYPE, + dictClass: 'string', + }, { label: '流程状态', @@ -140,7 +144,6 @@ export const SparePartsInLocationDetailRules = reactive({ areaCode: [required], sparePartsCode: [required], applyQty: [required], - concurrencyStamp: [required], }) export const SparePartsInLocationDetail = useCrudSchemas(reactive([ @@ -167,19 +170,19 @@ export const SparePartsInLocationDetail = useCrudSchemas(reactive( } }, tableForm: { - // isInpuFocusShow: true, - // searchListPlaceholder: '请选择备件编号', // 输入框占位文本 - // searchField: 'itemNumber', // 查询弹窗赋值字段 - // searchTitle: '备件信息', // 查询弹窗标题 - // searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 - // searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 - // searchCondition: [ - // { - // key: 'available', - // value: 'TRUE', - // isMainValue: false - // } - // ] + isInpuFocusShow: true, + searchListPlaceholder: '请选择备件编号', // 输入框占位文本 + searchField: 'itemNumber', // 查询弹窗赋值字段 + searchTitle: '备件信息', // 查询弹窗标题 + searchAllSchemas: Location.allSchemas, // 查询弹窗所需类 + searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法 + searchCondition: [ + { + key: 'available', + value: 'TRUE', + isMainValue: false + } + ] } }, { @@ -193,7 +196,7 @@ export const SparePartsInLocationDetail = useCrudSchemas(reactive( } }, tableForm:{ - // disabled: true + disabled: true } }, { diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue index 56f7ea46a..183f15541 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue @@ -177,7 +177,8 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 + // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 + defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请 ] } diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts index 096fde2ef..313d42255 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRecordMain/productreceiptAssembleRecordMain.data.ts @@ -534,6 +534,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( label: '单据号', field: 'number', sort: 'custom', + hiddenInMain:true, table: { width: 180 }, @@ -696,7 +697,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive( width: 150, fixed: 'right' }, - hiddenInMain: true, + hiddenInMain: false, isTableForm:false, } ])) diff --git a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue index 12036ffa0..0235a1311 100644 --- a/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue @@ -120,6 +120,7 @@