From 879153718ab3731e6c0e0bea2cc196e98ba3cc7d Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Fri, 14 Jun 2024 10:51:13 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8D=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/eam/equipmentAccounts/index.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/api/eam/equipmentAccounts/index.ts b/src/api/eam/equipmentAccounts/index.ts index afb035961..d1e9e401a 100644 --- a/src/api/eam/equipmentAccounts/index.ts +++ b/src/api/eam/equipmentAccounts/index.ts @@ -76,4 +76,9 @@ export const exportEquipmentAccounts = async (params) => { // 下载用户导入模板 export const importTemplate = () => { return request.download({ url: '/eam/device/equipment-accounts/get-import-template' }) +} + +// 查询设备台账列表 +export const getEquipmentAccountsNoPage = async (params) => { + return await request.get({ url: `/eam/device/equipment-accounts/noPage`, params }) } \ No newline at end of file From 2a6dffa2c21ceea3c08c58b3da44e15817d1c0fb Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Fri, 14 Jun 2024 11:09:20 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=89=93=E5=8C=85?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparePartsOutLocationDetailRecord.js | 2 +- src/views/eam/SparePartsOutLocationRecord/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js b/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js index 680825ba5..4e84a9429 100644 --- a/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js +++ b/src/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js @@ -1,4 +1,4 @@ -import request from '@/utils/request' +import request from '@/config/axios' // 创建领用出库记录子 export function createSparePartsOutLocationRecordDetail(data) { diff --git a/src/views/eam/SparePartsOutLocationRecord/index.vue b/src/views/eam/SparePartsOutLocationRecord/index.vue index 61719219e..72ea2dd4f 100644 --- a/src/views/eam/SparePartsOutLocationRecord/index.vue +++ b/src/views/eam/SparePartsOutLocationRecord/index.vue @@ -95,7 +95,7 @@ import { SparePartsOutLocationRecordMainRules, SparePartsOutLocationRecordDetail, SparePartsOutLocationRecordDetailRules -} from '.SparePartsOutLocationRecord.data' +} from './SparePartsOutLocationRecord.data' import * as SparePartsOutLocationRecordMainApi from '@/api/eam/sparePartsOutLocationRecordMain/index' import * as SparePartsOutLocationRecordDetailApi from '@/api/eam/sparePartsOutLocationRecordDetail/sparePartsOutLocationDetailRecord.js' import * as defaultButtons from '@/utils/disposition/defaultButtons' From 892cccacc99f5c1f2dc708452ae33ea7d96411a1 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 14 Jun 2024 11:09:42 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=94=BE=E5=A4=A7=E9=95=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../callmaterials/callmaterials.data.ts | 1 + .../labelManage/callmaterials/index.vue | 24 ++++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts index 52045b242..3f11aa5a5 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts @@ -53,6 +53,7 @@ export const Callmaterials = useCrudSchemas(reactive([ form: { // labelMessage: '信息提示说明！！！', componentProps: { + enterSearch: true, isSearchList: true, // 开启查询弹窗 searchListPlaceholder: '请选择物料代码', // 输入框占位文本 searchField: 'code', // 查询弹窗赋值字段 diff --git a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue index d6f628ede..961ddc139 100644 --- a/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue +++ b/src/views/wms/basicDataManage/labelManage/callmaterials/index.vue @@ -55,6 +55,7 @@ callmaterialQtySum:qty*callmaterialQty, }) }" + @onEnter="onEnter" /> @@ -75,7 +76,9 @@ import Detail from '@/components/Detail/src/Detail.vue' import { formatTime } from '@/utils/index' import { getAccessToken } from '@/utils/auth' import * as PackageApi from '@/api/wms/package' - +import * as ItembasicApi from '@/api/wms/itembasic' +import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data' +// 叫料标签 defineOptions({ name: 'Callmaterials' }) const message = useMessage() // 消息弹窗 @@ -86,6 +89,25 @@ const routeName = ref() routeName.value = route.name const tableColumns = ref(Callmaterials.allSchemas.tableColumns) + +const onEnter = async (field,value)=>{ + console.log(field,value) + if(field=='itemCode'){ + basicFormRef.value.opensearchTable('itemCode', 'code', '物料信息', Itembasic.allSchemas, ItembasicApi.getItembasicPage,[{ + key: 'available', + value: 'TRUE', + action: '==', + isSearch: true, + isMainValue: false + },{ + key: 'code', + value: value, + action: '==', + isSearch: true, + isMainValue: false + }]) + } +} // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { From 6172933d83c5aec5f2226fb9bd6aabe853b65d60 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 14 Jun 2024 11:59:43 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E7=9B=98=E7=82=B9=E6=A8=A1=E5=9D=97--?= =?UTF-8?q?=E4=B8=BB=E5=AD=90=E8=A1=A8=E5=90=88=E5=B9=B6--=E6=8B=86?= =?UTF-8?q?=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 ++++- .../countManage/count/countJobMain/index.vue | 18 ++++------ .../countManage/count/countPlanMain/index.vue | 34 ++++++++----------- .../count/countRecordMain/index.vue | 11 ++---- .../count/countRequestMain/index.vue | 34 ++++++++----------- .../countadjustRecordMain/index.vue | 12 +++---- .../countadjustRequestMain/index.vue | 26 ++++++-------- 7 files changed, 63 insertions(+), 81 deletions(-) diff --git a/README.md b/README.md index 648fbf09c..7c997d5fa 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,14 @@ const { tableObject, tableMethods } = useTable({ getListApi: “PurchasereceiptRequestDetailApi.getPurchasereceiptRequestDetailPage”// 分页接口 }) -5、ts文件配置： +5、搜索工作栏 + + +6、ts文件配置： hiddenInMain:true, //子表中数据不展示在主表 sortTableDefault:1000, // 主页面中Table表中展示的排序位置：默认值999 ，最小值1，值越大越靠后,值越小越靠前 sortSearchDefault：1000,// 搜素框中展示的排序位置，用法同sortTableDefault diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue index c695c1f77..1dc05b21e 100644 --- a/src/views/wms/countManage/count/countJobMain/index.vue +++ b/src/views/wms/countManage/count/countJobMain/index.vue @@ -1,7 +1,7 @@