From ba15d76ff0ec80ee759913511158d4333f6e6c59 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期五, 29 八月 2025 18:21:22 +0800
Subject: [PATCH] 日常业务问题修改、工具参数查询增加
---
src/views/tms/modules/baseTools/ParaBladeModal.vue | 6
src/views/tms/lossBound/modules/LossboundModal.vue | 54
src/views/tms/modules/inbound/InboundListRight.vue | 26
src/views/tms/modules/inbound/InboundModel.vue | 2
src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue | 525 +++++++---
src/views/tms/modules/baseTools/BaseToolsForm.vue | 10
src/views/tms/modules/baseTools/ParaTurningToolsSearchModal.vue | 553 +++++++---
src/views/tms/modules/toolLedger/InStoreDetailList.vue | 5
src/views/tms/modules/baseTools/ParaMillToolModal.vue | 5
src/views/tms/modules/baseTools/ParaTurningToolsModal.vue | 4
src/views/tms/modules/inbound/InboundApplyModelList.vue | 2
src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue | 371 +++++--
src/views/tms/modules/inboundOrder/JSelectToolingModal.vue | 2
src/views/tms/modules/baseTools/ParaHoleToolsSearchModal.vue | 592 ++++++++---
src/views/tms/modules/baseTools/ParaThreadingToolModal.vue | 4
src/views/tms/modules/baseTools/ParaBladeSearchModal.vue | 414 +++++---
src/views/tms/modules/baseTools/BaseToolsListRight.vue | 361 +++++--
src/views/tms/modules/baseTools/ParaHoleToolsModal.vue | 4
src/views/tms/modules/toolLedger/ToolLedgerListRight.vue | 2
src/views/tms/modules/toolsClassify/ToolsClassifyListRight.vue | 4
src/views/tms/modules/WarehouseForm.vue | 10
src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue | 10
src/views/flowable/workflow/lossBound/lossBoundHandle.vue | 29
src/views/tms/combinationKnife/ToolCombinationList.vue | 2
24 files changed, 2,023 insertions(+), 974 deletions(-)
diff --git a/src/views/flowable/workflow/lossBound/lossBoundHandle.vue b/src/views/flowable/workflow/lossBound/lossBoundHandle.vue
index 5d932c7..56e4eda 100644
--- a/src/views/flowable/workflow/lossBound/lossBoundHandle.vue
+++ b/src/views/flowable/workflow/lossBound/lossBoundHandle.vue
@@ -40,13 +40,20 @@
</a-form-model-item>
</a-col>
<a-col :span="span">
+ <a-form-model-item label="缁忔墜浜�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handler">
+ <j-dict-select-tag disabled
+ v-model="tableRowRecord.handler" dictCode="sys_user,realname,id"
+ placeholder="璇烽�夋嫨" />
+ </a-form-model-item>
+ </a-col>
+ <!-- <a-col :span="span">
<a-form-model-item label="鎶ユ崯浜�" :labelCol="labelCol" :wrapperCol="wrapperCol"
prop="outStorehouseType">
<j-dict-select-tag disabled
v-model="tableRowRecord.losser" dictCode="sys_user,realname,id"
placeholder="璇烽�夋嫨" />
</a-form-model-item>
- </a-col>
+ </a-col> -->
</a-row>
<a-row>
<a-col :span="span">
@@ -64,16 +71,10 @@
</a-col>
</a-row>
<a-row>
- <a-col :span="span">
- <a-form-model-item label="缁忔墜浜�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handler">
- <j-dict-select-tag disabled
- v-model="tableRowRecord.handler" dictCode="sys_user,realname,id"
- placeholder="璇烽�夋嫨" />
- </a-form-model-item>
- </a-col>
- <a-col :span="span">
- <a-form-model-item label="澶囨敞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
- <a-textarea disabled v-model="tableRowRecord.remark" rows="4" />
+
+ <a-col :span="24">
+ <a-form-model-item label="澶囨敞" :labelCol="{span:2}" :wrapperCol="{span:20}" prop="remark">
+ <a-textarea disabled v-model="tableRowRecord.remark" rows="2" />
</a-form-model-item>
</a-col>
</a-row>
@@ -118,8 +119,8 @@
<a-form-model ref="form" :model="approveData" :rules="validatorRules" slot="detail">
<a-row>
<a-col ::span="span">
- <a-form-model-item label="鐢宠浜�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handler_dictText">
- <a-input :readOnly="inputReadOnly" v-model="tableRowRecord.handler_dictText"></a-input>
+ <a-form-model-item label="鐢宠浜�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handlePerson">
+ <a-input :readOnly="inputReadOnly" v-model="tableRowRecord.handlePerson"></a-input>
</a-form-model-item>
</a-col>
<a-col ::span="span">
@@ -235,7 +236,7 @@
{
title: '鍒�鍏风紪鍙�',
align: 'center',
- dataIndex: 'toolCode'
+ dataIndex: 'toolId'
},
{
title: '宸ュ叿绫诲瀷',
diff --git a/src/views/tms/combinationKnife/ToolCombinationList.vue b/src/views/tms/combinationKnife/ToolCombinationList.vue
index 439b967..7b731e7 100644
--- a/src/views/tms/combinationKnife/ToolCombinationList.vue
+++ b/src/views/tms/combinationKnife/ToolCombinationList.vue
@@ -69,7 +69,7 @@
</template>
<span slot='action' slot-scope='text, record'>
- <a-popconfirm title='纭畾鎷嗗嵏鍚�?' @confirm='() => handleDelete(record.id)'>
+ <a-popconfirm title='纭畾鎷嗗嵏鍚�?' v-if="record.status == '1'" @confirm='() => handleDelete(record.id)'>
<a>鍒�鍏锋媶鍗�</a>
</a-popconfirm>
</span>
diff --git a/src/views/tms/lossBound/modules/LossboundModal.vue b/src/views/tms/lossBound/modules/LossboundModal.vue
index 7db180f..e10bd0c 100644
--- a/src/views/tms/lossBound/modules/LossboundModal.vue
+++ b/src/views/tms/lossBound/modules/LossboundModal.vue
@@ -13,16 +13,19 @@
<a-row>
<a-col :span="12">
<a-form-model-item label="鎶ユ崯鍗曞崟鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderCode">
- <j-input v-model="model.orderCode" placeholder="绯荤粺鑷姩鐢熸垚" :disabled="true"></j-input>
+ <a-input v-model="model.orderCode" placeholder="绯荤粺鑷姩鐢熸垚" :disabled="true"></a-input>
</a-form-model-item>
</a-col>
- <a-col :span="12">
- <a-form-model-item label="鎶ユ崯浜�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="losser">
- <j-dict-select-tag :disabled="disableSubmit"
- v-model="model.losser" dictCode="sys_user,realname,id"
+ <a-col :span="12">
+ <a-form-model-item label="缁忔墜浜�" :labelCol="labelCol" :wrapperCol="wrapperCol"
+ prop="handler">
+
+ <j-dict-select-tag :disabled="true"
+ v-model="model.handler" dictCode="sys_user,realname,id"
placeholder="璇烽�夋嫨" />
</a-form-model-item>
</a-col>
+
</a-row>
<a-row>
<a-col :span="12">
@@ -43,16 +46,14 @@
</a-col>
</a-row>
<a-row>
-
- <a-col :span="12">
- <a-form-model-item v-if="addShow" label="缁忔墜浜�" :labelCol="labelCol" :wrapperCol="wrapperCol"
- prop="handler">
-
+ <!-- <a-col :span="12">
+ <a-form-model-item label="鎶ユ崯浜�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="losser">
<j-dict-select-tag :disabled="disableSubmit"
- v-model="model.handler" dictCode="sys_user,realname,id"
+ v-model="model.losser" dictCode="sys_user,realname,id"
placeholder="璇烽�夋嫨" />
</a-form-model-item>
- </a-col>
+ </a-col> -->
+
<a-col :span="12">
<a-form-model-item v-if="addShow" label="瀹℃牳鐘舵��" :labelCol="labelCol" :wrapperCol="wrapperCol"
prop="orderStatus">
@@ -60,9 +61,7 @@
placeholder="璇烽�夋嫨瀹℃牳鐘舵��" disabled />
</a-form-model-item>
</a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
+ <a-col :span="12">
<a-form-model-item v-if="addShow" label="瀹℃牳鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol"
prop="approvalDate">
@@ -72,8 +71,8 @@
</a-col>
</a-row>
<a-row>
- <a-col :span="12">
- <a-form-model-item v-if="addShow" label="瀹℃牳鎰忚" :labelCol="labelCol" :wrapperCol="wrapperCol"
+ <a-col :span="24">
+ <a-form-model-item v-if="addShow" label="瀹℃牳鎰忚" :labelCol="{span:2}" :wrapperCol="{span:20}"
prop="approvalOpinion">
<a-input v-model="model.approvalOpinion" placeholder="璇疯緭鍏ュ鏍告剰瑙�" disabled></a-input>
</a-form-model-item>
@@ -81,15 +80,13 @@
</a-row>
<a-row>
<a-col :span="12">
- <a-form-model-item label="澶囨敞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
- <a-textarea :disabled="disableSubmit" v-model="model.remark" rows="4" placeholder="璇疯緭鍏ュ娉�" />
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
<a-form-model-item label="鎶ユ崯鍘熷洜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lossReason">
<a-textarea :disabled="disableSubmit" v-model="model.lossReason" rows="4" placeholder="璇疯緭鍏ユ姤鎹熷師鍥�" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="澶囨敞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
+ <a-textarea :disabled="disableSubmit" v-model="model.remark" rows="4" placeholder="璇疯緭鍏ュ娉�" />
</a-form-model-item>
</a-col>
</a-row>
@@ -115,9 +112,9 @@
<template v-for="col in columns" :slot="col.dataIndex" slot-scope="text, record, index">
<div v-if="col.dataIndex == 'lossNumber'">
<a-input-number
- :disabled="disableSubmit"
+ :disabled="record.accuracyClass === '1'"
:value="text"
- :min="0"
+ :min="1"
:max="99999"
@change="(e) => handleChange(e, record.key, col, index)"
style="width: 100%;"
@@ -327,9 +324,10 @@
goodsShelvesId: data[i].positionCode,
toolMaterial: data[i].toolMaterial,
partMaterial: data[i].partMaterial,
- lossNumber: null, // 鍒濆鍖栨姤鎹熸暟閲�
+ lossNumber: "1", // 鍒濆鍖栨姤鎹熸暟閲�
lossNumberError: false, // 鏍￠獙鐘舵��
- lossNumberMsg: '' // 閿欒淇℃伅
+ lossNumberMsg: '', // 閿欒淇℃伅
+ accuracyClass: data[i].accuracyClass
})
}
this.ipagination.total = this.dataSource.length
diff --git a/src/views/tms/modules/WarehouseForm.vue b/src/views/tms/modules/WarehouseForm.vue
index 73fc95c..dc2e44b 100644
--- a/src/views/tms/modules/WarehouseForm.vue
+++ b/src/views/tms/modules/WarehouseForm.vue
@@ -24,10 +24,10 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="鍙跺瓙鑺傜偣鏍囪瘑" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leafFlag">
- <a-radio-group :disabled="leafDisableFlag" v-model="model.leafFlag" placeholder="璇烽�夋嫨鏄惁鍙跺瓙鑺傜偣">
- <a-radio :value="'2'">鏈夊瓙鑺傜偣</a-radio>
- <a-radio :value="'1'">鏄彾瀛愯妭鐐�</a-radio>
+ <a-form-model-item label="鏄惁鏈変笅绾у垎绫�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leafFlag">
+ <a-radio-group :disabled="leafDisableFlag" v-model="model.leafFlag" placeholder="璇烽�夋嫨鏄惁鏈変笅绾у垎绫�">
+ <a-radio :value="'2'">鏄�</a-radio>
+ <a-radio :value="'1'">鍚�</a-radio>
</a-radio-group>
</a-form-model-item>
</a-col>
@@ -90,7 +90,7 @@
{ required: true, message: '璇疯緭鍏ョ埗鑺傜偣缂栧彿!'},
],
leafFlag: [
- { required: true, message: '璇疯緭鍏ユ槸鍚﹀彾瀛愯妭鐐�!'},
+ { required: true, message: '璇疯緭鍏ユ槸鍚︽湁涓嬬骇鍒嗙被!'},
],
seq: [
{ validator: (rule, value, callback) => {
diff --git a/src/views/tms/modules/baseTools/BaseToolsForm.vue b/src/views/tms/modules/baseTools/BaseToolsForm.vue
index 89de55d..05e368c 100644
--- a/src/views/tms/modules/baseTools/BaseToolsForm.vue
+++ b/src/views/tms/modules/baseTools/BaseToolsForm.vue
@@ -24,10 +24,10 @@
</a-form-model-item>
</a-col>
<a-col :span="12">
- <a-form-model-item label="鏄惁涓哄彾瀛愯妭鐐�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leafFlag">
- <a-radio-group v-model="model.leafFlag" placeholder="璇烽�夋嫨鏄惁鍙跺瓙鑺傜偣" @change="leafFlagChange">
- <a-radio :value="'1'">鏄�</a-radio>
- <a-radio :value="'2'">鍚�</a-radio>
+ <a-form-model-item label="鏄惁鏈変笅绾у垎绫�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leafFlag">
+ <a-radio-group v-model="model.leafFlag" placeholder="璇烽�夋嫨鏄惁鏈変笅绾у垎绫�" @change="leafFlagChange">
+ <a-radio :value="'1'">鍚�</a-radio>
+ <a-radio :value="'2'">鏄�</a-radio>
</a-radio-group>
</a-form-model-item>
</a-col>
@@ -100,7 +100,7 @@
{ required: true, message: '璇疯緭鍏ュ伐鍏峰垎绫诲悕绉�!'},
],
leafFlag: [
- { required: true, message: '璇烽�夋嫨鏄惁涓哄彾瀛愯妭鐐�!'},
+ { required: true, message: '璇烽�夋嫨鏄惁鏈変笅绾у垎绫�!'},
],
seq: [
{ min: 0, message: '灞曠ず搴忓彿涓嶈兘灏忎簬0!'},
diff --git a/src/views/tms/modules/baseTools/BaseToolsListRight.vue b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
index cf81456..b98df66 100644
--- a/src/views/tms/modules/baseTools/BaseToolsListRight.vue
+++ b/src/views/tms/modules/baseTools/BaseToolsListRight.vue
@@ -458,7 +458,7 @@
//鏄剧ず褰撳墠閫変腑绫诲瀷鍙傛暟
this.$refs.paraCommonToolList.getPara(res.result)
//闅愯棌鍏朵粬绫诲瀷鍙傛暟
- this.$refs.paraHoleToolsList.visable =false
+ this.$refs.paraHoleToolsList.visable = false
this.$refs.paraThreadingToolList.visable = false
this.$refs.paraMillToolList.visable = false
this.$refs.paraTurningToolsList.visable = false
@@ -473,28 +473,28 @@
} 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.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.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.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.paraHoleToolsList.visable = false
this.$refs.paraThreadingToolList.visable = false
this.$refs.paraMillToolList.visable = false
this.$refs.paraTurningToolsList.visable = false
@@ -709,114 +709,273 @@
}
},
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.queryParam.shortCalled = data.shortCalled
- this.queryParam.groupCompanyCode = data.groupCompanyCode
+ const fields = [
+ 'chineseName',
+ 'foreignLanguageName',
+ 'standardLevel',
+ 'standardCode',
+ 'coneAngle',
+ 'edgeLength',
+ 'totalLength',
+ 'toolMaterial',
+ 'partMaterial',
+ 'paintcoatFlag',
+ 'toolPattern',
+ 'handleSpecifications',
+ 'coolingMethod',
+ 'bladeCount',
+ 'technicalConditions',
+ 'conditionsInfo',
+ 'toolModel',
+ 'shortCalled',
+ 'groupCompanyCode',
+ 'groupCompanySign',
+ 'brand',
+ 'toleranceClass',
+ 'fitterPart',
+ 'connectorType',
+ 'smallDiameter',
+ 'chamferAngle',
+ 'effectiveLength',
+ 'drillDiameterRange',
+ 'knifeDiameter',
+ 'boreDiameter',
+ 'slotSpecification',
+ 'headsNumber',
+ 'adaptHolder',
+ 'guidanceLength',
+ 'guidanceDiameter',
+ 'accuracyClass',
+ 'types',
+ 'fluteForm',
+ 'handleForm',
+ 'scopeOfApplication',
+ 'processingmethod',
+ 'littleDiameter',
+ 'bigDiameter',
+ 'smallEdgeLength',
+ 'bigEdgeLength',
+ 'smallTotalLength',
+ 'bigTotalLength',
+ 'smallLatestBoringDiameter',
+ 'bigLatestBoringDiameter',
+ 'smallMaxBoringDiameter',
+ 'bigMaxBoringDiameter',
+ ]
+
+ fields.forEach((field) => {
+ this.queryParam[field] = data[field]
+ })
this.loadData()
},
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.queryParam.shortCalled = data.shortCalled
- this.queryParam.groupCompanyCode = data.groupCompanyCode
+ const fields = [
+ 'chineseName',
+ 'foreignLanguageName',
+ 'shortCalled',
+ 'groupCompanyCode',
+ 'groupCompanySign',
+ 'standardLevel',
+ 'standardCode',
+ 'toolModel',
+ 'partMaterial',
+ 'technicalConditions',
+ 'conditionsInfo',
+ 'brand',
+ 'coatingMaterial',
+ 'processingClassify',
+ 'bladePosterior',
+ 'bladeSize',
+ 'cuttingEdgeCount',
+ 'noseAngleR',
+ 'dentalAngle',
+ 'pitch',
+ 'accuracyClass',
+ 'bladeShape',
+ 'clampingType',
+ 'toolMaterial',
+ 'paintcoatFlag',
+ 'types',
+ 'cuttingDirection',
+ 'inOutThread',
+ 'threadStandard',
+ 'smallBladeLength',
+ 'bigBladeLength',
+ 'smallBladeThickness',
+ 'bigBladeThickness',
+ 'smallBladeWide',
+ 'bigBladeWide',
+ 'smallMinInternalThread',
+ 'bigMinInternalThread'
+ ]
+ fields.forEach((field) => {
+ this.queryParam[field] = data[field]
+ })
this.loadData()
},
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.queryParam.shortCalled = data.shortCalled
- this.queryParam.groupCompanyCode = data.groupCompanyCode
+ const fields = [
+ 'chineseName',
+ 'foreignLanguageName',
+ 'shortCalled',
+ 'groupCompanyCode',
+ 'groupCompanySign',
+ 'standardLevel',
+ 'standardCode',
+ 'toolModel',
+ 'partMaterial',
+ 'technicalConditions',
+ 'conditionsInfo',
+ 'brand',
+ 'threadCode',
+ 'tolerancezoneLevel',
+ 'pitch',
+ 'handleSpecifications',
+ 'guidingSize',
+ 'connectionAperture',
+ 'connectingKeyway',
+ 'accuracyClass',
+ 'rotationDirection',
+ 'paintcoatFlag',
+ 'toolMaterial',
+ 'coolingMethod',
+ 'types',
+ 'screwHoleType',
+ 'threadStandard',
+ 'fluteSoltType',
+ 'smallExternalDimensions',
+ 'bigExternalDimensions',
+ 'smallEdgeLength',
+ 'bigEdgeLength',
+ 'smallTotalLength',
+ 'bigTotalLength'
+ ]
+ fields.forEach((field) => {
+ this.queryParam[field] = data[field]
+ })
+
this.loadData()
},
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.queryParam.shortCalled = data.shortCalled
- this.queryParam.groupCompanyCode = data.groupCompanyCode
+ const fields = [
+ 'chineseName',
+ 'foreignLanguageName',
+ 'shortCalled',
+ 'groupCompanyCode',
+ 'groupCompanySign',
+ 'standardLevel',
+ 'standardCode',
+ 'toolModel',
+ 'partMaterial',
+ 'technicalConditions',
+ 'conditionsInfo',
+ 'brand',
+ 'clampingSpecifications',
+ 'sizeSpecifications',
+ 'adaptBlade',
+ 'noseAngleR',
+ 'noseAngleC',
+ 'angleInsideR',
+ 'numberOfTeeth',
+ 'smallDiameter',
+ 'toolAngle',
+ 'mainAngleK',
+ 'deepestDepth',
+ 'pitch',
+ 'recentlyDiameter',
+ 'accuracyClass',
+ 'toolMaterial',
+ 'coolingMethod',
+ 'paintcoatFlag',
+ 'toolPattern',
+ 'handleForm',
+ 'handleNeckForm',
+ 'numberPatterns',
+ 'millingHeadForm',
+ 'cuttingEdgeForm',
+ 'littleDiameter',
+ 'bigDiameter',
+ 'smallEdgeLength',
+ 'bigEdgeLength',
+ 'smallTotalLength',
+ 'bigTotalLength',
+ 'smallNeckDiameter',
+ 'bigNeckDiameter',
+ 'smallHandleLength',
+ 'bigHandleLength',
+ 'smallHandleNeckLength',
+ 'bigHandleNeckLength',
+ 'smallOverhangingLength',
+ 'bigOverhangingLength'
+ ]
+ fields.forEach((field) => {
+ this.queryParam[field] = data[field]
+ })
this.loadData()
},
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.queryParam.shortCalled = data.shortCalled
- this.queryParam.groupCompanyCode = data.groupCompanyCode
+ const fields = [
+ 'chineseName',
+ 'foreignLanguageName',
+ 'shortCalled',
+ 'groupCompanyCode',
+ 'groupCompanySign',
+ 'standardLevel',
+ 'standardCode',
+ 'toolModel',
+ 'partMaterial',
+ 'technicalConditions',
+ 'conditionsInfo',
+ 'brand',
+ 'paintcoatFlag',
+ 'headSpecifications',
+ 'matchingNumber',
+ 'knifeClipModel',
+ 'leadAngle',
+ 'crossSectionalSize',
+ 'knifeSize',
+ 'bladePosterior',
+ 'accuracyClass',
+ 'cuttingDirection',
+ 'toolMaterial',
+ 'toolPattern',
+ 'types',
+ 'coolingMethod',
+ 'fasteningForm',
+ 'holderCategory',
+ 'bladeShape',
+ 'clampingMethod',
+ 'barDirection',
+ 'smallTotalLength',
+ 'bigTotalLength',
+ 'smallBoringBarDiameter',
+ 'bigBoringBarDiameter',
+ 'smallBladeLength',
+ 'bigBladeLength',
+ 'smallToolDiameter',
+ 'bigToolDiameter',
+ 'smallBladeHeight',
+ 'bigBladeHeight',
+ 'smallBladeWide',
+ 'bigBladeWide',
+ 'smallBladeSize',
+ 'bigBladeSize',
+ 'smallSlotWidth',
+ 'bigSlotWidth',
+ 'smallSmallDiameter',
+ 'bigSmallDiameter',
+ 'smallMaxDiameter',
+ 'bigMaxDiameter',
+ 'smallMaxDepth',
+ 'bigMaxDepth',
+ 'smallMinDiameter',
+ 'bigMinDiameter',
+ 'smallBladeThickness',
+ 'bigBladeThickness'
+ ]
+ fields.forEach((field) => {
+ this.queryParam[field] = data[field]
+ })
this.loadData()
},
},
diff --git a/src/views/tms/modules/baseTools/ParaBladeModal.vue b/src/views/tms/modules/baseTools/ParaBladeModal.vue
index a9cfb17..cb6f873 100644
--- a/src/views/tms/modules/baseTools/ParaBladeModal.vue
+++ b/src/views/tms/modules/baseTools/ParaBladeModal.vue
@@ -671,6 +671,12 @@
edit(record) {
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
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
getAction(this.url.queryParaByToolCode, {
toolCode: record.toolCodeId,
diff --git a/src/views/tms/modules/baseTools/ParaBladeSearchModal.vue b/src/views/tms/modules/baseTools/ParaBladeSearchModal.vue
index df7d32b..5df24f3 100644
--- a/src/views/tms/modules/baseTools/ParaBladeSearchModal.vue
+++ b/src/views/tms/modules/baseTools/ParaBladeSearchModal.vue
@@ -1,7 +1,7 @@
<template>
<j-modal
:title="title"
- :width="800"
+ :width="1200"
:visible="visible"
centered
:confirmLoading="confirmLoading"
@@ -12,185 +12,263 @@
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item prop="chineseName" label="涓枃鍚嶇О">
- <a-input
- :placeholder="'璇疯緭鍏ヤ腑鏂囧悕绉�'"
- v-model="model.chineseName"
- />
+ <a-input :placeholder="'璇疯緭鍏ヤ腑鏂囧悕绉�'" v-model="model.chineseName" />
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item prop="foreignLanguageName" label="澶栨枃鍚嶇О">
- <a-input
- :placeholder="'璇疯緭鍏ュ鏂囧悕绉�'"
- v-model="model.foreignLanguageName"
- />
+ <a-input :placeholder="'璇疯緭鍏ュ鏂囧悕绉�'" v-model="model.foreignLanguageName" />
</a-form-model-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item prop="shortCalled" label="宸ュ叿绠�绉�">
- <a-input
- :placeholder="'璇疯緭鍏ュ伐鍏风畝绉�'"
- v-model="model.shortCalled"
- />
+ <a-input :placeholder="'璇疯緭鍏ュ伐鍏风畝绉�'" v-model="model.shortCalled" />
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
<a-form-model-item prop="groupCompanyCode" label="闆嗗洟鍏徃缂栫爜">
- <a-input
- :placeholder="'璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'"
- v-model="model.groupCompanyCode"
- />
+ <a-input :placeholder="'璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'" v-model="model.groupCompanyCode" />
</a-form-model-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
+ <a-form-model-item prop="groupCompanySign" label="鏍囪">
+ <a-input :placeholder="'璇疯緭鍏ユ爣璁�'" v-model="model.groupCompanySign" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
<a-form-model-item prop="standardLevel" label="鏍囧噯绾у埆">
- <a-input
- :placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'"
- v-model="model.standardLevel"
- />
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item prop="standardCode" label="鏍囧噯鍙�">
- <a-input
- :placeholder="'璇疯緭鍏ユ爣鍑嗗彿'"
- v-model="model.standardCode"
- />
+ <a-input :placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'" v-model="model.standardLevel" />
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
+ <a-form-model-item prop="standardCode" label="鏍囧噯鍙�">
+ <a-input :placeholder="'璇疯緭鍏ユ爣鍑嗗彿'" v-model="model.standardCode" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
<a-form-model-item prop="toolModel" label="鍨嬪彿/鍥惧彿">
- <a-input
- :placeholder="'璇疯緭鍏ュ瀷鍙�/鍥惧彿'"
- v-model="model.toolModel"
- />
+ <a-input :placeholder="'璇疯緭鍏ュ瀷鍙�/鍥惧彿'" v-model="model.toolModel" />
</a-form-model-item>
</a-col>
- <a-col :span="12">
- <a-form-model-item label="鍒�鐗囧舰鐘�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeShape">
- <a-input
- v-model="model.bladeShape"
- :placeholder="'璇疯緭鍏ュ垁鐗囧舰鐘�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="鍒�鐗囬暱搴�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeLength">
- <a-input
- v-model="model.bladeLength"
- :placeholder="'璇疯緭鍏ュ垁鐗囬暱搴�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鍒囧墛鍒冩暟" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingEdgeCount">
- <a-input
- v-model="model.cuttingEdgeCount"
- :placeholder="'璇疯緭鍏ュ垏鍓婂垉鏁�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="鍒�鐗囧帤搴�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeThickness">
- <a-input
- v-model="model.bladeThickness"
- :placeholder="'璇疯緭鍏ュ垁鐗囧帤搴�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
- <a-input
- v-model="model.toolMaterial"
- :placeholder="'璇疯緭鍏ュ垁鍏锋潗鏂�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item label="闆朵欢鏉愭枡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
- <a-input
- v-model="model.partMaterial"
- :placeholder="'璇疯緭鍏ラ浂浠舵潗鏂�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鏄惁娑傚眰" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
- <a-radio-group
- v-model="model.paintcoatFlag"
- :placeholder="'璇烽�夋嫨鏄惁娑傚眰'"
- >
- <a-radio :value="'1'">鏄�</a-radio>
- <a-radio :value="'2'">鍚�</a-radio>
- </a-radio-group>
+ <a-input v-model="model.partMaterial" :placeholder="'璇疯緭鍏ラ浂浠舵潗鏂�'"></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
- <a-col :span="12">
- <a-form-model-item label="澶瑰浐鍨嬪紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clampingType">
- <a-input
- v-model="model.clampingType"
- :placeholder="'璇疯緭鍏ュす鍥哄瀷寮�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item
- label="鍒�灏朢"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="noseAngleR"
- >
- <a-input
- v-model="model.noseAngleR"
- :placeholder="'璇疯緭鍏ュ垁灏朢'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item
label="闄勫姞鎶�鏈潯浠�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="technicalConditions"
>
- <a-input
- v-model="model.technicalConditions"
- :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'"
- ></a-input>
+ <a-input v-model="model.technicalConditions" :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'"></a-input>
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item
label="闄勫姞鎶�鏈潯浠惰鏄�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="conditionsInfo"
>
- <a-input
- v-model="model.conditionsInfo"
- :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'"
- ></a-input>
+ <a-input v-model="model.conditionsInfo" :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍝佺墝" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
+ <a-input v-model="model.brand" :placeholder="'璇疯緭鍏ュ搧鐗�'"></a-input>
</a-form-model-item>
</a-col>
</a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="娑傚眰鏉愯川" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coatingMaterial">
+ <a-input v-model="model.coatingMaterial" :placeholder="'璇疯緭鍏ユ秱灞傛潗璐�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍔犲伐鍒嗙被" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processingClassify">
+ <a-input v-model="model.processingClassify" :placeholder="'璇疯緭鍏ュ姞宸ュ垎绫�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鐗囧悗瑙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladePosterior">
+ <a-input v-model="model.bladePosterior" :placeholder="'璇疯緭鍏ュ垁鐗囧悗瑙�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鐗囧昂瀵�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeSize">
+ <a-input v-model="model.bladeSize" :placeholder="'璇疯緭鍏ュ垁鐗囧昂瀵�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒囧墛鍒冩暟" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingEdgeCount">
+ <a-input v-model="model.cuttingEdgeCount" :placeholder="'璇疯緭鍏ュ垏鍓婂垉鏁�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�灏朢" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noseAngleR">
+ <a-input v-model="model.noseAngleR" :placeholder="'璇疯緭鍏ュ垁灏朢'"></a-input>
+ </a-form-model-item>
+ </a-col>
+
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鐗欏瀷瑙掑害" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dentalAngle">
+ <a-input v-model="model.dentalAngle" :placeholder="'璇疯緭鍏ョ墮鍨嬭搴�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="铻鸿窛" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pitch">
+ <a-input v-model="model.pitch" :placeholder="'璇疯緭鍏ヨ灪璺�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="绮惧害绛夌骇" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accuracyClass">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.accuracyClass"
+ :triggerChange="true"
+ dictCode="accuracy_class"
+ placeholder="璇烽�夋嫨绮惧害绛夌骇"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鐗囧舰鐘�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeShape">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.bladeShape"
+ :triggerChange="true"
+ dictCode="blade_shape"
+ placeholder="璇烽�夋嫨鍒�鐗囧舰鐘�"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="澶瑰浐鍨嬪紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clampingType">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.clampingType"
+ :triggerChange="true"
+ dictCode="clamping_type"
+ placeholder="璇烽�夋嫨澶瑰浐鍨嬪紡"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鐗囨潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.toolMaterial"
+ :triggerChange="true"
+ dictCode="tool_material"
+ placeholder="璇烽�夋嫨鍒�鐗囨潗鏂�"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鏄惁娑傚眰" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
+ <a-radio-group v-model="model.paintcoatFlag" :placeholder="'璇烽�夋嫨鏄惁娑傚眰'">
+ <a-radio :value="'1'">鏄�</a-radio>
+ <a-radio :value="'2'">鍚�</a-radio>
+ </a-radio-group>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒跺紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.types"
+ :triggerChange="true"
+ dictCode="types"
+ placeholder="璇烽�夋嫨鍒跺紡"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒囧墛鏂瑰悜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingDirection">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.cuttingDirection"
+ :triggerChange="true"
+ dictCode="cutting_direction"
+ placeholder="璇烽�夋嫨鍒囧墛鏂瑰悜"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鍐呭铻虹汗" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inOutThread">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.inOutThread"
+ :triggerChange="true"
+ dictCode="in_out_thread"
+ placeholder="璇烽�夋嫨鍐呭铻虹汗"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="铻虹汗鏍囧噯" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadStandard">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.threadStandard"
+ :triggerChange="true"
+ dictCode="thread_standard"
+ placeholder="璇烽�夋嫨铻虹汗鏍囧噯"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鍒�鐗囬暱搴�">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallBladeLength"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigBladeLength"></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.smallBladeThickness"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigBladeThickness"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鍒�鐗囧搴�">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallBladeWide"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigBladeWide"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鏈�灏忓姞宸ュ唴铻虹汗鍏О鐩村緞">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallMinInternalThread"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigMinInternalThread"></a-input>
+ </a-form-item>
+ </a-col>
+ </a-row>
+
</a-form-model>
</a-spin>
<template slot="footer">
@@ -240,24 +318,48 @@
},
searchQuery(){
- this.searchParams.chineseName = this.model.chineseName
- this.searchParams.foreignLanguageName = this.model.foreignLanguageName
- this.searchParams.standardLevel = this.model.standardLevel
- this.searchParams.standardCode = this.model.standardCode
- this.searchParams.bladeShape = this.model.bladeShape
- this.searchParams.bladeLength = this.model.bladeLength
- this.searchParams.cuttingEdgeCount = this.model.cuttingEdgeCount
- this.searchParams.bladeThickness = this.model.bladeThickness
- this.searchParams.toolMaterial = this.model.toolMaterial
- this.searchParams.partMaterial = this.model.partMaterial
- this.searchParams.paintcoatFlag = this.model.paintcoatFlag
- this.searchParams.clampingType = this.model.clampingType
- this.searchParams.noseAngleR = this.model.noseAngleR
- 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
+ const fields = [
+ 'chineseName',
+ 'foreignLanguageName',
+ 'shortCalled',
+ 'groupCompanyCode',
+ 'groupCompanySign',
+ 'standardLevel',
+ 'standardCode',
+ 'toolModel',
+ 'partMaterial',
+ 'technicalConditions',
+ 'conditionsInfo',
+ 'brand',
+ 'coatingMaterial',
+ 'processingClassify',
+ 'bladePosterior',
+ 'bladeSize',
+ 'cuttingEdgeCount',
+ 'noseAngleR',
+ 'dentalAngle',
+ 'pitch',
+ 'accuracyClass',
+ 'bladeShape',
+ 'clampingType',
+ 'toolMaterial',
+ 'paintcoatFlag',
+ 'types',
+ 'cuttingDirection',
+ 'inOutThread',
+ 'threadStandard',
+ 'smallBladeLength',
+ 'bigBladeLength',
+ 'smallBladeThickness',
+ 'bigBladeThickness',
+ 'smallBladeWide',
+ 'bigBladeWide',
+ 'smallMinInternalThread',
+ 'bigMinInternalThread'
+ ]
+ fields.forEach((field) => {
+ this.searchParams[field] = this.model[field]
+ })
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 d92cfc2..c6e17bd 100644
--- a/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
+++ b/src/views/tms/modules/baseTools/ParaHoleToolsModal.vue
@@ -566,6 +566,10 @@
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
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
getAction(this.url.queryParaByToolCode, {
toolCode: record.toolCodeId,
diff --git a/src/views/tms/modules/baseTools/ParaHoleToolsSearchModal.vue b/src/views/tms/modules/baseTools/ParaHoleToolsSearchModal.vue
index 9dc5525..c16b675 100644
--- a/src/views/tms/modules/baseTools/ParaHoleToolsSearchModal.vue
+++ b/src/views/tms/modules/baseTools/ParaHoleToolsSearchModal.vue
@@ -1,7 +1,7 @@
<template>
<j-modal
:title="title"
- :width="800"
+ :width="1200"
:visible="visible"
centered
:confirmLoading="confirmLoading"
@@ -10,205 +10,363 @@
cancelText="鍏抽棴"
>
<a-spin :spinning="confirmLoading">
- <a-form-model ref="form" :model="model" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-form-model ref="form" :model="model" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item prop="chineseName" label="涓枃鍚嶇О">
- <a-input
- :placeholder="'璇疯緭鍏ヤ腑鏂囧悕绉�'"
- v-model="model.chineseName"
- />
+ <a-input :placeholder="'璇疯緭鍏ヤ腑鏂囧悕绉�'" v-model="model.chineseName" />
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item prop="foreignLanguageName" label="澶栨枃鍚嶇О">
- <a-input
- :placeholder="'璇疯緭鍏ュ鏂囧悕绉�'"
- v-model="model.foreignLanguageName"
- />
+ <a-input :placeholder="'璇疯緭鍏ュ鏂囧悕绉�'" v-model="model.foreignLanguageName" />
</a-form-model-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item prop="shortCalled" label="宸ュ叿绠�绉�">
- <a-input
- :placeholder="'璇疯緭鍏ュ伐鍏风畝绉�'"
- v-model="model.shortCalled"
- />
+ <a-input :placeholder="'璇疯緭鍏ュ伐鍏风畝绉�'" v-model="model.shortCalled" />
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
<a-form-model-item prop="groupCompanyCode" label="闆嗗洟鍏徃缂栫爜">
- <a-input
- :placeholder="'璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'"
- v-model="model.groupCompanyCode"
- />
+ <a-input :placeholder="'璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'" v-model="model.groupCompanyCode" />
</a-form-model-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
+ <a-form-model-item prop="groupCompanySign" label="鏍囪">
+ <a-input :placeholder="'璇疯緭鍏ユ爣璁�'" v-model="model.groupCompanySign" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
<a-form-model-item prop="standardLevel" label="鏍囧噯绾у埆">
- <a-input
- :placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'"
- v-model="model.standardLevel"
- />
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item prop="standardCode" label="鏍囧噯鍙�">
- <a-input
- :placeholder="'璇疯緭鍏ユ爣鍑嗗彿'"
- v-model="model.standardCode"
- />
+ <a-input :placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'" v-model="model.standardLevel" />
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
+ <a-form-model-item prop="standardCode" label="鏍囧噯鍙�">
+ <a-input :placeholder="'璇疯緭鍏ユ爣鍑嗗彿'" v-model="model.standardCode" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
<a-form-model-item prop="toolModel" label="鍨嬪彿/鍥惧彿">
- <a-input
- :placeholder="'璇疯緭鍏ュ瀷鍙�/鍥惧彿'"
- v-model="model.toolModel"
- />
+ <a-input :placeholder="'璇疯緭鍏ュ瀷鍙�/鍥惧彿'" v-model="model.toolModel" />
</a-form-model-item>
</a-col>
- <a-col :span="12">
- <a-form-model-item label="鐩村緞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="diameter">
- <a-input
- v-model="model.diameter"
- :placeholder="'璇疯緭鍏ョ洿寰�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="鍒囧墛鍒冮敟瑙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coneAngle">
- <a-input
- v-model="model.coneAngle"
- :placeholder="'璇疯緭鍏ュ垏鍓婂垉閿ヨ'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鍒囧墛鍒冮暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="edgeLength">
- <a-input
- v-model="model.edgeLength"
- :placeholder="'璇疯緭鍏ュ垏鍓婂垉闀�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="鍒�鍏锋�婚暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalLength">
- <a-input
- v-model="model.totalLength"
- :placeholder="'璇疯緭鍏ュ垁鍏锋�婚暱'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
- <a-input
- v-model="model.toolMaterial"
- :placeholder="'璇疯緭鍏ュ垁鍏锋潗鏂�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item label="闆朵欢鏉愭枡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
- <a-input
- v-model="model.partMaterial"
- :placeholder="'璇疯緭鍏ラ浂浠舵潗鏂�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鏄惁娑傚眰" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
- <a-radio-group
- v-model="model.paintcoatFlag"
- :placeholder="'璇烽�夋嫨鏄惁娑傚眰'"
- >
- <a-radio :value="'1'">鏄�</a-radio>
- <a-radio :value="'2'">鍚�</a-radio>
- </a-radio-group>
+ <a-input v-model="model.partMaterial" :placeholder="'璇疯緭鍏ラ浂浠舵潗鏂�'"></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
- <a-col :span="12">
- <a-form-model-item label="鍒�鍏峰瀷寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
- <a-input
- v-model="model.toolPattern"
- :placeholder="'璇疯緭鍏ュ垁鍏峰瀷寮�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item
- label="鏌勯儴瑙勬牸"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="handleSpecifications"
- >
- <a-input
- v-model="model.handleSpecifications"
- :placeholder="'璇疯緭鍏ユ焺閮ㄨ鏍�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="鍐峰嵈鏂瑰紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
- <a-input
- v-model="model.coolingMethod"
- :placeholder="'璇疯緭鍏ュ喎鍗存柟寮�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鍒冩暟" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeCount">
- <a-input
- v-model="model.bladeCount"
- :placeholder="'璇疯緭鍏ュ垉鏁�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item
label="闄勫姞鎶�鏈潯浠�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="technicalConditions"
>
- <a-input
- v-model="model.technicalConditions"
- :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'"
- ></a-input>
+ <a-input v-model="model.technicalConditions" :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'"></a-input>
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item
label="闄勫姞鎶�鏈潯浠惰鏄�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="conditionsInfo"
>
- <a-input
- v-model="model.conditionsInfo"
- :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'"
- ></a-input>
+ <a-input v-model="model.conditionsInfo" :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍝佺墝" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
+ <a-input v-model="model.brand" :placeholder="'璇疯緭鍏ュ搧鐗�'"></a-input>
</a-form-model-item>
</a-col>
</a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
+ <a-form-model-item
+ label="鏌勯儴瑙勬牸"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="handleSpecifications"
+ >
+ <a-input v-model="model.handleSpecifications" :placeholder="'璇疯緭鍏ユ焺閮ㄨ鏍�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍏樊绛夌骇" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toleranceClass">
+ <a-input v-model="model.toleranceClass" :placeholder="'璇疯緭鍏ュ叕宸瓑绾�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item
+ label="閫傞厤鍒�鐗�-鍒�澶�-鍒�鏉�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="fitterPart"
+ >
+ <a-input v-model="model.fitterPart" :placeholder="'璇疯緭鍏ラ�傞厤鍒�鐗�-鍒�澶�-鍒�鏉�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
+ <a-form-model-item label="鎺ュ彛褰㈠紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="connectorType">
+ <a-input v-model="model.connectorType" :placeholder="'璇疯緭鍏ユ帴鍙ｅ舰寮�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒囧墛鍒冮敟瑙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coneAngle">
+ <a-input v-model="model.coneAngle" :placeholder="'璇疯緭鍏ュ垏鍓婂垉閿ヨ'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒冩暟" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeCount">
+ <a-input v-model="model.bladeCount" :placeholder="'璇疯緭鍏ュ垉鏁�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
+ <a-form-model-item label="鏈�灏忕洿寰�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="smallDiameter">
+ <a-input v-model="model.smallDiameter" :placeholder="'璇疯緭鍏ユ渶灏忕洿寰�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍊掕瑙掑害" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chamferAngle">
+ <a-input v-model="model.chamferAngle" :placeholder="'璇疯緭鍏ュ�掕瑙掑害'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item
+ label="鏈夋晥鍔犲伐闀垮害"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="effectiveLength"
+ >
+ <a-input v-model="model.effectiveLength" :placeholder="'璇疯緭鍏ユ湁鏁堝姞宸ラ暱搴�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
+ <a-form-model-item
+ label="閽诲ご鐩村緞鑼冨洿"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="drillDiameterRange"
+ >
+ <a-input v-model="model.drillDiameterRange" :placeholder="'璇疯緭鍏ラ捇澶寸洿寰勮寖鍥� '"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鏉嗙洿寰�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="knifeDiameter">
+ <a-input v-model="model.knifeDiameter" :placeholder="'璇疯緭鍏ュ垁鏉嗙洿寰�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="瀛斿緞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="boreDiameter">
+ <a-input v-model="model.boreDiameter" :placeholder="'璇疯緭鍏ュ瓟寰�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
+ <a-form-model-item
+ label="鎺ュ彛妲介暱瑙勬牸"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="slotSpecification"
+ >
+ <a-input v-model="model.slotSpecification" :placeholder="'璇疯緭鍏ユ帴鍙ｆЫ闀胯鏍�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�澶存暟" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="headsNumber">
+ <a-input v-model="model.headsNumber" :placeholder="'璇疯緭鍏ュ垁澶存暟'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="閫傞厤鍒�搴�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="adaptHolder">
+ <a-input v-model="model.adaptHolder" :placeholder="'璇疯緭鍏ラ�傞厤鍒�搴�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
+ <a-form-model-item label="瀵煎悜闀垮害" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="guidanceLength">
+ <a-input v-model="model.guidanceLength" :placeholder="'璇疯緭鍏ュ鍚戦暱搴�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="瀵煎悜鐩村緞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="guidanceDiameter">
+ <a-input v-model="model.guidanceDiameter" :placeholder="'璇疯緭鍏ュ鍚戠洿寰�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="绮惧害绛夌骇" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accuracyClass">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.accuracyClass"
+ :triggerChange="true"
+ dictCode="accuracy_class"
+ placeholder="璇烽�夋嫨绮惧害绛夌骇"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.toolMaterial"
+ :triggerChange="true"
+ dictCode="tool_material"
+ placeholder="璇烽�夋嫨鍒�鍏锋潗鏂�"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鏄惁娑傚眰" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
+ <a-radio-group v-model="model.paintcoatFlag" :placeholder="'璇烽�夋嫨鏄惁娑傚眰'">
+ <a-radio :value="'1'">鏄�</a-radio>
+ <a-radio :value="'2'">鍚�</a-radio>
+ </a-radio-group>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鍏峰瀷寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.toolPattern"
+ :triggerChange="true"
+ dictCode="tool_pattern"
+ placeholder="璇烽�夋嫨鍒�鍏峰瀷寮�"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
+ <a-form-model-item label="鍐峰嵈鏂瑰紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.coolingMethod"
+ :triggerChange="true"
+ dictCode="cooling_method"
+ placeholder="璇烽�夋嫨鍐峰嵈鏂瑰紡"
+ />
+ </a-form-model-item>
+ </a-col>
+
+ <a-col :span="8">
+ <a-form-model-item label="鍒跺紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.types"
+ :triggerChange="true"
+ dictCode="types"
+ placeholder="璇烽�夋嫨鍒跺紡"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鎺掑睉妲藉舰寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fluteForm">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.fluteForm"
+ :triggerChange="true"
+ dictCode="flute_form"
+ placeholder="璇烽�夋嫨鎺掑睉妲藉舰寮�"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
+ <a-form-model-item label="鏌勯儴褰㈠紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleForm">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.handleForm"
+ :triggerChange="true"
+ dictCode="handle_form"
+ placeholder="璇烽�夋嫨鏌勯儴褰㈠紡"
+ />
+ </a-form-model-item>
+ </a-col>
+
+ <a-col :span="8">
+ <a-form-model-item label="閫傜敤鑼冨洿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scopeOfApplication">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.scopeOfApplication"
+ :triggerChange="true"
+ dictCode="scope_of_application"
+ placeholder="璇烽�夋嫨閫傜敤鑼冨洿"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍔犲伐鏂瑰紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processingmethod">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.processingmethod"
+ :triggerChange="true"
+ dictCode="processingmethod"
+ placeholder="璇烽�夋嫨鍔犲伐鏂瑰紡"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+
+ <a-row :gutter="24">
+ <a-col :span="8">
+ <a-form-item label="鐩村緞">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.littleDiameter"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigDiameter"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鍒囧墛鍒冮暱">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallEdgeLength"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigEdgeLength"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鍒�鍏锋�婚暱">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallTotalLength"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigTotalLength"></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.smallLatestBoringDiameter"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigLatestBoringDiameter"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鏈�澶ч晽瀛旂洿寰�">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallMaxBoringDiameter"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigMaxBoringDiameter"></a-input>
+ </a-form-item>
+ </a-col>
+ </a-row>
+
</a-form-model>
</a-spin>
<template slot="footer">
@@ -220,9 +378,13 @@
</template>
<script>
+import JDictSelectTag from '@/components/dict/JDictSelectTag'
export default {
name: 'ParaHoleToolsSearchModal',
+ components: {
+ JDictSelectTag,
+ },
data() {
return {
title: '宸ュ叿淇℃伅-楂樼骇鏌ヨ',
@@ -237,14 +399,11 @@
xs: { span: 24 },
sm: { span: 14 },
},
- searchParams:{}
+ searchParams: {},
}
},
- created() {
- },
- mounted() {
-
- },
+ created() {},
+ mounted() {},
methods: {
show() {
this.visible = true
@@ -256,34 +415,91 @@
handleCancel() {
this.close()
},
-
- searchQuery(){
- this.searchParams.chineseName = this.model.chineseName
- this.searchParams.foreignLanguageName = this.model.foreignLanguageName
- this.searchParams.standardLevel = this.model.standardLevel
- this.searchParams.standardCode = this.model.standardCode
- this.searchParams.diameter = this.model.diameter
- this.searchParams.coneAngle = this.model.coneAngle
- this.searchParams.edgeLength = this.model.edgeLength
- this.searchParams.totalLength = this.model.totalLength
- this.searchParams.toolMaterial = this.model.toolMaterial
- this.searchParams.partMaterial = this.model.partMaterial
- this.searchParams.paintcoatFlag = this.model.paintcoatFlag
- this.searchParams.toolPattern = this.model.toolPattern
- this.searchParams.handleSpecifications = this.model.handleSpecifications
- this.searchParams.coolingMethod = this.model.coolingMethod
- this.searchParams.bladeCount = this.model.bladeCount
- 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
+
+ searchQuery() {
+ const fields = [
+ 'chineseName',
+ 'foreignLanguageName',
+ 'standardLevel',
+ 'standardCode',
+ 'coneAngle',
+ 'edgeLength',
+ 'totalLength',
+ 'toolMaterial',
+ 'partMaterial',
+ 'paintcoatFlag',
+ 'toolPattern',
+ 'handleSpecifications',
+ 'coolingMethod',
+ 'bladeCount',
+ 'technicalConditions',
+ 'conditionsInfo',
+ 'toolModel',
+ 'shortCalled',
+ 'groupCompanyCode',
+ 'groupCompanySign',
+ 'brand',
+ 'toleranceClass',
+ 'fitterPart',
+ 'connectorType',
+ 'smallDiameter',
+ 'chamferAngle',
+ 'effectiveLength',
+ 'drillDiameterRange',
+ 'knifeDiameter',
+ 'boreDiameter',
+ 'slotSpecification',
+ 'headsNumber',
+ 'adaptHolder',
+ 'guidanceLength',
+ 'guidanceDiameter',
+ 'accuracyClass',
+ 'types',
+ 'fluteForm',
+ 'handleForm',
+ 'scopeOfApplication',
+ 'processingmethod',
+ 'littleDiameter',
+ 'bigDiameter',
+ 'smallEdgeLength',
+ 'bigEdgeLength',
+ 'smallTotalLength',
+ 'bigTotalLength',
+ 'smallLatestBoringDiameter',
+ 'bigLatestBoringDiameter',
+ 'smallMaxBoringDiameter',
+ 'bigMaxBoringDiameter'
+ ];
+
+ fields.forEach(field => {
+ this.searchParams[field] = this.model[field];
+ });
+ // this.searchParams.chineseName = this.model.chineseName
+ // this.searchParams.foreignLanguageName = this.model.foreignLanguageName
+ // this.searchParams.standardLevel = this.model.standardLevel
+ // this.searchParams.standardCode = this.model.standardCode
+ // this.searchParams.diameter = this.model.diameter
+ // this.searchParams.coneAngle = this.model.coneAngle
+ // this.searchParams.edgeLength = this.model.edgeLength
+ // this.searchParams.totalLength = this.model.totalLength
+ // this.searchParams.toolMaterial = this.model.toolMaterial
+ // this.searchParams.partMaterial = this.model.partMaterial
+ // this.searchParams.paintcoatFlag = this.model.paintcoatFlag
+ // this.searchParams.toolPattern = this.model.toolPattern
+ // this.searchParams.handleSpecifications = this.model.handleSpecifications
+ // this.searchParams.coolingMethod = this.model.coolingMethod
+ // this.searchParams.bladeCount = this.model.bladeCount
+ // 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)
+ this.$emit('searchParams', this.searchParams)
},
- searchReset(){
+ searchReset() {
this.model = {}
- }
+ },
},
}
</script>
diff --git a/src/views/tms/modules/baseTools/ParaMillToolModal.vue b/src/views/tms/modules/baseTools/ParaMillToolModal.vue
index 158637a..c18639a 100644
--- a/src/views/tms/modules/baseTools/ParaMillToolModal.vue
+++ b/src/views/tms/modules/baseTools/ParaMillToolModal.vue
@@ -570,6 +570,11 @@
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,
diff --git a/src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue b/src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue
index fb4c946..2b39133 100644
--- a/src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue
+++ b/src/views/tms/modules/baseTools/ParaMillToolSearchModal.vue
@@ -1,7 +1,7 @@
<template>
<j-modal
:title="title"
- :width="800"
+ :width="1200"
:visible="visible"
centered
:confirmLoading="confirmLoading"
@@ -12,144 +12,85 @@
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item prop="chineseName" label="涓枃鍚嶇О">
- <a-input
- :placeholder="'璇疯緭鍏ヤ腑鏂囧悕绉�'"
- v-model="model.chineseName"
- />
+ <a-input :placeholder="'璇疯緭鍏ヤ腑鏂囧悕绉�'" v-model="model.chineseName" />
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item prop="foreignLanguageName" label="澶栨枃鍚嶇О">
- <a-input
- :placeholder="'璇疯緭鍏ュ鏂囧悕绉�'"
- v-model="model.foreignLanguageName"
- />
+ <a-input :placeholder="'璇疯緭鍏ュ鏂囧悕绉�'" v-model="model.foreignLanguageName" />
</a-form-model-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item prop="shortCalled" label="宸ュ叿绠�绉�">
- <a-input
- :placeholder="'璇疯緭鍏ュ伐鍏风畝绉�'"
- v-model="model.shortCalled"
- />
+ <a-input :placeholder="'璇疯緭鍏ュ伐鍏风畝绉�'" v-model="model.shortCalled" />
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
<a-form-model-item prop="groupCompanyCode" label="闆嗗洟鍏徃缂栫爜">
- <a-input
- :placeholder="'璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'"
- v-model="model.groupCompanyCode"
- />
+ <a-input :placeholder="'璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'" v-model="model.groupCompanyCode" />
</a-form-model-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
+ <a-form-model-item prop="groupCompanySign" label="鏍囪">
+ <a-input :placeholder="'璇疯緭鍏ユ爣璁�'" v-model="model.groupCompanySign" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
<a-form-model-item prop="standardLevel" label="鏍囧噯绾у埆">
- <a-input
- :placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'"
- v-model="model.standardLevel"
- />
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item prop="standardCode" label="鏍囧噯鍙�">
- <a-input
- :placeholder="'璇疯緭鍏ユ爣鍑嗗彿'"
- v-model="model.standardCode"
- />
+ <a-input :placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'" v-model="model.standardLevel" />
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
+ <a-form-model-item prop="standardCode" label="鏍囧噯鍙�">
+ <a-input :placeholder="'璇疯緭鍏ユ爣鍑嗗彿'" v-model="model.standardCode" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
<a-form-model-item prop="toolModel" label="鍨嬪彿/鍥惧彿">
- <a-input
- :placeholder="'璇疯緭鍏ュ瀷鍙�/鍥惧彿'"
- v-model="model.toolModel"
- />
+ <a-input :placeholder="'璇疯緭鍏ュ瀷鍙�/鍥惧彿'" v-model="model.toolModel" />
</a-form-model-item>
</a-col>
- <a-col :span="12">
- <a-form-model-item label="鐩村緞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="diameter">
- <a-input
- v-model="model.diameter"
- :placeholder="'璇疯緭鍏ョ洿寰�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="榻挎暟" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="numberOfTeeth">
- <a-input
- v-model="model.numberOfTeeth"
- :placeholder="'璇疯緭鍏ラ娇鏁�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鍒囧墛鍒冮暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="edgeLength">
- <a-input
- v-model="model.edgeLength"
- :placeholder="'璇疯緭鍏ュ垏鍓婂垉闀�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="鍒�鍏锋�婚暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalLength">
- <a-input
- v-model="model.totalLength"
- :placeholder="'璇疯緭鍏ュ垁鍏锋�婚暱'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
- <a-input
- v-model="model.toolMaterial"
- :placeholder="'璇疯緭鍏ュ垁鍏锋潗鏂�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item label="闆朵欢鏉愭枡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
- <a-input
- v-model="model.partMaterial"
- :placeholder="'璇疯緭鍏ラ浂浠舵潗鏂�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鏄惁娑傚眰" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
- <a-radio-group
- v-model="model.paintcoatFlag"
- :placeholder="'璇烽�夋嫨鏄惁娑傚眰'"
- >
- <a-radio :value="'1'">鏄�</a-radio>
- <a-radio :value="'2'">鍚�</a-radio>
- </a-radio-group>
+ <a-input v-model="model.partMaterial" :placeholder="'璇疯緭鍏ラ浂浠舵潗鏂�'"></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
- <a-col :span="12">
- <a-form-model-item label="鍒�鍏峰瀷寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
- <a-input
- v-model="model.toolPattern"
- :placeholder="'璇疯緭鍏ュ垁鍏峰瀷寮�'"
- ></a-input>
+ <a-col :span="8">
+ <a-form-model-item
+ label="闄勫姞鎶�鏈潯浠�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="technicalConditions"
+ >
+ <a-input v-model="model.technicalConditions" :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'"></a-input>
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ <a-col :span="8">
+ <a-form-model-item
+ label="闄勫姞鎶�鏈潯浠惰鏄�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="conditionsInfo"
+ >
+ <a-input v-model="model.conditionsInfo" :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍝佺墝" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
+ <a-input v-model="model.brand" :placeholder="'璇疯緭鍏ュ搧鐗�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
<a-form-model-item
label="瑁呭す瑙勬牸"
:labelCol="labelCol"
@@ -162,17 +103,35 @@
></a-input>
</a-form-model-item>
</a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="鍐峰嵈鏂瑰紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
+ <a-col :span="8">
+ <a-form-model-item
+ label="鎺ュ彛灏哄瑙勬牸"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="sizeSpecifications"
+ >
<a-input
- v-model="model.coolingMethod"
- :placeholder="'璇疯緭鍏ュ喎鍗存柟寮�'"
+ v-model="model.sizeSpecifications"
+ :placeholder="'璇疯緭鍏ユ帴鍙ｅ昂瀵歌鏍�'"
></a-input>
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ <a-col :span="8">
+ <a-form-model-item
+ label="閫傞厤鍒�鐗�"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="adaptBlade"
+ >
+ <a-input
+ v-model="model.adaptBlade"
+ :placeholder="'璇疯緭鍏ラ�傞厤鍒�鐗�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
<a-form-model-item label="鍒�灏栬R" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noseAngleR">
<a-input
v-model="model.noseAngleR"
@@ -180,33 +139,247 @@
></a-input>
</a-form-model-item>
</a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
- <a-form-model-item
- label="闄勫姞鎶�鏈潯浠�"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="technicalConditions"
- >
+ <a-col :span="8">
+ <a-form-model-item label="鍒�灏栬C" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noseAngleC">
<a-input
- v-model="model.technicalConditions"
- :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'"
+ v-model="model.noseAngleC"
+ :placeholder="'璇疯緭鍏ュ垁灏栬C'"
></a-input>
</a-form-model-item>
</a-col>
- <a-col :span="12">
- <a-form-model-item
- label="闄勫姞鎶�鏈潯浠惰鏄�"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="conditionsInfo"
- >
+ <a-col :span="8">
+ <a-form-model-item label="鍒�灏栬鍐匯" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="angleInsideR">
<a-input
- v-model="model.conditionsInfo"
- :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'"
+ v-model="model.angleInsideR"
+ :placeholder="'璇疯緭鍏ュ垁灏栬鍐匯'"
></a-input>
</a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="榻挎暟" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="numberOfTeeth">
+ <a-input
+ v-model="model.numberOfTeeth"
+ :placeholder="'璇疯緭鍏ラ娇鏁�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鏈�灏忕洿寰�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="smallDiameter">
+ <a-input
+ v-model="model.smallDiameter"
+ :placeholder="'璇疯緭鍏ユ渶灏忕洿寰�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鍏疯搴�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolAngle">
+ <a-input
+ v-model="model.toolAngle"
+ :placeholder="'璇疯緭鍏ュ垁鍏疯搴�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="涓诲亸瑙扠" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mainAngleK">
+ <a-input
+ v-model="model.mainAngleK"
+ :placeholder="'璇疯緭鍏ヤ富鍋忚K'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鏈�澶у垏娣�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deepestDepth">
+ <a-input
+ v-model="model.deepestDepth"
+ :placeholder="'璇疯緭鍏ユ渶澶у垏娣�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="铻鸿窛" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pitch">
+ <a-input
+ v-model="model.pitch"
+ :placeholder="'璇疯緭鍏ヨ灪璺�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鏈�灏忓姞宸ョ洿寰�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recentlyDiameter">
+ <a-input
+ v-model="model.recentlyDiameter"
+ :placeholder="'璇疯緭鍏ユ渶灏忓姞宸ョ洿寰�'"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="绮惧害绛夌骇" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accuracyClass">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.accuracyClass"
+ :triggerChange="true"
+ dictCode="accuracy_class"
+ placeholder="璇烽�夋嫨绮惧害绛夌骇"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.toolMaterial"
+ :triggerChange="true"
+ dictCode="tool_material"
+ placeholder="璇烽�夋嫨鍒�鍏锋潗鏂�"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鍐峰嵈鏂瑰紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.coolingMethod"
+ :triggerChange="true"
+ dictCode="cooling_method"
+ placeholder="璇烽�夋嫨鍐峰嵈鏂瑰紡"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鏄惁娑傚眰" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
+ <a-radio-group v-model="model.paintcoatFlag" :placeholder="'璇烽�夋嫨鏄惁娑傚眰'">
+ <a-radio :value="'1'">鏄�</a-radio>
+ <a-radio :value="'2'">鍚�</a-radio>
+ </a-radio-group>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鍏峰瀷寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.toolPattern"
+ :triggerChange="true"
+ dictCode="tool_pattern"
+ placeholder="璇烽�夋嫨鍒�鍏峰瀷寮�"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+<a-col :span="8">
+ <a-form-model-item label="鏌勯儴褰㈠紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleForm">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.handleForm"
+ :triggerChange="true"
+ dictCode="handle_form"
+ placeholder="璇烽�夋嫨鏌勯儴褰㈠紡"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鏌勯褰㈠紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleNeckForm">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.handleNeckForm"
+ :triggerChange="true"
+ dictCode="handle_neck_form"
+ placeholder="璇烽�夋嫨鏌勯褰㈠紡"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <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="璇烽�夋嫨鍐呭铻虹汗"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+<a-col :span="8">
+ <a-form-model-item label="閾ｅ垁澶村舰寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="millingHeadForm">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.millingHeadForm"
+ :triggerChange="true"
+ dictCode="milling_head_form"
+ placeholder="璇烽�夋嫨閾ｅ垁澶村舰寮�"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒囧墛鍒冨舰寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingEdgeForm">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.cuttingEdgeForm"
+ :triggerChange="true"
+ dictCode="cutting_edge_form"
+ placeholder="璇烽�夋嫨鍒囧墛鍒冨舰寮�"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鍒�鍏风洿寰�">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.littleDiameter"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigDiameter"></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>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigEdgeLength"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鍒�鍏锋�婚暱">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallTotalLength"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigTotalLength"></a-input>
+ </a-form-item>
+ </a-col><a-col :span="8">
+ <a-form-item label="棰堝緞">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallNeckDiameter"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigNeckDiameter"></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.smallHandleLength"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigHandleLength"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鏌勯闀垮害">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallHandleNeckLength"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigHandleNeckLength"></a-input>
+ </a-form-item>
+ </a-col><a-col :span="8">
+ <a-form-item label="鎮几闀垮害">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallOverhangingLength"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigOverhangingLength"></a-input>
+ </a-form-item>
</a-col>
</a-row>
</a-form-model>
@@ -258,26 +431,60 @@
},
searchQuery(){
- this.searchParams.chineseName = this.model.chineseName
- this.searchParams.foreignLanguageName = this.model.foreignLanguageName
- this.searchParams.standardLevel = this.model.standardLevel
- this.searchParams.standardCode = this.model.standardCode
- this.searchParams.diameter = this.model.diameter
- this.searchParams.noseAngleR = this.model.noseAngleR
- this.searchParams.edgeLength = this.model.edgeLength
- this.searchParams.totalLength = this.model.totalLength
- this.searchParams.toolMaterial = this.model.toolMaterial
- this.searchParams.partMaterial = this.model.partMaterial
- this.searchParams.paintcoatFlag = this.model.paintcoatFlag
- this.searchParams.toolPattern = this.model.toolPattern
- this.searchParams.clampingSpecifications = this.model.clampingSpecifications
- this.searchParams.coolingMethod = this.model.coolingMethod
- this.searchParams.numberOfTeeth = this.model.numberOfTeeth
- 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
+ const fields = [
+ 'chineseName',
+ 'foreignLanguageName',
+ 'shortCalled',
+ 'groupCompanyCode',
+ 'groupCompanySign',
+ 'standardLevel',
+ 'standardCode',
+ 'toolModel',
+ 'partMaterial',
+ 'technicalConditions',
+ 'conditionsInfo',
+ 'brand',
+ 'clampingSpecifications',
+ 'sizeSpecifications',
+ 'adaptBlade',
+ 'noseAngleR',
+ 'noseAngleC',
+ 'angleInsideR',
+ 'numberOfTeeth',
+ 'smallDiameter',
+ 'toolAngle',
+ 'mainAngleK',
+ 'deepestDepth',
+ 'pitch',
+ 'recentlyDiameter',
+ 'accuracyClass',
+ 'toolMaterial',
+ 'coolingMethod',
+ 'paintcoatFlag',
+ 'toolPattern',
+ 'handleForm',
+ 'handleNeckForm',
+ 'numberPatterns',
+ 'millingHeadForm',
+ 'cuttingEdgeForm',
+ 'littleDiameter',
+ 'bigDiameter',
+ 'smallEdgeLength',
+ 'bigEdgeLength',
+ 'smallTotalLength',
+ 'bigTotalLength',
+ 'smallNeckDiameter',
+ 'bigNeckDiameter',
+ 'smallHandleLength',
+ 'bigHandleLength',
+ 'smallHandleNeckLength',
+ 'bigHandleNeckLength',
+ 'smallOverhangingLength',
+ 'bigOverhangingLength'
+ ]
+ fields.forEach((field) => {
+ this.searchParams[field] = this.model[field]
+ })
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 5bf56a5..ce5eec0 100644
--- a/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
+++ b/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
@@ -505,6 +505,10 @@
edit(record) {
this.editable = true;
this.model = Object.assign({}, record)
+ this.chineseNameChange1 = record.chineseName
+ this.toolModelChange1 = '-'+record.toolModel
+ this.threadCodeChange1 = '-'+record.threadCode
+ this.pitchChange1 = '-'+record.pitch
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
getAction(this.url.queryParaByToolCode, {
toolCode: record.toolCodeId,
diff --git a/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue b/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue
index a916f3b..bd2790d 100644
--- a/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue
+++ b/src/views/tms/modules/baseTools/ParaThreadingToolSearchModal.vue
@@ -1,7 +1,7 @@
<template>
<j-modal
:title="title"
- :width="800"
+ :width="1200"
:visible="visible"
centered
:confirmLoading="confirmLoading"
@@ -12,134 +12,58 @@
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item prop="chineseName" label="涓枃鍚嶇О">
<a-input :placeholder="'璇疯緭鍏ヤ腑鏂囧悕绉�'" v-model="model.chineseName" />
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item prop="foreignLanguageName" label="澶栨枃鍚嶇О">
<a-input :placeholder="'璇疯緭鍏ュ鏂囧悕绉�'" v-model="model.foreignLanguageName" />
</a-form-model-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
<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-input :placeholder="'璇疯緭鍏ュ伐鍏风畝绉�'" v-model="model.shortCalled" />
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
+ <a-form-model-item prop="groupCompanyCode" label="闆嗗洟鍏徃缂栫爜">
+ <a-input :placeholder="'璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'" v-model="model.groupCompanyCode" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item prop="groupCompanySign" label="鏍囪">
+ <a-input :placeholder="'璇疯緭鍏ユ爣璁�'" v-model="model.groupCompanySign" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
<a-form-model-item prop="standardLevel" label="鏍囧噯绾у埆">
<a-input :placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'" v-model="model.standardLevel" />
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
<a-form-model-item prop="standardCode" label="鏍囧噯鍙�">
<a-input :placeholder="'璇疯緭鍏ユ爣鍑嗗彿'" v-model="model.standardCode" />
</a-form-model-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item prop="toolModel" label="鍨嬪彿/鍥惧彿">
<a-input :placeholder="'璇疯緭鍏ュ瀷鍙�/鍥惧彿'" v-model="model.toolModel" />
</a-form-model-item>
</a-col>
- <a-col :span="12">
- <a-form-model-item label="铻虹汗浠ｅ彿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadCode">
- <a-input v-model="model.threadCode" :placeholder="'璇疯緭鍏ヨ灪绾逛唬鍙�'"></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="铻鸿窛" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pitch">
- <a-input v-model="model.pitch" :placeholder="'璇疯緭鍏ヨ灪璺�'"></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="铻虹汗鏃嬪悜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rotationDirection">
- <a-input v-model="model.rotationDirection" :placeholder="'璇疯緭鍏ヨ灪绾规棆鍚�'"></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
- <a-form-model-item
- label="铻虹汗鍏樊甯︿唬鍙�/绮惧害绛夌骇"
- :labelCol="{span:12}"
- :wrapperCol="{span:10}"
- prop="tolerancezoneLevel"
- >
- <a-input v-model="model.tolerancezoneLevel" :placeholder="'璇疯緭鍏ヨ灪绾瑰叕宸甫浠ｅ彿/绮惧害绛夌骇'"></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鍒囧墛鍒冮暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="edgeLength">
- <a-input v-model="model.edgeLength" :placeholder="'璇疯緭鍏ュ垏鍓婂垉闀�'"></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="鍒�鍏锋�婚暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalLength">
- <a-input v-model="model.totalLength" :placeholder="'璇疯緭鍏ュ垁鍏锋�婚暱'"></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鏄惁娑傚眰" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
- <a-radio-group v-model="model.paintcoatFlag" :placeholder="'璇烽�夋嫨鏄惁娑傚眰'">
- <a-radio :value="'1'">鏄�</a-radio>
- <a-radio :value="'2'">鍚�</a-radio>
- </a-radio-group>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
- <a-input v-model="model.toolMaterial" :placeholder="'璇疯緭鍏ュ垁鍏锋潗鏂�'"></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item label="闆朵欢鏉愭枡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
<a-input v-model="model.partMaterial" :placeholder="'璇疯緭鍏ラ浂浠舵潗鏂�'"></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
- <a-col :span="12">
- <a-form-model-item label="澶栧瀷灏哄" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="externalDimensions">
- <a-input v-model="model.externalDimensions" :placeholder="'璇疯緭鍏ュ鍨嬪昂瀵�'"></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item
- label="鏌勯儴瑙勬牸"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="handleSpecifications"
- >
- <a-input v-model="model.handleSpecifications" :placeholder="'璇疯緭鍏ユ焺閮ㄨ鏍�'"></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item
label="闄勫姞鎶�鏈潯浠�"
:labelCol="labelCol"
@@ -149,7 +73,7 @@
<a-input v-model="model.technicalConditions" :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'"></a-input>
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item
label="闄勫姞鎶�鏈潯浠惰鏄�"
:labelCol="labelCol"
@@ -158,6 +82,196 @@
>
<a-input v-model="model.conditionsInfo" :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'"></a-input>
</a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍝佺墝" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
+ <a-input v-model="model.brand" :placeholder="'璇疯緭鍏ュ搧鐗�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
+ <a-form-model-item label="铻虹汗浠ｅ彿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadCode">
+ <a-input v-model="model.threadCode" :placeholder="'璇疯緭鍏ヨ灪绾逛唬鍙�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item
+ label="铻虹汗鍏樊甯︿唬鍙�/绮惧害绛夌骇"
+ :labelCol="{ span: 12 }"
+ :wrapperCol="{ span: 10 }"
+ prop="tolerancezoneLevel"
+ >
+ <a-input v-model="model.tolerancezoneLevel" :placeholder="'璇疯緭鍏ヨ灪绾瑰叕宸甫浠ｅ彿/绮惧害绛夌骇'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="铻鸿窛" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pitch">
+ <a-input v-model="model.pitch" :placeholder="'璇疯緭鍏ヨ灪璺�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item
+ label="鏌勯儴瑙勬牸"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="handleSpecifications"
+ >
+ <a-input v-model="model.handleSpecifications" :placeholder="'璇疯緭鍏ユ焺閮ㄨ鏍�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="瀵煎悜灏哄" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="guidingSize">
+ <a-input v-model="model.guidingSize" :placeholder="'璇疯緭鍏ュ鍚戝昂瀵�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="杩炴帴瀛斿緞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="connectionAperture">
+ <a-input v-model="model.connectionAperture" :placeholder="'璇疯緭鍏ヨ繛鎺ュ瓟寰�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="杩炴帴閿Ы" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="connectingKeyway">
+ <a-input v-model="model.connectingKeyway" :placeholder="'璇疯緭鍏ヨ繛鎺ラ敭妲�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+
+ <a-col :span="8">
+ <a-form-model-item label="绮惧害绛夌骇" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accuracyClass">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.accuracyClass"
+ :triggerChange="true"
+ dictCode="accuracy_class"
+ placeholder="璇烽�夋嫨绮惧害绛夌骇"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="铻虹汗鏃嬪悜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rotationDirection">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.rotationDirection"
+ :triggerChange="true"
+ dictCode="rotation_direction"
+ placeholder="璇烽�夋嫨铻虹汗鏃嬪悜"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鏄惁娑傚眰" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
+ <a-radio-group v-model="model.paintcoatFlag" :placeholder="'璇烽�夋嫨鏄惁娑傚眰'">
+ <a-radio :value="'1'">鏄�</a-radio>
+ <a-radio :value="'2'">鍚�</a-radio>
+ </a-radio-group>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.toolMaterial"
+ :triggerChange="true"
+ dictCode="tool_material"
+ placeholder="璇烽�夋嫨鍒�鍏锋潗鏂�"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍐峰嵈鏂瑰紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.coolingMethod"
+ :triggerChange="true"
+ dictCode="cooling_method"
+ placeholder="璇烽�夋嫨鍐峰嵈鏂瑰紡"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鍒跺紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.types"
+ :triggerChange="true"
+ dictCode="types"
+ placeholder="璇烽�夋嫨鍒跺紡"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <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="8">
+ <a-form-model-item label="铻虹汗鏍囧噯" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadStandard">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.threadStandard"
+ :triggerChange="true"
+ dictCode="thread_standard"
+ placeholder="璇烽�夋嫨铻虹汗鏍囧噯"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鎺掑睉妲藉瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fluteSoltType">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.fluteSoltType"
+ :triggerChange="true"
+ dictCode="flute_solt_type"
+ placeholder="璇烽�夋嫨鎺掑睉妲藉瀷"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="澶栧瀷灏哄">
+ <a-input
+ placeholder="璇疯緭鍏ユ渶灏忓��"
+ class="query-group-cust"
+ v-model="model.smallExternalDimensions"
+ ></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input
+ placeholder="璇疯緭鍏ユ渶澶у��"
+ class="query-group-cust"
+ v-model="model.bigExternalDimensions"
+ ></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鍒囧墛鍒冮暱">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallEdgeLength"></a-input>
+ <span class="query-group-split-cust"></span>
+ <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>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigTotalLength"></a-input>
+ </a-form-item>
</a-col>
</a-row>
</a-form-model>
@@ -205,24 +319,47 @@
},
searchQuery() {
- this.searchParams.chineseName = this.model.chineseName
- this.searchParams.foreignLanguageName = this.model.foreignLanguageName
- this.searchParams.threadCode = this.model.threadCode
- this.searchParams.pitch = this.model.pitch
- this.searchParams.rotationDirection = this.model.rotationDirection
- this.searchParams.tolerancezoneLevel = this.model.tolerancezoneLevel
- this.searchParams.edgeLength = this.model.edgeLength
- this.searchParams.totalLength = this.model.totalLength
- this.searchParams.toolMaterial = this.model.toolMaterial
- this.searchParams.partMaterial = this.model.partMaterial
- this.searchParams.paintcoatFlag = this.model.paintcoatFlag
- this.searchParams.externalDimensions = this.model.externalDimensions
- this.searchParams.handleSpecifications = this.model.handleSpecifications
- 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
+ const fields = [
+ 'chineseName',
+ 'foreignLanguageName',
+ 'shortCalled',
+ 'groupCompanyCode',
+ 'groupCompanySign',
+ 'standardLevel',
+ 'standardCode',
+ 'toolModel',
+ 'partMaterial',
+ 'technicalConditions',
+ 'conditionsInfo',
+ 'brand',
+ 'threadCode',
+ 'tolerancezoneLevel',
+ 'pitch',
+ 'handleSpecifications',
+ 'guidingSize',
+ 'connectionAperture',
+ 'connectingKeyway',
+ 'accuracyClass',
+ 'rotationDirection',
+ 'paintcoatFlag',
+ 'toolMaterial',
+ 'coolingMethod',
+ 'types',
+ 'screwHoleType',
+ 'threadStandard',
+ 'fluteSoltType',
+ 'smallExternalDimensions',
+ 'bigExternalDimensions',
+ 'smallEdgeLength',
+ 'bigEdgeLength',
+ 'smallTotalLength',
+ 'bigTotalLength'
+ ]
+
+ fields.forEach((field) => {
+ this.searchParams[field] = this.model[field]
+ })
+
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 a42c541..078e63a 100644
--- a/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
+++ b/src/views/tms/modules/baseTools/ParaTurningToolsModal.vue
@@ -582,6 +582,10 @@
edit(record) {
this.editable = true;
this.model = Object.assign({}, record)
+ this.chineseNameChange1 = record.chineseName
+ this.toolModelChange1 = '-'+record.toolModel
+ this.headSpecificationsChange1 = '-'+record.headSpecifications
+ this.leadAngleChange1 = '-'+record.leadAngle
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
getAction(this.url.queryParaByToolCode, {
toolCode: record.toolCodeId,
diff --git a/src/views/tms/modules/baseTools/ParaTurningToolsSearchModal.vue b/src/views/tms/modules/baseTools/ParaTurningToolsSearchModal.vue
index f0b7392..735719b 100644
--- a/src/views/tms/modules/baseTools/ParaTurningToolsSearchModal.vue
+++ b/src/views/tms/modules/baseTools/ParaTurningToolsSearchModal.vue
@@ -1,7 +1,7 @@
<template>
<j-modal
:title="title"
- :width="800"
+ :width="1200"
:visible="visible"
centered
:confirmLoading="confirmLoading"
@@ -12,201 +12,360 @@
<a-spin :spinning="confirmLoading">
<a-form-model ref="form" :model="model" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item prop="chineseName" label="涓枃鍚嶇О">
- <a-input
- :placeholder="'璇疯緭鍏ヤ腑鏂囧悕绉�'"
- v-model="model.chineseName"
- />
+ <a-input :placeholder="'璇疯緭鍏ヤ腑鏂囧悕绉�'" v-model="model.chineseName" />
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item prop="foreignLanguageName" label="澶栨枃鍚嶇О">
- <a-input
- :placeholder="'璇疯緭鍏ュ鏂囧悕绉�'"
- v-model="model.foreignLanguageName"
- />
+ <a-input :placeholder="'璇疯緭鍏ュ鏂囧悕绉�'" v-model="model.foreignLanguageName" />
</a-form-model-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item prop="shortCalled" label="宸ュ叿绠�绉�">
- <a-input
- :placeholder="'璇疯緭鍏ュ伐鍏风畝绉�'"
- v-model="model.shortCalled"
- />
+ <a-input :placeholder="'璇疯緭鍏ュ伐鍏风畝绉�'" v-model="model.shortCalled" />
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="8">
<a-form-model-item prop="groupCompanyCode" label="闆嗗洟鍏徃缂栫爜">
- <a-input
- :placeholder="'璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'"
- v-model="model.groupCompanyCode"
- />
+ <a-input :placeholder="'璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'" v-model="model.groupCompanyCode" />
</a-form-model-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
+ <a-form-model-item prop="groupCompanySign" label="鏍囪">
+ <a-input :placeholder="'璇疯緭鍏ユ爣璁�'" v-model="model.groupCompanySign" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
<a-form-model-item prop="standardLevel" label="鏍囧噯绾у埆">
- <a-input
- :placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'"
- v-model="model.standardLevel"
- />
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item prop="standardCode" label="鏍囧噯鍙�">
- <a-input
- :placeholder="'璇疯緭鍏ユ爣鍑嗗彿'"
- v-model="model.standardCode"
- />
+ <a-input :placeholder="'璇疯緭鍏ユ爣鍑嗙骇鍒�'" v-model="model.standardLevel" />
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
+ <a-col :span="8">
+ <a-form-model-item prop="standardCode" label="鏍囧噯鍙�">
+ <a-input :placeholder="'璇疯緭鍏ユ爣鍑嗗彿'" v-model="model.standardCode" />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
<a-form-model-item prop="toolModel" label="鍨嬪彿/鍥惧彿">
- <a-input
- :placeholder="'璇疯緭鍏ュ瀷鍙�/鍥惧彿'"
- v-model="model.toolModel"
- />
+ <a-input :placeholder="'璇疯緭鍏ュ瀷鍙�/鍥惧彿'" v-model="model.toolModel" />
</a-form-model-item>
</a-col>
- <a-col :span="12">
- <a-form-model-item label="鍒�澶磋鏍�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="headSpecifications">
- <a-input
- v-model="model.headSpecifications"
- :placeholder="'璇疯緭鍏ュ垁澶磋鏍�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="閰嶅鍒�鐗囧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="matchingNumber">
- <a-input
- v-model="model.matchingNumber"
- :placeholder="'璇疯緭鍏ラ厤濂楀垁鐗囧彿'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="涓诲亸瑙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leadAngle">
- <a-input
- v-model="model.leadAngle"
- :placeholder="'璇疯緭鍏ヤ富鍋忚'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="鍒�鍏锋�婚暱" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalLength">
- <a-input
- v-model="model.totalLength"
- :placeholder="'璇疯緭鍏ュ垁鍏锋�婚暱'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
- <a-input
- v-model="model.toolMaterial"
- :placeholder="'璇疯緭鍏ュ垁鍏锋潗鏂�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item label="闆朵欢鏉愭枡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
- <a-input
- v-model="model.partMaterial"
- :placeholder="'璇疯緭鍏ラ浂浠舵潗鏂�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鏄惁娑傚眰" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
- <a-radio-group
- v-model="model.paintcoatFlag"
- :placeholder="'璇烽�夋嫨鏄惁娑傚眰'"
- >
- <a-radio :value="'1'">鏄�</a-radio>
- <a-radio :value="'2'">鍚�</a-radio>
- </a-radio-group>
+ <a-input v-model="model.partMaterial" :placeholder="'璇疯緭鍏ラ浂浠舵潗鏂�'"></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
- <a-col :span="12">
- <a-form-model-item label="鍒�鍏峰瀷寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
- <a-input
- v-model="model.toolPattern"
- :placeholder="'璇疯緭鍏ュ垁鍏峰瀷寮�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item
- label="鍒�鍏锋埅闈㈠昂瀵�"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="crossSectionalSize"
- >
- <a-input
- v-model="model.crossSectionalSize"
- :placeholder="'璇疯緭鍏ュ垁鍏锋埅闈㈠昂瀵�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
- <a-form-model-item label="鍒囧墛鏂瑰悜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingDirection">
- <a-input
- v-model="model.cuttingDirection"
- :placeholder="'璇疯緭鍏ュ垏鍓婃柟鍚�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span="12">
- <a-form-model-item label="鍐峰嵈鏂瑰紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
- <a-input
- v-model="model.coolingMethod"
- :placeholder="'璇疯緭鍏ュ喎鍗存柟寮�'"
- ></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item
label="闄勫姞鎶�鏈潯浠�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="technicalConditions"
>
- <a-input
- v-model="model.technicalConditions"
- :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'"
- ></a-input>
+ <a-input v-model="model.technicalConditions" :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'"></a-input>
</a-form-model-item>
</a-col>
- <a-col :span="12">
+ <a-col :span="8">
<a-form-model-item
label="闄勫姞鎶�鏈潯浠惰鏄�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
prop="conditionsInfo"
>
- <a-input
- v-model="model.conditionsInfo"
- :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'"
- ></a-input>
+ <a-input v-model="model.conditionsInfo" :placeholder="'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'"></a-input>
</a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍝佺墝" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
+ <a-input v-model="model.brand" :placeholder="'璇疯緭鍏ュ搧鐗�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�澶磋鏍�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="headSpecifications">
+ <a-input v-model="model.headSpecifications" :placeholder="'璇疯緭鍏ュ垁澶磋鏍�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="閰嶅鍒�鐗囧彿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="matchingNumber">
+ <a-input v-model="model.matchingNumber" :placeholder="'璇疯緭鍏ラ厤濂楀垁鐗囧彿'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�澶瑰瀷鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="knifeClipModel">
+ <a-input v-model="model.knifeClipModel" :placeholder="'璇疯緭鍏ュ垁澶瑰瀷鍙�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="涓诲亸瑙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leadAngle">
+ <a-input v-model="model.leadAngle" :placeholder="'璇疯緭鍏ヤ富鍋忚'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鍏锋埅闈㈠昂瀵�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="crossSectionalSize">
+ <a-input v-model="model.crossSectionalSize" :placeholder="'璇疯緭鍏ュ垁鍏锋埅闈㈠昂瀵�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鐗囧昂瀵�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="knifeSize">
+ <a-input v-model="model.knifeSize" :placeholder="'璇疯緭鍏ュ垁鐗囧昂瀵�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鐗囧悗瑙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladePosterior">
+ <a-input v-model="model.bladePosterior" :placeholder="'璇疯緭鍏ュ垁鐗囧悗瑙�'"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="绮惧害绛夌骇" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accuracyClass">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.accuracyClass"
+ :triggerChange="true"
+ dictCode="accuracy_class"
+ placeholder="璇烽�夋嫨绮惧害绛夌骇"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒囧墛鏂瑰悜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingDirection">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.cuttingDirection"
+ :triggerChange="true"
+ dictCode="cutting_direction"
+ placeholder="璇烽�夋嫨鍒囧墛鏂瑰悜"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鍏锋潗鏂�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.toolMaterial"
+ :triggerChange="true"
+ dictCode="tool_material"
+ placeholder="璇烽�夋嫨鍒�鍏锋潗鏂�"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鍏峰瀷寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.toolPattern"
+ :triggerChange="true"
+ dictCode="tool_pattern"
+ placeholder="璇烽�夋嫨鍒�鍏峰瀷寮�"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒跺紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.types"
+ :triggerChange="true"
+ dictCode="types"
+ placeholder="璇烽�夋嫨鍒跺紡"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鍐峰嵈鏂瑰紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.coolingMethod"
+ :triggerChange="true"
+ dictCode="cooling_method"
+ placeholder="璇烽�夋嫨鍐峰嵈鏂瑰紡"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鎺ュ彛绱у浐褰㈠紡" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fasteningForm">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.fasteningForm"
+ :triggerChange="true"
+ dictCode="fastening_form"
+ placeholder="璇烽�夋嫨鎺ュ彛绱у浐褰㈠紡"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鏉嗙被鍒�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="holderCategory">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.holderCategory"
+ :triggerChange="true"
+ dictCode="holder_category"
+ placeholder="璇烽�夋嫨鍒�鏉嗙被鍒�"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鐗囧舰鐘�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeShape">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.bladeShape"
+ :triggerChange="true"
+ dictCode="blade_shape"
+ placeholder="璇烽�夋嫨鍒�鐗囧舰鐘�"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鐗囪澶规柟寮�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clampingMethod">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.clampingMethod"
+ :triggerChange="true"
+ dictCode="clamping_method"
+ placeholder="璇烽�夋嫨鍒�鐗囪澶规柟寮�"
+ />
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-model-item label="鍒�鏉嗘柟鍚�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="barDirection">
+ <j-dict-select-tag
+ type="list"
+ v-model="model.barDirection"
+ :triggerChange="true"
+ dictCode="bar_direction"
+ placeholder="璇烽�夋嫨鍒�鏉嗘柟鍚�"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="8">
+ <a-form-model-item label="鏄惁娑傚眰" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
+ <a-radio-group v-model="model.paintcoatFlag" :placeholder="'璇烽�夋嫨鏄惁娑傚眰'">
+ <a-radio :value="'1'">鏄�</a-radio>
+ <a-radio :value="'2'">鍚�</a-radio>
+ </a-radio-group>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鍒�鍏锋�婚暱">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallTotalLength"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigTotalLength"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="闀楁潌鐩村緞">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallBoringBarDiameter"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigBoringBarDiameter"></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.smallBladeLength"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigBladeLength"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鍒�鍏风洿寰�">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallToolDiameter"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigToolDiameter"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鍒�鏉嗛珮搴�">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallBladeHeight"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigBladeHeight"></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.smallBladeSize"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigBladeSize"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鍒�鐗囨Ы瀹�">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallSlotWidth"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigSlotWidth"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鏈�灏忓垏鍏ョ洿寰�">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallSmallDiameter"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigSmallDiameter"></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.smallMaxDiameter"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigMaxDiameter"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鏈�澶у垏妲芥繁搴�">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallMaxDepth"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigMaxDepth"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鏈�灏忓姞宸ョ洿寰�">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallMinDiameter"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigMinDiameter"></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.smallBladeThickness"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigBladeThickness"></a-input>
+ </a-form-item>
+ </a-col>
+ <a-col :span="8">
+ <a-form-item label="鍒�鏉嗗搴�">
+ <a-input placeholder="璇疯緭鍏ユ渶灏忓��" class="query-group-cust" v-model="model.smallBladeWide"></a-input>
+ <span class="query-group-split-cust"></span>
+ <a-input placeholder="璇疯緭鍏ユ渶澶у��" class="query-group-cust" v-model="model.bigBladeWide"></a-input>
+ </a-form-item>
</a-col>
</a-row>
</a-form-model>
@@ -258,26 +417,68 @@
},
searchQuery(){
- this.searchParams.chineseName = this.model.chineseName
- this.searchParams.foreignLanguageName = this.model.foreignLanguageName
- this.searchParams.standardLevel = this.model.standardLevel
- this.searchParams.standardCode = this.model.standardCode
- this.searchParams.headSpecifications = this.model.headSpecifications
- this.searchParams.matchingNumber = this.model.matchingNumber
- this.searchParams.leadAngle = this.model.leadAngle
- this.searchParams.totalLength = this.model.totalLength
- this.searchParams.toolMaterial = this.model.toolMaterial
- this.searchParams.partMaterial = this.model.partMaterial
- this.searchParams.paintcoatFlag = this.model.paintcoatFlag
- this.searchParams.toolPattern = this.model.toolPattern
- this.searchParams.crossSectionalSize = this.model.crossSectionalSize
- this.searchParams.coolingMethod = this.model.coolingMethod
- this.searchParams.cuttingDirection = this.model.cuttingDirection
- 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
+ const fields = [
+ 'chineseName',
+ 'foreignLanguageName',
+ 'shortCalled',
+ 'groupCompanyCode',
+ 'groupCompanySign',
+ 'standardLevel',
+ 'standardCode',
+ 'toolModel',
+ 'partMaterial',
+ 'technicalConditions',
+ 'conditionsInfo',
+ 'brand',
+ 'headSpecifications',
+ 'matchingNumber',
+ 'knifeClipModel',
+ 'leadAngle',
+ 'crossSectionalSize',
+ 'knifeSize',
+ 'bladePosterior',
+ 'accuracyClass',
+ 'cuttingDirection',
+ 'toolMaterial',
+ 'toolPattern',
+ 'types',
+ 'paintcoatFlag',
+ 'coolingMethod',
+ 'fasteningForm',
+ 'holderCategory',
+ 'bladeShape',
+ 'clampingMethod',
+ 'barDirection',
+ 'smallTotalLength',
+ 'bigTotalLength',
+ 'smallBoringBarDiameter',
+ 'bigBoringBarDiameter',
+ 'smallBladeLength',
+ 'bigBladeLength',
+ 'smallToolDiameter',
+ 'bigToolDiameter',
+ 'smallBladeHeight',
+ 'bigBladeHeight',
+ 'smallBladeWide',
+ 'bigBladeWide',
+ 'smallBladeSize',
+ 'bigBladeSize',
+ 'smallSlotWidth',
+ 'bigSlotWidth',
+ 'smallSmallDiameter',
+ 'bigSmallDiameter',
+ 'smallMaxDiameter',
+ 'bigMaxDiameter',
+ 'smallMaxDepth',
+ 'bigMaxDepth',
+ 'smallMinDiameter',
+ 'bigMinDiameter',
+ 'smallBladeThickness',
+ 'bigBladeThickness'
+ ]
+ fields.forEach((field) => {
+ this.searchParams[field] = this.model[field]
+ })
this.close()
this.$emit('searchParams',this.searchParams)
},
diff --git a/src/views/tms/modules/inbound/InboundApplyModelList.vue b/src/views/tms/modules/inbound/InboundApplyModelList.vue
index 2e49fac..44c59f2 100644
--- a/src/views/tms/modules/inbound/InboundApplyModelList.vue
+++ b/src/views/tms/modules/inbound/InboundApplyModelList.vue
@@ -268,7 +268,7 @@
postAction(this.url.addApplyInStorage, formData)
.then((res) => {
if (res.success) {
- that.$message.success(res.message)
+ that.$message.success("鍏ュ簱鎴愬姛")
that.$emit('ok', new Date())
} else {
that.$message.warning(res.message)
diff --git a/src/views/tms/modules/inbound/InboundListRight.vue b/src/views/tms/modules/inbound/InboundListRight.vue
index 6735275..c1cc993 100644
--- a/src/views/tms/modules/inbound/InboundListRight.vue
+++ b/src/views/tms/modules/inbound/InboundListRight.vue
@@ -50,7 +50,7 @@
<div class="table-operator">
<Tooltip
placement="top"
- title="閫夋嫨鍙跺瓙鑺傜偣鍚庡啀鎵ц鏂板"
+ title="閫夋嫨娌℃湁涓嬬骇鍒嗙被鐨勮妭鐐瑰悗鍐嶆墽琛屾柊澧�"
>
<a-button @click="handleAdd(nodeSelected)" type="primary" icon="plus" :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '2'">鏂板</a-button>
</Tooltip>
@@ -239,11 +239,11 @@
align:"center",
dataIndex: 'inNumber'
},
- // {
- // title:'澶囨敞',
- // align:"center",
- // dataIndex: 'remark'
- // },
+ {
+ title:'鍏ュ簱鏃堕棿',
+ align:"center",
+ dataIndex: 'inboundTime'
+ },
{
title:'鍒涘缓浜�',
align:"center",
@@ -355,19 +355,19 @@
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows
//閫氳繃id鏌ヨ绠＄悊鍙傛暟鍜屽弬鏁版暟鎹�
- getAction(this.url.queryParaByToolCode, { toolCode: this.selectionRows[0].toolCodeId,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"){
+ }else if(this.selectionRows[0].paraTypeFlag === "2"){
this.$refs.paraHoleToolsList.getPara(res.result);
- }else if(this.paraTypeFlag === "3"){
+ }else if(this.selectionRows[0].paraTypeFlag === "3"){
this.$refs.paraThreadingToolList.getPara(res.result);
- }else if(this.paraTypeFlag === "4"){
+ }else if(this.selectionRows[0].paraTypeFlag === "4"){
this.$refs.paraMillToolList.getPara(res.result);
- }else if(this.paraTypeFlag === "5"){
+ }else if(this.selectionRows[0].paraTypeFlag === "5"){
this.$refs.paraTurningToolsList.getPara(res.result);
- }else if(this.paraTypeFlag === "6"){
+ }else if(this.selectionRows[0].paraTypeFlag === "6"){
this.$refs.paraBladeList.getPara(res.result);
}
} else {
diff --git a/src/views/tms/modules/inbound/InboundModel.vue b/src/views/tms/modules/inbound/InboundModel.vue
index 55980de..623e2a6 100644
--- a/src/views/tms/modules/inbound/InboundModel.vue
+++ b/src/views/tms/modules/inbound/InboundModel.vue
@@ -354,7 +354,7 @@
}));
this.handleBacthPrint();
}else{
- that.$message.success("淇濆瓨鎴愬姛")
+ that.$message.success("鍏ュ簱鎴愬姛")
}
that.$emit('ok', new Date())
} else {
diff --git a/src/views/tms/modules/inboundOrder/JSelectToolingModal.vue b/src/views/tms/modules/inboundOrder/JSelectToolingModal.vue
index 049dc6f..6b8595c 100644
--- a/src/views/tms/modules/inboundOrder/JSelectToolingModal.vue
+++ b/src/views/tms/modules/inboundOrder/JSelectToolingModal.vue
@@ -142,7 +142,7 @@
loading: false,
url: {
// list: '/base/tooling/list',
- list: '/tms/baseTools/selectToolList',
+ list: '/tms/baseTools/paraCommonToolList',
},
}
},
diff --git a/src/views/tms/modules/toolLedger/InStoreDetailList.vue b/src/views/tms/modules/toolLedger/InStoreDetailList.vue
index 70f6f31..c4afcff 100644
--- a/src/views/tms/modules/toolLedger/InStoreDetailList.vue
+++ b/src/views/tms/modules/toolLedger/InStoreDetailList.vue
@@ -87,6 +87,11 @@
dataIndex: 'inNumber',
align: 'center',
},
+ {
+ title: '鍏ュ簱鏃堕棿',
+ dataIndex: 'inboundTime',
+ align: 'center',
+ },
],
para:{},
}
diff --git a/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue b/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
index 071f244..c791a83 100644
--- a/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
+++ b/src/views/tms/modules/toolLedger/ToolLedgerListRight.vue
@@ -131,7 +131,7 @@
forceRender
>
<span slot="tab">
- <a-badge>鎶婂彿 </a-badge>
+ <a-badge>宸ュ叿缂栧彿 </a-badge>
</span>
<tool-ledger-detail-list ref="toolLedgerDetailList"></tool-ledger-detail-list>
</a-tab-pane>
diff --git a/src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue b/src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue
index e20a71e..a891428 100644
--- a/src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue
+++ b/src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue
@@ -24,10 +24,10 @@
</a-form-model-item>
</a-col>
<a-col :span="12" v-show="leafFlagShow">
- <a-form-model-item label="鏄惁涓哄彾瀛愯妭鐐�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leafFlag">
- <a-radio-group v-model="model.leafFlag" placeholder="璇烽�夋嫨鏄惁鍙跺瓙鑺傜偣" @change="leafFlagChange">
- <a-radio :value="'1'">鏄�</a-radio>
- <a-radio :value="'2'">鍚�</a-radio>
+ <a-form-model-item label="鏄惁鏈変笅绾у垎绫�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leafFlag">
+ <a-radio-group v-model="model.leafFlag" placeholder="璇烽�夋嫨鏄惁鏈変笅绾у垎绫�" @change="leafFlagChange">
+ <a-radio :value="'1'">鍚�</a-radio>
+ <a-radio :value="'2'">鏄�</a-radio>
</a-radio-group>
</a-form-model-item>
</a-col>
@@ -115,7 +115,7 @@
{ required: true, message: '璇疯緭鍏ュ伐鍏峰垎绫诲悕绉�!'},
],
leafFlag: [
- { required: true, message: '璇烽�夋嫨鏄惁涓哄彾瀛愯妭鐐�!'},
+ { required: true, message: '璇烽�夋嫨鏄惁鏈変笅绾у垎绫�!'},
],
paraTypeFlag: [
{ required: true, message: '璇烽�夋嫨鍙傛暟妯℃澘!' },
diff --git a/src/views/tms/modules/toolsClassify/ToolsClassifyListRight.vue b/src/views/tms/modules/toolsClassify/ToolsClassifyListRight.vue
index fa65571..97a1ed8 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