From bbb03ff09f77e4ece3dfcf80df855829399528ae Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 27 九月 2022 16:21:43 +0800
Subject: [PATCH] 1.新增cookie参数 rediskey
---
src/utils/request.js | 1
/dev/null | 978 ---------------------------------------------------
src/store/modules/user.js | 2
src/views/jcsz/jsqd.vue | 43 ++
src/views/xtsz/bmgz.vue | 5
src/views/gantt_back/gantt_back.vue | 102 ++--
src/views/bbgl/rygz.vue | 6
7 files changed, 108 insertions(+), 1,029 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 82cc709..3c8332f 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -44,6 +44,7 @@
setCookie('navTabId', res.data.usercode)
setCookie('usertype', res.data.usertype)
setCookie('userid', res.data.userid)
+ setCookie('rediskey', res.data.rediskey)
// }
// console.log(res.code === '302', 8989)
// if (res.code === '302') {
@@ -121,6 +122,7 @@
removeCookie('navTabId')
removeCookie('usertype')
removeCookie('userid')
+ removeCookie('rediskey')
removeCookie('code')
// reset visited views and cached views
diff --git a/src/utils/request.js b/src/utils/request.js
index 19793af..77c864f 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -65,6 +65,7 @@
removeCookie('navTabId')
removeCookie('usertype')
removeCookie('userid')
+ removeCookie('rediskey')
removeCookie('code')
setTimeout(() => {
sessionStorage.removeItem('tabViews')
diff --git a/src/views/bbgl/rygz.vue b/src/views/bbgl/rygz.vue
index 37dc13c..d14b06b 100644
--- a/src/views/bbgl/rygz.vue
+++ b/src/views/bbgl/rygz.vue
@@ -118,6 +118,7 @@
<el-table-column
prop="partspec"
label="浜у搧瑙勬牸"
+ width="160"
show-tooltip-when-overflow
sortable="custom"
>
@@ -178,8 +179,8 @@
</el-table-column>
<el-table-column
prop="usermoney"
- label="璁颁欢宸ヨ祫"
- width="110"
+ label="鐝粍璁颁欢宸ヨ祫"
+ width="130"
sortable="custom"
>
<template slot-scope="{row}">
@@ -198,6 +199,7 @@
label="鎶ュ伐鏃堕棿"
width="160"
sortable="custom"
+ fixed="right"
/>
</el-table>
diff --git a/src/views/gantt_back/gantt_back.vue b/src/views/gantt_back/gantt_back.vue
index 59ccad7..203fa8f 100644
--- a/src/views/gantt_back/gantt_back.vue
+++ b/src/views/gantt_back/gantt_back.vue
@@ -83,8 +83,11 @@
</el-row>
<el-row />
</el-tabs>
+ <!-- {{ time_data }}-->
+ <!-- {{ bm_data }}-->
<div class="container" style="margin: 30px;">
<v-gantt-chart
+
:start-time="time_data[0]"
:end-time="time_data[1]"
:cell-width="cellWidth"
@@ -273,54 +276,6 @@
},
'rows': [
{
- 'YearDate': '2022-09-24',
- 'children': [
- {
- 'AdvaDevicNumber': 'LKFDL_SC-PC029',
- 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
- 'AdvaDevicCropMob': '78',
- 'AdvaDevicRhythm': '10',
- 'OneStartDate': '08:00~11:30',
- 'TwoStartDate': '12:30~17:00',
- 'ThreeStartDate': '',
- 'FourStartDate': '',
- 'FiveStartDate': ''
- }
- ]
- },
- {
- 'YearDate': '2022-09-25',
- 'children': [
- {
- 'AdvaDevicNumber': 'LKFDL_SC-PC029',
- 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
- 'AdvaDevicCropMob': '78',
- 'AdvaDevicRhythm': '10',
- 'OneStartDate': '08:00~11:30',
- 'TwoStartDate': '12:30~17:00',
- 'ThreeStartDate': '',
- 'FourStartDate': '',
- 'FiveStartDate': ''
- }
- ]
- },
- {
- 'YearDate': '2022-09-26',
- 'children': [
- {
- 'AdvaDevicNumber': 'LKFDL_SC-PC029',
- 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
- 'AdvaDevicCropMob': '78',
- 'AdvaDevicRhythm': '10',
- 'OneStartDate': '08:00~11:30',
- 'TwoStartDate': '12:30~17:00',
- 'ThreeStartDate': '',
- 'FourStartDate': '',
- 'FiveStartDate': ''
- }
- ]
- },
- {
'YearDate': '2022-09-27',
'children': [
{
@@ -359,6 +314,54 @@
'AdvaDevicNumber': 'LKFDL_SC-PC029',
'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
'AdvaDevicCropMob': '78',
+ 'AdvaDevicRhythm': '10',
+ 'OneStartDate': '08:00~11:30',
+ 'TwoStartDate': '12:30~17:00',
+ 'ThreeStartDate': '',
+ 'FourStartDate': '',
+ 'FiveStartDate': ''
+ }
+ ]
+ },
+ {
+ 'YearDate': '2022-09-30',
+ 'children': [
+ {
+ 'AdvaDevicNumber': 'LKFDL_SC-PC029',
+ 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
+ 'AdvaDevicCropMob': '78',
+ 'AdvaDevicRhythm': '10',
+ 'OneStartDate': '08:00~11:30',
+ 'TwoStartDate': '12:30~17:00',
+ 'ThreeStartDate': '',
+ 'FourStartDate': '',
+ 'FiveStartDate': ''
+ }
+ ]
+ },
+ {
+ 'YearDate': '2022-10-01',
+ 'children': [
+ {
+ 'AdvaDevicNumber': 'LKFDL_SC-PC029',
+ 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
+ 'AdvaDevicCropMob': '78',
+ 'AdvaDevicRhythm': '10',
+ 'OneStartDate': '08:00~11:30',
+ 'TwoStartDate': '12:30~17:00',
+ 'ThreeStartDate': '',
+ 'FourStartDate': '',
+ 'FiveStartDate': ''
+ }
+ ]
+ },
+ {
+ 'YearDate': '2022-10-02',
+ 'children': [
+ {
+ 'AdvaDevicNumber': 'LKFDL_SC-PC029',
+ 'AdvaDevicName': '閲戦紟鏁版帶杞﹀簥029',
+ 'AdvaDevicCropMob': '30',
'AdvaDevicRhythm': '10',
'OneStartDate': '08:00~11:30',
'TwoStartDate': '12:30~17:00',
@@ -745,6 +748,7 @@
}
}
}
+ console.log(newList, 321)
for (const i in list) {
this.pushTiem(newList, list[i].id, list[i].gtArray)
}
@@ -977,7 +981,7 @@
for (const i in this.bm_data) {
const newArr = []
for (const j in this.bm_data[i].gtArray) {
- if (this.bm_data[i].gtArray[j].type != 'schedule') {
+ if (this.bm_data[i].gtArray[j].type !== 'schedule') {
newArr.push(this.bm_data[i].gtArray[j])
}
}
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index bc703f2..490040f 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -511,6 +511,7 @@
<input
class="myCheckboxInput"
type="checkbox"
+ :disabled="rightFrom.usercode==='S001'"
:value="item.code"
:name="item.name"
:style="{color:item.isSelected2?'#42b983':'#fff'}"
@@ -794,6 +795,10 @@
},
// 淇敼鎸夐挳
edit(operation, row) {
+ if (row.role_code === 'S001') {
+ return this.$message.info('姝よ鑹叉棤娉曟搷浣滐紒')
+ }
+
this.operation = operation
this.dialogVisible = true
@@ -808,6 +813,9 @@
},
// 鍒犻櫎鎸夐挳
del(row) {
+ if (row.role_code === 'S001') {
+ return this.$message.info('姝よ鑹叉棤娉曟搷浣滐紒')
+ }
this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -953,6 +961,9 @@
/* 鍏宠仈鐢ㄦ埛妯″潡*/
userClick(row) {
+ if (row.role_code === 'S001') {
+ return this.$message.info('姝よ鑹叉棤娉曟搷浣滐紒')
+ }
this.userDialogVisible = true
this.userForm.roleName = row.role_name
this.dialogFormUser.rolecode = row.role_code
@@ -1072,6 +1083,19 @@
this.dialogFormRight.rightPCArr[0].children = this.dialogFormRight.rightPCArr[0].children.filter(item => item.is_delete === '0')
this.dialogFormRight.rightPCArr[0].children.forEach(item => {
item.children = item.children.filter(it => it.is_delete === '0')
+
+ if (this.rightFrom.usercode === 'S001') { // Admin绯荤粺绠＄悊鍛樿彍鍗曞仛鍒板彧澧炰笉鍑�
+ if (item.flag === 'Y') {
+ item.disabled = true
+ }
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(it => {
+ if (it.flag === 'Y') {
+ it.disabled = true
+ }
+ })
+ }
+ }
})
}
@@ -1080,6 +1104,19 @@
this.dialogFormRight.rightAPPArr[0].children.forEach(item => {
item.children = item.children.filter(it => it.is_delete === '0' || it.is_delete === null)
// item.children = item.children.filter(it => it.is_delete !== '1')
+
+ if (this.rightFrom.usercode === 'S001') { // Admin绯荤粺绠＄悊鍛樿彍鍗曞仛鍒板彧澧炰笉鍑�
+ if (item.flag === 'Y') {
+ item.disabled = true
+ }
+ if (item.children && item.children.length > 0) {
+ item.children.forEach(it => {
+ if (it.flag === 'Y') {
+ it.disabled = true
+ }
+ })
+ }
+ }
})
}
// console.log(this.dialogFormRight.rightAPPArr[0], 234)
@@ -1233,9 +1270,15 @@
}
if (this.PCTrue) {
this.dialogFormRight.rightPCArr[0].name = '鍏ㄩ儴'
+ if (this.rightFrom.usercode === 'S001') { // Admin绯荤粺绠＄悊鍛樿彍鍗曞仛鍒板彧澧炰笉鍑�
+ this.dialogFormRight.rightPCArr[0].disabled = true
+ }
}
if (this.APPTrue) {
this.dialogFormRight.rightAPPArr[0].name = '鍏ㄩ儴'
+ if (this.rightFrom.usercode === 'S001') { // Admin绯荤粺绠＄悊鍛樿彍鍗曞仛鍒板彧澧炰笉鍑�
+ this.dialogFormRight.rightAPPArr[0].disabled = true
+ }
}
// 鏍戝舰鍥炴樉閮ㄥ垎
diff --git a/src/views/xtsz/bmgz.vue b/src/views/xtsz/bmgz.vue
index 13c16ae..7f78051 100644
--- a/src/views/xtsz/bmgz.vue
+++ b/src/views/xtsz/bmgz.vue
@@ -65,6 +65,11 @@
fixed
/>
<el-table-column
+ prop="right_code"
+ label="缂栫爜"
+ sortable="custom"
+ />
+ <el-table-column
prop="right_name"
label="缂栫爜鍚嶇О"
sortable="custom"
diff --git a/src/views/zzmx/gylx_bak.vue b/src/views/zzmx/gylx_bak.vue
deleted file mode 100644
index 85855fc..0000000
--- a/src/views/zzmx/gylx_bak.vue
+++ /dev/null
@@ -1,978 +0,0 @@
-<template>
- <div>
- <div class="body" :style="{height:mainHeight+'px'}">
-
- <div class="bodyTopButtonGroup">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
- </div>
-
- <div class="bodyTopFormGroup">
- <el-form
- ref="form"
- :model="form"
- label-width="100px"
- inline
- style="display: flex;justify-content: space-between"
- >
- <div class="elForm">
- <el-form-item label="宸ヨ壓璺嚎缂栫爜" style=" display: flex;">
- <el-input v-model="form.routecode" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item label="宸ヨ壓鍚嶇О" style=" display: flex;">
- <el-input v-model="form.routename" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item label="宸ヨ壓鎻忚堪" style=" display: flex;">
- <el-input v-model="form.description" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
- <el-input v-model="form.createuser" style="width: 200px" placeholder="璇疯緭鍏�" />
- </el-form-item>
- </div>
- <div class="bodySearchReset">
- <el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
- <el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
- </div>
- </el-form>
- </div>
-
- <div class="elTableDiv">
- <el-table
- ref="tableDataRef"
- class="tableFixed"
- :data="tableData"
- :height="tableHeight"
- border
- :row-class-name="tableRowClassName"
- :style="{width: 100+'%',height:tableHeight+'px',}"
- highlight-current-row
- :header-cell-style="this.$headerCellStyle"
- :cell-style="this.$cellStyle"
- @sort-change="sortChange"
- >
- <!-- <el-table-column-->
- <!-- type="selection"-->
- <!-- width="50"-->
- <!-- />-->
- <el-table-column
- prop="RowNum"
- width="50"
- label="搴忓彿"
- fixed
- />
- <el-table-column
- prop="code"
- label="缂栫爜"
- sortable="custom"
- />
- <el-table-column
- prop="name"
- label="鍚嶇О"
- sortable="custom"
- />
- <el-table-column
- prop="description"
- label="宸ヨ壓璺嚎鎻忚堪"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.description">{{ row.description }}</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="enable"
- label="浣跨敤鐘舵��"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.enable==='Y'">
- <svg-icon icon-class="circleYes" style="margin-right: 2px" />
- 鏄�
- </div>
- <div v-if="row.enable==='N'">
- <svg-icon icon-class="circleNo" style="margin-right: 2px" />
- 鍚�
- </div>
- </template>
- </el-table-column>
- <el-table-column
- prop="lm_user"
- label="鍒涘缓浜哄憳"
- sortable="custom"
- />
- <el-table-column
- prop="lm_date"
- label="鍒涘缓鏃堕棿"
- sortable="custom"
- width="160"
- />
- <el-table-column
- label="鎿嶄綔"
- width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <el-tooltip class="item" effect="dark" content="棰勮" placement="top">
- <i
- class="el-icon-view"
- style="margin-right:15px;cursor: pointer;color:#42b983 "
- @click="edit('edit',row)"
- />
- </el-tooltip>
- <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" @click="del(row)" />
- </el-tooltip>
- </div>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <!--鍒嗛〉-->
- <pagination
- :total="total"
- :page.sync="form.page"
- :limit.sync="form.rows"
- align="right"
- layout="total,prev, pager, next,sizes"
- popper-class="select_bottom"
- @pagination="getRouteSearch"
- />
- </div>
-
- <el-dialog
- :title="operation==='add'?'鏂板':'棰勮'"
- :visible.sync="dialogVisible"
- width="1000px"
- :close-on-click-modal="false"
- :top="isIpad?'5vh':'15vh'"
- @closed="handleClose"
- @close="handleClose"
- >
- <el-form ref="dialogForm" style="height: 500px" :rules="dialogFormRules" :model="dialogForm" label-width="110px">
- <div style="display: flex">
- <el-form-item label="宸ヨ壓璺嚎缂栫爜" prop="code" style="margin-right: 20px">
- <el-input v-model="dialogForm.code" :disabled="operation!=='add'" style="width: 220px" />
- </el-form-item>
- <el-form-item label="宸ヨ壓鍚嶇О" prop="name">
- <el-input v-model="dialogForm.name" :disabled="operation==='edit'" style="width: 220px" />
- </el-form-item>
- </div>
- <div style="display: flex">
- <el-form-item prop="enable" label="浣跨敤鐘舵��" style="margin-right: 20px">
- <el-select
- v-model="dialogForm.enable"
- filterable
- :disabled="operation==='edit'"
- :popper-append-to-body="false"
- style="width: 220px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in isEnableArr"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="宸ヨ壓鎻忚堪" prop="description">
- <el-input
- v-model="dialogForm.description"
- :disabled="operation==='edit'"
- type="textarea"
- style="width: 220px"
- />
- </el-form-item>
- </div>
- <el-form-item label="宸ヨ壓璁剧疆" prop="Data" style="margin-top: 30px">
- <div class="settingDiv">
- <!-- 瀹炵幇宸ヨ壓璁剧疆鍔ㄦ�佹坊鍔�-->
- <div v-for="(tag,index) in dynamicTags" :key="tag.seq" style="display: flex;align-items: center">
- <div style="display: flex;align-items: center;position: relative;">
- <div
- class="orderNumber"
- :style="{
- backgroundColor:index===0?'#f8f8fa':'#409EFF',
- color:index===0?'#c6bbc4':'#FFFFFF',
- border:index===0?'1px solid #c6bbc4':'1px solid #409EFF',
- zIndex:tag.label===selectedName?0:2
- }"
- >
- {{ index + 1 }}
- </div>
-
- <!-- <el-tooltip-->
- <!-- class="item"-->
- <!-- effect="dark"-->
- <!-- :content="tag.stepname"-->
- <!-- placement="top"-->
- <!-- >-->
- <!-- @close="handleTagClose(tag.stepname)"-->
- <!-- :closable="index!==0"-->
-
- <el-tag
- v-if="tag.stepname!==selectedName"
- :disable-transitions="false"
- class="elTag"
- :effect="tag.effect"
- @click="elTagClick(tag)"
- >
- {{ tag.stepname }}
- <i
- v-if="tag.editDisabled&&operation!=='edit'"
- class="el-icon-edit"
- @click="tagEdit(tag)"
- />
- </el-tag>
- <!-- </el-tooltip>-->
-
- <!-- left:tag.stepname===selectedName?'191px':'141px',-->
- <i
- v-if="index!==0&&tag.editDisabled&&operation!=='edit'"
- :style="{
- top:tag.stepname===selectedName?'-2px':'-8px',
- }"
- class="el-icon-close"
- @click="handleTagClose(tag)"
- />
- <el-autocomplete
- v-if="tag.stepname===selectedName"
- :ref="'saveTagInput'+tag.seq"
- v-model="autocompleteValue"
- class="input-new-tag"
- size="small"
- :fetch-suggestions="querySearch"
- style="margin-left: 0;width: 150px;transform: translate(1)"
- autofocus
- :debounce="300"
- :popper-append-to-body="false"
- popper-class="autocompleteClass"
- @select="handleSelect"
- @keyup.enter.native="handleInputConfirm(tag)"
- />
- <!-- @blur="handleBlur2"-->
- <div
- v-if="index!==dynamicTags.length-1"
- style="width: 40px;height: 1px;border: 1px solid #42b983"
- />
- </div>
- </div>
-
- <el-button
- v-if="operation!=='edit'"
- type="success"
- :disabled="addDisabled"
- class="tagSuccess"
- size="small"
- icon="el-icon-plus"
- @click="showInput"
- />
-
- </div>
- </el-form-item>
- </el-form>
- <span slot="footer" class="dialog-footer">
- <div class="footerButton">
- <el-button v-if="operation==='edit'" @click="dialogVisibleCancel">杩� 鍥�</el-button>
- <el-button v-if="operation!=='edit'" @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button v-if="operation!=='edit'" type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
- </div>
- </span>
- </el-dialog>
- </div>
-</template>
-
-<script>
-import Pagination from '@/components/Pagination'
-import { AddUpdateRoute, DeleteRoute, RouteSearch, StepSelect, ViewRoute } from '@/api/zzmx'
-import { validateCode } from '@/utils/global'
-
-export default {
- name: 'GYLX',
- components: {
- Pagination
- },
- data() {
- return {
- isIpad: false,
- mainHeight: 0,
- tableHeight: 0,
- form: {
- routecode: '', // 宸ヨ壓璺嚎缂栫爜
- routename: '', // 宸ヨ壓璺嚎鍚嶇О
- description: '', // 宸ヨ壓璺嚎鎻忚堪
- createuser: '', // 鍒涘缓浜哄憳
- prop: 'lm_date', // 鎺掑簭瀛楁
- order: 'desc', // 鎺掑簭瀛楁
- page: 1, // 绗嚑椤�
- rows: 20 // 姣忛〉澶氬皯鏉�
- },
- isEnableArr: [
- { label: '鏄�', value: 'Y' },
- { label: '鍚�', value: 'N' }
- ],
- total: 10,
- tableData: [],
- dialogVisible: false,
- dialogForm: {
- id: '',
- code: '',
- name: '',
- enable: 'Y',
- description: '',
- Data: []
- },
- dynamicTags: [// 宸ヨ壓璁剧疆鏁扮粍
- { editDisabled: true, stepcode: '', seq: 1, stepname: ' ', effect: 'light' }
- // { editDisabled: true, stepcode: 'Step02', seq: 2, stepname: '濂�', effect: 'light' },
- // { editDisabled: true, stepcode: 'Step03', seq: 3, stepname: '澶�', effect: 'light' }
- ],
- clickSelected: '', // 榧犳爣鐐瑰嚮閫変腑鐨勫��
- selectedName: '', // 閫変腑鐨勫悕绉�
- autocompleteValue: '', // 鍙悳绱㈣緭鍏ユ涓殑鍊�
- routeArr: [], // 宸ヨ壓璁剧疆涓嬫媺鎵�鏈夊��
- routeSelectedArr: [], // 宸ヨ壓璁剧疆涓嬫媺宸查�夌殑鍊�
- addDisabled: true, // 娣诲姞鎸夐挳鏄惁鍙偣鍑�
- editDisabled: true, // 淇敼鎸夐挳鏄惁鍙偣鍑�
- mouseFocusPosition: 0, // 榧犳爣鑱氱劍鐨勪綅缃�
- operation: '',
- dialogFormRules: {
- code: [
- { required: true, validator: validateCode, trigger: ['blur', 'change'] }
- ],
- name: [
- { required: true, message: '璇疯緭鍏ュ悕绉�', trigger: ['blur', 'change'] }
- ],
- enable: [
- { required: true, message: '璇烽�夋嫨浣跨敤鐘舵��', trigger: ['blur', 'change'] }
- ]
- // Data: [
- // { required: true, message: '璇疯缃伐鑹�', trigger: ['blur', 'change'] }
- // ]
- }
-
- }
- },
- created() {
- this.getRouteSearch()
- },
- mounted() {
- window.addEventListener('resize', this.getHeight)
- this.getHeight()
- },
- methods: {
- // 杩滅▼鎼滅储
- querySearch(queryString, cb) {
- const routeArr = this.routeArr
- routeArr.forEach(item => {
- item.value = item.stepname
- })
- const results = queryString ? routeArr.filter(this.createFilter(queryString)) : routeArr
- // 璋冪敤 callback 杩斿洖寤鸿鍒楄〃鐨勬暟鎹�
- cb(results)
- },
- // 杩囨护
- createFilter(queryString) {
- return (res) => {
- return (res.value.toLowerCase().indexOf(queryString.toLowerCase()) !== -1)
- }
- },
- // 宸ヨ壓璁剧疆 涓嬫媺鑾峰彇鎵�鏈�
- async getStepSelectArr() {
- const { data: res } = await StepSelect()
- this.routeArr = res
- },
- // 澶勭悊涓嬫媺閫夋嫨
- handleSelect(item) {
- this.autocompleteValue = item.value
- this.$nextTick(_ => {
- this.$refs['saveTagInput' + this.mouseFocusPosition][0].focus()
- })
- },
- // 杈撳叆妗嗙‘璁や簨浠�
- handleInputConfirm(tag) {
- console.log(tag, 111)
- console.log(this.autocompleteValue, 2)
- // 1.閫夋嫨鍐呭涓嶈兘涓虹┖
- if (this.autocompleteValue.trim().length < 1) {
- return this.$message.info('閫夋嫨鍐呭涓嶈兘涓虹┖锛�')
- }
- // 2.杈撳叆妗嗗唴瀹逛笌涓嬫媺閫夐」鍐呭涓嶅尮閰�
- let flag = false
- this.routeArr.forEach(item => {
- if (item.stepname === this.autocompleteValue) {
- flag = true
- }
- })
- if (!flag) {
- return this.$message.info('杈撳叆妗嗗唴瀹逛笌涓嬫媺閫夐」鍐呭涓嶅尮閰嶏紒')
- }
-
- // 3.杈撳叆妗嗗唴瀹逛笌宸查�夊唴瀹圭浉鍚屾椂涓嶈兘淇濆瓨
- let flag2 = false
- this.dynamicTags.forEach(item => {
- if (item.stepname === this.autocompleteValue.trim()) {
- flag2 = true
- }
- })
- if (tag.stepname === this.autocompleteValue.trim()) {
- flag2 = false
- }
- if (flag2) {
- return this.$message.info('姝ゅ伐搴忓凡閫夛紝璇烽�夋嫨鍏跺畠宸ュ簭锛�')
- }
- console.log(this.routeArr, 9)
- this.routeArr.forEach((item, index) => {
- if (this.autocompleteValue.trim() === item.stepname) {
- console.log(tag.stepname === item.stepname, 353535)
- this.routeSelectedArr.push({
- stepcode: item.stepcode,
- stepname: item.stepname,
- value: item.value
- })
- this.routeArr.splice(index, 1)
- }
- })
-
- // 灏嗗�兼浛鎹㈠埌鍘焧ag浣嶇疆涓�
- this.dynamicTags.forEach((item, index) => {
- if ((index + 1) === tag.seq) {
- console.log(tag)
- item.stepname = this.autocompleteValue
- }
- item.editDisabled = true
- })
- console.log(this.dynamicTags, 234)
- this.addDisabled = false
- this.editDisabled = true
- this.selectedName = ''
- },
- // tag鐐瑰嚮淇敼鎸夐挳
- tagEdit(tag) {
- console.log(tag, 2)
- this.autocompleteValue = ''
- this.dynamicTags.forEach(item => {
- item.stepname = item.stepname.trim()
- if (item.seq !== tag.seq) {
- item.editDisabled = false
- // item.stepcode = this.routeArr.find(it=>it.stepcode=tag.stepcode).stepcode
- // return this.$message.info('璇峰厛濉啓鎴栭�夋嫨宸ヨ壓锛�')
- }
- })
-
- // if (tag.stepname === '') {
- // this.dynamicTags[0].stepcode=
- // }
-
- // if (tag.stepname.toString().length > 0 && tag.editDisabled) {
- if (tag.stepname !== '') {
- const routeSelectedArr = this.routeSelectedArr.find(item => item.stepname === tag.stepname)
-
- this.routeArr.push(
- {
- stepcode: routeSelectedArr.stepcode,
- stepname: routeSelectedArr.stepname,
- value: routeSelectedArr.value
- }
- )
- }
- // }
-
- this.addDisabled = true
- this.selectedName = tag.stepname
- this.autocompleteValue = tag.stepname
- this.$nextTick(_ => {
- this.$refs['saveTagInput' + tag.seq][0].focus()
- })
- this.mouseFocusPosition = tag.seq
- },
- // tag鐐瑰嚮浜嬩欢
- elTagClick(tag) {
- console.log(tag, 1)
- this.clickSelected = tag.seq
- if (tag.effect === 'dark') {
- tag.effect = 'light'
- this.clickSelected = ''
- } else {
- this.dynamicTags.forEach(item => {
- item.effect = 'light'
- })
- if (tag.effect === 'light') {
- tag.effect = 'dark'
- } else if (tag.effect === 'dark') {
- tag.effect = 'light'
- }
- }
- console.log(this.$el)
- // console.log(this.$el.style.color = 'red')
- },
- // 澶勭悊tag鍏抽棴浜嬩欢
- handleTagClose(tag) {
- console.log(tag)
-
- // 褰撻�変腑鐨勬楠よ鍒犻櫎鏃�
- if (tag.seq === this.clickSelected) {
- this.clickSelected = ''
- }
- this.dynamicTags.forEach((item, index) => {
- if (item.seq === tag.seq) {
- this.dynamicTags.splice(index, 1)
- }
- })
-
- const routeSelectedArr = this.routeSelectedArr.find(item => item.stepname === tag.stepname)
- if (routeSelectedArr !== undefined) {
- this.routeArr.push(
- {
- stepcode: routeSelectedArr.stepcode,
- stepname: routeSelectedArr.stepname,
- value: routeSelectedArr.value
- }
- )
- }
- this.routeArr = this.routeArr.filter((currentValue, currentIndex, selfArr) => {
- return selfArr.findIndex(item => item.stepcode === currentValue.stepcode) === currentIndex
- })
- console.log(this.dynamicTags, 1)
- // 閲嶆柊鎺掑簭
- this.dynamicTags.forEach((item, index) => {
- item.editDisabled = true
- item.seq = index + 1
- // item.stepcode = 'Step' + ((index + 1).toString().length === 2 ? (index + 1) : '0' + (index + 1))
- item.stepcode = ''
- })
- if (this.clickSelected === '') {
- this.selectedName = ''
- }
- this.addDisabled = false
- },
- // tag娣诲姞鎸夐挳
- showInput() {
- this.autocompleteValue = ''
- this.addDisabled = true
- this.editDisabled = false
- let seq = 0
- // 1.绗竴绉嶆儏鍐� 褰撴湭閫変腑鎯呭喌涓嬫垨鑰呴�変腑鏈�鍚庝竴涓殑鎯呭喌涓�
- if (this.clickSelected === '' || this.clickSelected === this.dynamicTags.length) {
- seq = this.dynamicTags.length + 1
- this.dynamicTags.push(
- {
- editDisabled: true,
- seq: seq,
- stepname: '',
- effect: 'light',
- // stepcode: ('Step' + (seq.toString().length === 2 ? seq : '0' + seq))
- stepcode: ''
- }
- )
- } else {
- // 2.绗簩绉嶆儏鍐� 褰撻�変腑鏌愪釜tag 灏嗗湪tag鍚庨潰娣诲姞
- seq = this.clickSelected + 1
- this.dynamicTags.splice(this.clickSelected, 0, { editDisabled: true, seq: seq, stepname: '', effect: 'light' })
- this.dynamicTags.forEach((item, index) => {
- item.seq = index + 1
- // item.stepcode = 'Step' + ((index + 1).toString().length === 2 ? (index + 1) : '0' + (index + 1))
- item.stepcode = ''
- })
- }
-
- this.$nextTick(_ => {
- this.$refs['saveTagInput' + seq][0].focus()
- })
-
- this.mouseFocusPosition = seq
-
- this.dynamicTags.forEach((item, index) => {
- item.editDisabled = seq === index + 1
- })
-
- console.log(this.dynamicTags, 1)
- },
-
- // 鑾峰彇宸ヨ壓璺嚎鍒楄〃娓呭崟
- async getRouteSearch() {
- const res = await RouteSearch(this.form)
- this.tableData = res.data
- this.total = res.count
- },
- // 鎺掑簭鏀瑰彉鏃�
- sortChange({ 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.getRouteSearch()
- },
- // 鏌ヨ
- search() {
- this.getRouteSearch()
- },
- upload() {
-
- },
- // 閲嶇疆
- reset() {
- this.form.routecode = ''
- this.form.routename = ''
- this.form.description = ''
- this.form.createuser = ''
- this.getRouteSearch()
- },
-
- // 鏂板鎸夐挳
- add(operation) {
- this.operation = operation
- this.dialogVisible = true
- this.getStepSelectArr()
- },
- // 宸ヨ壓璺嚎棰勮
- async edit(operation, row) {
- this.operation = operation
- this.dialogVisible = true
-
- const { data: res } = await ViewRoute({ routecode: row.code })
-
- this.dynamicTags = []
- this.$nextTick(() => {
- this.dialogForm.code = res[0].code
- this.dialogForm.name = res[0].name
- this.dialogForm.enable = res[0].enable
- this.dialogForm.description = res[0].description
- // this.dialogForm.Data = row.description
- res[0].Data.forEach(item => {
- this.dynamicTags.push(
- { seq: item.seq, stepname: item.stepname, stepcode: item.stepcode, editDisabled: true, effect: 'light' }
- )
- })
- })
- },
- // 鍒犻櫎鎸夐挳
- async del(row) {
- this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- DeleteRoute({ routecode: row.code }).then(res => {
- if (res.code === '200') {
- this.$message.success('鍒犻櫎鎴愬姛!')
- if (this.form.page > 1 && this.tableData.length === 1) {
- this.form.page--
- }
- this.getRouteSearch()
- }
- })
- }).catch(() => {
- this.$message.info('宸插彇娑堝垹闄�')
- })
- },
- // 瀵硅瘽妗嗗叧闂簨浠�
- handleClose() {
- this.dialogForm.code = ''
- this.dialogForm.name = ''
- this.dialogForm.enable = 'Y'
- this.dialogForm.description = ''
- this.dialogForm.Data = []
-
- this.dynamicTags = [
- { editDisabled: true, stepcode: '', seq: 1, stepname: ' ', effect: 'light' }
- ]
- this.addDisabled = true
- this.routeSelectedArr = []
- this.$refs.dialogForm.clearValidate()
- },
- // 瀵硅瘽妗嗗彇娑�
- dialogVisibleCancel() {
- this.dialogVisible = false
- },
- // 瀵硅瘽妗嗙‘璁�
- dialogVisibleConfirm() {
- if (this.dynamicTags[0].stepname.trim() === '') {
- return this.$message.info('宸ヨ壓璁剧疆绗竴椤逛笉鑳戒负绌猴紒')
- }
- console.log(this.routeSelectedArr, 3666666)
- console.log(this.dynamicTags, 3)
- const Data = []
- this.dynamicTags.forEach(item => {
- Data.push({ seq: item.seq, stepcode: this.routeSelectedArr.find(it => it.stepname === item.stepname).stepcode, stepname: item.stepname })
- })
-
- Data.forEach(item => {
- if (item.stepname === this.routeSelectedArr.find(it => it.stepname === item.stepname).stepname) {
- item.stepcode = this.routeSelectedArr.find(it => it.stepname === item.stepname).stepcode
- }
- })
- console.log(Data, 32)
- this.$refs.dialogForm.validate(valid => {
- if (valid) {
- const data = {
- code: this.dialogForm.code,
- name: this.dialogForm.name,
- enable: this.dialogForm.enable,
- description: this.dialogForm.description,
- Data: Data
- }
- console.log(data, 2)
- AddUpdateRoute(this.dialogForm.id, this.operation === 'add' ? 'Add' : 'Update', data).then(res => {
- if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- this.dialogVisible = false
- this.getRouteSearch()
- } else {
- this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- }
- })
- }
- })
- },
- // 鑾峰彇椤甸潰楂樺害
- getHeight() {
- this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 200
- if (window.innerHeight < 769) {
- this.tableHeight = this.tableHeight - 40
- }
- this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
- this.$refs.tableDataRef.doLayout()
- })
- },
- tableRowClassName({ row, rowIndex }) {
- return 'custom-row'
- }
- }
-}
-</script>
-
-<style lang="scss" scoped>
-$main_color: #42b983;
-
-/*
-瀹炵幇宸ヨ壓璁剧疆鍔ㄦ�佹坊鍔犳牱寮�
-*/
-
-.orderNumber {
- margin-bottom: 31px;
- position: absolute;
- margin-left: -7px;
- z-index: 2;
- width: 16px;
- height: 16px !important;
- font-size: 12px;
- text-align: center;
- line-height: 15px;
- color: #FFFFFF;
- background-color: #409EFF;
- border-radius: 50%;
-}
-
-.el-icon-edit {
- width: 16px;
- height: 16px;
- border-radius: 50%;
- padding: 3px 0 0 3px;
- margin-left: 5px;
- cursor: pointer;
- position: absolute;
- right: 3px;
- bottom: 8px;
-}
-
-.el-icon-edit:hover {
- background-color: #99a9bf;
- color: #FFFFFF;
-}
-
-.el-icon-close {
- position: absolute;
- top: -8px;
- z-index: 2;
- left: 141px;
- cursor: pointer;
- color: #FFFFFF;
- border-radius: 50%;
- background-color: #ff7474;
- padding: 1px 0 0 1px;
-}
-
-//.el-icon-close:hover {
-// background-color: #99a9bf;
-//}
-
-.el-tag--dark {
- background-color: $main_color;
- border-color: $main_color;
-}
-
-.tagSuccess {
- margin-left: 20px;
- width: 100px;
- height: 32px;
- display: flex;
- justify-content: center;
- color: $main_color;
-}
-
-::v-deep .el-button--success {
- width: 40px !important;
- background-color: #ecf5ff;
- border-radius: 0;
- color: $main_color;
-}
-
-::v-deep .el-button--success:disabled {
- background-color: #eeeeee;
- color: $main_color;
-}
-
-::v-deep .el-tag {
- //height: 30px;
- border-radius: 0;
- border: 1px solid $main_color;
-}
-
-::v-deep .el-input--small .el-input__inner {
- border-radius: 0;
-}
-
-.settingDiv {
- display: flex;
- width: 100%;
- padding-left: 7px;
- height: 56px;
- overflow-x: scroll;
- overflow-y: hidden;
- align-items: center;
- background: aliceblue;
-}
-
-.elTag {
- margin-left: 0;
- width: 150px;
- position: relative;
- overflow: hidden;
- text-overflow: ellipsis;
- white-space: nowrap;
-}
-
-.autocompleteClass {
- .el-autocomplete-suggestion li {
- //color: red;
- }
-}
-</style>
-
-<!--鍏叡椤甸潰鏍峰紡-->
-<style lang="scss" scoped>
-$main_color: #42b983;
-.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
- color: $main_color;
- cursor: pointer;
-}
-
-.el-icon-edit-outline {
- margin-right: 15px;
-}
-
-::v-deep .el-button--primary, .el-button--default, .el-button--info {
- height: 34px;
- display: flex;
- align-items: center;
- padding: 0 15px;
-}
-
-::v-deep .el-button--primary {
- //background-color: $main_color !important;
-}
-
-::v-deep .el-button--default {
- background-color: #f8f8fa;
- border: none;
-}
-
-::v-deep .el-input__inner {
- height: 34px;
- line-height: 34px;
- //color: #a7a7a7;
-}
-
-::v-deep .el-dialog__body {
- padding: 20px 20px !important;
-}
-
-::v-deep .dialogVisibleRoles .el-dialog__body {
- padding: 20px 20px !important;
-}
-
-::v-deep .importPickerClass .el-dialog__body {
- padding: 20px 20px !important;
-}
-
-::v-deep .el-dialog__footer {
- display: flex;
- justify-content: flex-end;
-}
-
-::v-deep .el-table .caret-wrapper {
- transform: scale(0.8);
-}
-
-::v-deep .cell {
- display: flex;
- align-items: center;
- justify-content: space-between;
-}
-
-::v-deep .el-table::before {
- height: 0;
-}
-
-::v-deep .el-table__body-wrapper {
- background-color: #f8f8fa;
-}
-
-::v-deep .el-table__body .el-table__row.hover-row td {
- background-color: #eaecef;
-}
-
-::v-deep .el-form--inline .el-form-item__label {
- color: #a7a7a7;
-}
-
-.body ::v-deep .el-divider {
- border: 1px solid #eee;
- width: 99%;
- margin: 10px auto;
-}
-
-.body ::v-deep .el-form-item {
- margin-bottom: 0;
-}
-
-.userDialogVisible ::v-deep .el-form-item {
- margin-bottom: 0;
-}
-
-.tableFixed{
- ::v-deep .el-table__fixed-right{
- height: 100% !important;
- }
- ::v-deep .el-table__fixed{
- height: 100% !important;
- }
-}
-
-</style>
-<style>
-
-.el-table .custom-row {
- background: #f8f8fa;
-}
-</style>
--
Gitblit v1.9.3