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/ParaMillToolModal.vue | 89 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 80 insertions(+), 9 deletions(-)
diff --git a/src/views/tms/modules/baseTools/ParaMillToolModal.vue b/src/views/tms/modules/baseTools/ParaMillToolModal.vue
index d7ee80c..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">
@@ -532,6 +588,7 @@
url: {
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
+ queryParaByToolCode: '/tms/baseTools/queryByToolCode',
},
locationCodeOptions:[],
chineseNameChange1:'',
@@ -569,6 +626,20 @@
edit(record) {
this.editable = true;
this.model = Object.assign({}, record)
+ this.chineseNameChange1 = record.chineseName
+ this.toolModelChange1 = '-'+record.toolModel
+ this.diameterChange1 = '-'+record.diameter
+ 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)
+ // }
+ // })
this.visible = true
},
close() {
--
Gitblit v1.9.3