From 135b5b2e497514dc4456e33b0db0fe5e7fa4e62f Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 11 八月 2025 09:11:19 +0800
Subject: [PATCH] 现场问题处理
---
src/views/tms/modules/baseTools/ParaThreadingToolModal.vue | 295 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 213 insertions(+), 82 deletions(-)
diff --git a/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue b/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
index d0db317..cfaa270 100644
--- a/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
+++ b/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
@@ -16,62 +16,106 @@
</a-divider>
<a-row :gutter="24">
- <a-col :span="8">
- <a-form-model-item prop="classifyNum" label="宸ュ叿鍒嗙被缂栫爜">
- <a-input placeholder="璇疯緭鍏ュ伐鍏峰垎绫荤紪鐮�" v-model="model.classifyNum" :disabled="true" />
- </a-form-model-item>
+ <a-col :span="6">
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item prop="classifyNum" label="宸ュ叿鍒嗙被缂栫爜">
+ <a-input placeholder="璇疯緭鍏ュ伐鍏峰垎绫荤紪鐮�" v-model="model.classifyNum" :disabled="true" />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item prop="classifyName" label="宸ュ叿鍒嗙被鍚嶇О">
+ <a-input placeholder="璇疯緭鍏ュ伐鍏峰垎绫诲悕绉�" v-model="model.classifyName" :disabled="true" />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item prop="toolCode" label="宸ュ叿缂栫爜">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ伐鍏风紪鐮�'" v-model="model.toolCode" :disabled="disableSubmit"/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item prop="accuracyClass" label="绮惧害绛夌骇">
+ <j-dict-select-tag
+ :disabled="disableSubmit"
+ type="list"
+ v-model="model.accuracyClass"
+ :triggerChange="true"
+ dictCode="accuracy_class"
+ :placeholder="disableSubmit?'':'璇烽�夋嫨绮惧害绛夌骇'"
+ />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
</a-col>
- <a-col :span="8">
- <a-form-model-item prop="classifyName" label="宸ュ叿鍒嗙被鍚嶇О">
- <a-input placeholder="璇疯緭鍏ュ伐鍏峰垎绫诲悕绉�" v-model="model.classifyName" :disabled="true" />
- </a-form-model-item>
+
+ <a-col :span="6">
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item prop="chineseName"
+ label="涓枃鍚嶇О">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヤ腑鏂囧悕绉�'" v-model="model.chineseName" :disabled="disableSubmit" @change="e => chineseNameChange(e.target.value)"/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item prop="foreignLanguageName"
+ label="澶栨枃鍚嶇О">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ鏂囧悕绉�'" v-model="model.foreignLanguageName" :disabled="disableSubmit" />
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item prop="toolModel"
+ label="鍨嬪彿/鍥惧彿">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瀷鍙�/鍥惧彿'" v-model="model.toolModel" :disabled="disableSubmit" @change="e => toolModelChange(e.target.value)"/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
</a-col>
- <a-col :span="8">
- <a-form-model-item prop="toolCode" label="宸ュ叿缂栫爜">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ伐鍏风紪鐮�'" v-model="model.toolCode" :disabled="disableSubmit"/>
- </a-form-model-item>
+
+ <a-col :span="6">
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item prop="standardLevel"
+ label="鏍囨敞绾у埆">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ爣鍑嗙骇鍒�'" v-model="model.standardLevel" :disabled="disableSubmit"/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item prop="standardCode" label="鏍囧噯鍙�">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ爣鍑嗗彿'" v-model="model.standardCode" :disabled="disableSubmit"/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item prop="signCode" label="搴忓彿">
+ <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ簭鍙�'" v-model="model.signCode" :disabled="disableSubmit"/>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ </a-col>
+
+ <a-col :span="6">
+ <a-row>
+ <a-col :span="24">
+ <a-form-model-item label='' :labelCol='{span:4}' :wrapperCol='{span:20}'>
+ <j-image-upload text='涓婁紶宸ュ叿鍥剧墖' v-model='model.toolPicture'></j-image-upload>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
</a-col>
</a-row>
-
- <a-row>
- <a-col :span="8">
- <a-form-model-item prop="chineseName"
- label="涓枃鍚嶇О">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヤ腑鏂囧悕绉�'" v-model="model.chineseName" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="8">
- <a-form-model-item prop="foreignLanguageName"
- label="澶栨枃鍚嶇О">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ鏂囧悕绉�'" v-model="model.foreignLanguageName" :disabled="disableSubmit" />
- </a-form-model-item>
- </a-col>
- <a-col :span="8">
- <a-form-model-item prop="toolModel"
- label="鍨嬪彿/鍥惧彿">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瀷鍙�/鍥惧彿'" v-model="model.toolModel" :disabled="disableSubmit" />
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span="8">
- <a-form-model-item prop="standardLevel"
- label="鏍囨敞绾у埆">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ爣鍑嗙骇鍒�'" v-model="model.standardLevel" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="8">
- <a-form-model-item prop="standardCode" label="鏍囧噯鍙�">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ爣鍑嗗彿'" v-model="model.standardCode" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- <a-col :span="8">
- <a-form-model-item prop="signCode" label="搴忓彿">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ簭鍙�'" v-model="model.signCode" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
- </a-row>
-
<a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 绠＄悊鍙傛暟
</a-divider>
@@ -79,7 +123,7 @@
<a-col :span="8">
<a-form-model-item prop="applicationType"
label="宸ュ叿绫诲瀷">
- <j-dict-select-tag dict-code="equipment_category" :placeholder="disableSubmit?'':'璇烽�夋嫨宸ュ叿绫诲瀷'"
+ <j-dict-select-tag dict-code="application_type" :placeholder="disableSubmit?'':'璇烽�夋嫨宸ュ叿绫诲瀷'"
v-model="model.applicationType" :disabled="disableSubmit" />
</a-form-model-item>
</a-col>
@@ -89,18 +133,28 @@
</a-form-model-item>
</a-col>
<a-col :span="8">
- <a-form-model-item prop="positionCode" label="搴撲綅鍙�">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ簱浣嶅彿'" v-model="model.positionCode" :disabled="disableSubmit"/>
+ <!-- <a-form-model-item prop="positionCode" label="搴撲綅鍙�">
+ <a-select
+ :disabled="disableSubmit"
+ :triggerChange="true"
+ :options="locationCodeOptions"
+ v-model="model.positionCode"
+ />
+ </a-form-model-item> -->
+ <a-form-model-item label="搴撲綅" :labelCol="labelCol" :wrapperCol="wrapperCol">
+ <a-tooltip title="閫夋嫨搴撲綅鍚庯紝姝ょ被鍒�鍏烽粯璁ゅ瓨鍌ㄥ埌姝ゅ簱浣嶏紝璇锋厧閲嶉�夋嫨锛�" placement="topRight">
+ <a-input-search
+ v-model="model.positionCode"
+ @search="positionCodeSearch"
+ enter-button
+ placeholder="璇烽�夋嫨搴撲綅"
+ />
+ </a-tooltip>
</a-form-model-item>
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="8">
- <a-form-model-item prop="storageLocation" label="瀛樺偍浣嶇疆">
- <a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ瓨鍌ㄤ綅缃�'" v-model="model.storageLocation" :disabled="disableSubmit"/>
- </a-form-model-item>
- </a-col>
<a-col :span="8">
<a-form-model-item prop="lowerInventory" label="鏈�浣庡簱瀛�">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ渶浣庡簱瀛�'" v-model="model.lowerInventory" :disabled="disableSubmit"/>
@@ -111,9 +165,6 @@
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ユ渶楂樺簱瀛�'" v-model="model.highestInventory" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="auxiliaryUnitFlag" label="鏄惁鏈夎閲忚緟鍗曚綅">
<a-radio-group v-model="model.auxiliaryUnitFlag" :placeholder="disableSubmit?'':'璇烽�夋嫨鏄惁鏈夎閲忚緟鍗曚綅'" :disabled="disableSubmit">
@@ -122,6 +173,9 @@
</a-radio-group>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="mainUnit" label="璁￠噺涓诲崟浣�">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ閲忎富鍗曚綅'" v-model="model.mainUnit" :disabled="disableSubmit"/>
@@ -132,14 +186,14 @@
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ヨ閲忚緟鍗曚綅'" v-model="model.auxiliaryUnit" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
- </a-row>
-
- <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="supplierId" label="鍘傚">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ巶瀹�'" v-model="model.supplierId" :disabled="disableSubmit"/>
</a-form-model-item>
</a-col>
+ </a-row>
+
+ <a-row :gutter="24">
<a-col :span="8">
<a-form-model-item prop="price" label="鍗曚环">
<a-input :placeholder="disableSubmit?'':'璇疯緭鍏ュ崟浠�'" v-model="model.price" :disabled="disableSubmit"/>
@@ -157,13 +211,41 @@
<a-row :gutter="24">
<a-col :span="6">
+ <a-form-model-item label="宸ュ叿绠�绉�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shortCalled">
+ <a-input
+ v-model="model.shortCalled"
+ :placeholder="disableSubmit ? '' : '璇疯緭鍏ュ伐鍏风畝绉�'"
+ :disabled="disableSubmit"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="6">
+ <a-form-model-item label="闆嗗洟鍏徃缂栫爜" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="groupCompanyCode">
+ <a-input
+ v-model="model.groupCompanyCode"
+ :placeholder="disableSubmit ? '' : '璇疯緭鍏ラ泦鍥㈠叕鍙哥紪鐮�'"
+ :disabled="disableSubmit"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="12">
+ <a-form-model-item label="闆嗗洟鍏徃鏍囪" :labelCol="{span:4}" :wrapperCol="{span:20}" prop="groupCompanySign">
+ <a-input
+ v-model="model.groupCompanySign"
+ :disabled="true"
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
+ <a-col :span="6">
<a-form-model-item label="铻虹汗浠ｅ彿" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadCode">
- <a-input v-model="model.threadCode" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ灪绾逛唬鍙�'" :disabled="disableSubmit"></a-input>
+ <a-input v-model="model.threadCode" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ灪绾逛唬鍙�'" :disabled="disableSubmit" @change="e => threadCodeChange(e.target.value)"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="6">
<a-form-model-item label="铻鸿窛" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pitch">
- <a-input v-model="model.pitch" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ灪璺�'" :disabled="disableSubmit"></a-input>
+ <a-input v-model="model.pitch" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ灪璺�'" :disabled="disableSubmit" @change="e => pitchChange(e.target.value)"></a-input>
</a-form-model-item>
</a-col>
<a-col :span="6">
@@ -172,7 +254,7 @@
</a-form-model-item>
</a-col>
<a-col :span="6">
- <a-form-model-item label="铻虹汗鍏樊甯︿唬鍙�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tolerancezoneLevel">
+ <a-form-model-item label="铻虹汗鍏樊甯︿唬鍙�" :labelCol="{span:12}" :wrapperCol="{span:12}" prop="tolerancezoneLevel">
<a-input v-model="model.tolerancezoneLevel" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ灪绾瑰叕宸甫浠ｅ彿'" :disabled="disableSubmit"></a-input>
</a-form-model-item>
</a-col>
@@ -224,13 +306,13 @@
<a-input v-model="model.technicalConditions" :placeholder="disableSubmit?'':'璇疯緭鍏ラ檮鍔犳妧鏈潯浠�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row>
<a-col :span="6">
- <a-form-model-item label="闄勫姞鎶�鏈潯浠惰鏄�" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="conditionsInfo">
+ <a-form-model-item label="闄勫姞鎶�鏈潯浠惰鏄�" :labelCol="{span:12}" :wrapperCol="{span:12}" prop="conditionsInfo">
<a-input v-model="model.conditionsInfo" :placeholder="disableSubmit?'':'璇疯緭鍏ラ檮鍔犳妧鏈潯浠惰鏄�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
- </a-row>
- <a-row>
<a-col :span="6">
<a-form-model-item label="鍝佺墝" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
<a-input v-model="model.brand" :placeholder="disableSubmit?'':'璇疯緭鍏ュ搧鐗�'" :disabled="disableSubmit" ></a-input>
@@ -246,13 +328,13 @@
<a-input v-model="model.coolingMethod" :placeholder="disableSubmit?'':'璇疯緭鍏ュ喎鍗存柟寮�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
- <a-col :span="6">
+ </a-row>
+ <a-row>
+ <a-col :span="6">
<a-form-model-item label="铻虹汗鏍囧噯" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadStandard">
<a-input v-model="model.threadStandard" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ灪绾规爣鍑�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
- </a-row>
- <a-row>
<a-col :span="6">
<a-form-model-item label="鎺掑睉妲藉瀷" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fluteSoltType">
<a-input v-model="model.fluteSoltType" :placeholder="disableSubmit?'':'璇疯緭鍏ユ帓灞戞Ы鍨�'" :disabled="disableSubmit" ></a-input>
@@ -268,13 +350,13 @@
<a-input v-model="model.guidingSize" :placeholder="disableSubmit?'':'璇疯緭鍏ュ鍚戝昂瀵�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
+ </a-row>
+ <a-row>
<a-col :span="6">
<a-form-model-item label="杩炴帴瀛斿緞" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="connectionAperture">
<a-input v-model="model.connectionAperture" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ繛鎺ュ瓟寰�'" :disabled="disableSubmit" ></a-input>
</a-form-model-item>
</a-col>
- </a-row>
- <a-row>
<a-col :span="6">
<a-form-model-item label="杩炴帴閿Ы" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="connectingKeyway">
<a-input v-model="model.connectingKeyway" :placeholder="disableSubmit?'':'璇疯緭鍏ヨ繛鎺ラ敭妲�'" :disabled="disableSubmit" ></a-input>
@@ -290,19 +372,21 @@
</a-row>
</a-form-model>
</a-spin>
+ <select-position-code-modal ref="selectPositionCodeModal" :title="'閫夋嫨搴撲綅'" />
</j-modal>
</template>
<script>
import { getAction,postAction, httpAction } from '@/api/manage'
-import { validateDuplicateValueInDelFlag } from '@/utils/util'
import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
-import { getSystemConfigValue } from '@api/api'
- import { duplicateCheck } from '@/api/api'//閲嶅鏍￠獙
+import { duplicateCheck } from '@/api/api'//閲嶅鏍￠獙
+import { ajaxGetDictItems } from '@/api/api'
+ import JDictSelectTag from '@/components/dict/JDictSelectTag'
+ import SelectPositionCodeModal from './SelectPositionCodeModal'
export default {
name: 'ParaHoleToolsModal',
- components: { JSelectProduction },
+ components: { JSelectProduction,JDictSelectTag,SelectPositionCodeModal },
data() {
return {
title: '鎿嶄綔',
@@ -330,6 +414,9 @@
},
confirmLoading: false,
validatorRules: {
+ accuracyClass:[
+ { required: true, message: '璇烽�夋嫨绮惧害绛夌骇' },
+ ],
toolCode: [
{ required: true, message: '璇疯緭鍏ュ伐鍏风紪鐮�' },
{ validator: this.validateNum }
@@ -382,15 +469,32 @@
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
},
+ locationCodeOptions:[],
+ chineseNameChange1:'',
+ toolModelChange1:'',
+ threadCodeChange1:'',
+ pitchChange1:'',
}
},
created() {
+ ajaxGetDictItems("tms_goods_shelves,location_code,id", null).then((res) => {
+ if (res.success) {
+ this.locationCodeOptions = res.result
+ }
+ })
+ },
+ mounted() {
+ this.$bus.$on('selectionRows', (data) => {
+ this.model.positionCode = data[0].positionCode
+ })
},
methods: {
add(nodeSelected) {
this.editable = false;
//鍒濆鍖栭粯璁ゅ��
- this.model = {};
+ this.model = {
+ positionCode: ''
+ };
this.model.classifyId = nodeSelected.key
this.model.classifyNum = nodeSelected.entity.classifyId
this.model.classifyName = nodeSelected.entity.typeName
@@ -406,6 +510,17 @@
this.$emit('close')
this.visible = false
this.$refs.form.clearValidate()
+ this.chineseNameChange1 = '',
+ this.toolModelChange1 = '',
+ this.threadCodeChange1 = '',
+ this.pitchChange1 = ''
+ },
+ positionCodeSearch() {
+ let positionCode = []
+ positionCode.push(this.model.positionCode)
+ this.$refs.selectPositionCodeModal.showModal(positionCode)
+ this.$refs.selectPositionCodeModal.title = '閫夋嫨搴撲綅'
+ this.$refs.selectPositionCodeModal.disableSubmit = false
},
handleOk() {
const that = this
@@ -472,6 +587,22 @@
}
})
},
+ chineseNameChange(chineseNameChange){
+ this.chineseNameChange1 = chineseNameChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.threadCodeChange1+this.pitchChange1
+ },
+ toolModelChange(toolModelChange){
+ this.toolModelChange1 = toolModelChange == '' ? '' : '-'+toolModelChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.threadCodeChange1+this.pitchChange1
+ },
+ threadCodeChange(threadCodeChange){
+ this.threadCodeChange1 = threadCodeChange == '' ? '' : '-'+threadCodeChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.threadCodeChange1+this.pitchChange1
+ },
+ pitchChange(pitchChange){
+ this.pitchChange1 = pitchChange == '' ? '' : '-'+pitchChange
+ this.model.groupCompanySign = this.chineseNameChange1+this.toolModelChange1+this.threadCodeChange1+this.pitchChange1
+ }
}
}
</script>
--
Gitblit v1.9.3