From 9915e6e99aeae9b1d0d1ec1d7b4aa48a2fb3f930 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Tue, 28 May 2024 10:14:05 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A4=87=E8=B4=A7=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockupMainRecord.data.ts | 44 +++++++++---------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts index 8e1a229d2..bd725f183 100644 --- a/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts +++ b/src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts @@ -29,7 +29,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ label: '申请单号', field: 'requestNumber', sort: 'custom', - isSearch: true, + // isSearch: true, table: { width: 180 }, @@ -39,7 +39,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ label: '任务单号', field: 'jobNumber', sort: 'custom', - isSearch: true, + // isSearch: true, table: { width: 180 }, @@ -102,7 +102,7 @@ export const StockupMainRecord = useCrudSchemas(reactive([ label: '从库区代码范围', field: 'fromAreaCodes', sort: 'custom', - isSearch: true, + // isSearch: true, isTable: false, table: { width: 180 @@ -313,7 +313,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '单据号', field: 'number', sort: 'custom', - isSearch: true, + // isSearch: true, table: { width: 180 }, @@ -343,7 +343,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '从器具号', field: 'fromContainerNumber', sort: 'custom', - isSearch: true, + // isSearch: true, table: { width: 150 }, @@ -371,7 +371,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '物品描述1', field: 'itemDesc1', sort: 'custom', - isSearch: true, + // isSearch: true, table: { width: 150 }, @@ -382,7 +382,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '物品描述2', field: 'itemDesc2', sort: 'custom', - isSearch: true, + // isSearch: true, table: { width: 150 }, @@ -393,7 +393,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '项目代码', field: 'projectCode', sort: 'custom', - isSearch: true, + // isSearch: true, table: { width: 150 }, @@ -403,7 +403,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '数量', field: 'qty', sort: 'custom', - isSearch: true, + // isSearch: true, table: { width: 150 }, @@ -435,7 +435,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '从货主代码', field: 'fromOwnerCode', sort: 'custom', - isSearch: true, + // isSearch: true, table: { width: 150 }, @@ -445,7 +445,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '从库位', field: 'fromLocationCode', sort: 'custom', - isSearch: true, + // isSearch: true, table: { width: 150 }, @@ -454,7 +454,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '从库位组代码', field: 'fromLocationGroupCode', sort: 'custom', - isSearch: true, + // isSearch: true, table: { width: 150 }, @@ -464,7 +464,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '从库区代码', field: 'fromAreaCode', sort: 'custom', - isSearch: true, + // isSearch: true, table: { width: 150 }, @@ -474,7 +474,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '到货主代码', field: 'toOwnerCode', sort: 'custom', - isSearch: true, + // isSearch: true, table: { width: 150 }, @@ -484,7 +484,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '到器具号', field: 'toContainerNumber', sort: 'custom', - isSearch: true, + // isSearch: true, table: { width: 150 }, @@ -494,7 +494,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '到库位', field: 'toLocationCode', sort: 'custom', - isSearch: true, + // isSearch: true, table: { width: 150 }, @@ -503,7 +503,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '到库位组代码', field: 'toLocationGroupCode', sort: 'custom', - isSearch: true, + // isSearch: true, hiddenInMain: true, table: { width: 150 @@ -513,7 +513,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '到库区代码', field: 'toAreaCode', sort: 'custom', - isSearch: true, + // isSearch: true, hiddenInMain: true, table: { width: 150 @@ -523,7 +523,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '单价', field: 'singlePrice', sort: 'custom', - isSearch: true, + // isSearch: true, hiddenInMain: true, table: { width: 150 @@ -533,7 +533,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '金额', field: 'amount', sort: 'custom', - isSearch: true, + // isSearch: true, hiddenInMain: true, table: { width: 150 @@ -577,7 +577,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ field: 'createTime', sort: 'custom', formatter: dateFormatter, - isSearch: true, + // isSearch: true, table: { width: 180 }, @@ -596,7 +596,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive([ label: '备注', field: 'remark', sort: 'custom', - isSearch: true, + // isSearch: true, hiddenInMain: true, table: { width: 150 From 45fba1c42a7adb67f9d74804c1d1df7a64d06340 Mon Sep 17 00:00:00 2001 From: zhaoyiran Date: Tue, 28 May 2024 10:35:35 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=88=97=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 0cf8a39b0..04789f448 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -403,7 +403,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ isDetail: false, isForm: false, table: { - width: 300, + width: 400, fixed: 'right' }, }, @@ -1877,4 +1877,4 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive< disabled: true, } } -])) \ No newline at end of file +])) From ee5085340a4c75ad1650ab4586a354e8fed34770 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Tue, 28 May 2024 10:39:31 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processproductionRequestMain.data.ts | 143 +++++++++++++++--- 1 file changed, 120 insertions(+), 23 deletions(-) diff --git a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts index e34250efe..2c2685894 100644 --- a/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts +++ b/src/views/wms/productionManage/processproduction/processproductionRequest/processproductionRequestMain.data.ts @@ -1,6 +1,10 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas' import { dateFormatter } from '@/utils/formatTime' - +import * as ItembasicApi from '@/api/wms/itembasic' +import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' +import * as ProductionlineitemApi from '@/api/wms/productionlineitem' +import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data' +import { fa } from 'element-plus/es/locale' export const ProcessproductionRequestMain = useCrudSchemas(reactive([ { @@ -18,6 +22,7 @@ export const ProcessproductionRequestMain = useCrudSchemas(reactive([ - { - label: 'id', - field: 'id', - sort: 'custom', - isForm: false, - isTable:false, - }, - { - label: '主表ID', - field: 'masterId', - sort: 'custom', - isTable:false, - form: { - component: 'InputNumber', - value: 0 - }, - }, + { label: '单据号', field: 'number', sort: 'custom', - isSearch: true, + isSearch: false, + isTable:false, + isTableForm:false, table: { width: 150 }, hiddenInMain:true, }, { - label: '工序', - field: 'processCode', + label: '生产线', + field: 'productionLine', sort: 'custom', table: { width: 150 }, + form: { + // labelMessage: '信息提示说明！！！', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchField: 'itemCode', // 查询弹窗赋值字段 + searchTitle: '生产线物料关系信息', // 查询弹窗标题 + searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 + searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'itemCode', + value:'itemCode', + message: '请选择物料代码！', + isMainValue: true + },{ + key: 'available', + value: 'TRUE', + isMainValue: false + }], + } + }, + tableForm:{ + multiple:true, + isInpuFocusShow: true, + searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchField: 'itemCode', // 查询弹窗赋值字段 + searchTitle: '生产线物料关系信息', // 查询弹窗标题 + searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类 + searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法 + searchCondition: [{ + key:'itemCode', + value:'itemCode', + message: '请选择物料代码！', + isMainValue: true + },{ + key: 'available', + value: 'TRUE', + isMainValue: false + }], + }, }, { - label: '生产线', - field: 'productionLine', + label: '工序', + field: 'processCode', sort: 'custom', table: { width: 150 @@ -239,6 +317,7 @@ export const ProcessproductionRequestDetail = useCrudSchemas(reactive Date: Tue, 28 May 2024 10:42:22 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceipt/unplannedreceiptRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index edb1747c3..167761dc5 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -333,7 +333,7 @@ const butttondata = (row,$index) => { hasPermi: '', link: true, // 文本展现按钮 }, - defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','8']) }), // 标签打印 + defaultButtons.mainListPointBtn({ hide: isShowMainButton(row, ['3','6','8']) }), // 标签打印 ] } From 3bf08732bd9fbe8b05d66432d14f332f7f1ddb24 Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Tue, 28 May 2024 10:52:42 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Detail/src/DetailLedger.vue | 144 ++++++++++++---- src/utils/dict.ts | 7 +- src/views/eam/equipmentAccounts/index.vue | 72 +++++++- .../equipmentInspectionRecordDetail.data.ts | 98 ++--------- .../equipmentInspectionRecordMain.data.ts | 120 +++----------- .../equipmentMaintenanceRecordDetail.data.ts | 96 ++--------- .../equipmentMaintenanceRecordMain.data.ts | 122 +++----------- .../equipmentRepairRecordDetail.data.ts | 86 +--------- .../equipmentRepairRecordMain.data.ts | 156 +++++------------- .../equipmentReportRepairRequest.data.ts | 114 +++---------- .../equipmentSpotCheckRecordMain.data.ts | 126 +++----------- 11 files changed, 361 insertions(+), 780 deletions(-) diff --git a/src/components/Detail/src/DetailLedger.vue b/src/components/Detail/src/DetailLedger.vue index 5633f4bdb..887778ba4 100644 --- a/src/components/Detail/src/DetailLedger.vue +++ b/src/components/Detail/src/DetailLedger.vue @@ -55,12 +55,6 @@ v-model:currentPage="tableObjectRef.currentPage" v-model:sort="tableObjectRef.sort" > - - + + + + + + + + + + + + + + +
+ +
+ + + @@ -144,25 +187,7 @@ - + @@ -390,6 +415,21 @@ const props = defineProps({ required: false, default: '' }, + operationRecordList: { + type: Array, + required: false, + default: () => [] + }, + dialogApiPage: { + type: Function, + required: false, + default: null + }, + dialogAllSchemas: { + type: Object, + required: false, + default: null + }, // 附件 备注 变更记录 别名 }) const isShowDrawer = ref(false) @@ -400,6 +440,8 @@ const fileParmas = ref({ funcCode: props.funcCode, fileBusiType: '' }) +const operationRecordType = ref() +const operationRecordList = ref(props.operationRecordList) if (props.isBasic == true) { if (tabsList.value && tabsList.value.length > 0) { tabsList.value.unshift({ @@ -585,6 +627,10 @@ const change = (item, index) => { } if(item.prop == 'ExpandProps'){ getExtendedPropsList() + }else if(item.prop == 'OperationRecord'){ + if(props.operationRecordList){ + operationRecordType.value = props.operationRecordList[0]?.value + } } } @@ -738,7 +784,6 @@ const detailAllSchemasRef = ref() const { tableObject, tableMethods } = useTable({ getListApi: props.apiPage // 分页接口 }) - tableObjectRef.value = tableObject tableMethodsRef.value = tableMethods detailAllSchemasRef.value = props.detailAllSchemas @@ -919,7 +964,8 @@ const emit = defineEmits([ 'onBlur', 'detailBasicFormOnChange', 'formFormDateChange', - 'buttonBaseClick' + 'buttonBaseClick', + 'handleOperationTabsChange' ]) /** 删除按钮操作 */ const handleDelete = async (id: number) => { @@ -1061,6 +1107,47 @@ const getExtendedPropsList = async () => { }); } +const handleOperationTabsChange = async (val) => { + emit("handleOperationTabsChange",val) +} + + +const dialogVisible = ref(false) +const dialogTitle = ref() +const dialogAllSchemasRef = ref() +const dialogTableObjectRef = ref() +const dialogTableMethodsRef = ref() +const dialogUploadTitle = ref('文件上传') +const dialogUploadVisible = ref(false) +const dialogUploadNumber = ref() +const dialogUploadBusiCode = ref() +const dialogFormKey = ref(0) +const openDialog = async(row: any, titleName: any, titleValue: any) => { + const { tableObject, tableMethods } = useTable({ + getListApi: props.dialogApiPage, // 分页接口 + defaultParams: getDialogParams(row) + }) + dialogVisible.value = true + dialogTitle.value = getDialogName() + dialogAllSchemasRef.value = props.dialogAllSchemas + dialogTableObjectRef.value = tableObject + dialogTableMethodsRef.value = tableMethods + dialogTableObjectRef.value.tableList = [] + const { getList } = tableMethods + await getList() + updateKey.value += 1 +} + +function getDialogParams(row: any) { + return { + number: row.number + } +} + +function getDialogName(){ + // return operationRecordList.value.find(element=>element.value == operationRecordType)?.value +} + //监视属性 watch( @@ -1082,6 +1169,7 @@ watch( getList() } ) +