From d04ce900df68cd59595ca3cbefb094450ac5331c Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期二, 26 三月 2024 23:18:25 +0800
Subject: [PATCH] 工位组功能
---
src/views/basicdata/machine/workstation.vue | 142 ++++++++++++++++++++++++++++-------------------
1 files changed, 85 insertions(+), 57 deletions(-)
diff --git a/src/views/basicdata/machine/workstation.vue b/src/views/basicdata/machine/workstation.vue
index a656538..5b23675 100644
--- a/src/views/basicdata/machine/workstation.vue
+++ b/src/views/basicdata/machine/workstation.vue
@@ -76,13 +76,10 @@
<el-aside width="200px" v-loading="showGrouploading">
<el-container>
<el-main class="nopadding">
- <el-tree ref="group" class="menu" node-key="id" :data="group"
- :current-node-key="treeCheckKey"
- :highlight-current="true"
- :expand-on-click-node="false"
- :check-on-click-node="true"
- :default-expanded-keys="[1]"
- :filter-node-method="groupFilterNode"
+ <el-tree ref="group" class="menu" node-key="id" :data="group"
+ :current-node-key="treeCheckKey" :highlight-current="true"
+ :expand-on-click-node="false" :check-on-click-node="true"
+ :default-expanded-keys="[1]" :filter-node-method="groupFilterNode"
@node-click="groupClick"></el-tree>
</el-main>
</el-container>
@@ -91,51 +88,67 @@
<el-header>
<div class="left-panel">
<el-button type="primary" plain>鏂板涓嬬骇</el-button>
- <el-button v-show="!['1','101'].includes(treeCheckedNode.id)" type="danger" plain>鍒犻櫎</el-button>
+ <el-button v-show="!['1', '101'].includes(treeCheckedNode.id)" type="danger"
+ plain>鍒犻櫎</el-button>
</div>
</el-header>
<el-main class="">
- <ul class="show-info" v-show="['1','101'].includes(treeCheckedNode.id)">
- <li>鍚嶇О: {{treeCheckedNode.name}}</li>
- <li>鎺掑簭: {{treeCheckedNode.sort}}</li>
- <li>澶囨敞: {{treeCheckedNode.remark}}</li>
+ <ul class="show-info" v-show="['1', '101'].includes(treeCheckedNode.id)">
+ <li>鍚嶇О: {{ treeCheckedNode.name }}</li>
+ <li>鎺掑簭: {{ treeCheckedNode.sort }}</li>
+ <li>澶囨敞: {{ treeCheckedNode.remark }}</li>
</ul>
- <el-form v-show="beltline_type.map(item => item.dictKey).includes(treeCheckedNode.groupTag)" :model="form" :rules="rules" ref="dialogForm" label-width="200px"
+ <el-form
+ v-show="beltline_type.map(item => item.dictKey).includes(treeCheckedNode.groupTag)"
+ :model="form" :rules="rules" ref="dialogForm" label-width="200px"
label-position="left">
- <el-form-item label="浜х嚎鏍囩" prop="meta.title">
- <el-input v-model="form.meta.title" clearable placeholder="宸ヤ綅缁勫悕绉�"></el-input>
+ <el-form-item label="浜х嚎鏍囩" prop="groupTag">
+ <el-select v-model="form.groupTag" clearable placeholder="浜х嚎鏍囩"
+ style="width: 240px">
+ <el-option v-for="item in beltline_type" :key="item.dictKey"
+ :label="item.dictValue" :value="item.dictKey" />
+ </el-select>
</el-form-item>
- <el-form-item label="浜х嚎鍚嶇О" prop="meta.title">
- <el-input v-model="form.meta.title" clearable placeholder="宸ヤ綅缁勫悕绉�"></el-input>
+ <el-form-item label="浜х嚎鍚嶇О" prop="name">
+ <el-input style="width: 240px" v-model="form.name" clearable
+ placeholder="浜х嚎鍚嶇О"></el-input>
</el-form-item>
- <el-form-item label="浜х嚎鎺掑簭" prop="meta.title">
- <el-input v-model="form.meta.title" clearable placeholder="宸ヤ綅缁勫悕绉�"></el-input>
+ <el-form-item label="浜х嚎鎺掑簭" prop="sort">
+ <el-input style="width: 240px" v-model="form.sort" clearable
+ placeholder="浜х嚎鎺掑簭"></el-input>
</el-form-item>
- <el-form-item label="澶囨敞" prop="meta.title">
- <el-input v-model="form.meta.title" clearable placeholder="宸ヤ綅缁勫悕绉�"></el-input>
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input type="textarea" style="width: 240px" v-model="form.remark" clearable
+ placeholder="澶囨敞"></el-input>
</el-form-item>
</el-form>
- <ul v-show="group_tag.map(item => item.dictKey).includes(treeCheckedNode.groupTag)">
- <li>浜х嚎鍚嶇О:鍗冩枃绉戞妧</li>
- <li>浜х嚎鏍囩:鏌旀�т骇绾�</li>
- <li>澶囨敞:</li>
- </ul>
- <el-form v-show="group_tag.map(item => item.dictKey).includes(treeCheckedNode.groupTag)" :model="form" :rules="rules" ref="dialogForm" label-width="200px"
+ <el-form v-show="group_tag.map(item => item.dictKey).includes(treeCheckedNode.groupTag)"
+ :model="form" :rules="rules" ref="dialogForm" label-width="200px"
label-position="left">
- <el-form-item label="宸ヤ綅缁勫悕绉�" prop="meta.title">
- <el-input v-model="form.meta.title" clearable placeholder="宸ヤ綅缁勫悕绉�"></el-input>
+ <el-form-item label="宸ヤ綅缁勬爣绛�" prop="groupTag">
+ <el-select v-model="form.groupTag" clearable placeholder="宸ヤ綅缁勬爣绛�"
+ style="width: 240px">
+ <el-option v-for="item in group_tag" :key="item.dictKey"
+ :label="item.dictValue" :value="item.dictKey" />
+ </el-select>
</el-form-item>
- <el-form-item label="宸ヤ綅缁勬帓搴�" prop="meta.title">
- <el-input v-model="form.meta.title" clearable placeholder="宸ヤ綅缁勫悕绉�"></el-input>
+ <el-form-item label="宸ヤ綅缁勫悕绉�" prop="name">
+ <el-input style="width: 240px" v-model="form.name" clearable
+ placeholder="宸ヤ綅缁勫悕绉�"></el-input>
</el-form-item>
- <el-form-item label="宸ヤ綅缁勬爣绛�" prop="meta.title">
- <el-input v-model="form.meta.title" clearable placeholder="宸ヤ綅缁勫悕绉�"></el-input>
+ <el-form-item label="宸ヤ綅缁勬帓搴�" prop="sort">
+ <el-input-number v-model="form.sort" :min="0" :max="10" />
</el-form-item>
- <el-form-item label="澶囨敞" prop="meta.title">
- <el-input v-model="form.meta.title" clearable placeholder="宸ヤ綅缁勫悕绉�"></el-input>
+ <el-form-item label="澶囨敞" prop="remark">
+ <el-input type="textarea" style="width: 240px" v-model="form.remark" clearable
+ placeholder="澶囨敞"></el-input>
</el-form-item>
</el-form>
</el-main>
+ <el-main v-show="!['1', '101'].includes(treeCheckedNode.id)">
+ <el-button style="width: 100px" type="primary" plain>鎻愪氦</el-button>
+ </el-main>
+
</el-container>
</el-container>
</el-tab-pane>
@@ -157,11 +170,16 @@
groupFilterText: '',
// --------
form: {
- meta: {
-
- }
+ groupTag: '',
+ name: '',
+ sort: '',
+ remark: ''
},
- rules: {},
+ rules: {
+ groupTag: { required: true, message: '蹇呭～', trigger: 'blur' },
+ name: { required: true, message: '蹇呭～', trigger: 'blur' },
+ sort: { required: true, message: '蹇呭～', trigger: 'blur' }
+ },
treeCheckedNode: {},
treeCheckKey: [],
beltline_type: [],
@@ -169,8 +187,16 @@
}
},
watch: {
- activeName () {
+ activeName() {
this.queryList()
+ },
+ treeCheckedNode: {
+ handler (val) {
+ Object.keys(this.form).forEach(key => {
+ this.form[key] = val?.[key]
+ })
+ },
+ deep: true
}
},
created() {
@@ -178,40 +204,42 @@
this.queryList()
},
methods: {
- init () {
- this.$API.system.dic.getDic.get({code: 'beltline_type'}).then(res => {
+ init() {
+ this.$API.system.dic.getDic.get({ code: 'beltline_type' }).then(res => {
this.beltline_type = res.data
})
- this.$API.system.dic.getDic.get({code: 'group_tag'}).then(res => {
+ this.$API.system.dic.getDic.get({ code: 'group_tag' }).then(res => {
this.group_tag = res.data
})
-
+
},
- queryList () {
+ queryList() {
this.showGrouploading = true
this.$API.basicdata.getWorkstationGroup.get().then(res => {
- if (res.code == 200) {
- let parent = res.data.filter(item => item.parentId == 0)[0]
- this.treeCheckedNode = parent
- this.treeCheckKey = parent.id
- let data = this.formatData(res.data)
- this.group = data
- this.showGrouploading = false
- }
- })
+ if (res.code == 200) {
+ let parent = res.data.filter(item => item.parentId == 0)[0]
+ this.treeCheckedNode = parent
+ this.treeCheckKey = parent.id
+ let data = this.formatData(res.data)
+ this.group = data
+ this.showGrouploading = false
+ }
+ })
},
formatData(data, current) {
let newData = []
if (!current) {
newData = data.filter(item => item.parentId == 0).map(v => {
- v.children = this.formatData(data, v)
+ v.children = this.formatData(data, v).sort((a, b) => {
+ return b.sort - a.sort
+ })
return v
})
} else {
let res = data.filter(v => v.parentId === current.id)
res = res.map(item => {
- item.children = this.formatData(data, item).sort((a,b) => {
- return a.sort - b.sort
+ item.children = this.formatData(data, item).sort((a, b) => {
+ return b.sort - a.sort
})
return item
})
--
Gitblit v1.9.3