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 | 265 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 194 insertions(+), 71 deletions(-)
diff --git a/src/views/basicdata/machine/workstation.vue b/src/views/basicdata/machine/workstation.vue
index 99ce2b5..5b23675 100644
--- a/src/views/basicdata/machine/workstation.vue
+++ b/src/views/basicdata/machine/workstation.vue
@@ -1,34 +1,39 @@
<template>
<el-main>
<el-card shadow="never">
- <el-tabs tab-position="top" class="custom-tabs">
- <el-tab-pane label="宸ヤ綅">
+ <el-tabs tab-position="top" class="custom-tabs" v-model="activeName">
+ <el-tab-pane label="宸ヤ綅" name="1">
<el-container>
<el-aside width="200px" v-loading="showGrouploading">
<el-container>
- <el-header>
- <el-input placeholder="杈撳叆鍏抽敭瀛楄繘琛岃繃婊�" v-model="groupFilterText" clearable></el-input>
- </el-header>
<el-main class="nopadding">
<el-tree ref="group" class="menu" node-key="id" :data="group" :current-node-key="''"
:highlight-current="true" :expand-on-click-node="false"
- :filter-node-method="groupFilterNode" @node-click="groupClick"></el-tree>
+ :default-expanded-keys="[1]" :filter-node-method="groupFilterNode"
+ @node-click="groupClick"></el-tree>
</el-main>
</el-container>
</el-aside>
<el-container>
<el-header>
<div class="left-panel">
- <el-button type="primary" icon="el-icon-plus" @click="add"></el-button>
- <el-button type="danger" plain icon="el-icon-delete"
- :disabled="selection.length == 0" @click="batch_del"></el-button>
- <el-button type="primary" plain :disabled="selection.length == 0">鍒嗛厤瑙掕壊</el-button>
- <el-button type="primary" plain :disabled="selection.length == 0">瀵嗙爜閲嶇疆</el-button>
+ <el-button type="primary" icon="el-icon-plus"></el-button>
+ <el-button type="danger" plain icon="el-icon-delete"></el-button>
+ <el-button type="primary" plain>瀵煎叆</el-button>
+ <el-button type="primary" plain>鎵归噺鎿嶄綔</el-button>
</div>
<div class="right-panel">
<div class="right-panel-search">
- <el-input v-model="search.name" placeholder="鐧诲綍璐﹀彿 / 濮撳悕" clearable></el-input>
- <el-button type="primary" icon="el-icon-search" @click="upsearch"></el-button>
+ <el-select v-model="value" placeholder="Select" style="width: 240px">
+ <el-option v-for="item in options" :key="item.value" :label="item.label"
+ :value="item.value" />
+ </el-select>
+ <el-select v-model="value" placeholder="Select" style="width: 240px">
+ <el-option v-for="item in options" :key="item.value" :label="item.label"
+ :value="item.value" />
+ </el-select>
+ <el-input style="width: 240px" placeholder="璇疯緭鍏ュ伐浣嶅悕绉�/缂栧彿" clearable></el-input>
+ <el-button type="primary" icon="el-icon-search"></el-button>
</div>
</div>
</el-header>
@@ -36,22 +41,13 @@
<scTable ref="table" :apiObj="apiObj" @selection-change="selectionChange" stripe
remoteSort remoteFilter>
<el-table-column type="selection" width="50"></el-table-column>
- <el-table-column label="ID" prop="id" width="80"
+ <el-table-column label="宸ヤ綅缂栧彿" prop="id" width="120"
sortable='custom'></el-table-column>
- <el-table-column label="澶村儚" width="80" column-key="filterAvatar"
- :filters="[{ text: '宸蹭笂浼�', value: '1' }, { text: '鏈笂浼�', value: '0' }]">
- <template #default="scope">
- <el-avatar :src="scope.row.avatar" size="small"></el-avatar>
- </template>
- </el-table-column>
- <el-table-column label="鐧诲綍璐﹀彿" prop="userName" width="150" sortable='custom'
- column-key="filterUserName"
- :filters="[{ text: '绯荤粺璐﹀彿', value: '1' }, { text: '鏅�氳处鍙�', value: '0' }]"></el-table-column>
- <el-table-column label="濮撳悕" prop="name" width="150"
+ <el-table-column label="宸ヤ綅鍚嶇О" prop="id" width="120"
sortable='custom'></el-table-column>
- <el-table-column label="鎵�灞炶鑹�" prop="groupName" width="200"
+ <el-table-column label="宸ヤ綅绫诲瀷" prop="id" width="120"
sortable='custom'></el-table-column>
- <el-table-column label="鍔犲叆鏃堕棿" prop="date" width="170"
+ <el-table-column label="宸ヤ綅鏃ュ巻" prop="id" width="120"
sortable='custom'></el-table-column>
<el-table-column label="鎿嶄綔" fixed="right" align="right" width="160">
<template #default="scope">
@@ -69,15 +65,92 @@
</el-button-group>
</template>
</el-table-column>
-
</scTable>
</el-main>
</el-container>
</el-container>
</el-tab-pane>
-
- <el-tab-pane label="宸ヤ綅缁�">
-
+ <!-- 宸ヤ綅缁� -->
+ <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]" :filter-node-method="groupFilterNode"
+ @node-click="groupClick"></el-tree>
+ </el-main>
+ </el-container>
+ </el-aside>
+ <el-container>
+ <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>
+ </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>
+ <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 style="width: 240px" v-model="form.sort" clearable
+ placeholder="浜х嚎鎺掑簭"></el-input>
+ </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)">
+ <el-button style="width: 100px" type="primary" plain>鎻愪氦</el-button>
+ </el-main>
+
+ </el-container>
+ </el-container>
</el-tab-pane>
</el-tabs>
@@ -90,52 +163,97 @@
name: 'system',
data() {
return {
- sys: {
- name: "SCUI",
- logoUrl: "",
- login: true,
- passwordRules: "^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,20}$",
- copyright: "@SCUI"
+ showGrouploading: false,
+ options: [],
+ activeName: '2',
+ group: [],
+ groupFilterText: '',
+ // --------
+ form: {
+ groupTag: '',
+ name: '',
+ sort: '',
+ remark: ''
},
- msg: {
- open: true,
- appKey: "",
- secretKey: ""
+ rules: {
+ groupTag: { required: true, message: '蹇呭～', trigger: 'blur' },
+ name: { required: true, message: '蹇呭～', trigger: 'blur' },
+ sort: { required: true, message: '蹇呭～', trigger: 'blur' }
},
- setting: [
- {
- key: "file_serve",
- value: "https://file.scui.com",
- category: "url",
- title: "鏂囦欢鏈嶅姟鍣ㄥ湴鍧�"
- },
- {
- key: "cloud_url",
- value: "-",
- category: "url",
- title: "瀹㈡埛绔湴鍧�"
- },
- {
- key: "crm_url",
- value: "-",
- category: "url",
- title: "CRM鍦板潃"
- },
- {
- key: "autoSwitch",
- value: true,
- category: "user",
- title: "鑷姩鍒ゆ柇boolean绫诲瀷"
- }
- ]
+ treeCheckedNode: {},
+ treeCheckKey: [],
+ beltline_type: [],
+ group_tag: []
}
},
- created () {
- this.$API.basicdata.getWorkstationGroup.get().then(res => {
- console.log(res)
- })
+ watch: {
+ activeName() {
+ this.queryList()
+ },
+ treeCheckedNode: {
+ handler (val) {
+ Object.keys(this.form).forEach(key => {
+ this.form[key] = val?.[key]
+ })
+ },
+ deep: true
+ }
+ },
+ created() {
+ this.init()
+ this.queryList()
},
methods: {
+ 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() {
+ 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
+ }
+ })
+ },
+ formatData(data, current) {
+ let newData = []
+ if (!current) {
+ newData = data.filter(item => item.parentId == 0).map(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 b.sort - a.sort
+ })
+ return item
+ })
+ return res
+ }
+ return newData
+ },
+ groupFilterNode() {
+
+ },
+ groupClick(node) {
+ console.log(node)
+ this.treeCheckedNode = node
+ },
table_add() {
var newRow = {
key: "",
@@ -159,4 +277,9 @@
}
</script>
-<style></style>
+<style scoped>
+.show-info {
+ list-style: none;
+ font-size: 14px;
+}
+</style>
--
Gitblit v1.9.3