From a98deb841df1cf0fa5df1f91d034e224c4c0dbc0 Mon Sep 17 00:00:00 2001
From: gaoshp <291585735@qq.com>
Date: 星期三, 27 三月 2024 21:28:01 +0800
Subject: [PATCH] Merge branch 'gaoshp'
---
src/views/basicdata/machine/workstation.vue | 274 +++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 258 insertions(+), 16 deletions(-)
diff --git a/src/views/basicdata/machine/workstation.vue b/src/views/basicdata/machine/workstation.vue
index 53d10bc..d113566 100644
--- a/src/views/basicdata/machine/workstation.vue
+++ b/src/views/basicdata/machine/workstation.vue
@@ -65,15 +65,142 @@
</el-button-group>
</template>
</el-table-column>
-
</scTable>
</el-main>
</el-container>
</el-container>
</el-tab-pane>
-
+ <!-- 宸ヤ綅缁� -->
<el-tab-pane label="宸ヤ綅缁�" name="2">
-
+ <el-container>
+ <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]"
+ :render-content="renderContent"
+ :filter-node-method="groupFilterNode"
+ @node-click="groupClick"></el-tree>
+ </el-main>
+ </el-container>
+ </el-aside>
+ <el-container>
+ <el-main class="" v-show="addGroupShow">
+ <el-form
+ v-show="treeCheckedNode.id == 1"
+ :model="form" :rules="rules" ref="dialogForm" label-width="200px"
+ label-position="left">
+ <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="name">
+ <el-input style="width: 240px" v-model="form.name" clearable
+ placeholder="浜х嚎鍚嶇О"></el-input>
+ </el-form-item>
+ <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="remark">
+ <el-input type="textarea" style="width: 240px" v-model="form.remark" clearable
+ placeholder="澶囨敞"></el-input>
+ </el-form-item>
+ </el-form>
+ <el-form v-show="group_tag.map(item => item.dictKey).includes(treeCheckedNode.groupTag) || beltline_type.map(item => item.dictKey).includes(treeCheckedNode.groupTag) || treeCheckedNode.id == 101"
+ :model="form" :rules="rules" ref="dialogForm" label-width="200px"
+ label-position="left">
+ <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="name">
+ <el-input style="width: 240px" v-model="form.name" clearable
+ placeholder="宸ヤ綅缁勫悕绉�"></el-input>
+ </el-form-item>
+ <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="remark">
+ <el-input type="textarea" style="width: 240px" v-model="form.remark" clearable
+ placeholder="澶囨敞"></el-input>
+ </el-form-item>
+ </el-form>
+ </el-main>
+ <el-header v-show="!addGroupShow">
+ <div class="left-panel">
+ <el-button @click="addChild" type="primary" plain>鏂板涓嬬骇</el-button>
+ <el-button @click="deleteWorkGroup" v-show="!['1', '101'].includes(treeCheckedNode.id)" type="danger"
+ plain>鍒犻櫎</el-button>
+ </div>
+ </el-header>
+ <el-main class="" v-show="!addGroupShow">
+ <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"
+ label-position="left">
+ <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="name">
+ <el-input style="width: 240px" v-model="form.name" clearable
+ placeholder="浜х嚎鍚嶇О"></el-input>
+ </el-form-item>
+ <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="remark">
+ <el-input type="textarea" style="width: 240px" v-model="form.remark" clearable
+ placeholder="澶囨敞"></el-input>
+ </el-form-item>
+ </el-form>
+ <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="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="name">
+ <el-input style="width: 240px" v-model="form.name" clearable
+ placeholder="宸ヤ綅缁勫悕绉�"></el-input>
+ </el-form-item>
+ <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="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) || addGroupShow">
+ <el-button @click="saveWorkstationGroup" style="width: 100px" type="primary"
+ plain>鎻愪氦</el-button>
+ </el-main>
+ </el-container>
+ </el-container>
</el-tab-pane>
</el-tabs>
@@ -82,46 +209,156 @@
</template>
<script>
+import pmsPng from '@/assets/pms.png'
export default {
name: 'system',
data() {
return {
- activeName: '1',
+ showGrouploading: false,
+ options: [],
+ activeName: '2',
group: [],
- groupFilterText: ''
+ groupFilterText: '',
+ // --------
+ form: {
+ groupTag: '',
+ name: '',
+ sort: '',
+ remark: ''
+ },
+ rules: {
+ groupTag: { required: true, message: '蹇呭～', trigger: 'blur' },
+ name: { required: true, message: '蹇呭～', trigger: 'blur' },
+ sort: { required: true, message: '蹇呭～', trigger: 'blur' }
+ },
+ treeCheckedNode: {},
+ treeCheckKey: [],
+ beltline_type: [],
+ group_tag: [],
+ addGroupShow: false
+ }
+ },
+ watch: {
+ activeName() {
+ this.queryList()
+ },
+ treeCheckedNode: {
+ handler(val) {
+ this.addGroupShow = false
+ Object.keys(this.form).forEach(key => {
+ this.form[key] = val?.[key]
+ })
+ },
+ deep: true
}
},
created() {
- this.$API.basicdata.getWorkstationGroup.get().then(res => {
- if (res.code == 200) {
- let data = this.formatData(res.data)
- this.group = data
- }
- })
+ this.init()
+ this.queryList()
},
methods: {
+ renderContent (h, {node,data}) {
+ console.log(node,data)
+ let img = data.groupTag == 'fms_beltline'
+ return h('span',{
+
+ },
+ img ? h('img', {
+ src: pmsPng
+ }, '') : '',
+ data.name)
+ },
+ 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.group_tag = res.data
+ })
+
+ },
+ queryList(flag) {
+ this.showGrouploading = true
+ this.$API.basicdata.getWorkstationGroup.get().then(res => {
+ if (res.code == 200) {
+ if (!flag) {
+ let parent = res.data.filter(item => item.parentId == 0)[0]
+ this.treeCheckedNode = parent
+ this.treeCheckKey = parent.id
+ } else {
+ let parent = res.data.filter(item => item.id == this.treeCheckedNode.id)[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)
+ item.children = this.formatData(data, item).sort((a, b) => {
+ return b.sort - a.sort
+ })
return item
})
return res
}
return newData
},
+ async saveWorkstationGroup() {
+ const validate = await this.$refs.dialogForm.validate().catch(()=>{})
+ if(!validate){ return false }
+ if (this.addGroupShow) {
+ let data = Object.assign({
+ code: "",
+ fullName: "",
+ id: "",
+ parentId: this.treeCheckedNode.id,
+ status: 1,
+ groupType: this.treeCheckedNode.groupType,
+ groupCategory: this.treeCheckedNode.groupCategory
+ },this.form)
+ return this.$API.basicdata.saveWorkstationGroup.post(data).then(res => {
+ console.log(res)
+ this.queryList(true)
+ })
+ }
+ let data = Object.assign({},this.treeCheckedNode,this.form)
+ this.$API.basicdata.saveWorkstationGroup.put(data).then(res => {
+ console.log(res)
+ this.queryList(true)
+ })
+ },
+ deleteWorkGroup () {
+ this.$API.basicdata.deleteWorkGroup.delete({
+ groupId: this.treeCheckedNode.id
+ }).then(() => {
+ this.queryList()
+ })
+ },
+ addChild () {
+ this.addGroupShow = true
+ this.$refs.dialogForm.resetFields()
+ },
groupFilterNode() {
},
- groupClick() {
-
+ groupClick(node) {
+ console.log(node)
+ this.treeCheckedNode = node
},
table_add() {
var newRow = {
@@ -146,4 +383,9 @@
}
</script>
-<style></style>
+<style scoped>
+.show-info {
+ list-style: none;
+ font-size: 14px;
+}
+</style>
--
Gitblit v1.9.3