From 7fbe0f95cf428eb516f9015adae8bbe4baf539d4 Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期五, 25 七月 2025 11:01:15 +0800
Subject: [PATCH] 安灯管理列表筛选条件修改
---
src/views/tms/modules/baseTools/ParaThreadingToolModal.vue | 202 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 143 insertions(+), 59 deletions(-)
diff --git a/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue b/src/views/tms/modules/baseTools/ParaThreadingToolModal.vue
index d0db317..82a61ad 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"/>
+ </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" />
+ </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>
@@ -89,8 +133,23 @@
</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>
@@ -290,19 +349,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 +391,9 @@
},
confirmLoading: false,
validatorRules: {
+ accuracyClass:[
+ { required: true, message: '璇烽�夋嫨绮惧害绛夌骇' },
+ ],
toolCode: [
{ required: true, message: '璇疯緭鍏ュ伐鍏风紪鐮�' },
{ validator: this.validateNum }
@@ -382,15 +446,28 @@
add: '/tms/baseTools/add',
edit: '/tms/baseTools/edit',
},
+ locationCodeOptions:[]
}
},
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
@@ -407,6 +484,13 @@
this.visible = false
this.$refs.form.clearValidate()
},
+ 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
// 瑙﹀彂琛ㄥ崟楠岃瘉
--
Gitblit v1.9.3