From 8d4c67323bee47d6225f150e9f61868c6434a358 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 03 九月 2025 17:48:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/tms/modules/baseTools/ParaThreadingToolModal.vue | 90 +++++-
src/views/tms/modules/baseTools/ParaBladeSearchModal.vue | 4
src/views/tms/modules/baseTools/BaseToolsListRight.vue | 93 +++++-
src/views/tms/modules/baseTools/ParaBladeModal.vue | 235 ++++++++++------
src/views/tms/modules/baseTools/ParaHoleToolsModal.vue | 90 +++++-
src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue | 2
src/views/tms/modules/toolLedger/ToolLedgerListRight.vue | 86 ++++-
src/views/tms/modules/toolsClassify/ToolsClassifyListRight.vue | 4
src/views/tms/modules/baseTools/ParaMillToolModal.vue | 90 +++++-
src/views/tms/modules/baseTools/ParaTurningToolsModal.vue | 106 ++++++-
src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue | 16 +
11 files changed, 611 insertions(+), 205 deletions(-)
diff --git a/src/views/tms/modules/baseTools/BaseToolsListRight.vue b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
index b98df66..88c05da 100644
--- a/src/views/tms/modules/baseTools/BaseToolsListRight.vue
+++ b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
@@ -449,14 +449,9 @@
this.selectedRowKeys = selectedRowKeys
this.selectionRows = selectionRows
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
- getAction(this.url.queryParaByToolCode, {
- toolCode: this.selectedRowKeys[0],
- paraTypeFlag: this.selectionRows[0].paraTypeFlag,
- }).then((res) => {
- if (res.success) {
- if (this.selectionRows[0].paraTypeFlag === '1') {
+ if (this.selectionRows[0].paraTypeFlag === '1') {
//鏄剧ず褰撳墠閫変腑绫诲瀷鍙傛暟
- this.$refs.paraCommonToolList.getPara(res.result)
+ this.$refs.paraCommonToolList.getPara(this.selectionRows[0])
//闅愯棌鍏朵粬绫诲瀷鍙傛暟
this.$refs.paraHoleToolsList.visable = false
this.$refs.paraThreadingToolList.visable = false
@@ -464,35 +459,35 @@
this.$refs.paraTurningToolsList.visable = false
this.$refs.paraBladeList.visable = false
} else if (this.selectionRows[0].paraTypeFlag === '2') {
- this.$refs.paraHoleToolsList.getPara(res.result)
+ this.$refs.paraHoleToolsList.getPara(this.selectionRows[0])
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)
+ this.$refs.paraThreadingToolList.getPara(this.selectionRows[0])
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)
+ this.$refs.paraMillToolList.getPara(this.selectionRows[0])
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)
+ this.$refs.paraTurningToolsList.getPara(this.selectionRows[0])
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.paraBladeList.getPara(this.selectionRows[0])
this.$refs.paraCommonToolList.visable = false
this.$refs.paraHoleToolsList.visable = false
this.$refs.paraThreadingToolList.visable = false
@@ -500,17 +495,69 @@
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) => {
- if (res.success) {
- this.$refs.toolsConfigPropertyList.getPara(res.result)
- } else {
- this.$message.warning(res.message)
- }
- })
+ this.$refs.toolsConfigPropertyList.getPara(this.selectionRows[0])
+ // getAction(this.url.queryParaByToolCode, {
+ // toolCode: this.selectedRowKeys[0],
+ // paraTypeFlag: this.selectionRows[0].paraTypeFlag,
+ // }).then((res) => {
+ // if (res.success) {
+ // if (this.selectionRows[0].paraTypeFlag === '1') {
+ // //鏄剧ず褰撳墠閫変腑绫诲瀷鍙傛暟
+ // this.$refs.paraCommonToolList.getPara(res.result)
+ // //闅愯棌鍏朵粬绫诲瀷鍙傛暟
+ // 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)
+ // 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)
+ // 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)
+ // 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)
+ // 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) => {
+ // if (res.success) {
+ // this.$refs.toolsConfigPropertyList.getPara(res.result)
+ // } else {
+ // this.$message.warning(res.message)
+ // }
+ // })
},
// 澶勭悊缂栬緫鎸夐挳鐐瑰嚮浜嬩欢
handleEditSelected() {
diff --git a/src/views/tms/modules/baseTools/ParaBladeModal.vue b/src/views/tms/modules/baseTools/ParaBladeModal.vue
index cb6f873..734f943 100644
--- a/src/views/tms/modules/baseTools/ParaBladeModal.vue
+++ b/src/views/tms/modules/baseTools/ParaBladeModal.vue
@@ -68,7 +68,7 @@
:placeholder="disableSubmit ? '' : '璇疯緭鍏ヤ腑鏂囧悕绉�'"
v-model="model.chineseName"
:disabled="disableSubmit"
- @change="e => chineseNameChange(e.target.value)"
+ @change="(e) => chineseNameChange(e.target.value)"
/>
</a-form-model-item>
</a-col>
@@ -91,7 +91,7 @@
:placeholder="disableSubmit ? '' : '璇疯緭鍏ュ瀷鍙�/鍥惧彿'"
v-model="model.toolModel"
:disabled="disableSubmit"
- @change="e => toolModelChange(e.target.value)"
+ @change="(e) => toolModelChange(e.target.value)"
/>
</a-form-model-item>
</a-col>
@@ -256,7 +256,7 @@
</a-col>
</a-row>
- <a-row :gutter="24">
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="price" label="鍗曚环">
<a-input
@@ -288,7 +288,12 @@
</a-form-model-item>
</a-col>
<a-col :span="6">
- <a-form-model-item label="闆嗗洟鍏徃缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupCompanyCode">
+ <a-form-model-item
+ label="闆嗗洟鍏徃缂栫爜"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="groupCompanyCode"
+ >
<a-input
v-model="model.groupCompanyCode"
:placeholder="disableSubmit ? '' : '璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'"
@@ -297,11 +302,13 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="闆嗗洟鍏徃鏍囪" :labelCol="{span:4}" :wrapperCol="{span:20}" prop="groupCompanySign">
- <a-input
- v-model="model.groupCompanySign"
- :disabled="true"
- ></a-input>
+ <a-form-model-item
+ label="闆嗗洟鍏徃鏍囪"
+ :labelCol="{ span: 4 }"
+ :wrapperCol="{ span: 20 }"
+ prop="groupCompanySign"
+ >
+ <a-input v-model="model.groupCompanySign" :disabled="true"></a-input>
</a-form-model-item>
</a-col>
</a-row>
@@ -309,12 +316,14 @@
<a-row :gutter="24">
<a-col :span="6">
<a-form-model-item label="鍒�鐗囧舰鐘�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeShape">
- <a-input
+ <j-dict-select-tag
+ type="list"
v-model="model.bladeShape"
- :placeholder="disableSubmit ? '' : '璇疯緭鍏ュ垁鐗囧舰鐘�'"
+ :triggerChange="true"
+ dictCode="blade_shape"
+ placeholder="璇烽�夋嫨鍒�鐗囧舰鐘�"
:disabled="disableSubmit"
- @change="e => bladeShapeChange(e.target.value)"
- ></a-input>
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -323,7 +332,7 @@
v-model="model.bladeLength"
:placeholder="disableSubmit ? '' : '璇疯緭鍏ュ垁鐗囬暱搴�'"
:disabled="disableSubmit"
- @change="e => bladeLengthChange(e.target.value)"
+ @change="(e) => bladeLengthChange(e.target.value)"
></a-input>
</a-form-model-item>
</a-col>
@@ -333,7 +342,7 @@
v-model="model.cuttingEdgeCount"
:placeholder="disableSubmit ? '' : '璇疯緭鍏ュ垏鍓婂垉鏁�'"
:disabled="disableSubmit"
- @change="e => cuttingEdgeCountChange(e.target.value)"
+ @change="(e) => cuttingEdgeCountChange(e.target.value)"
></a-input>
</a-form-model-item>
</a-col>
@@ -351,11 +360,14 @@
<a-row :gutter="24">
<a-col :span="6">
<a-form-model-item label="澶瑰浐鍨嬪紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clampingType">
- <a-input
+ <j-dict-select-tag
+ type="list"
v-model="model.clampingType"
- :placeholder="disableSubmit ? '' : '璇疯緭鍏ュす鍥哄瀷寮�'"
+ :triggerChange="true"
+ dictCode="clamping_type"
+ placeholder="璇烽�夋嫨澶瑰浐鍨嬪紡"
:disabled="disableSubmit"
- ></a-input>
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -364,17 +376,20 @@
v-model="model.noseAngleR"
:placeholder="disableSubmit ? '' : '璇疯緭鍏ュ垁灏朢'"
:disabled="disableSubmit"
- @change="e => noseAngleRChange(e.target.value)"
+ @change="(e) => noseAngleRChange(e.target.value)"
></a-input>
</a-form-model-item>
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒�鐗囨潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
- <a-input
+ <j-dict-select-tag
+ type="list"
v-model="model.toolMaterial"
- :placeholder="disableSubmit ? '' : '璇疯緭鍏ュ垁鐗囨潗鏂�'"
+ :triggerChange="true"
+ dictCode="tool_material"
+ placeholder="璇烽�夋嫨鍒�鐗囨潗鏂�"
:disabled="disableSubmit"
- ></a-input>
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -417,8 +432,8 @@
<a-col :span="6">
<a-form-model-item
label="闄勫姞鎶�鏈潯浠惰鏄�"
- :labelCol="{span:12}"
- :wrapperCol="{span:12}"
+ :labelCol="{ span: 12 }"
+ :wrapperCol="{ span: 12 }"
prop="conditionsInfo"
>
<a-input
@@ -450,11 +465,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒跺紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
- <a-input
+ <j-dict-select-tag
+ type="list"
v-model="model.types"
- :placeholder="disableSubmit ? '' : '璇疯緭鍏ュ埗寮�'"
+ :triggerChange="true"
+ dictCode="types"
+ placeholder="璇烽�夋嫨鍒跺紡"
:disabled="disableSubmit"
- ></a-input>
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -479,11 +497,14 @@
<a-row>
<a-col :span="6">
<a-form-model-item label="鍒囧墛鏂瑰悜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingDirection">
- <a-input
+ <j-dict-select-tag
+ type="list"
v-model="model.cuttingDirection"
- :placeholder="disableSubmit ? '' : '璇疯緭鍏ュ垏鍓婃柟鍚�'"
+ :triggerChange="true"
+ dictCode="cutting_direction"
+ placeholder="璇烽�夋嫨鍒囧墛鏂瑰悜"
:disabled="disableSubmit"
- ></a-input>
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -506,22 +527,28 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍐呭铻虹汗" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inOutThread">
- <a-input
+ <j-dict-select-tag
+ type="list"
v-model="model.inOutThread"
- :placeholder="disableSubmit ? '' : '璇疯緭鍏ュ唴澶栬灪绾�'"
+ :triggerChange="true"
+ dictCode="in_out_thread"
+ placeholder="璇烽�夋嫨鍐呭铻虹汗"
:disabled="disableSubmit"
- ></a-input>
+ />
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="6">
<a-form-model-item label="铻虹汗鏍囧噯" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadStandard">
- <a-input
+ <j-dict-select-tag
+ type="list"
v-model="model.threadStandard"
- :placeholder="disableSubmit ? '' : '璇疯緭鍏ヨ灪绾规爣鍑�'"
+ :triggerChange="true"
+ dictCode="tool_thread_standard"
+ placeholder="璇烽�夋嫨铻虹汗鏍囧噯"
:disabled="disableSubmit"
- ></a-input>
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -545,8 +572,8 @@
<a-col :span="6">
<a-form-model-item
label="鏈�灏忓姞宸ュ唴铻虹汗鍏О鐩村緞"
- :labelCol="{span:15}"
- :wrapperCol="{span:9}"
+ :labelCol="{ span: 15 }"
+ :wrapperCol="{ span: 9 }"
prop="minInternalThread"
>
<a-input
@@ -635,12 +662,12 @@
queryParaByToolCode: '/tms/baseTools/queryByToolCode',
},
locationCodeOptions: [],
- chineseNameChange1:'',
- toolModelChange1:'',
- bladeShapeChange1:'',
- bladeLengthChange1:'',
- cuttingEdgeCountChange1:'',
- noseAngleRChange1:''
+ chineseNameChange1: '',
+ toolModelChange1: '',
+ bladeShapeChange1: '',
+ bladeLengthChange1: '',
+ cuttingEdgeCountChange1: '',
+ noseAngleRChange1: '',
}
},
created() {
@@ -660,8 +687,8 @@
this.editable = false
//鍒濆鍖栭粯璁ゅ��
this.model = {
- positionCode: ''
- };
+ positionCode: '',
+ }
this.model.classifyId = nodeSelected.key
this.model.classifyNum = nodeSelected.entity.classifyId
this.model.classifyName = nodeSelected.entity.typeName
@@ -672,32 +699,32 @@
this.editable = true
this.model = Object.assign({}, record)
this.chineseNameChange1 = record.chineseName
- this.toolModelChange1 = '-'+record.toolModel
- this.bladeShapeChange1 = '-'+record.bladeShape
- this.bladeLengthChange1 = '-'+record.bladeLength
- this.cuttingEdgeCountChange1 = '-'+record.cuttingEdgeCount
- this.noseAngleRChange1 = '-'+record.noseAngleR
+ this.toolModelChange1 = '-' + record.toolModel
+ this.bladeShapeChange1 = '-' + record.bladeShape
+ this.bladeLengthChange1 = '-' + record.bladeLength
+ this.cuttingEdgeCountChange1 = '-' + record.cuttingEdgeCount
+ this.noseAngleRChange1 = '-' + record.noseAngleR
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
- getAction(this.url.queryParaByToolCode, {
- toolCode: record.toolCodeId,
- paraTypeFlag: record.paraTypeFlag,
- }).then((res) => {
- if (res.success) {
- this.model = Object.assign({}, res.result)
- }
- })
+ // 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() {
this.$emit('close')
this.visible = false
this.$refs.form.clearValidate()
- this.chineseNameChange1 = '',
- this.toolModelChange1 = '',
- this.bladeShapeChange1 = '',
- this.bladeLengthChange1 = '',
- this.cuttingEdgeCountChange1 = '',
- this.noseAngleRChange1 = ''
+ ;(this.chineseNameChange1 = ''),
+ (this.toolModelChange1 = ''),
+ (this.bladeShapeChange1 = ''),
+ (this.bladeLengthChange1 = ''),
+ (this.cuttingEdgeCountChange1 = ''),
+ (this.noseAngleRChange1 = '')
},
positionCodeSearch() {
let positionCode = []
@@ -771,36 +798,66 @@
}
})
},
- chineseNameChange(chineseNameChange){
+ chineseNameChange(chineseNameChange) {
this.chineseNameChange1 = chineseNameChange
- this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
- +this.cuttingEdgeCountChange1+this.noseAngleRChange1
+ this.model.groupCompanySign =
+ this.chineseNameChange1 +
+ this.toolModelChange1 +
+ this.bladeShapeChange1 +
+ this.bladeLengthChange1 +
+ this.cuttingEdgeCountChange1 +
+ this.noseAngleRChange1
},
- toolModelChange(toolModelChange){
- this.toolModelChange1 = toolModelChange == '' ? '' : '-'+toolModelChange
- this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
- +this.cuttingEdgeCountChange1+this.noseAngleRChange1
+ toolModelChange(toolModelChange) {
+ this.toolModelChange1 = toolModelChange == '' ? '' : '-' + toolModelChange
+ this.model.groupCompanySign =
+ this.chineseNameChange1 +
+ this.toolModelChange1 +
+ this.bladeShapeChange1 +
+ this.bladeLengthChange1 +
+ this.cuttingEdgeCountChange1 +
+ this.noseAngleRChange1
},
- bladeShapeChange(bladeShapeChange){
- this.bladeShapeChange1 = bladeShapeChange == '' ? '' : '-'+bladeShapeChange
- this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
- +this.cuttingEdgeCountChange1+this.noseAngleRChange1
+ bladeShapeChange(bladeShapeChange) {
+ this.bladeShapeChange1 = bladeShapeChange == '' ? '' : '-' + bladeShapeChange
+ this.model.groupCompanySign =
+ this.chineseNameChange1 +
+ this.toolModelChange1 +
+ this.bladeShapeChange1 +
+ this.bladeLengthChange1 +
+ this.cuttingEdgeCountChange1 +
+ this.noseAngleRChange1
},
- bladeLengthChange(bladeLengthChange){
- this.bladeLengthChange1 = bladeLengthChange == '' ? '' : '-'+bladeLengthChange
- this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
- +this.cuttingEdgeCountChange1+this.noseAngleRChange1
+ bladeLengthChange(bladeLengthChange) {
+ this.bladeLengthChange1 = bladeLengthChange == '' ? '' : '-' + bladeLengthChange
+ this.model.groupCompanySign =
+ this.chineseNameChange1 +
+ this.toolModelChange1 +
+ this.bladeShapeChange1 +
+ this.bladeLengthChange1 +
+ this.cuttingEdgeCountChange1 +
+ this.noseAngleRChange1
},
- cuttingEdgeCountChange(cuttingEdgeCountChange){
- this.cuttingEdgeCountChange1 = cuttingEdgeCountChange == '' ? '' : '-'+cuttingEdgeCountChange
- this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
- +this.cuttingEdgeCountChange1+this.noseAngleRChange1
+ cuttingEdgeCountChange(cuttingEdgeCountChange) {
+ this.cuttingEdgeCountChange1 = cuttingEdgeCountChange == '' ? '' : '-' + cuttingEdgeCountChange
+ this.model.groupCompanySign =
+ this.chineseNameChange1 +
+ this.toolModelChange1 +
+ this.bladeShapeChange1 +
+ this.bladeLengthChange1 +
+ this.cuttingEdgeCountChange1 +
+ this.noseAngleRChange1
},
- noseAngleRChange(noseAngleRChange){
- this.noseAngleRChange1 = noseAngleRChange == '' ? '' : '-'+noseAngleRChange
- this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.bladeShapeChange1+this.bladeLengthChange1
- +this.cuttingEdgeCountChange1+this.noseAngleRChange1
- }
+ noseAngleRChange(noseAngleRChange) {
+ this.noseAngleRChange1 = noseAngleRChange == '' ? '' : '-' + noseAngleRChange
+ this.model.groupCompanySign =
+ this.chineseNameChange1 +
+ this.toolModelChange1 +
+ this.bladeShapeChange1 +
+ this.bladeLengthChange1 +
+ this.cuttingEdgeCountChange1 +
+ this.noseAngleRChange1
+ },
},
}
</script>
diff --git a/src/views/tms/modules/baseTools/ParaBladeSearchModal.vue b/src/views/tms/modules/baseTools/ParaBladeSearchModal.vue
index 5df24f3..99fcc4a 100644
--- a/src/views/tms/modules/baseTools/ParaBladeSearchModal.vue
+++ b/src/views/tms/modules/baseTools/ParaBladeSearchModal.vue
@@ -221,7 +221,7 @@
type="list"
v-model="model.inOutThread"
:triggerChange="true"
- dictCode="in_out_thread"
+ dictCode="number_patterns"
placeholder="璇烽�夋嫨鍐呭铻虹汗"
/>
</a-form-model-item>
@@ -232,7 +232,7 @@
type="list"
v-model="model.threadStandard"
:triggerChange="true"
- dictCode="thread_standard"
+ dictCode="tool_thread_standard"
placeholder="璇烽�夋嫨铻虹汗鏍囧噯"
/>
</a-form-model-item>
diff --git a/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue b/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
index c6e17bd..9c59f79 100644
--- a/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
+++ b/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
@@ -264,7 +264,14 @@
<a-row :gutter="24">
<a-col :span="6">
<a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
- <a-input v-model="model.toolMaterial" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁鍏锋潗鏂�'" :disabled="disableSubmit"></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.toolMaterial"
+ :triggerChange="true"
+ dictCode="tool_material"
+ placeholder="璇烽�夋嫨鍒�鍏锋潗鏂�"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -282,7 +289,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒�鍏峰瀷寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
- <a-input v-model="model.toolPattern" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁鍏峰瀷寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.toolPattern"
+ :triggerChange="true"
+ dictCode="tool_pattern"
+ placeholder="璇烽�夋嫨鍒�鍏峰瀷寮�"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -294,7 +308,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍐峰嵈鏂瑰紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
- <a-input v-model="model.coolingMethod" :placeholder="disableSubmit?'':'璇疯緭鍏ュ喎鍗存柟寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.coolingMethod"
+ :triggerChange="true"
+ dictCode="cooling_method"
+ placeholder="璇烽�夋嫨鍐峰嵈鏂瑰紡"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -316,7 +337,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒跺紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
- <a-input v-model="model.types" :placeholder="disableSubmit?'':'璇疯緭鍏ュ埗寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.types"
+ :triggerChange="true"
+ dictCode="types"
+ placeholder="璇烽�夋嫨鍒跺紡"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -326,14 +354,28 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鎺掑睉妲藉舰寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fluteForm">
- <a-input v-model="model.fluteForm" :placeholder="disableSubmit?'':'璇疯緭鍏ユ帓灞戞Ы褰㈠紡'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.fluteForm"
+ :triggerChange="true"
+ dictCode="flute_form"
+ placeholder="璇烽�夋嫨鎺掑睉妲藉舰寮�"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="6">
<a-form-model-item label="鏌勯儴褰㈠紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleForm">
- <a-input v-model="model.handleForm" :placeholder="disableSubmit?'':'璇疯緭鍏ユ焺閮ㄥ舰寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.handleForm"
+ :triggerChange="true"
+ dictCode="handle_form"
+ placeholder="璇烽�夋嫨鏌勯儴褰㈠紡"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -392,7 +434,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="閫傜敤鑼冨洿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scopeOfApplication">
- <a-input v-model="model.scopeOfApplication" :placeholder="disableSubmit?'':'璇疯緭鍏ラ�傜敤鑼冨洿'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.scopeOfApplication"
+ :triggerChange="true"
+ dictCode="scope_of_application"
+ placeholder="璇烽�夋嫨閫傜敤鑼冨洿"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -409,7 +458,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍔犲伐鏂瑰紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processingmethod">
- <a-input v-model="model.processingmethod" :placeholder="disableSubmit?'':'璇疯緭鍏ュ姞宸ユ柟寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.processingmethod"
+ :triggerChange="true"
+ dictCode="processingmethod"
+ placeholder="璇烽�夋嫨鍔犲伐鏂瑰紡"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -565,20 +621,22 @@
},
edit(record) {
this.editable = true;
+ console.log("1111",this.model.classifyNum)
this.model = Object.assign({}, record)
+ console.log("2222",this.model.classifyNum)
this.chineseNameChange1 = record.chineseName
this.toolModelChange1 = '-'+record.toolModel
this.diameterChange1 = '-'+record.diameter
this.totalLengthChange1 = '-'+record.totalLength
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
- getAction(this.url.queryParaByToolCode, {
- toolCode: record.toolCodeId,
- paraTypeFlag: record.paraTypeFlag,
- }).then((res) => {
- if (res.success) {
- this.model = Object.assign({}, res.result)
- }
- })
+ // 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/ParaMillToolModal.vue b/src/views/tms/modules/baseTools/ParaMillToolModal.vue
index c18639a..c49c464 100644
--- a/src/views/tms/modules/baseTools/ParaMillToolModal.vue
+++ b/src/views/tms/modules/baseTools/ParaMillToolModal.vue
@@ -263,7 +263,14 @@
<a-row :gutter="24">
<a-col :span="6">
<a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
- <a-input v-model="model.toolMaterial" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁鍏锋潗鏂�'" :disabled="disableSubmit"></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.toolMaterial"
+ :triggerChange="true"
+ dictCode="tool_material"
+ placeholder="璇烽�夋嫨鍒�鍏锋潗鏂�"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -281,7 +288,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒�鍏峰瀷寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
- <a-input v-model="model.toolPattern" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁鍏峰瀷寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.toolPattern"
+ :triggerChange="true"
+ dictCode="tool_pattern"
+ placeholder="璇烽�夋嫨鍒�鍏峰瀷寮�"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -293,12 +307,26 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鏌勯儴褰㈠紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleForm">
- <a-input v-model="model.handleForm" :placeholder="disableSubmit?'':'璇疯緭鍏ユ焺閮ㄥ舰寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.handleForm"
+ :triggerChange="true"
+ dictCode="mill_handle_form"
+ placeholder="璇烽�夋嫨鏌勯儴褰㈠紡"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
<a-form-model-item label="鍐峰嵈鏂瑰紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
- <a-input v-model="model.coolingMethod" :placeholder="disableSubmit?'':'璇疯緭鍏ュ喎鍗存柟寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.coolingMethod"
+ :triggerChange="true"
+ dictCode="cooling_method"
+ placeholder="璇烽�夋嫨鍐峰嵈鏂瑰紡"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -371,7 +399,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鏌勯褰㈠紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleNeckForm">
- <a-input v-model="model.handleNeckForm" :placeholder="disableSubmit?'':'璇疯緭鍏ユ焺棰堝舰寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.handleNeckForm"
+ :triggerChange="true"
+ dictCode="handle_neck_form"
+ placeholder="璇烽�夋嫨鏌勯褰㈠紡"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -388,7 +423,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="閾ｅ垁澶村舰寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="millingHeadForm">
- <a-input v-model="model.millingHeadForm" :placeholder="disableSubmit?'':'璇疯緭鍏ラ摚鍒�澶村舰寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.millingHeadForm"
+ :triggerChange="true"
+ dictCode="milling_head_form"
+ placeholder="璇烽�夋嫨閾ｅ垁澶村舰寮�"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -398,7 +440,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒囧墛鍒冨舰寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingEdgeForm">
- <a-input v-model="model.cuttingEdgeForm" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垏鍓婂垉褰㈠紡'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.cuttingEdgeForm"
+ :triggerChange="true"
+ dictCode="cutting_edge_form"
+ placeholder="璇烽�夋嫨鍒囧墛鍒冨舰寮�"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -409,8 +458,15 @@
</a-form-model-item>
</a-col>
<a-col :span="6">
- <a-form-model-item label="鍐呭绾规暟" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="numberPatterns">
- <a-input v-model="model.numberPatterns" :placeholder="disableSubmit?'':'璇疯緭鍏ュ唴澶栫汗鏁�'" :disabled="disableSubmit" ></a-input>
+ <a-form-model-item label="鍐呭铻虹汗" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="numberPatterns">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.numberPatterns"
+ :triggerChange="true"
+ dictCode="number_patterns"
+ placeholder="璇烽�夋嫨鍐呭铻虹汗"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -576,14 +632,14 @@
this.totalLengthChange1 = '-'+record.totalLength
this.noseAngleRChange1 = '-' + record.noseAngleR
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
- getAction(this.url.queryParaByToolCode, {
- toolCode: record.toolCodeId,
- paraTypeFlag: record.paraTypeFlag,
- }).then((res) => {
- if (res.success) {
- this.model = Object.assign({}, res.result)
- }
- })
+ // 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 2b39133..7844f35 100644
--- a/src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue
+++ b/src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue
@@ -279,7 +279,7 @@
type="list"
v-model="model.handleForm"
:triggerChange="true"
- dictCode="handle_form"
+ dictCode="mill_handle_form"
placeholder="璇烽�夋嫨鏌勯儴褰㈠紡"
/>
</a-form-model-item>
diff --git a/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue b/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
index ce5eec0..79a473e 100644
--- a/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
+++ b/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
@@ -250,7 +250,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="铻虹汗鏃嬪悜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rotationDirection">
- <a-input v-model="model.rotationDirection" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ灪绾规棆鍚�'" :disabled="disableSubmit"></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.rotationDirection"
+ :triggerChange="true"
+ dictCode="rotation_direction"
+ placeholder="璇烽�夋嫨铻虹汗鏃嬪悜"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -273,7 +280,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
- <a-input v-model="model.toolMaterial" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁鍏锋潗鏂�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.toolMaterial"
+ :triggerChange="true"
+ dictCode="tool_material"
+ placeholder="璇烽�夋嫨鍒�鍏锋潗鏂�"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -320,29 +334,64 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒跺紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
- <a-input v-model="model.types" :placeholder="disableSubmit?'':'璇疯緭鍏ュ埗寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.types"
+ :triggerChange="true"
+ dictCode="types"
+ placeholder="璇烽�夋嫨鍒跺紡"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
<a-form-model-item label="鍐峰嵈鏂瑰紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
- <a-input v-model="model.coolingMethod" :placeholder="disableSubmit?'':'璇疯緭鍏ュ喎鍗存柟寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.coolingMethod"
+ :triggerChange="true"
+ dictCode="cooling_method"
+ placeholder="璇烽�夋嫨鍐峰嵈鏂瑰紡"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="6">
<a-form-model-item label="铻虹汗鏍囧噯" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadStandard">
- <a-input v-model="model.threadStandard" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ灪绾规爣鍑�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.threadStandard"
+ :triggerChange="true"
+ dictCode="thread_standard"
+ placeholder="璇烽�夋嫨铻虹汗鏍囧噯"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
<a-form-model-item label="鎺掑睉妲藉瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fluteSoltType">
- <a-input v-model="model.fluteSoltType" :placeholder="disableSubmit?'':'璇疯緭鍏ユ帓灞戞Ы鍨�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.fluteSoltType"
+ :triggerChange="true"
+ dictCode="flute_solt_type"
+ placeholder="璇烽�夋嫨鎺掑睉妲藉瀷"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
<a-form-model-item label="铻虹汗绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadType">
- <a-input v-model="model.threadType" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ灪绾圭被鍨�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.threadType"
+ :triggerChange="true"
+ dictCode="thread_type"
+ placeholder="璇烽�夋嫨铻虹汗绫诲瀷"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -352,6 +401,17 @@
</a-col>
</a-row>
<a-row>
+ <a-col :span="6">
+ <a-form-model-item label="铻哄瓟绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="screwHoleType">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.screwHoleType"
+ :triggerChange="true"
+ dictCode="screw_hole_type"
+ placeholder="璇烽�夋嫨铻哄瓟绫诲瀷"
+ />
+ </a-form-model-item>
+ </a-col>
<a-col :span="6">
<a-form-model-item label="杩炴帴瀛斿緞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="connectionAperture">
<a-input v-model="model.connectionAperture" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ繛鎺ュ瓟寰�'" :disabled="disableSubmit" ></a-input>
@@ -510,14 +570,14 @@
this.threadCodeChange1 = '-'+record.threadCode
this.pitchChange1 = '-'+record.pitch
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
- getAction(this.url.queryParaByToolCode, {
- toolCode: record.toolCodeId,
- paraTypeFlag: record.paraTypeFlag,
- }).then((res) => {
- if (res.success) {
- this.model = Object.assign({}, res.result)
- }
- })
+ // 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 bd2790d..bf1de53 100644
--- a/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue
+++ b/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue
@@ -231,6 +231,17 @@
</a-col>
</a-row>
<a-row>
+ <a-col :span="8">
+ <a-form-model-item label="铻虹汗绫诲瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadType">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.threadType"
+ :triggerChange="true"
+ dictCode="thread_type"
+ placeholder="璇烽�夋嫨铻虹汗绫诲瀷"
+ />
+ </a-form-model-item>
+ </a-col>
<a-col :span="8">
<a-form-model-item label="鎺掑睉妲藉瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fluteSoltType">
<j-dict-select-tag
@@ -257,6 +268,9 @@
></a-input>
</a-form-item>
</a-col>
+
+ </a-row>
+ <a-row>
<a-col :span="8">
<a-form-item label="鍒囧墛鍒冮暱">
<a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallEdgeLength"></a-input>
@@ -264,8 +278,6 @@
<a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigEdgeLength"></a-input>
</a-form-item>
</a-col>
- </a-row>
- <a-row>
<a-col :span="8">
<a-form-item label="鍒�鍏锋�婚暱">
<a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallTotalLength"></a-input>
diff --git a/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue b/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
index 078e63a..7ae3354 100644
--- a/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
+++ b/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
@@ -268,12 +268,26 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒囧墛鏂瑰悜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingDirection">
- <a-input v-model="model.cuttingDirection" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垏鍓婃柟鍚�'" :disabled="disableSubmit"></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.cuttingDirection"
+ :triggerChange="true"
+ dictCode="cutting_direction"
+ placeholder="璇烽�夋嫨鍒囧墛鏂瑰悜"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
- <a-input v-model="model.toolMaterial" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁鍏锋潗鏂�'" :disabled="disableSubmit"></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.toolMaterial"
+ :triggerChange="true"
+ dictCode="tool_material"
+ placeholder="璇烽�夋嫨鍒�鍏锋潗鏂�"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -294,7 +308,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒�鍏峰瀷寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
- <a-input v-model="model.toolPattern" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁鍏峰瀷寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.toolPattern"
+ :triggerChange="true"
+ dictCode="tool_pattern"
+ placeholder="璇烽�夋嫨鍒�鍏峰瀷寮�"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -316,7 +337,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒跺紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
- <a-input v-model="model.types" :placeholder="disableSubmit?'':'璇疯緭鍏ュ埗寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.types"
+ :triggerChange="true"
+ dictCode="types"
+ placeholder="璇烽�夋嫨鍒跺紡"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -326,14 +354,28 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍐峰嵈鏂瑰紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
- <a-input v-model="model.coolingMethod" :placeholder="disableSubmit?'':'璇疯緭鍏ュ喎鍗存柟寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.coolingMethod"
+ :triggerChange="true"
+ dictCode="cooling_method"
+ placeholder="璇烽�夋嫨鍐峰嵈鏂瑰紡"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span="6">
<a-form-model-item label="鍒�鏉嗙被鍒�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="holderCategory">
- <a-input v-model="model.holderCategory" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁鏉嗙被鍒�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.holderCategory"
+ :triggerChange="true"
+ dictCode="holder_category"
+ placeholder="璇烽�夋嫨鍒�鏉嗙被鍒�"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -343,7 +385,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鎺ュ彛绱у浐褰㈠紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fasteningForm">
- <a-input v-model="model.fasteningForm" :placeholder="disableSubmit?'':'璇疯緭鍏ユ帴鍙ｇ揣鍥哄舰寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.fasteningForm"
+ :triggerChange="true"
+ dictCode="fastening_form"
+ placeholder="璇烽�夋嫨鎺ュ彛绱у浐褰㈠紡"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -360,7 +409,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒�鐗囧舰鐘�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeShape">
- <a-input v-model="model.bladeShape" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁鐗囧舰鐘�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.bladeShape"
+ :triggerChange="true"
+ dictCode="blade_shape"
+ placeholder="璇烽�夋嫨鍒�鐗囧舰鐘�"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -370,7 +426,14 @@
</a-col>
<a-col :span="6">
<a-form-model-item label="鍒�鏉嗘柟鍚�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="barDirection">
- <a-input v-model="model.barDirection" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁鏉嗘柟鍚�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.barDirection"
+ :triggerChange="true"
+ dictCode="bar_direction"
+ placeholder="璇烽�夋嫨鍒�鏉嗘柟鍚�"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
</a-row>
@@ -399,7 +462,14 @@
<a-row>
<a-col :span="6">
<a-form-model-item label="鍒�鐗囪澶规柟寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clampingMethod">
- <a-input v-model="model.clampingMethod" :placeholder="disableSubmit?'':'璇疯緭鍏ュ垁鐗囪澶规柟寮�'" :disabled="disableSubmit" ></a-input>
+ <j-dict-select-tag
+ type="list"
+ v-model="model.clampingMethod"
+ :triggerChange="true"
+ dictCode="clamping_method"
+ placeholder="璇烽�夋嫨鍒�鐗囪澶规柟寮�"
+ :disabled="disableSubmit"
+ />
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -587,14 +657,14 @@
this.headSpecificationsChange1 = '-'+record.headSpecifications
this.leadAngleChange1 = '-'+record.leadAngle
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
- getAction(this.url.queryParaByToolCode, {
- toolCode: record.toolCodeId,
- paraTypeFlag: record.paraTypeFlag,
- }).then((res) => {
- if (res.success) {
- this.model = Object.assign({}, res.result)
- }
- })
+ // 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/toolLedger/ToolLedgerListRight.vue b/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
index c791a83..518c812 100644
--- a/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
+++ b/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
@@ -453,10 +453,8 @@
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
- getAction(this.url.queryParaByToolCode, { toolCode: this.selectionRows[0].toolCodeId,paraTypeFlag:this.selectionRows[0].paraTypeFlag}).then((res) => {
- if (res.success) {
- if(this.selectionRows[0].paraTypeFlag === "1"){
- this.$refs.paraCommonToolList.getPara(res.result);
+ if(this.selectionRows[0].paraTypeFlag === "1"){
+ this.$refs.paraCommonToolList.getPara(this.selectionRows[0]);
//闅愯棌鍏朵粬绫诲瀷鍙傛暟
this.$refs.paraHoleToolsList.visable =false
this.$refs.paraThreadingToolList.visable = false
@@ -464,35 +462,35 @@
this.$refs.paraTurningToolsList.visable = false
this.$refs.paraBladeList.visable = false
}else if(this.selectionRows[0].paraTypeFlag === "2"){
- this.$refs.paraHoleToolsList.getPara(res.result);
+ this.$refs.paraHoleToolsList.getPara(this.selectionRows[0]);
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);
+ this.$refs.paraThreadingToolList.getPara(this.selectionRows[0]);
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);
+ this.$refs.paraMillToolList.getPara(this.selectionRows[0]);
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);
+ this.$refs.paraTurningToolsList.getPara(this.selectionRows[0]);
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.paraBladeList.getPara(this.selectionRows[0]);
this.$refs.paraCommonToolList.visable = false
this.$refs.paraHoleToolsList.visable =false
this.$refs.paraThreadingToolList.visable = false
@@ -500,17 +498,65 @@
this.$refs.paraTurningToolsList.visable = false
this.$refs.paraBladeList.visable = false
}
- } else {
- this.$message.warning(res.message);
- }
- })
- getAction(this.url.queryByToolCode, { toolCode: this.selectionRows[0].toolCodeId}).then((res) => {
- if (res.success) {
- this.$refs.toolsConfigPropertyList.getPara(res.result);
- } else {
- this.$message.warning(res.message);
- }
- })
+ this.$refs.toolsConfigPropertyList.getPara(this.selectionRows[0]);
+ // getAction(this.url.queryParaByToolCode, { toolCode: this.selectionRows[0].toolCodeId,paraTypeFlag:this.selectionRows[0].paraTypeFlag}).then((res) => {
+ // if (res.success) {
+ // if(this.selectionRows[0].paraTypeFlag === "1"){
+ // this.$refs.paraCommonToolList.getPara(res.result);
+ // //闅愯棌鍏朵粬绫诲瀷鍙傛暟
+ // 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);
+ // 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);
+ // 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);
+ // 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);
+ // 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.selectionRows[0].toolCodeId}).then((res) => {
+ // if (res.success) {
+ // this.$refs.toolsConfigPropertyList.getPara(res.result);
+ // } else {
+ // this.$message.warning(res.message);
+ // }
+ // })
this.$bus.$emit('getToolLedgerData', this.selectionRows[0])
},
//绂佺敤鐘舵�佹牱寮�
diff --git a/src/views/tms/modules/toolsClassify/ToolsClassifyListRight.vue b/src/views/tms/modules/toolsClassify/ToolsClassifyListRight.vue
index 97a1ed8..fa65571 100644
--- a/src/views/tms/modules/toolsClassify/ToolsClassifyListRight.vue
+++ b/src/views/tms/modules/toolsClassify/ToolsClassifyListRight.vue
@@ -54,10 +54,10 @@
>
<a-button @click="handleAdd(nodeSelected)" type="primary" icon="plus" :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '1'">鏂板</a-button>
</Tooltip>
- <!-- <a-button type="primary" icon="download" @click="handleExportXls('宸ュ叿鍒嗙被淇℃伅')">瀵煎嚭</a-button>
+ <a-button type="primary" icon="download" @click="handleExportXls('宸ュ叿鍒嗙被淇℃伅')">瀵煎嚭</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">瀵煎叆</a-button>
- </a-upload> -->
+ </a-upload>
</div>
<!-- table鍖哄煙-begin -->
--
Gitblit v1.9.3