From 55abd3e2adf7585fb4597a6227336f0a0550f1ba Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期四, 21 八月 2025 09:06:44 +0800
Subject: [PATCH] 工具信息、工具台账、出入库申请增加参数查询
---
src/views/tms/modules/baseTools/ParaBladeModal.vue | 10 ++
src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue | 22 ++++
src/views/tms/modules/baseTools/ParaTurningToolsSearchModal.vue | 22 ++++
src/views/tms/modules/baseTools/ParaMillToolModal.vue | 10 ++
src/views/tms/modules/baseTools/ParaTurningToolsModal.vue | 10 ++
src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue | 22 ++++
src/views/tms/modules/inboundOrder/JSelectToolingModal.vue | 20 +++-
src/views/tms/modules/baseTools/ParaHoleToolsSearchModal.vue | 22 ++++
src/views/tms/modules/baseTools/ParaThreadingToolModal.vue | 10 ++
src/views/tms/modules/baseTools/ParaBladeSearchModal.vue | 22 ++++
src/views/tms/modules/baseTools/BaseToolsListRight.vue | 34 ++++--
src/views/tms/modules/baseTools/ParaHoleToolsModal.vue | 10 ++
src/views/tms/modules/toolLedger/ToolLedgerListRight.vue | 10 ++
src/views/tms/modules/outBound/JSelectBorrowOutboundToolModal.vue | 36 ++++++-
14 files changed, 233 insertions(+), 27 deletions(-)
diff --git a/src/views/tms/modules/baseTools/BaseToolsListRight.vue b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
index 78e0e0b..cf81456 100644
--- a/src/views/tms/modules/baseTools/BaseToolsListRight.vue
+++ b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
@@ -525,27 +525,27 @@
},
//缂栬緫
handleEdit(record) {
- if (record.paramaTableName === '1') {
+ if (record.paraTypeFlag === '1') {
this.$refs.paraCommonToolModal.edit(record)
this.$refs.paraCommonToolModal.title = '缂栬緫'
this.$refs.paraCommonToolModal.disableSubmit = false
- } else if (record.paramaTableName === '2') {
+ } else if (record.paraTypeFlag === '2') {
this.$refs.paraHoleToolsModal.edit(record)
this.$refs.paraHoleToolsModal.title = '缂栬緫'
this.$refs.paraHoleToolsModal.disableSubmit = false
- } else if (record.paramaTableName === '3') {
+ } else if (record.paraTypeFlag === '3') {
this.$refs.paraThreadingToolModal.edit(record)
this.$refs.paraThreadingToolModal.title = '缂栬緫'
this.$refs.paraThreadingToolModal.disableSubmit = false
- } else if (record.paramaTableName === '4') {
+ } else if (record.paraTypeFlag === '4') {
this.$refs.paraMillToolModal.edit(record)
this.$refs.paraMillToolModal.title = '缂栬緫'
this.$refs.paraMillToolModal.disableSubmit = false
- } else if (record.paramaTableName === '5') {
+ } else if (record.paraTypeFlag === '5') {
this.$refs.paraTurningToolsModal.edit(record)
this.$refs.paraTurningToolsModal.title = '缂栬緫'
this.$refs.paraTurningToolsModal.disableSubmit = false
- } else if (record.paramaTableName === '6') {
+ } else if (record.paraTypeFlag === '6') {
this.$refs.paraBladeModal.edit(record)
this.$refs.paraBladeModal.title = '缂栬緫'
this.$refs.paraBladeModal.disableSubmit = false
@@ -553,27 +553,27 @@
},
//璇︽儏
handleDetail: function (record) {
- if (record.paramaTableName === '1') {
+ if (record.paraTypeFlag === '1') {
this.$refs.paraCommonToolModal.edit(record)
this.$refs.paraCommonToolModal.title = '璇︽儏'
this.$refs.paraCommonToolModal.disableSubmit = true
- } else if (record.paramaTableName === '2') {
+ } else if (record.paraTypeFlag === '2') {
this.$refs.paraHoleToolsModal.edit(record)
this.$refs.paraHoleToolsModal.title = '璇︽儏'
this.$refs.paraHoleToolsModal.disableSubmit = true
- } else if (record.paramaTableName === '3') {
+ } else if (record.paraTypeFlag === '3') {
this.$refs.paraThreadingToolModal.edit(record)
this.$refs.paraThreadingToolModal.title = '璇︽儏'
this.$refs.paraThreadingToolModal.disableSubmit = true
- } else if (record.paramaTableName === '4') {
+ } else if (record.paraTypeFlag === '4') {
this.$refs.paraMillToolModal.edit(record)
this.$refs.paraMillToolModal.title = '璇︽儏'
this.$refs.paraMillToolModal.disableSubmit = true
- } else if (record.paramaTableName === '5') {
+ } else if (record.paraTypeFlag === '5') {
this.$refs.paraTurningToolsModal.edit(record)
this.$refs.paraTurningToolsModal.title = '璇︽儏'
this.$refs.paraTurningToolsModal.disableSubmit = true
- } else if (record.paramaTableName === '6') {
+ } else if (record.paraTypeFlag === '6') {
this.$refs.paraBladeModal.edit(record)
this.$refs.paraBladeModal.title = '璇︽儏'
this.$refs.paraBladeModal.disableSubmit = true
@@ -727,6 +727,8 @@
this.queryParam.technicalConditions = data.technicalConditions
this.queryParam.conditionsInfo = data.conditionsInfo
this.queryParam.toolModel = data.toolModel
+ this.queryParam.shortCalled = data.shortCalled
+ this.queryParam.groupCompanyCode = data.groupCompanyCode
this.loadData()
},
paraBladeOk(data) {
@@ -746,6 +748,8 @@
this.queryParam.technicalConditions = data.technicalConditions
this.queryParam.conditionsInfo = data.conditionsInfo
this.queryParam.toolModel = data.toolModel
+ this.queryParam.shortCalled = data.shortCalled
+ this.queryParam.groupCompanyCode = data.groupCompanyCode
this.loadData()
},
paraThreadingToolOk(data) {
@@ -765,6 +769,8 @@
this.queryParam.technicalConditions = data.technicalConditions
this.queryParam.conditionsInfo = data.conditionsInfo
this.queryParam.toolModel = data.toolModel
+ this.queryParam.shortCalled = data.shortCalled
+ this.queryParam.groupCompanyCode = data.groupCompanyCode
this.loadData()
},
paraMillToolOk(data) {
@@ -786,6 +792,8 @@
this.queryParam.technicalConditions = data.technicalConditions
this.queryParam.conditionsInfo = data.conditionsInfo
this.queryParam.toolModel = data.toolModel
+ this.queryParam.shortCalled = data.shortCalled
+ this.queryParam.groupCompanyCode = data.groupCompanyCode
this.loadData()
},
paraTurningToolsOk(data) {
@@ -807,6 +815,8 @@
this.queryParam.technicalConditions = data.technicalConditions
this.queryParam.conditionsInfo = data.conditionsInfo
this.queryParam.toolModel = data.toolModel
+ this.queryParam.shortCalled = data.shortCalled
+ this.queryParam.groupCompanyCode = data.groupCompanyCode
this.loadData()
},
},
diff --git a/src/views/tms/modules/baseTools/ParaBladeModal.vue b/src/views/tms/modules/baseTools/ParaBladeModal.vue
index 0b5dd2b..a9cfb17 100644
--- a/src/views/tms/modules/baseTools/ParaBladeModal.vue
+++ b/src/views/tms/modules/baseTools/ParaBladeModal.vue
@@ -632,6 +632,7 @@
url: {
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
+ queryParaByToolCode: '/tms/baseTools/queryByToolCode',
},
locationCodeOptions: [],
chineseNameChange1:'',
@@ -670,6 +671,15 @@
edit(record) {
this.editable = true
this.model = Object.assign({}, record)
+ //閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
+ getAction(this.url.queryParaByToolCode, {
+ toolCode: record.toolCodeId,
+ paraTypeFlag: record.paraTypeFlag,
+ }).then((res) => {
+ if (res.success) {
+ this.model = Object.assign({}, res.result)
+ }
+ })
this.visible = true
},
close() {
diff --git a/src/views/tms/modules/baseTools/ParaBladeSearchModal.vue b/src/views/tms/modules/baseTools/ParaBladeSearchModal.vue
index 96a0880..df7d32b 100644
--- a/src/views/tms/modules/baseTools/ParaBladeSearchModal.vue
+++ b/src/views/tms/modules/baseTools/ParaBladeSearchModal.vue
@@ -31,6 +31,24 @@
</a-row>
<a-row :gutter="24">
<a-col :span="12">
+ <a-form-model-item prop="shortCalled" label="宸ュ叿绠�绉�">
+ <a-input
+ :placeholder="'璇疯緭鍏ュ伐鍏风畝绉�'"
+ v-model="model.shortCalled"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item prop="groupCompanyCode" label="闆嗗洟鍏徃缂栫爜">
+ <a-input
+ :placeholder="'璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'"
+ v-model="model.groupCompanyCode"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
<a-form-model-item prop="standardLevel" label="鏍囧噯绾у埆">
<a-input
:placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'"
@@ -189,7 +207,7 @@
name: 'ParaHoleToolsSearchModal',
data() {
return {
- title: '宸ュ叿淇℃伅-楂樼骇鎼滅储',
+ title: '宸ュ叿淇℃伅-楂樼骇鏌ヨ',
visible: false,
confirmLoading: false,
model: {},
@@ -238,6 +256,8 @@
this.searchParams.technicalConditions = this.model.technicalConditions
this.searchParams.conditionsInfo = this.model.conditionsInfo
this.searchParams.toolModel = this.model.toolModel
+ this.searchParams.shortCalled = this.model.shortCalled
+ this.searchParams.groupCompanyCode = this.model.groupCompanyCode
this.close()
this.$emit('searchParams',this.searchParams)
},
diff --git a/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue b/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
index afccb1e..d92cfc2 100644
--- a/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
+++ b/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
@@ -529,6 +529,7 @@
url: {
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
+ queryParaByToolCode: '/tms/baseTools/queryByToolCode',
},
locationCodeOptions:[],
chineseNameChange1:'',
@@ -565,6 +566,15 @@
edit(record) {
this.editable = true;
this.model = Object.assign({}, record)
+ //閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
+ getAction(this.url.queryParaByToolCode, {
+ toolCode: record.toolCodeId,
+ paraTypeFlag: record.paraTypeFlag,
+ }).then((res) => {
+ if (res.success) {
+ this.model = Object.assign({}, res.result)
+ }
+ })
this.visible = true
},
close() {
diff --git a/src/views/tms/modules/baseTools/ParaHoleToolsSearchModal.vue b/src/views/tms/modules/baseTools/ParaHoleToolsSearchModal.vue
index 4802e5e..9dc5525 100644
--- a/src/views/tms/modules/baseTools/ParaHoleToolsSearchModal.vue
+++ b/src/views/tms/modules/baseTools/ParaHoleToolsSearchModal.vue
@@ -29,6 +29,24 @@
</a-form-model-item>
</a-col>
</a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
+ <a-form-model-item prop="shortCalled" label="宸ュ叿绠�绉�">
+ <a-input
+ :placeholder="'璇疯緭鍏ュ伐鍏风畝绉�'"
+ v-model="model.shortCalled"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item prop="groupCompanyCode" label="闆嗗洟鍏徃缂栫爜">
+ <a-input
+ :placeholder="'璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'"
+ v-model="model.groupCompanyCode"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
<a-row :gutter="24">
<a-col :span="12">
<a-form-model-item prop="standardLevel" label="鏍囧噯绾у埆">
@@ -207,7 +225,7 @@
name: 'ParaHoleToolsSearchModal',
data() {
return {
- title: '宸ュ叿淇℃伅-楂樼骇鎼滅储',
+ title: '宸ュ叿淇℃伅-楂樼骇鏌ヨ',
visible: false,
confirmLoading: false,
model: {},
@@ -258,6 +276,8 @@
this.searchParams.technicalConditions = this.model.technicalConditions
this.searchParams.conditionsInfo = this.model.conditionsInfo
this.searchParams.toolModel = this.model.toolModel
+ this.searchParams.shortCalled = this.model.shortCalled
+ this.searchParams.groupCompanyCode = this.model.groupCompanyCode
this.close()
this.$emit('searchParams',this.searchParams)
},
diff --git a/src/views/tms/modules/baseTools/ParaMillToolModal.vue b/src/views/tms/modules/baseTools/ParaMillToolModal.vue
index d7ee80c..158637a 100644
--- a/src/views/tms/modules/baseTools/ParaMillToolModal.vue
+++ b/src/views/tms/modules/baseTools/ParaMillToolModal.vue
@@ -532,6 +532,7 @@
url: {
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
+ queryParaByToolCode: '/tms/baseTools/queryByToolCode',
},
locationCodeOptions:[],
chineseNameChange1:'',
@@ -569,6 +570,15 @@
edit(record) {
this.editable = true;
this.model = Object.assign({}, record)
+ //閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
+ getAction(this.url.queryParaByToolCode, {
+ toolCode: record.toolCodeId,
+ paraTypeFlag: record.paraTypeFlag,
+ }).then((res) => {
+ if (res.success) {
+ this.model = Object.assign({}, res.result)
+ }
+ })
this.visible = true
},
close() {
diff --git a/src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue b/src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue
index 715986d..fb4c946 100644
--- a/src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue
+++ b/src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue
@@ -31,6 +31,24 @@
</a-row>
<a-row :gutter="24">
<a-col :span="12">
+ <a-form-model-item prop="shortCalled" label="宸ュ叿绠�绉�">
+ <a-input
+ :placeholder="'璇疯緭鍏ュ伐鍏风畝绉�'"
+ v-model="model.shortCalled"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item prop="groupCompanyCode" label="闆嗗洟鍏徃缂栫爜">
+ <a-input
+ :placeholder="'璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'"
+ v-model="model.groupCompanyCode"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
<a-form-model-item prop="standardLevel" label="鏍囧噯绾у埆">
<a-input
:placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'"
@@ -207,7 +225,7 @@
name: 'ParaHoleToolsSearchModal',
data() {
return {
- title: '宸ュ叿淇℃伅-楂樼骇鎼滅储',
+ title: '宸ュ叿淇℃伅-楂樼骇鏌ヨ',
visible: false,
confirmLoading: false,
model: {},
@@ -258,6 +276,8 @@
this.searchParams.technicalConditions = this.model.technicalConditions
this.searchParams.conditionsInfo = this.model.conditionsInfo
this.searchParams.toolModel = this.model.toolModel
+ this.searchParams.shortCalled = this.model.shortCalled
+ this.searchParams.groupCompanyCode = this.model.groupCompanyCode
this.close()
this.$emit('searchParams',this.searchParams)
},
diff --git a/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue b/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
index cfaa270..5bf56a5 100644
--- a/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
+++ b/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
@@ -468,6 +468,7 @@
url: {
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
+ queryParaByToolCode: '/tms/baseTools/queryByToolCode',
},
locationCodeOptions:[],
chineseNameChange1:'',
@@ -504,6 +505,15 @@
edit(record) {
this.editable = true;
this.model = Object.assign({}, record)
+ //閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
+ getAction(this.url.queryParaByToolCode, {
+ toolCode: record.toolCodeId,
+ paraTypeFlag: record.paraTypeFlag,
+ }).then((res) => {
+ if (res.success) {
+ this.model = Object.assign({}, res.result)
+ }
+ })
this.visible = true
},
close() {
diff --git a/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue b/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue
index 460d748..a916f3b 100644
--- a/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue
+++ b/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue
@@ -25,6 +25,24 @@
</a-row>
<a-row :gutter="24">
<a-col :span="12">
+ <a-form-model-item prop="shortCalled" label="宸ュ叿绠�绉�">
+ <a-input
+ :placeholder="'璇疯緭鍏ュ伐鍏风畝绉�'"
+ v-model="model.shortCalled"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item prop="groupCompanyCode" label="闆嗗洟鍏徃缂栫爜">
+ <a-input
+ :placeholder="'璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'"
+ v-model="model.groupCompanyCode"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
<a-form-model-item prop="standardLevel" label="鏍囧噯绾у埆">
<a-input :placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'" v-model="model.standardLevel" />
</a-form-model-item>
@@ -157,7 +175,7 @@
name: 'ParaHoleToolsSearchModal',
data() {
return {
- title: '宸ュ叿淇℃伅-楂樼骇鎼滅储',
+ title: '宸ュ叿淇℃伅-楂樼骇鏌ヨ',
visible: false,
confirmLoading: false,
model: {},
@@ -203,6 +221,8 @@
this.searchParams.technicalConditions = this.model.technicalConditions
this.searchParams.conditionsInfo = this.model.conditionsInfo
this.searchParams.toolModel = this.model.toolModel
+ this.searchParams.shortCalled = this.model.shortCalled
+ this.searchParams.groupCompanyCode = this.model.groupCompanyCode
this.close()
this.$emit('searchParams', this.searchParams)
},
diff --git a/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue b/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
index 3b09047..a42c541 100644
--- a/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
+++ b/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
@@ -545,6 +545,7 @@
url: {
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
+ queryParaByToolCode: '/tms/baseTools/queryByToolCode',
},
locationCodeOptions:[],
chineseNameChange1:'',
@@ -581,6 +582,15 @@
edit(record) {
this.editable = true;
this.model = Object.assign({}, record)
+ //閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
+ getAction(this.url.queryParaByToolCode, {
+ toolCode: record.toolCodeId,
+ paraTypeFlag: record.paraTypeFlag,
+ }).then((res) => {
+ if (res.success) {
+ this.model = Object.assign({}, res.result)
+ }
+ })
this.visible = true
},
close() {
diff --git a/src/views/tms/modules/baseTools/ParaTurningToolsSearchModal.vue b/src/views/tms/modules/baseTools/ParaTurningToolsSearchModal.vue
index 2f8b0d6..f0b7392 100644
--- a/src/views/tms/modules/baseTools/ParaTurningToolsSearchModal.vue
+++ b/src/views/tms/modules/baseTools/ParaTurningToolsSearchModal.vue
@@ -31,6 +31,24 @@
</a-row>
<a-row :gutter="24">
<a-col :span="12">
+ <a-form-model-item prop="shortCalled" label="宸ュ叿绠�绉�">
+ <a-input
+ :placeholder="'璇疯緭鍏ュ伐鍏风畝绉�'"
+ v-model="model.shortCalled"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item prop="groupCompanyCode" label="闆嗗洟鍏徃缂栫爜">
+ <a-input
+ :placeholder="'璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'"
+ v-model="model.groupCompanyCode"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="12">
<a-form-model-item prop="standardLevel" label="鏍囧噯绾у埆">
<a-input
:placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'"
@@ -207,7 +225,7 @@
name: 'ParaHoleToolsSearchModal',
data() {
return {
- title: '宸ュ叿淇℃伅-楂樼骇鎼滅储',
+ title: '宸ュ叿淇℃伅-楂樼骇鏌ヨ',
visible: false,
confirmLoading: false,
model: {},
@@ -258,6 +276,8 @@
this.searchParams.technicalConditions = this.model.technicalConditions
this.searchParams.conditionsInfo = this.model.conditionsInfo
this.searchParams.toolModel = this.model.toolModel
+ this.searchParams.shortCalled = this.model.shortCalled
+ this.searchParams.groupCompanyCode = this.model.groupCompanyCode
this.close()
this.$emit('searchParams',this.searchParams)
},
diff --git a/src/views/tms/modules/inboundOrder/JSelectToolingModal.vue b/src/views/tms/modules/inboundOrder/JSelectToolingModal.vue
index bd76e80..049dc6f 100644
--- a/src/views/tms/modules/inboundOrder/JSelectToolingModal.vue
+++ b/src/views/tms/modules/inboundOrder/JSelectToolingModal.vue
@@ -20,13 +20,13 @@
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="涓枃鍚嶇О">
- <a-input placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�,鏀寔妯＄硦鏌ヨ" v-model="queryParam.chineseName"></a-input>
+ <a-form-item label="鏍囪">
+ <a-input placeholder="璇疯緭鍏ユ爣璁�,鏀寔妯＄硦鏌ヨ" v-model="queryParam.groupCompanySign"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="鍨嬪彿/鍥惧彿">
- <a-input placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�,鏀寔妯＄硦鏌ヨ" v-model="queryParam.toolModel"></a-input>
+ <a-form-item label="宸ュ叿绠�绉�">
+ <a-input placeholder="璇疯緭鍏ュ伐鍏风畝绉�" v-model="queryParam.shortCalled"></a-input>
</a-form-item>
</a-col>
@@ -90,6 +90,16 @@
dataIndex: 'chineseName',
},
{
+ title: '宸ュ叿绠�绉�',
+ align: 'center',
+ dataIndex: 'shortCalled',
+ },
+ {
+ title: '鏍囪',
+ align: 'center',
+ dataIndex: 'groupCompanySign',
+ },
+ {
title: '搴撲綅鍙�',
align: 'center',
dataIndex: 'positionCode',
@@ -132,7 +142,7 @@
loading: false,
url: {
// list: '/base/tooling/list',
- list: '/tms/baseTools/paraCommonToolList',
+ list: '/tms/baseTools/selectToolList',
},
}
},
diff --git a/src/views/tms/modules/outBound/JSelectBorrowOutboundToolModal.vue b/src/views/tms/modules/outBound/JSelectBorrowOutboundToolModal.vue
index db9be59..ea3a476 100644
--- a/src/views/tms/modules/outBound/JSelectBorrowOutboundToolModal.vue
+++ b/src/views/tms/modules/outBound/JSelectBorrowOutboundToolModal.vue
@@ -19,6 +19,16 @@
<a-input placeholder="璇疯緭鍏ュ伐鍏风紪鐮�,鏀寔妯＄硦鏌ヨ" v-model="queryParam.toolCode"></a-input>
</a-form-item>
</a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="鏍囪">
+ <a-input placeholder="璇疯緭鍏ユ爣璁�,鏀寔妯＄硦鏌ヨ" v-model="queryParam.groupCompanySign"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="宸ュ叿绠�绉�">
+ <a-input placeholder="璇疯緭鍏ュ伐鍏风畝绉�" v-model="queryParam.shortCalled"></a-input>
+ </a-form-item>
+ </a-col>
<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-row>
@@ -74,15 +84,31 @@
dataIndex: 'toolId'
},
{
- title:'鍙敤搴撳瓨鏁伴噺',
+ title:'鍨嬪彿/鍥惧彿',
align:"center",
- dataIndex: 'quantity'
+ dataIndex: 'toolModel'
},
{
- title:'鎵�鍦ㄤ粨搴�',
+ title:'宸ュ叿绠�绉�',
align:"center",
- dataIndex: 'warehouseName'
+ dataIndex: 'shortCalled'
},
+ {
+ title:'鏍囪',
+ align:"center",
+ dataIndex: 'groupCompanySign'
+ },
+
+ // {
+ // title:'鍙敤搴撳瓨鏁伴噺',
+ // align:"center",
+ // dataIndex: 'quantity'
+ // },
+ // {
+ // title:'鎵�鍦ㄤ粨搴�',
+ // align:"center",
+ // dataIndex: 'warehouseName'
+ // },
{
title:'鎵�鍦ㄥ簱浣嶅彿',
align:"center",
@@ -127,7 +153,7 @@
loading: false,
prepareKnifeDetailList:[],
url: {
- list: '/tms/outboundOrder/selectBorrowOutboundToolPageList'
+ list: '/tms/outboundOrder/selectBorrowToolPageList'
},
}
},
diff --git a/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue b/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
index fb9e03e..071f244 100644
--- a/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
+++ b/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
@@ -615,6 +615,8 @@
this.queryParam.technicalConditions = data.technicalConditions
this.queryParam.conditionsInfo = data.conditionsInfo
this.queryParam.toolModel = data.toolModel
+ this.queryParam.shortCalled = data.shortCalled
+ this.queryParam.groupCompanyCode = data.groupCompanyCode
this.loadData(1)
},
paraBladeOk(data) {
@@ -634,6 +636,8 @@
this.queryParam.technicalConditions = data.technicalConditions
this.queryParam.conditionsInfo = data.conditionsInfo
this.queryParam.toolModel = data.toolModel
+ this.queryParam.shortCalled = data.shortCalled
+ this.queryParam.groupCompanyCode = data.groupCompanyCode
this.loadData(1)
},
paraThreadingToolOk(data) {
@@ -653,6 +657,8 @@
this.queryParam.technicalConditions = data.technicalConditions
this.queryParam.conditionsInfo = data.conditionsInfo
this.queryParam.toolModel = data.toolModel
+ this.queryParam.shortCalled = data.shortCalled
+ this.queryParam.groupCompanyCode = data.groupCompanyCode
this.loadData(1)
},
paraMillToolOk(data) {
@@ -674,6 +680,8 @@
this.queryParam.technicalConditions = data.technicalConditions
this.queryParam.conditionsInfo = data.conditionsInfo
this.queryParam.toolModel = data.toolModel
+ this.queryParam.shortCalled = data.shortCalled
+ this.queryParam.groupCompanyCode = data.groupCompanyCode
this.loadData(1)
},
paraTurningToolsOk(data) {
@@ -695,6 +703,8 @@
this.queryParam.technicalConditions = data.technicalConditions
this.queryParam.conditionsInfo = data.conditionsInfo
this.queryParam.toolModel = data.toolModel
+ this.queryParam.shortCalled = data.shortCalled
+ this.queryParam.groupCompanyCode = data.groupCompanyCode
this.loadData(1)
},
},
--
Gitblit v1.9.3