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/ParaHoleToolsModal.vue | 90 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 74 insertions(+), 16 deletions(-)
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() {
--
Gitblit v1.9.3