From 3043aabc2e5dc72b1e76fd44a05edaa5c0f214fa Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期二, 19 八月 2025 09:38:01 +0800
Subject: [PATCH] 工具信息、工具台账增加高级查询功能
---
src/views/tms/modules/toolLedger/ToolLedgerListRight.vue | 249 ++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 222 insertions(+), 27 deletions(-)
diff --git a/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue b/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
index e5e10e5..fb9e03e 100644
--- a/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
+++ b/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
@@ -1,5 +1,5 @@
<template>
- <a-card :bordered="false">
+ <a-card :bordered="false" style="flex: 1;overflow:auto;max-height: 600px; min-height: 600px">
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -38,6 +38,21 @@
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a-button
+ type="primary"
+ @click="searchHeightQuery"
+ icon="search"
+ style="margin-left: 8px"
+ :disabled="
+ !nodeSelected.key ||
+ nodeSelected.entity.leafFlag === '2' ||
+ (this.paraTypeFlag != '2' &&
+ this.paraTypeFlag != '3' &&
+ this.paraTypeFlag != '4' &&
+ this.paraTypeFlag != '5' &&
+ this.paraTypeFlag != '6')
+ "
+ >楂樼骇鏌ヨ</a-button>
</span>
</a-col>
@@ -171,6 +186,23 @@
<stocktaking-list ref="stocktakingList"></stocktaking-list>
</a-tab-pane>
</a-tabs>
+ <para-hole-tools-search-modal
+ ref="paraHoleToolsSearchModal"
+ @searchParams="paraHoleToolsOk"
+ ></para-hole-tools-search-modal>
+ <para-turning-tools-search-modal
+ ref="paraTurningToolsSearchModal"
+ @searchParams="paraTurningToolsOk"
+ ></para-turning-tools-search-modal>
+ <para-threading-tool-search-modal
+ ref="paraThreadingToolSearchModal"
+ @searchParams="paraThreadingToolOk"
+ ></para-threading-tool-search-modal>
+ <para-mill-tool-search-modal
+ ref="paraMillToolSearchModal"
+ @searchParams="paraMillToolOk"
+ ></para-mill-tool-search-modal>
+ <para-blade-search-modal ref="paraBladeSearchModal" @searchParams="paraBladeOk"></para-blade-search-modal>
</a-card>
</template>
@@ -194,6 +226,11 @@
import StocktakingList from './StocktakingList'
import InStoreDetailList from './InStoreDetailList'
import OutStoreDetailList from './OutStoreDetailList'
+ import ParaHoleToolsSearchModal from '../baseTools/ParaHoleToolsSearchModal'
+import ParaMillToolSearchModal from '../baseTools/ParaMillToolSearchModal'
+import ParaThreadingToolSearchModal from '../baseTools/ParaThreadingToolSearchModal'
+import ParaTurningToolsSearchModal from '../baseTools/ParaTurningToolsSearchModal'
+import ParaBladeSearchModal from '../baseTools/ParaBladeSearchModal'
export default {
name: 'ToolLedgerListRight',
@@ -212,7 +249,12 @@
ToolSharpenList,
StocktakingList,
InStoreDetailList,
- OutStoreDetailList
+ OutStoreDetailList,
+ ParaHoleToolsSearchModal,
+ ParaMillToolSearchModal,
+ ParaThreadingToolSearchModal,
+ ParaTurningToolsSearchModal,
+ ParaBladeSearchModal,
},
data () {
return {
@@ -220,8 +262,8 @@
/* 鍒嗛〉鍙傛暟 */
ipagination:{
current: 1,
- pageSize: 10,
- pageSizeOptions: ['10', '20', '50'],
+ pageSize: 5,
+ pageSizeOptions: ['5', '10', '30'],
showTotal: (total, range) => {
return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
},
@@ -282,15 +324,15 @@
dataIndex: 'applicationType'
},
{
- title:'绠＄悊绛夌骇',
+ title:'绮惧害绛夌骇',
align:"center",
- dataIndex: 'accuracyClass'
+ dataIndex: 'accuracyClassName'
},
- {
- title:'瀛樺偍浣嶇疆',
- align:"center",
- dataIndex: 'storageLocation'
- },
+ // {
+ // title:'瀛樺偍浣嶇疆',
+ // align:"center",
+ // dataIndex: 'storageLocation'
+ // },
{
title:'搴撲綅鍙�',
align:"center",
@@ -386,12 +428,12 @@
}
},
created() {
- this.$bus.$on('getCurrSelected', (data) => {
- //getCurrSelected 浜嬩欢 鎺ユ敹缁勪欢浼犻�掔殑鍙傛暟
+ this.$bus.$on('getToolLedgerListSelected', (data) => {
+ //getToolLedgerListSelected 浜嬩欢 鎺ユ敹缁勪欢浼犻�掔殑鍙傛暟
this.nodeType = (data.type == undefined ? 0 : data.type);
this.paraTypeFlag = (data.entity == undefined ? 0 : data.entity.paraTypeFlag)
this.nodeSelected = data;
- this.loadData()
+ this.loadData(1)
this.clearPara()
})
},
@@ -403,7 +445,7 @@
methods: {
modalFormOk() {
- this.loadData(); // 鍒锋柊琛ㄦ牸鏁版嵁
+ this.loadData(1); // 鍒锋柊琛ㄦ牸鏁版嵁
this.$bus.$emit('queryTreeData') //鍒锋柊宸︿晶鏍�
},
@@ -411,26 +453,58 @@
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
- getAction(this.url.queryParaByToolCode, { toolCode: this.selectedRowKeys[0],paraTypeFlag:this.paraTypeFlag}).then((res) => {
+ getAction(this.url.queryParaByToolCode, { toolCode: this.selectionRows[0].toolCodeId,paraTypeFlag:this.selectionRows[0].paraTypeFlag}).then((res) => {
if (res.success) {
- if(this.paraTypeFlag === "1"){
+ if(this.selectionRows[0].paraTypeFlag === "1"){
this.$refs.paraCommonToolList.getPara(res.result);
- }else if(this.paraTypeFlag === "2"){
+ //闅愯棌鍏朵粬绫诲瀷鍙傛暟
+ this.$refs.paraHoleToolsList.visable =false
+ this.$refs.paraThreadingToolList.visable = false
+ this.$refs.paraMillToolList.visable = false
+ this.$refs.paraTurningToolsList.visable = false
+ this.$refs.paraBladeList.visable = false
+ }else if(this.selectionRows[0].paraTypeFlag === "2"){
this.$refs.paraHoleToolsList.getPara(res.result);
- }else if(this.paraTypeFlag === "3"){
+ this.$refs.paraCommonToolList.visable = false
+ this.$refs.paraThreadingToolList.visable = false
+ this.$refs.paraMillToolList.visable = false
+ this.$refs.paraTurningToolsList.visable = false
+ this.$refs.paraBladeList.visable = false
+ }else if(this.selectionRows[0].paraTypeFlag === "3"){
this.$refs.paraThreadingToolList.getPara(res.result);
- }else if(this.paraTypeFlag === "4"){
+ this.$refs.paraCommonToolList.visable = false
+ this.$refs.paraHoleToolsList.visable =false
+ this.$refs.paraMillToolList.visable = false
+ this.$refs.paraTurningToolsList.visable = false
+ this.$refs.paraBladeList.visable = false
+ }else if(this.selectionRows[0].paraTypeFlag === "4"){
this.$refs.paraMillToolList.getPara(res.result);
- }else if(this.paraTypeFlag === "5"){
+ this.$refs.paraCommonToolList.visable = false
+ this.$refs.paraHoleToolsList.visable =false
+ this.$refs.paraThreadingToolList.visable = false
+ this.$refs.paraTurningToolsList.visable = false
+ this.$refs.paraBladeList.visable = false
+ }else if(this.selectionRows[0].paraTypeFlag === "5"){
this.$refs.paraTurningToolsList.getPara(res.result);
- }else if(this.paraTypeFlag === "6"){
+ this.$refs.paraCommonToolList.visable = false
+ this.$refs.paraHoleToolsList.visable =false
+ this.$refs.paraThreadingToolList.visable = false
+ this.$refs.paraMillToolList.visable = false
+ this.$refs.paraBladeList.visable = false
+ }else if(this.selectionRows[0].paraTypeFlag === "6"){
this.$refs.paraBladeList.getPara(res.result);
+ this.$refs.paraCommonToolList.visable = false
+ this.$refs.paraHoleToolsList.visable =false
+ this.$refs.paraThreadingToolList.visable = false
+ this.$refs.paraMillToolList.visable = false
+ this.$refs.paraTurningToolsList.visable = false
+ this.$refs.paraBladeList.visable = false
}
} else {
this.$message.warning(res.message);
}
})
- getAction(this.url.queryByToolCode, { toolCode: this.selectedRowKeys[0]}).then((res) => {
+ getAction(this.url.queryByToolCode, { toolCode: this.selectionRows[0].toolCodeId}).then((res) => {
if (res.success) {
this.$refs.toolsConfigPropertyList.getPara(res.result);
} else {
@@ -446,7 +520,11 @@
}
return "";
},
- loadData() {
+ loadData(arg) {
+ //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+ if (arg === 1) {
+ this.ipagination.current = 1;
+ }
let params = this.getQueryParams();
if (this.nodeSelected && this.nodeSelected.key !== '-1') {
// 鍔犺浇閫変腑鑺傜偣鐨勫瓙绫�
@@ -458,8 +536,12 @@
if (res.success) {
this.dataSource = res.result.records; // 鏇存柊琛ㄦ牸鏁版嵁
this.ipagination.total = res.result.total
+ //榛樿閫変腑绗竴鏉℃暟鎹�
+ this.selectedRowKeys[0] = res.result.records[0].id
+ this.selectionRows[0] = res.result.records[0]
+ this.onSelectChange(this.selectedRowKeys,this.selectionRows)
} else {
- this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
+ //this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
this.ipagination.total = 0
}
})
@@ -467,7 +549,7 @@
this.loading = false;
});
} else {
- this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
+ // this.$message.warning("璇烽�夋嫨鍙跺瓙鑺傜偣杩涜鏌ヨ");
}
},
onClearSelected() {
@@ -501,7 +583,120 @@
}
}
},
-
+ searchHeightQuery() {
+ if (this.paraTypeFlag === '2') {
+ this.$refs.paraHoleToolsSearchModal.show()
+ } else if (this.paraTypeFlag === '3') {
+ this.$refs.paraThreadingToolSearchModal.show()
+ } else if (this.paraTypeFlag === '4') {
+ this.$refs.paraMillToolSearchModal.show()
+ } else if (this.paraTypeFlag === '5') {
+ this.$refs.paraTurningToolsSearchModal.show()
+ } else if (this.paraTypeFlag === '6') {
+ this.$refs.paraBladeSearchModal.show()
+ }
+ },
+ paraHoleToolsOk(data) {
+ this.queryParam.chineseName = data.chineseName
+ this.queryParam.foreignLanguageName = data.foreignLanguageName
+ this.queryParam.standardLevel = data.standardLevel
+ this.queryParam.standardCode = data.standardCode
+ this.queryParam.diameter = data.diameter
+ this.queryParam.coneAngle = data.coneAngle
+ this.queryParam.edgeLength = data.edgeLength
+ this.queryParam.totalLength = data.totalLength
+ this.queryParam.toolMaterial = data.toolMaterial
+ this.queryParam.partMaterial = data.partMaterial
+ this.queryParam.paintcoatFlag = data.paintcoatFlag
+ this.queryParam.toolPattern = data.toolPattern
+ this.queryParam.handleSpecifications = data.handleSpecifications
+ this.queryParam.coolingMethod = data.coolingMethod
+ this.queryParam.bladeCount = data.bladeCount
+ this.queryParam.technicalConditions = data.technicalConditions
+ this.queryParam.conditionsInfo = data.conditionsInfo
+ this.queryParam.toolModel = data.toolModel
+ this.loadData(1)
+ },
+ paraBladeOk(data) {
+ this.queryParam.chineseName = data.chineseName
+ this.queryParam.foreignLanguageName = data.foreignLanguageName
+ this.queryParam.standardLevel = data.standardLevel
+ this.queryParam.standardCode = data.standardCode
+ this.queryParam.bladeShape = data.bladeShape
+ this.queryParam.bladeLength = data.bladeLength
+ this.queryParam.cuttingEdgeCount = data.cuttingEdgeCount
+ this.queryParam.bladeThickness = data.bladeThickness
+ this.queryParam.toolMaterial = data.toolMaterial
+ this.queryParam.partMaterial = data.partMaterial
+ this.queryParam.paintcoatFlag = data.paintcoatFlag
+ this.queryParam.clampingType = data.clampingType
+ this.queryParam.noseAngleR = data.noseAngleR
+ this.queryParam.technicalConditions = data.technicalConditions
+ this.queryParam.conditionsInfo = data.conditionsInfo
+ this.queryParam.toolModel = data.toolModel
+ this.loadData(1)
+ },
+ paraThreadingToolOk(data) {
+ this.queryParam.chineseName = data.chineseName
+ this.queryParam.foreignLanguageName = data.foreignLanguageName
+ this.queryParam.threadCode = data.threadCode
+ this.queryParam.pitch = data.pitch
+ this.queryParam.rotationDirection = data.rotationDirection
+ this.queryParam.tolerancezoneLevel = data.tolerancezoneLevel
+ this.queryParam.edgeLength = data.edgeLength
+ this.queryParam.totalLength = data.totalLength
+ this.queryParam.toolMaterial = data.toolMaterial
+ this.queryParam.partMaterial = data.partMaterial
+ this.queryParam.paintcoatFlag = data.paintcoatFlag
+ this.queryParam.externalDimensions = data.externalDimensions
+ this.queryParam.handleSpecifications = data.handleSpecifications
+ this.queryParam.technicalConditions = data.technicalConditions
+ this.queryParam.conditionsInfo = data.conditionsInfo
+ this.queryParam.toolModel = data.toolModel
+ this.loadData(1)
+ },
+ paraMillToolOk(data) {
+ this.queryParam.chineseName = data.chineseName
+ this.queryParam.foreignLanguageName = data.foreignLanguageName
+ this.queryParam.standardLevel = data.standardLevel
+ this.queryParam.standardCode = data.standardCode
+ this.queryParam.diameter = data.diameter
+ this.queryParam.noseAngleR = data.noseAngleR
+ this.queryParam.edgeLength = data.edgeLength
+ this.queryParam.totalLength = data.totalLength
+ this.queryParam.toolMaterial = data.toolMaterial
+ this.queryParam.partMaterial = data.partMaterial
+ this.queryParam.paintcoatFlag = data.paintcoatFlag
+ this.queryParam.toolPattern = data.toolPattern
+ this.queryParam.clampingSpecifications = data.clampingSpecifications
+ this.queryParam.coolingMethod = data.coolingMethod
+ this.queryParam.numberOfTeeth = data.numberOfTeeth
+ this.queryParam.technicalConditions = data.technicalConditions
+ this.queryParam.conditionsInfo = data.conditionsInfo
+ this.queryParam.toolModel = data.toolModel
+ this.loadData(1)
+ },
+ paraTurningToolsOk(data) {
+ this.queryParam.chineseName = data.chineseName
+ this.queryParam.foreignLanguageName = data.foreignLanguageName
+ this.queryParam.standardLevel = data.standardLevel
+ this.queryParam.standardCode = data.standardCode
+ this.queryParam.headSpecifications = data.headSpecifications
+ this.queryParam.matchingNumber = data.matchingNumber
+ this.queryParam.leadAngle = data.leadAngle
+ this.queryParam.totalLength = data.totalLength
+ this.queryParam.toolMaterial = data.toolMaterial
+ this.queryParam.partMaterial = data.partMaterial
+ this.queryParam.paintcoatFlag = data.paintcoatFlag
+ this.queryParam.toolPattern = data.toolPattern
+ this.queryParam.crossSectionalSize = data.crossSectionalSize
+ this.queryParam.coolingMethod = data.coolingMethod
+ this.queryParam.cuttingDirection = data.cuttingDirection
+ this.queryParam.technicalConditions = data.technicalConditions
+ this.queryParam.conditionsInfo = data.conditionsInfo
+ this.queryParam.toolModel = data.toolModel
+ this.loadData(1)
+ },
},
}
</script>
--
Gitblit v1.9.3