From b46bc2dba51a3885a68e4c58316b41a31ea16bb2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 二月 2023 13:35:03 +0800
Subject: [PATCH] 1.存货档案修改
---
src/views/jcsz/jsqd.vue | 216 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 144 insertions(+), 72 deletions(-)
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 57ccf74..ea8b5c2 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -3,13 +3,13 @@
<div class="body" :style="{height:mainHeight+'px'}">
<div class="bodyTopButtonGroup" style="justify-content: space-between">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
<div style="display: flex">
<el-tooltip class="item" effect="dark" content="瑙掕壊绫诲瀷鏁版嵁缁存姢" placement="top">
- <el-button icon="el-icon-setting" @click="settingButton">璁剧疆</el-button>
+ <el-button v-waves icon="el-icon-setting" @click="settingButton">璁剧疆</el-button>
</el-tooltip>
- <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>
</div>
</div>
@@ -19,10 +19,10 @@
:model="form"
label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
- <el-form-item label-width="70px" label="瑙掕壊缂栫爜" style=" display: flex;">
+ <el-form-item label="瑙掕壊缂栫爜" style=" display: flex;">
<el-input v-model="form.RoleCode" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="瑙掕壊鍚嶇О" style=" display: flex;">
@@ -49,9 +49,12 @@
<el-input v-model="form.UserName" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div class="bodySearchReset" :style="{marginLeft:$store.state.app.sidebar.opened?'5%':'10%'}">
- <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
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
+ <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
<div
@@ -147,7 +150,8 @@
<i
v-if="row.is_user==='Y'"
class="el-icon-user-solid"
- style="color:#42b983;cursor: pointer"
+ style=" cursor: pointer"
+ :style="{color:styleObject}"
@click="userClick(row)"
/>
<i
@@ -166,7 +170,12 @@
width="120"
>
<template slot-scope="{row}">
- <i v-if="row.is_right==='Y'" class="el-icon-share" @click="rightClick(row)" />
+ <i
+ v-if="row.is_right==='Y'"
+ :style="{color:styleObject}"
+ class="el-icon-share"
+ @click="rightClick(row)"
+ />
<i
v-if="row.is_right==='N'"
class="el-icon-share"
@@ -183,9 +192,20 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
- <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ <i
+ class="el-icon-edit-outline"
+ :style="{color:styleObject}"
+ @click="edit('edit',row)"
+ />
</el-tooltip>
- <el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
+ <el-tooltip
+ v-del-tab-index
+ class="item"
+ :style="{color:styleObject}"
+ effect="dark"
+ content="鍒犻櫎"
+ placement="top"
+ >
<i class="el-icon-delete" @click="del(row)" />
</el-tooltip>
</div>
@@ -207,6 +227,7 @@
<!-- 鏂板淇敼瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
width="800px"
@@ -244,8 +265,9 @@
</el-form>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
<el-button
+ v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
:disabled="$store.state.app.buttonIsDisabled"
@@ -256,6 +278,7 @@
</el-dialog>
<!-- 璁剧疆鎸夐挳瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
title="璁剧疆"
:visible.sync="settingDialogVisible"
width="800px"
@@ -265,8 +288,8 @@
@close="handleCloseSetting"
>
<div style="margin-bottom: 20px;display: flex">
- <el-button type="primary" icon="el-icon-circle-plus-outline" @click="addSetting">鏂板</el-button>
- <!-- <el-button type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="addSetting">鏂板</el-button>
+ <!-- <el-button v-waves type="primary" icon="el-icon-delete" @click="delSetting">鍒犻櫎</el-button>-->
</div>
<el-table
ref="RoleTypeCodeArr"
@@ -297,7 +320,12 @@
sortable="custom"
>
<template slot-scope="{row}">
- <el-input v-if="row.isVisible===1" v-model="row.roletype_code" oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')" placeholder="璇疯緭鍏�" />
+ <el-input
+ v-if="row.isVisible===1"
+ v-model="row.roletype_code"
+ oninput="value=value.replace(/[^0-9a-zA-Z]/g,'')"
+ placeholder="璇疯緭鍏�"
+ />
<div v-else> {{ row.roletype_code }}</div>
</template>
</el-table-column>
@@ -315,9 +343,9 @@
<el-table-column label="鎿嶄綔">
<template slot-scope="{row}">
<div class="operationClass">
- <el-button v-if="row.isVisible===0" type="text" @click="delSetting(row)">鍒犻櫎</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="formSettingSave(row)">淇濆瓨</el-button>
- <el-button v-if="row.isVisible===1" type="text" @click="formSettingCancel(row)">鍙栨秷</el-button>
+ <el-button v-if="row.isVisible===0" v-waves type="text" @click="delSetting(row)">鍒犻櫎</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="formSettingSave(row)">淇濆瓨</el-button>
+ <el-button v-if="row.isVisible===1" v-waves type="text" @click="formSettingCancel(row)">鍙栨秷</el-button>
</div>
</template>
</el-table-column>
@@ -335,13 +363,14 @@
/>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="settingDialogVisibleCancel">杩斿洖</el-button>
- <!-- <el-button type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
+ <el-button v-waves @click="settingDialogVisibleCancel">杩斿洖</el-button>
+ <!-- <el-button v-waves type="primary" @click="settingDialogVisibleConfirm">纭� 瀹�</el-button>-->
</div>
</span>
</el-dialog>
<!-- 鍏宠仈鐢ㄦ埛瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
title="瑙掕壊鍏宠仈鐢ㄦ埛"
:visible.sync="userDialogVisible"
width="900px"
@@ -353,11 +382,11 @@
@close="handleCloseUser"
>
<div>
- <i class="el-icon-s-comment" style="color:#42b983;" /> 瑙掕壊鍚嶇О锛歿{ userForm.roleName }}
+ <i class="el-icon-s-comment" :style="{color:styleObject}" /> 瑙掕壊鍚嶇О锛歿{ userForm.roleName }}
</div>
<el-divider />
<div style="margin-bottom: 10px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 鐢ㄦ埛鍒楄〃
+ <i class="el-icon-s-operation" :style="{color:styleObject}" /> 鐢ㄦ埛鍒楄〃
</div>
<div style="display: flex;min-height: 50px;margin-bottom: 10px">
<el-form ref="dialogFormUser" inline :model="dialogFormUser" label-width="80px">
@@ -406,6 +435,7 @@
</el-form-item>
</el-form>
<el-button
+ v-waves
type="primary"
icon="el-icon-search"
style="margin-top: 5px;margin-left: 30px"
@@ -413,6 +443,7 @@
>鏌ヨ
</el-button>
<el-button
+ v-waves
type="info"
icon="el-icon-refresh"
style="margin-top: 5px;margin-left: 10px"
@@ -469,11 +500,13 @@
>
<template slot-scope="{row}">
<div v-if="row.flag==='Y'">
- <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+ <i class="el-icon-success" :style="{color:styleObject}" style="margin-right: 2px" />
+ <!-- <svg-icon icon-class="circleYes" :style="{color:styleObject}" style="margin-right: 2px" />-->
鏄�
</div>
<div v-if="row.flag==='N'">
- <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+ <i class="el-icon-info" style="margin-right: 2px" />
+ <!-- <svg-icon icon-class="circleNo" style="margin-right: 2px" />-->
鍚�
</div>
</template>
@@ -494,8 +527,9 @@
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="userDialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button v-waves @click="userDialogVisibleCancel">鍙� 娑�</el-button>
<el-button
+ v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
:disabled="$store.state.app.buttonIsDisabled"
@@ -506,6 +540,7 @@
</el-dialog>
<!-- 鍒嗛厤鏉冮檺瀵硅瘽妗�-->
<el-dialog
+ v-el-drag-dialog
title="瑙掕壊鍏宠仈鏉冮檺"
:visible.sync="dialogVisibleRight"
width="800px"
@@ -517,37 +552,53 @@
@close="handleCloseRight"
>
<div>
- <i class="el-icon-s-comment" style="color:#42b983;" /> 瑙掕壊鍚嶇О锛歿{ rightFrom.username }}
+ <i class="el-icon-s-comment" :style="{color:styleObject}" /> 瑙掕壊鍚嶇О锛歿{ rightFrom.username }}
</div>
<el-divider />
<div style="margin-bottom: 10px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 鏉冮檺鎿嶄綔绔�
+ <i class="el-icon-s-operation" :style="{color:styleObject}" /> 鏉冮檺鎿嶄綔绔�
</div>
<div class="myCheckboxGroup">
<div
v-for="item in dialogFormRight.rightOperationArr"
:key="item.code"
- :style="{border:item.isSelected1?'1px solid #42b983':'1px solid #eee'}"
+ :style="{border:item.isSelected1?'1px solid '+ styleObject :'1px solid #eee'}"
class="myCheckbox"
@click="myCheckboxClick(item)"
>
- <input
- class="myCheckboxInput"
- type="checkbox"
- :disabled="rightFrom.usercode==='S001'"
- :value="item.code"
- :name="item.name"
- :style="{color:item.isSelected2?'#42b983':'#fff'}"
- @click="myCheckboxInputClick(item)"
- >{{ item.name }}
+
+ <!-- <input-->
+ <!-- class="myCheckboxInput"-->
+ <!-- type="checkbox"-->
+ <!-- :disabled="rightFrom.usercode==='S001'"-->
+ <!-- :value="item.code"-->
+ <!-- :name="item.name"-->
+ <!-- :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
+ <!-- @click="myCheckboxInputClick(item)"-->
+ <!-- >{{ item.name }}-->
+
<!-- 鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
<!-- onClick="event.cancelBubble = true"-->
+ <!--鏄庡ぉ鍐嶇湅涓�涓媔nput鍜宔l-checkbox涔嬮棿鐨勫尯鍒�-->
+
+ <el-checkbox
+ :key="item.code"
+ v-model="item.isSelected2"
+ class="myCheckboxInput"
+ :value="item.code"
+ :name="item.name"
+ :disabled="rightFrom.usercode==='S001'"
+ :checked="item.isSelected2"
+ :label="item.name"
+ @change="myCheckboxInputClick(item)"
+ />
+ <div class="myCheckboxInputLabel">{{ item.name }}</div>
</div>
</div>
<el-divider />
<div style="margin-bottom: 10px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 鍔熻兘鏉冮檺
+ <i class="el-icon-s-operation" :style="{color:styleObject}" /> 鍔熻兘鏉冮檺
</div>
<div style="height: 393px;overflow-y: scroll">
<el-tree
@@ -577,8 +628,9 @@
</div>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="rightDialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button v-waves @click="rightDialogVisibleCancel">鍙� 娑�</el-button>
<el-button
+ v-waves
type="primary"
:loading="$store.state.app.buttonIsDisabled"
:disabled="$store.state.app.buttonIsDisabled"
@@ -614,12 +666,15 @@
import { getCookie } from '@/utils/auth'
import $ from 'jquery'
import clearAllChildren, { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
export default {
name: 'JSQD',
components: {
Pagination, ImportPicker
},
+ directives: { elDragDialog, waves },
data() {
return {
isIpad: false,
@@ -723,6 +778,11 @@
title_value: '鏁版嵁瀵煎叆 / 瑙掕壊娓呭崟',
code: '1',
shows: false
+ }
+ },
+ computed: {
+ styleObject() {
+ return this.$store.state.settings.theme
}
},
watch: {
@@ -939,6 +999,10 @@
},
// 娣诲姞鎸夐挳
addSetting() {
+ if (this.RoleTypeCodeArr.find(i => i.isVisible === 1)) {
+ return this.$message.info('璇峰厛淇濆瓨涓婁竴琛岃褰曪紒')
+ }
+
let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
const data = { roletype_code: '', roletype_name: '', isVisible: 1, number: number }
@@ -992,7 +1056,7 @@
},
/* 鍏宠仈鐢ㄦ埛妯″潡*/
- async userClick(row) {
+ async userClick(row) {
if (row.role_code === 'S001') {
return this.$message.info('姝よ鑹叉棤娉曟搷浣滐紒')
}
@@ -1213,13 +1277,13 @@
pcIsSelected2 = true
const interval = setInterval(() => {
- if ($("input[name='PC']").length > 0) {
+ if ($('input[name=\'PC\']').length > 0) {
waitFlag = true
}
if (waitFlag) {
clearInterval(interval)
this.$nextTick(() => {
- $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'PC\']').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
}
}, 100)
@@ -1232,13 +1296,13 @@
appIsSelected2 = true
const interval = setInterval(() => {
- if ($("input[name='APP']").length > 0) {
+ if ($('input[name=\'APP\']').length > 0) {
waitFlag = true
}
if (waitFlag) {
clearInterval(interval)
this.$nextTick(() => {
- $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'APP\']').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
}
}, 100)
@@ -1253,14 +1317,14 @@
appIsSelected2 = true
const interval = setInterval(() => {
- if ($("input[name='PC']").length > 0) {
+ if ($('input[name=\'PC\']').length > 0) {
waitFlag = true
}
if (waitFlag) {
clearInterval(interval)
this.$nextTick(() => {
- $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
- $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'PC\']').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'APP\']').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
}
}, 100)
@@ -1277,13 +1341,13 @@
pcIsSelected2 = true
const interval = setInterval(() => {
- if ($("input[name='PC']").length > 0) {
+ if ($('input[name=\'PC\']').length > 0) {
waitFlag = true
}
if (waitFlag) {
clearInterval(interval)
this.$nextTick(() => {
- $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'PC\']').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
}
}, 100)
@@ -1299,13 +1363,13 @@
appIsSelected2 = true
const interval = setInterval(() => {
- if ($("input[name='APP']").length > 0) {
+ if ($('input[name=\'APP\']').length > 0) {
waitFlag = true
}
if (waitFlag) {
clearInterval(interval)
this.$nextTick(() => {
- $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'APP\']').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
}
}, 100)
@@ -1509,8 +1573,8 @@
},
// 灏忕洅瀛愮偣鍑讳簨浠�
myCheckboxInputClick(val) {
- // console.log(val)
- val.isSelected2 = !val.isSelected2
+ val.isSelected2 = !!val.isSelected2
+
this.dialogFormRight.rightCurrentCode = val.code
// 1.绗竴绉嶆儏鍐� 灏忕洅瀛愪粠娌￠�変腑鍒伴�変腑
@@ -1561,10 +1625,10 @@
this.$nextTick(() => {
if (item.name === 'PC') {
- $("input[name='PC']").eq(0).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'PC\']').eq(0).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
}
if (item.name === 'APP') {
- $("input[name='APP']").eq(0).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'APP\']').eq(0).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
}
// $("input[name='APP']").eq(0).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
// $('input:checkbox').eq(index).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
@@ -1587,10 +1651,10 @@
item.isSelected2 = true
this.$nextTick(() => {
if (item.name === 'PC') {
- $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'PC\']').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
}
if (item.name === 'APP') {
- $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'APP\']').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
}
// $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
@@ -1613,10 +1677,10 @@
item.isSelected2 = true
this.$nextTick(() => {
if (item.name === 'PC') {
- $("input[name='PC']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'PC\']').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
}
if (item.name === 'APP') {
- $("input[name='APP']").eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
+ $('input[name=\'APP\']').eq(0).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
}
// $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
})
@@ -1671,17 +1735,22 @@
margin: 10px 30px 0 0;
border-radius: 5px;
cursor: default;
+ position: relative;
.myCheckboxInput {
margin: 1px 5px 0 0;
cursor: pointer;
}
- }
+ .myCheckboxInputLabel {
+ position: absolute;
+ left: 29px;
+ padding: 5px;
+ top: 6px;
+ color: transparent;
+ }
- //.myCheckbox{
- // border: 1px solid $main_color;
- //}
+ }
input[type=checkbox] {
cursor: pointer;
@@ -1722,10 +1791,11 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-::v-deep .el-button--text{
- font-size: 14px ;
- cursor: pointer ;
+::v-deep .el-button--text {
+ font-size: 14px;
+ cursor: pointer;
}
+
.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
color: $main_color;
cursor: pointer;
@@ -1814,23 +1884,25 @@
margin-bottom: 0;
}
-.tableFixed{
- ::v-deep .el-table__fixed-right{
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
height: 100% !important;
}
- ::v-deep .el-table__fixed{
+
+ ::v-deep .el-table__fixed {
height: 100% !important;
}
}
</style>
<style>
-.osloading{
+.osloading {
font-size: 26px !important;
}
-.el-loading-text{
+.el-loading-text {
font-size: 26px !important;
}
+
.el-table .custom-row {
background: #f8f8fa;
}
--
Gitblit v1.9.3