From f791db88d83a7ed851b9412d9797ed16b345fe79 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 07 七月 2022 18:39:18 +0800
Subject: [PATCH] 1.项目页面修改2.生产管理工单页面开发
---
src/views/jcsz/yhqd.vue | 233 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 224 insertions(+), 9 deletions(-)
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index 3763d4f..a20ec9f 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -57,6 +57,7 @@
<el-divider />
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <el-button type="primary" icon="el-icon-menu" @click="workingTramClick">鐢熶骇鐝粍</el-button>
<el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
</div>
<el-divider />
@@ -102,8 +103,13 @@
sortable="custom"
/>
<el-table-column
+ prop="group_name"
+ label="鐢熶骇鐝粍"
+ sortable="custom"
+ />
+ <el-table-column
prop="wagetype"
- label="鎵�灞炵粍缁�"
+ label="宸ヨ祫绫诲瀷"
sortable="custom"
>
<template slot-scope="{row}">
@@ -179,7 +185,7 @@
<el-dialog
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="65%"
+ width="800px"
:close-on-click-modal="false"
top="15vh"
@closed="handleClose"
@@ -259,7 +265,7 @@
<el-dialog
title="鍏宠仈瑙掕壊"
:visible.sync="dialogVisibleRoles"
- width="65%"
+ width="800px"
top="15vh"
:fullscreen="isFullscreen"
:close-on-click-modal="false"
@@ -323,6 +329,99 @@
</div>
</span>
</el-dialog>
+
+ <!-- 浜х粍鎸夐挳瀵硅瘽妗�-->
+ <el-dialog
+ title="鐢熶骇鐝粍"
+ :visible.sync="workingDialogVisible"
+ width="800px"
+ top="15vh"
+ :close-on-click-modal="false"
+ class="workingDialogVisible"
+ @close="handleCloseWorking"
+ >
+ <div style="margin-bottom: 20px;display: flex">
+ <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addWorking">鏂板</el-button>
+ <!-- <el-button type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
+ </div>
+ <el-table
+ :data="workingTableData"
+ border
+ height="300"
+ highlight-current-row
+ :header-cell-style="this.$headerCellStyle"
+ :cell-style="this.$cellStyle"
+ @sort-change="sortChangeOfWorking"
+ >
+ <!-- :style="{width: 100+'%',height:tableHeight-300+'px'}"-->
+
+ <!-- <el-table-column-->
+ <!-- type="selection"-->
+ <!-- width="50"-->
+ <!-- />-->
+ <el-table-column
+ width="50"
+ label="搴忓彿"
+ prop="RowNum"
+ />
+ <el-table-column
+ prop="group_code"
+ label="鐝粍缂栫爜"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <el-input v-if="row.isVisible===1" v-model="row.group_code" placeholder="璇疯緭鍏�" />
+ <div v-else> {{ row.group_code }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="group_name"
+ label="鐝粍鍚嶇О"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <el-input v-if="row.isVisible===1" v-model="row.group_name" placeholder="璇疯緭鍏�" />
+ <div v-else> {{ row.group_name }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="description"
+ label="鐝粍鎻忚堪"
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ <el-input v-if="row.isVisible===1" v-model="row.description" placeholder="璇疯緭鍏�" />
+ <div v-else> {{ row.description }}</div>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔">
+ <template slot-scope="{row}">
+ <div class="operationClass">
+ <el-button v-if="row.isVisible===0" type="text" @click="delWorking(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="saveWorking(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" type="text" @click="cancelWorking(row)">鍙栨秷</el-button>
+ </div>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!--鍒嗛〉-->
+ <pagination
+ v-show="workingTableDataLength>0"
+ :total="workingTableDataLength"
+ :page.sync="formWorking.page"
+ :limit.sync="formWorking.rows"
+ align="right"
+ layout="prev, pager, next,sizes"
+ popper-class="select_bottom"
+ @pagination="getUserGroupSearch"
+ />
+ <span slot="footer" class="dialog-footer">
+ <div class="footerButton">
+ <el-button @click="WorkingDialogVisibleCancel">杩斿洖</el-button>
+ <!-- <el-button type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
+ </div>
+ </span>
+ </el-dialog>
</div>
</template>
@@ -330,7 +429,14 @@
import Pagination from '@/components/Pagination'
import {
AddUpdateUser,
- DeleteUser, SaveUserAssoctRole, UserAssociationRole,
+ DeleteUser,
+ RoleTypeAdd,
+ RoleTypeDelete,
+ SaveUserAssoctRole,
+ UserAssociationRole,
+ UserGroupAdd,
+ UserGroupDelete,
+ UserGroupSearch,
UserOrganization,
UserSearch
} from '@/api/jcsz'
@@ -436,8 +542,16 @@
value: 'code',
label: 'name',
children: 'children'
+ },
+ workingDialogVisible: false,
+ workingTableData: [],
+ workingTableDataLength: 0,
+ formWorking: {
+ rows: 10,
+ page: 1,
+ prop: 'group_code',
+ order: 'desc'
}
-
}
},
created() {
@@ -879,8 +993,105 @@
// })
console.log(this.dialogFormRoles.rolesArrSelectedArr, 6666)
console.log(this.dialogFormRoles.roleTreeSelectedArr, 6777)
- }
+ },
+ /*
+ 鐢熶骇鐝粍妯″潡
+ */
+ // 鐢熶骇鐝粍鎸夐挳鐐瑰嚮
+ workingTramClick() {
+ this.workingDialogVisible = true
+ this.getUserGroupSearch()
+ },
+ // 鐢熶骇鐝粍瀵硅瘽妗嗗叧闂簨浠�
+ handleCloseWorking() {
+ this.workingTableData.forEach((item, index) => {
+ if (item.isVisible === 1) {
+ this.workingTableData.splice(index, 1)
+ }
+ })
+ // this.getUserGroupSearch()
+ },
+ // 鐢熶骇鐝粍鎺掑簭
+ sortChangeOfWorking({ column, prop, order }) {
+ if (order === 'descending') {
+ order = 'desc'
+ } else if (order === 'ascending') {
+ order = 'asc'
+ } else {
+ order = 'desc'
+ }
+ this.form.order = order
+ this.form.prop = prop
+ this.getUserGroupSearch()
+ },
+ // 鑾峰彇鐢熶骇鐝粍鍒楄〃
+ async getUserGroupSearch() {
+ const res = await UserGroupSearch(this.formWorking)
+ this.workingTableData = res.data
+ this.workingTableDataLength = res.count
+ this.workingTableData.forEach(item => {
+ item.isVisible = 0
+ })
+ },
+ // 鏂板
+ addWorking() {
+ let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
+ const data = { group_code: '', group_name: '', description: '', isVisible: 1, number: number }
+ this.workingTableData.unshift(data)
+ },
+ // 鍒犻櫎
+ delWorking(row) {
+ this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ UserGroupDelete({ UserGrupCode: row.group_code }).then(res => {
+ if (res.code === '200') {
+ this.$message.success('鍒犻櫎鎴愬姛!')
+ this.getUserGroupSearch()
+ }
+ })
+ }).catch(() => {
+ this.$message.info('宸插彇娑堝垹闄�')
+ })
+ },
+ // 淇濆瓨
+ async saveWorking(row) {
+ if (row.group_code.trim().length < 1) {
+ return this.$message.info('鐝粍缂栫爜涓嶈兘涓虹┖锛�')
+ }
+ if (row.group_name.trim().length < 1) {
+ return this.$message.info('鐝粍鍚嶇О涓嶈兘涓虹┖锛�')
+ }
+ if (row.description.trim().length < 1) {
+ return this.$message.info('鐝粍鎻忚堪涓嶈兘涓虹┖锛�')
+ }
+ const data = {
+ code: row.group_code,
+ name: row.group_name,
+ flag: row.description
+ }
+ const res = await UserGroupAdd([data])
+ if (res.code === '200') {
+ this.$message.success('淇濆瓨鎴愬姛锛�')
+ await this.getUserGroupSearch()
+ }
+ },
+ // 鍙栨秷
+ cancelWorking(row) {
+ this.workingTableData.forEach((item, index) => {
+ if (item.isVisible === 1 && item.number === row.number) {
+ this.workingTableData.splice(index, 1)
+ }
+ })
+ },
+ // 鐢熶骇鐝粍杩斿洖鎸夐挳
+ WorkingDialogVisibleCancel() {
+ this.workingDialogVisible = false
+ }
}
}
</script>
@@ -934,9 +1145,13 @@
color: #606266;
}
-//::v-deep .el-dialog__body {
-// padding: 20px 100px !important;
-//}
+::v-deep .el-dialog__body {
+ padding: 20px 100px !important;
+}
+
+.workingDialogVisible ::v-deep .el-dialog__body{
+ padding: 20px 20px !important;
+}
::v-deep .el-radio__input.is-checked .el-radio__inner {
background-color: $main_color;
--
Gitblit v1.9.3