From 04c5571156dc904de0ab2478a6b73b304bc16c4c Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 09 八月 2022 11:13:41 +0800
Subject: [PATCH] 1.项目整体样式修改
---
src/views/zzmx/chda.vue | 4
src/views/scgl/scdd.vue | 24
src/views/xtsy/index.vue | 2
src/views/zlgl/gxjy.vue | 232 +--
src/views/scgl/gd.vue | 303 ++--
src/styles/global.css | 12
src/views/scgl/sckbg.vue | 262 ++--
src/views/zlgl/gxjyxm.vue | 205 +--
src/components/Pagination/index.vue | 5
/dev/null | 1484 ---------------------------
src/views/zzmx/jpgj.vue | 4
src/views/zlgl/qxdy.vue | 206 +--
src/views/xtsz/bmgz.vue | 209 +--
src/views/zzmx/gxdy.vue | 2
src/views/zlgl/gxjybz.vue | 237 +--
15 files changed, 717 insertions(+), 2,474 deletions(-)
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 331ebd7..b86c583 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -132,4 +132,9 @@
.el-pagination button, .el-pagination span:not([class*=suffix]){
font-size: 14px;
}
+
+.el-pagination .el-select .el-input .el-input__inner{
+ line-height: 34px;
+ height: 34px;
+}
</style>
diff --git a/src/styles/global.css b/src/styles/global.css
index 11a632a..e636bc0 100644
--- a/src/styles/global.css
+++ b/src/styles/global.css
@@ -78,12 +78,15 @@
::-webkit-scrollbar {
width: 7px;
height: 7px;
- background-color: white;
+ /*background-color: white;*/
+ background-color: #f8f8fa;
}
::-webkit-scrollbar-thumb {
- box-shadow: inset 0 0 0px white;
- -webkit-box-shadow: inset 0 0 0px white;
+ /*box-shadow: inset 0 0 0px white;*/
+ box-shadow: inset 0 0 0px #f8f8fa;
+ /*-webkit-box-shadow: inset 0 0 0px white;*/
+ -webkit-box-shadow: inset 0 0 0px #f8f8fa;
background-color: rgb(193, 193, 193);
/*婊氬姩鏉＄殑鑳屾櫙棰滆壊*/
border-radius: 20px;
@@ -100,7 +103,8 @@
.el-table__fixed-right::before,
.el-table__fixed::before {
- background-color: unset !important;
+ /*background-color: unset !important;*/
+ background-color: #f8f8fa !important;
}
/*scrollbar END*/
diff --git a/src/styles/global_back.css b/src/styles/global_back.css
deleted file mode 100644
index 71fb220..0000000
--- a/src/styles/global_back.css
+++ /dev/null
@@ -1,73 +0,0 @@
-/*鍏ㄥ眬鏍峰紡琛�*/
-html, body, #app {
- height: 100%;
- margin: 0;
- padding: 0;
- /*min-width: 1800px;*/
- /*overflow-y: hidden;*/
- /*overflow-x: hidden;*/
-
- -moz-osx-font-smoothing: grayscale;
- -webkit-font-smoothing: antialiased;
- text-rendering: optimizeLegibility;
- font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
-}
-
-
-.body {
- display: flex;
- flex-direction: column;
- height: 100%;
- /*background-color: #eee;*/
- margin: 0;
- padding: 0 10px;
-}
-
-.elForm {
- display: flex;
- justify-content: flex-start;
- width: 100%;
- flex-wrap: wrap;
-}
-
-.elTableDiv {
- display: flex;
- border: 1px solid #eee;
- width: 99%;
- margin: 0 auto;
-}
-
-/*
-瀹氫箟婊氬姩鏉￠珮瀹藉強鑳屾櫙
-楂樺鍒嗗埆瀵瑰簲妯珫婊氬姩鏉＄殑灏哄
-*/
-::-webkit-scrollbar {
- width: 7px;
- height: 7px;
- background-color: white;
-}
-
-::-webkit-scrollbar-thumb {
- box-shadow: inset 0 0 0px white;
- -webkit-box-shadow: inset 0 0 0px white;
- background-color: rgb(193, 193, 193);
- /*婊氬姩鏉＄殑鑳屾櫙棰滆壊*/
- border-radius: 20px;
-}
-
-/*瑙ｅ喅琛ㄦ牸鍥哄畾鍒楁椂鐨勫帇鏍峰紡闂*/
-.el-table__fixed {
- height: calc(100% - 7px) !important;
-}
-
-.el-table__fixed-right {
- height: calc(100% - 12px) !important;
-}
-
-.el-table__fixed-right::before,
-.el-table__fixed::before {
- background-color: unset !important;
-}
-
-/*scrollbar END*/
-
diff --git a/src/utils/global_back.js b/src/utils/global_back.js
deleted file mode 100644
index 310c12a..0000000
--- a/src/utils/global_back.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import { NewEncodingRules } from '@/api/xtsz'
-
-// 鍏ㄥ眬涓昏棰滆壊
-export function getGlobalColor() {
- return { globalColor: `#42b983` }
-}
-
-// 澶勭悊琛ㄥご鍗曞厓鏍兼牱寮�
-export function headerCellStyle() {
- const option = {
- background: '#eee', padding: '0'
- }
- return option
-}
-
-// 澶勭悊琛ㄦ牸鍗曞厓鏍兼牱寮�
-export function cellStyle() {
- const option = {
- padding: '5px 0'
- }
- return option
-}
-
-// 鏃堕棿澶勭悊鍑芥暟
-export function handleDatetime(value) {
- const data = new Date(value)
- const month = data.getMonth() < 9 ? '0' + (data.getMonth() + 1) : data.getMonth() + 1
- const date = data.getDate() <= 9 ? '0' + data.getDate() : data.getDate()
- return data.getFullYear() + '-' + month + '-' + date
-}
-
-// 鑾峰彇瑙勫垯鐢熸垚鐨勭紪鐮�
-export async function getNewEncodingRules(encode) {
- const res = await NewEncodingRules({ rightcode: encode })
- if (res.code === '200') {
- return { RightCode: res.data[0], numvalue: res.data[1] }
- }
-}
-
-// 閫掑綊娓呴櫎鏁扮粍姣忎釜鍏冪礌涓嬬殑children涓虹┖鐨勬暟缁�
-const clearAllChildren = (items, childrenName = 'children') => {
- for (let i = 0; i < items.length; i++) {
- const item = items[i]
- // 褰撳墠瀵硅薄瀛樺湪children
- if (item && item[childrenName]) {
- // children涓虹┖鏁扮粍鏃跺垹闄�
- if (item[childrenName].length === 0) {
- delete item[childrenName]
- } else {
- // 閫掑綊褰撳墠children鏁扮粍
- clearAllChildren(item[childrenName], childrenName)
- }
- }
- }
- return items
-}
-
-export default clearAllChildren
diff --git a/src/views/jcsz/yhqd_back.vue b/src/views/jcsz/yhqd_back.vue
deleted file mode 100644
index bac0ffe..0000000
--- a/src/views/jcsz/yhqd_back.vue
+++ /dev/null
@@ -1,1484 +0,0 @@
-<template>
- <div>
- <div class="body" :style="{height:mainHeight+'px'}">
- <div style="padding: 10px 5px 0 0">
- <el-form
- ref="form"
- :model="form"
- label-width="80px"
- inline
- style="display: flex;justify-content: space-between"
- >
- <div class="elForm">
- <el-form-item label="鐢ㄦ埛缂栫爜" style=" display: flex;">
- <el-input v-model="form.UserCode" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item label="鐢ㄦ埛鍚嶇О" style=" display: flex;">
- <el-input v-model="form.UserName" placeholder="璇疯緭鍏�" style="width: 200px" />
- </el-form-item>
- <el-form-item label="鎵�灞炵粍缁�" style=" display: flex;">
- <el-cascader
- ref="cascader"
- filterable
- popper-class="elCascader"
- :options="StuOrgArr"
- :props="defaultProps"
- @change="cascaderChange"
- />
- <!-- @focus="getUserOrganization"-->
-
- </el-form-item>
- <el-form-item label="宸ヨ祫绫诲瀷" style=" display: flex;">
- <el-select
- v-model="form.wagetype"
- :popper-append-to-body="false"
- filterable
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in wagetypeArr"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鍦ㄨ亴鐘舵��" style=" display: flex;">
- <el-select
- v-model="form.Enable"
- :popper-append-to-body="false"
- filterable
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in EnableArr"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </div>
- <div style="display: flex;align-items: start;margin-top: 5px;">
- <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>
- <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 />
- <div class="elTableDiv">
- <el-table
- :data="tableData"
- border
- stripe
- :height="tableHeight+'px'"
- highlight-current-row
- :style="{width: 100+'%',height:tableHeight+'px'}"
- :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="usercode"
- label="鐢ㄦ埛缂栫爜"
- min-width="110"
- sortable="custom"
- />
- <el-table-column
- prop="username"
- label="鐢ㄦ埛鍚嶇О"
- min-width="110"
- sortable="custom"
- />
- <el-table-column
- prop="password"
- label="鐢ㄦ埛瀵嗙爜"
- min-width="110"
- sortable="custom"
- />
- <el-table-column
- prop="org_name"
- label="鎵�灞炵粍缁�"
- min-width="110"
- sortable="custom"
- />
- <el-table-column
- prop="group_name"
- label="鐢熶骇鐝粍"
- min-width="110"
- sortable="custom"
- />
- <el-table-column
- prop="wagetype"
- label="宸ヨ祫绫诲瀷"
- sortable="custom"
- width="110"
- >
- <template slot-scope="{row}">
- <div v-if="row.wagetype==='1'">璁℃椂鍒�</div>
- <div v-if="row.wagetype==='2'">璁′欢鍒�</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="mobile"
- label="鑱旂郴鏂瑰紡"
- min-width="110"
- sortable="custom"
- >
- <template slot-scope="{row}">
- <div v-if="row.mobile===''">/</div>
- <div v-else>{{ row.mobile }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="email"
- label="鐢靛瓙閭"
- sortable="custom"
- min-width="110"
- >
- <template slot-scope="{row}">
- <div v-if="row.email===''">/</div>
- <div v-else>{{ row.email }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="enable"
- label="鍦ㄨ亴鐘舵��"
- width="110"
- 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="鍒涘缓浜哄憳"
- width="110"
- sortable="custom"
- />
- <el-table-column
- prop="lm_date"
- label="鍒涘缓鏃堕棿"
- width="160"
- sortable="custom"
- />
- <el-table-column
- prop="is_role"
- label="鍏宠仈瑙掕壊"
- width="110"
- >
- <template slot-scope="{row}">
- <i v-if="row.is_role==='Y'" class="el-icon-share" @click="roleClick({row})" />
- <i v-if="row.is_role==='N'" class="el-icon-share" style="color: rgb(180 ,181, 185)" @click="roleClick({row})" />
- </template>
- </el-table-column>
- <el-table-column
- label="鎿嶄綔"
- fixed="right"
- width="120"
- >
- <template slot-scope="{row}">
- <div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <el-button type="text" @click="del(row.id)">鍒犻櫎</el-button>
- </div>
- </template>
- </el-table-column>
- </el-table>
- </div>
- <!--鍒嗛〉-->
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="form.page"
- :limit.sync="form.rows"
- align="right"
- layout="prev, pager, next,sizes"
- popper-class="select_bottom"
- @pagination="getUserSearch"
- />
- </div>
-
- <!-- 鐢ㄦ埛娓呭崟鏂板銆佺紪杈�-->
- <el-dialog
- :title="operation==='add'?'鏂板':'缂栬緫'"
- :visible.sync="dialogVisible"
- width="800px"
- :close-on-click-modal="false"
- top="15vh"
- @closed="handleClose"
- @close="handleClose"
- >
- <el-form ref="dialogForm" :rules="dialogFormRules" inline :model="dialogForm" label-width="80px">
- <el-form-item label="鐢ㄦ埛缂栫爜" prop="UserCode">
- <el-input v-model="dialogForm.UserCode" :disabled="operation!=='add'" style="width: 200px" />
- </el-form-item>
- <el-form-item label="鐢ㄦ埛鍚嶇О" prop="UserName">
- <el-input v-model="dialogForm.UserName" style="width: 200px" />
- </el-form-item>
- <el-form-item label="鐢ㄦ埛瀵嗙爜" prop="Password">
- <el-input v-model="dialogForm.Password" style="width: 200px" />
- </el-form-item>
- <el-form-item label="鍦ㄨ亴鐘舵��" prop="Enable">
- <el-select
- v-model="dialogForm.Enable"
- :popper-append-to-body="false"
- filterable
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in EnableArr"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鎵�灞炵粍缁�" prop="StuOrg" style="display: flex;float: left">
- <el-cascader
- ref="dialogCascader"
- key="cascaderKey"
- filterable
- popper-class="elCascader"
- :options="StuOrgArr2"
- :props="defaultProps"
- style="width: 200px;"
- @change="dialogCascaderChange"
- />
- </el-form-item>
- <el-form-item label="鎵�灞炵彮缁�" prop="groupcode">
- <el-select
- v-model="dialogForm.groupcode"
- :popper-append-to-body="false"
- filterable
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in usergroupArr"
- :key="item.group_code"
- :label="item.group_name"
- :value="item.group_code"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="宸ヨ祫绫诲瀷" prop="wagetype">
- <el-select
- v-model="dialogForm.wagetype"
- :popper-append-to-body="false"
- filterable
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in wagetypeArr"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鑱旂郴鏂瑰紡" prop="Mobile">
- <el-input v-model="dialogForm.Mobile" style="width: 200px" />
- </el-form-item>
- <el-form-item label="鐢靛瓙閭" prop="Email">
- <el-input v-model="dialogForm.Email" style="width: 200px" />
- </el-form-item>
- </el-form>
- <span slot="footer" class="dialog-footer">
- <div class="footerButton">
- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
- </div>
- </span>
- </el-dialog>
-
- <!-- 鍏宠仈瑙掕壊-->
- <el-dialog
- title="鍏宠仈瑙掕壊"
- :visible.sync="dialogVisibleRoles"
- width="800px"
- :top="isIpad?'3vh':'15vh'"
- :fullscreen="isIpad"
- :close-on-click-modal="false"
- class="dialogVisibleRoles"
- @closed="handleCloseRoles"
- @close="handleCloseRoles"
- >
- <!-- @opened="handleOpenedRoles"-->
-
- <div>
- <i class="el-icon-s-comment" style="color:#42b983;" /> 鐢ㄦ埛鍚嶇О锛歿{ dialogFormRoles.username }}
- </div>
- <el-divider />
- <div>
- <div style="margin-bottom:20px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 瑙掕壊绫诲瀷闆嗗悎锛�
- </div>
- <div class="myCheckboxGroup">
- <div
- v-for="item in dialogFormRoles.rolesArr"
- :key="item.code"
- :style="{border:item.isSelected1?'1px solid #42b983':'1px solid #eee'}"
- class="myCheckbox"
- @click="myCheckboxClick(item)"
- >
- <input
- class="myCheckboxInput"
- type="checkbox"
- :value="item.code"
- :name="item.name"
- :style="{color:item.isSelected2?'#42b983':'#fff'}"
- @click="myCheckboxInputClick(item)"
- >{{ item.name }}
- <!-- 鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
- <!-- onClick="event.cancelBubble = true"-->
- </div>
- </div>
- </div>
- <el-divider />
- <div>
- <div style="margin-bottom:20px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 瑙掕壊锛�
- </div>
- <el-tree
- ref="roleTree"
- :data="dialogFormRoles.roleTree"
- show-checkbox
- node-key="code"
- default-expand-all
- style="height: 300px"
- :props="defaultPropsOfRoleTree"
- @check="checkBoxClick"
- />
- <!-- @check-change="checkChange"-->
-
- </div>
- <span slot="footer" class="dialog-footer">
- <div class="footerButton">
- <el-button @click="rolesDialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="rolesDialogVisibleConfirm">纭� 瀹�</el-button>
- </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>
-
- <!--瀵煎叆缁勪欢-->
- <import-picker ref="importPickerFunc" :shows.sync="shows" :title="title_value" :colos="colos" :code="code" />
-
- </div>
-</template>
-
-<script>
-import Pagination from '@/components/Pagination'
-import ImportPicker from '@/components/ImportPicker'
-
-import {
- AddUpdateUser,
- DeleteUser,
- SaveUserAssoctRole,
- UserAssociationRole,
- UserGroupAdd,
- UserGroupDelete,
- UserGroupSearch,
- UserOrganization,
- UserSearch
-} from '@/api/jcsz'
-import { getCookie } from '@/utils/auth'
-import $ from 'jquery'
-import clearAllChildren from '@/utils/global'
-import { MesOrderStepReportSelectUserGroup } from '@/api/scgl'
-
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
-export default {
- name: 'YYQD',
- components: {
- Pagination, ImportPicker
- },
- data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
- const validateMobile = (rule, value, callback) => {
- if (!value) {
- callback()
- // return callback(new Error('璇疯緭鍏ョ數璇濆彿鐮�'))
- } else {
- const mobile = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/ // 闀垮彿
- const mobile2 = /^[0-9]{6}$/ // 鐭彿
- if (mobile.test(value) || mobile2.test(value)) {
- callback()
- // return callback(new Error('鐢佃瘽鍙风爜涓嶇鍚堣鍒�'))
- } else {
- return callback(new Error('鐢佃瘽鍙风爜涓嶇鍚堣鍒�'))
- // callback()
- }
- }
- }
- const validateEmail = (rule, value, callback) => {
- if (!value) {
- callback()
- // return callback(new Error('璇疯緭鍏ョ數瀛愰偖绠�'))
- } else {
- const email = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(.[a-zA-Z0-9_-]+)+$/
- if (email.test(value)) {
- callback()
- } else {
- return callback(new Error('鐢靛瓙閭涓嶇鍚堣鍒�'))
- }
- }
- }
-
- return {
- isIpad: false,
- mainHeight: 0,
- tableHeight: 0,
- form: {
- UserCode: '', // 鐢ㄦ埛缂栫爜
- UserName: '', // 鐢ㄦ埛鍚嶇О
- StuOrg: '', // 鎵�灞炵粍缁�
- wagetype: '', // 宸ヨ祫绫诲瀷
- Enable: '', // 鍦ㄨ亴鐘舵��
- prop: 'lm_date', // 鎺掑簭瀛楁
- order: 'desc', // 鎺掑簭瀛楁
- page: 1, // 绗嚑椤�
- rows: 20 // 姣忛〉澶氬皯鏉�
- },
- StuOrgArr: [], // 鎵�灞炵粍缁囨暟缁�
- StuOrgArr2: [], // 鎵�灞炵粍缁囨暟缁� 瀵硅瘽妗�
- defaultProps: {
- checkStrictly: true,
- value: 'code',
- label: 'name',
- children: 'children'
- },
- EnableArr: [
- { value: 'Y', label: '鍦ㄨ亴' },
- { value: 'N', label: '绂昏亴' }
- ], // 鍦ㄨ亴鐘舵��
- total: 10,
- tableData: [],
- dialogVisible: false,
- dialogForm: {
- id: '',
- UserCode: '',
- UserName: '',
- Password: '',
- Enable: 'Y',
- StuOrg: '',
- Mobile: '',
- Email: '',
- groupcode: '',
- Operator: '',
- OperType: '',
- wagetype: ''
- },
- usergroupArr: [], // 鐢熶骇鐝粍鏁扮粍
- wagetypeArr: [
- { value: '2', label: '璁′欢鍒�' },
- { value: '1', label: '璁℃椂鍒�' }
- ],
- operation: '',
- dialogFormRules: {
- UserCode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
- ],
- UserName: [
- { required: true, message: '璇疯緭鍏ョ敤鎴峰悕绉�', trigger: ['blur', 'change'] }
- ],
- Password: [
- { required: true, message: '璇疯緭鍏ョ敤鎴峰瘑鐮�', trigger: ['blur', 'change'] }
- ],
- Enable: [
- { required: true, message: '璇烽�夋嫨鍦ㄨ亴鐘舵��', trigger: ['blur', 'change'] }
- ],
- StuOrg: [
- { required: true, message: '璇烽�夋嫨鎵�灞炵粍缁�', trigger: ['blur', 'change'] }
- ],
- wagetype: [
- { required: true, message: '璇烽�夋嫨宸ヨ祫绫诲瀷', trigger: ['blur', 'change'] }
- ],
- groupcode: [
- { required: true, message: '璇烽�夋嫨鎵�灞炵彮缁�', trigger: ['blur', 'change'] }
- ],
- Mobile: [
- { required: false, validator: validateMobile, trigger: ['blur', 'change'] }
- ],
- Email: [
- { required: false, validator: validateEmail, trigger: ['blur', 'change'] }
- ]
-
- },
- dialogVisibleRoles: false,
- dialogFormRoles: {
- username: '', // 鐢ㄦ埛鍚嶇О
- usercode: '', // 鐢ㄦ埛缂栫爜
- rolesArr: [], // 瑙掕壊绫诲瀷闆嗗悎
- rolesArrSelectedArr: [], // 瑙掕壊绫诲瀷闆嗗悎閫変腑
- roleTree: [], // 瑙掕壊鏍�
- roleTreeSelectedArr: [] // 瑙掕壊鏍戦�変腑
- },
- rolesAll: [], // 瑙掕壊鎵�鏈�
- defaultPropsOfRoleTree: {
- value: 'code',
- label: 'name',
- children: 'children'
- },
- workingDialogVisible: false,
- workingTableData: [],
- workingTableDataLength: 0,
- formWorking: {
- rows: 10,
- page: 1,
- prop: 'group_code',
- order: 'desc'
- },
-
- title_value: '鏁版嵁瀵煎叆 / 鐢ㄦ埛娓呭崟',
- code: '2',
- shows: false
- }
- },
- watch: {
- shows() {
- if (!this.shows) {
- this.getUserSearch()
- }
- }
- },
- created() {
- this.handleRequest()
- },
-
- mounted() {
- window.addEventListener('resize', this.getHeight)
- this.getHeight()
- },
- methods: {
- handleRequest() {
- this.getUserSearch().then(res => {
- if (res.code === '200') {
- this.getUserOrganization()
- }
- })
- },
-
- // 鑾峰彇鐢ㄦ埛娓呭崟
- async getUserSearch() {
- const res = await UserSearch(this.form)
- this.tableData = res.data
- this.total = res.count
- return { code: res.code }
- },
- // 鑾峰彇鎵�灞炵粍缁�
- async getUserOrganization() {
- const { data: res } = await UserOrganization()
- this.StuOrgArr = clearAllChildren(res)
- },
- // 鑾峰彇鎵�灞炵粍缁囧璇濇
- async getUserOrganization2() {
- const { data: res } = await UserOrganization()
- this.StuOrgArr2 = clearAllChildren(res)
- },
- // 瀵煎叆鎸夐挳
- upload() {
- this.shows = true
- this.$refs.importPickerFunc.newDataFunc()
- },
- colos() {
- this.shows = false
- },
- // 鎺掑簭鏀瑰彉鏃�
- 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.getUserSearch()
- },
- // 鏌ヨ
- search() {
- this.getUserSearch()
- },
- // 閲嶇疆
- reset() {
- this.form.UserCode = ''
- this.form.UserName = ''
- this.form.StuOrg = ''
- this.form.Enable = 'Y'
- this.form.wagetype = ''
- this.$refs.cascader.checkedValue = ''// 绾ц仈閫夋嫨鍣ㄧ殑娓呯┖
- this.getUserSearch()
- },
- // 绾ц仈閫夋嫨鍣ㄦ敼鍙樹簨浠�
- cascaderChange(val) {
- this.form.StuOrg = val[val.length - 1]
- },
- dialogCascaderChange(val) {
- this.dialogForm.StuOrg = val[val.length - 1]
- },
- // 鑾峰彇涓嬫媺鐢熶骇鐝粍
- async getMesOrderStepReportSelectUserGroup() {
- const { data: res } = await MesOrderStepReportSelectUserGroup()
- this.usergroupArr = res
- },
- // 鏂板鎸夐挳
- add(operation) {
- this.operation = operation
- this.dialogVisible = true
- this.getUserOrganization2()
- this.getMesOrderStepReportSelectUserGroup()
- },
- // 淇敼鎸夐挳
- edit(operation, row) {
- this.operation = operation
- this.dialogVisible = true
- console.log(row)
-
- this.$nextTick(() => {
- this.dialogForm.id = row.id
- this.dialogForm.UserCode = row.usercode
- this.dialogForm.UserName = row.username
- this.dialogForm.Password = row.password
- this.dialogForm.groupcode = row.group_code
- this.dialogForm.Enable = row.enable
- this.dialogForm.StuOrg = row.stu_torgcode
- this.$refs.dialogCascader.checkedValue = row.stu_torgcode
- this.dialogForm.Mobile = row.mobile
- this.dialogForm.Email = row.email
- this.dialogForm.wagetype = row.wagetype
- })
- this.getMesOrderStepReportSelectUserGroup()
- this.getUserOrganization2()
- },
- // 鍒犻櫎鎸夐挳
- async del(id) {
- this.$confirm('鏄惁纭鍒犻櫎?', '鎻愮ず', {
- confirmButtonText: '纭畾',
- cancelButtonText: '鍙栨秷',
- type: 'warning'
- }).then(() => {
- DeleteUser({ Userid: id }).then(res => {
- if (res.code === '200') {
- this.$message.success('鍒犻櫎鎴愬姛!')
- this.getUserSearch()
- }
- })
- }).catch(() => {
- this.$message.info('宸插彇娑堝垹闄�')
- })
- },
- // 瀵硅瘽妗嗗叧闂簨浠�
- handleClose() {
- this.dialogForm.UserCode = ''
- this.dialogForm.UserCode = ''
- this.dialogForm.UserName = ''
- this.dialogForm.Password = ''
- this.dialogForm.Enable = 'Y'
- this.$refs.dialogCascader.checkedValue = ''
- this.dialogForm.StuOrg = ''
- this.dialogForm.Mobile = ''
- this.dialogForm.Email = ''
- this.dialogForm.groupcode = ''
- this.dialogForm.wagetype = ''
- this.$refs.dialogForm.clearValidate()
- },
- // 瀵硅瘽妗嗗彇娑�
- dialogVisibleCancel() {
- this.dialogVisible = false
- },
- // 瀵硅瘽妗嗙‘璁�
- dialogVisibleConfirm() {
- this.$refs.dialogForm.validate(valid => {
- if (valid) {
- const data = {
- id: this.dialogForm.id,
- UserCode: this.dialogForm.UserCode,
- UserName: this.dialogForm.UserName,
- Password: this.dialogForm.Password,
- Enable: this.dialogForm.Enable,
- // StuOrg: this.dialogForm.StuOrg,
- StuOrg: Array.isArray(this.$refs.dialogCascader.checkedValue) ? this.$refs.dialogCascader.checkedValue[this.$refs.dialogCascader.checkedValue.length - 1] : this.$refs.dialogCascader.checkedValue,
- Mobile: this.dialogForm.Mobile,
- Email: this.dialogForm.Email,
- groupcode: this.dialogForm.groupcode,
- wagetype: this.dialogForm.wagetype,
- OperType: this.operation === 'add' ? 'Add' : 'Update',
- Operator: getCookie('admin')
- }
- AddUpdateUser(data).then(res => {
- if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- this.dialogVisible = false
- this.getUserSearch()
- } else {
- this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
- }
- })
- }
- })
- },
- // 鑾峰彇椤甸潰楂樺害
- getHeight() {
- this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 50
- if (window.innerHeight < 769) {
- this.tableHeight = this.tableHeight - 50
- }
- this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
- })
- },
- // 鍏宠仈瑙掕壊鐐瑰嚮浜嬩欢
- async roleClick({ row }) {
- this.dialogFormRoles.rolesArrSelectedArr = []
- this.dialogFormRoles.rolesArr = []
- this.dialogFormRoles.roleTreeSelectedArr = []
- this.dialogVisibleRoles = true
- this.dialogFormRoles.username = row.username
- this.dialogFormRoles.usercode = row.usercode
- const { data: res } = await UserAssociationRole({ usercode: row.usercode })
- this.rolesAll = res
-
- const nodeKey = []// 鏍戝舰鍥炴樉key
- res.forEach((item, index) => {
- this.dialogFormRoles.rolesArr.push({
- code: item.code,
- name: item.name,
- flag: item.flag,
- isSelected1: false,
- isSelected2: false
- })
- if (item.flag === 'Y') {
- this.dialogFormRoles.rolesArr[index].isSelected2 = true
- this.$nextTick(() => {
- // $('input:checkbox').eq(index).attr('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
- $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
- })
- this.dialogFormRoles.rolesArrSelectedArr.push(item.name)
- if (item.children && item.children.length > 0) {
- const Data = []
- item.children.forEach(it => {
- if (it.flag === 'Y') {
- nodeKey.push(it.code)
- Data.push(it.code)
- }
- })
- this.dialogFormRoles.roleTreeSelectedArr.push({ Code: item.code, Name: item.name, Data: Data })
- }
- }
- })
- console.log(this.dialogFormRoles.roleTreeSelectedArr, 11)
- console.log(this.dialogFormRoles.rolesArr, 888)
-
- this.dialogFormRoles.rolesArr[0].isSelected1 = true// 榛樿閫変腑绗竴涓�
- // this.dialogFormRoles.rolesArr[0].name = '鍏ㄩ儴'
-
- this.dialogFormRoles.roleTree = this.rolesAll.filter(item => item.code === this.dialogFormRoles.rolesArr[0].code)
- this.dialogFormRoles.roleTree[0].name = '鍏ㄩ儴'
- // this.dialogFormRoles.rolesArr
- console.log(nodeKey, 1)
- this.$refs.roleTree.setCheckedKeys(nodeKey)
- },
- // 澶勭悊鐢ㄦ埛鍏宠仈瀵硅瘽妗嗗叧闂簨浠�
- handleCloseRoles() {
- this.$refs.roleTree.setCheckedKeys([])
- this.dialogFormRoles.rolesArrSelectedArr = []
- },
- // 鐢ㄦ埛鍏宠仈瀵硅瘽妗嗗彇娑堜簨浠�
- rolesDialogVisibleCancel() {
- this.dialogVisibleRoles = false
- },
- // 鐢ㄦ埛鍏宠仈瀵硅瘽妗嗙‘璁や簨浠�
- async rolesDialogVisibleConfirm() {
- console.log(this.dialogFormRoles.roleTreeSelectedArr, 333337)
- const res = await SaveUserAssoctRole(this.dialogFormRoles.roleTreeSelectedArr, this.dialogFormRoles.usercode)
- if (res.code === '200') {
- this.$message.success('淇濆瓨鎴愬姛锛�')
- await this.getUserSearch()
- this.dialogVisibleRoles = false
- }
- },
- // 鏍戝舰澶嶉�夋鐐瑰嚮浜嬩欢
- checkBoxClick(obj, { checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys }) {
- // console.log(obj, checkedNodes, checkedKeys, halfCheckedNodes, halfCheckedKeys, 78787878)
-
- // 鎵惧埌 checkedFatherCode 鐖禼ode鍊�
- // 褰揾alfCheckedKeys涓嶇瓑绛夐浂鐨勬椂鍊�
- // let checkedFatherCode = halfCheckedKeys.length !== 0 ? halfCheckedKeys[0] : checkedKeys[0]
- let checkedFatherCode = '' // 鎵惧埌 checkedFatherCode 鐖禼ode鍊�
- // if (checkedFatherCode === undefined) {
- // console.log(this.rolesAll, 66666)
- this.rolesAll.forEach((item, index) => {
- if (item.code === obj.code) {
- checkedFatherCode = item.code
- }
- if (item.children && item.children.length > 0) {
- item.children.forEach((it, ind) => {
- if (it.code === obj.code) {
- checkedFatherCode = item.code
- }
- })
- }
- })
-
- // }
- console.log(checkedFatherCode, 8)
-
- // 1.绗竴绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓嶄负闆� 鍏ㄥ彾 涓嶄负闆�
- if (halfCheckedKeys.length !== 0 && checkedKeys.length !== 0) {
- this.dialogFormRoles.rolesArr.forEach((item, index) => {
- if (item.code === checkedFatherCode) {
- console.log('1.绗竴绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓嶄负闆� 鍏ㄥ彾 涓嶄负闆�')
- this.dialogFormRoles.rolesArr[index].isSelected2 = true
- this.$nextTick(() => {
- // $('input:checkbox').eq(index).attr('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
- $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
- })
- const temp = this.rolesAll.filter(it => it.code === checkedFatherCode)// 杩囨护鍑烘瘡娆￠�変腑鐨勫ぇ椤�
- temp.forEach(it => {
- const a = []
- it.children.forEach(it => {
- if (it.code === obj.code) {
- a.push(it.code)
- }
- })
- // console.log(!this.dialogFormRoles.roleTreeSelectedArr.some(i => i.Code === checkedFatherCode))
- if (!this.dialogFormRoles.roleTreeSelectedArr.some(i => i.Code === checkedFatherCode)) { // 褰撶洿鎺ラ�夌埗code鏃舵墽琛�
- this.dialogFormRoles.roleTreeSelectedArr.push({
- Code: it.code,
- Name: it.name,
- Data: a
- })
- } else {
- this.dialogFormRoles.roleTreeSelectedArr.forEach((i, ind) => { // 褰撻�夊瓙code鏃舵墽琛�
- if (i.Code === checkedFatherCode) {
- this.dialogFormRoles.roleTreeSelectedArr[ind].Data.forEach((i1, ind2) => {
- if (i1 === a[0]) {
- // this.dialogFormRoles.roleTreeSelectedArr[ind].Data.splice(ind2, 1)// 褰撳瓙code涓庣幇鍦ㄧ殑code鐩稿悓鏃舵墽琛�
- this.dialogFormRoles.roleTreeSelectedArr[ind].Data = this.dialogFormRoles.roleTreeSelectedArr[ind].Data.filter(i2 => i2 !== a[0])
- } else {
- this.dialogFormRoles.roleTreeSelectedArr[ind].Data.push(a[0])// //褰撳瓙code涓庣幇鍦ㄧ殑code涓嶇浉鍚屾椂鎵ц
- }
- })
- // this.dialogFormRoles.roleTreeSelectedArr[ind].Data.filter((i1, ind2) => i1 !== a[0])// 杩囨护鎺夐�変腑鐩稿悓鐨�
- }
- })
- }
- })
- }
- })
- }
-
- console.log(this.dialogFormRoles.roleTreeSelectedArr, 11)
-
- // 2.绗簩绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓洪浂 鍏ㄥ彾 涓洪浂
- if (halfCheckedKeys.length === 0 && checkedKeys.length === 0) {
- this.dialogFormRoles.rolesArr.forEach((item, index) => {
- if (item.code === checkedFatherCode) {
- console.log('2.绗簩绉嶆儏鍐靛綋鏍戝舰 鍗婂彾 涓洪浂 鍏ㄥ彾 涓洪浂')
- this.dialogFormRoles.rolesArr[index].isSelected2 = false
- this.$nextTick(() => {
- // console.log($('input:checkbox').eq(1).attr('checked', false), 88888)
- $('input:checkbox').eq(index).prop('checked', false)// 鑷畾涔夊崟閫夋鍥炴樉
- })
- this.dialogFormRoles.roleTreeSelectedArr.forEach((it, ind) => {
- if (it.Code === checkedFatherCode) {
- console.log(it.Code, 9)
- this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1)
- }
- })
- this.dialogFormRoles.rolesArrSelectedArr.forEach((i, i1) => {
- if (i === checkedFatherCode) {
- this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1)
- }
- })
- }
- })
- }
- console.log(this.dialogFormRoles.roleTreeSelectedArr, 22)
-
- // 3.绗笁绉嶇鎯呭喌褰撴爲褰� 鍗婂彾 涓洪浂 鍏ㄥ彾 涓嶄负闆�
- if (halfCheckedKeys.length === 0 && checkedKeys.length !== 0) {
- // this.dialogFormRoles.roleTreeSelectedArr = []
- this.dialogFormRoles.rolesArr.forEach((item, index) => {
- if (item.code === checkedFatherCode) {
- console.log(' 3.绗笁绉嶇鎯呭喌褰撴爲褰� 鍗婂彾 涓洪浂 鍏ㄥ彾 涓嶄负闆�')
- this.dialogFormRoles.rolesArr[index].isSelected2 = true
- this.$nextTick(() => {
- // $('input:checkbox').eq(index).attr('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
- $('input:checkbox').eq(index).prop('checked', true)// 鑷畾涔夊崟閫夋鍥炴樉
- })
- }
- })
-
- const temp = this.rolesAll.filter(it => it.code === checkedFatherCode)// 杩囨护鍑烘瘡娆￠�変腑鐨勫ぇ椤�
- // console.log(!this.dialogFormRoles.roleTreeSelectedArr.some(i => i.Code === checkedFatherCode))
- if (!this.dialogFormRoles.roleTreeSelectedArr.some(i => i.Code === checkedFatherCode)) { // 褰撶埗绫讳负鍏ㄥ彾鏃�
- temp.forEach(it => {
- this.dialogFormRoles.roleTreeSelectedArr.push({
- Code: it.code,
- Name: it.name,
- Data: it.children.map(i => i.code)
- })
- })
- } else { // 褰撶埗绫荤敱鍗婂彾鍙樹负鍏ㄥ彾鏃�
- this.dialogFormRoles.roleTreeSelectedArr.forEach((i1, ind) => {
- if (i1.Code === checkedFatherCode) { // i1娌℃壘瀵�
- this.dialogFormRoles.roleTreeSelectedArr.splice(ind, 1)
- temp.forEach(it => {
- this.dialogFormRoles.roleTreeSelectedArr.push({
- Code: it.code,
- Name: it.name,
- Data: it.children.map(i => i.code)
- })
- })
- }
- })
- }
- }
- },
- // myCheckBox鐐瑰嚮浜嬩欢 澶х洅瀛愮偣鍑�
- myCheckboxClick(item) {
- console.log(this.dialogFormRoles.rolesArr, 7)
- this.dialogFormRoles.rolesArr.forEach(it => {
- it.isSelected1 = it.code === item.code
- })
- this.dialogFormRoles.roleTree = this.rolesAll.filter(it => it.code === item.code)
- this.dialogFormRoles.roleTree[0].name = '鍏ㄩ儴'
- if (this.dialogFormRoles.roleTree[0].children.length < 1) {
- this.dialogFormRoles.roleTree = ''
- }
- const temp = this.dialogFormRoles.roleTreeSelectedArr.filter(it => it.Code === item.code)
- console.log(temp, 33)
- if (temp.length > 0) {
- this.$refs.roleTree.setCheckedKeys(temp[0].Data)// 鏍戝舰閫変腑鍥炴樉
- } else {
- this.$refs.roleTree.setCheckedKeys([])// 褰撻暱搴︿负闆舵椂缃┖
- }
- },
- // myCheckBoxInput鐐瑰嚮浜嬩欢 灏忕洅瀛愮偣鍑�(input)
- myCheckboxInputClick(item) {
- item.isSelected2 = !item.isSelected2
- this.dialogFormRoles.rolesArrSelectedArr = [...new Set(this.dialogFormRoles.rolesArrSelectedArr)]// 鏁扮粍鍘婚噸
- if (item.isSelected2) { // 浠庢病閫変腑鍒伴�変腑
- console.log('浠庢病閫変腑鍒伴�変腑')
- this.dialogFormRoles.rolesArr.forEach(it => {
- if (it.code === item.code && item.isSelected2) {
- this.dialogFormRoles.rolesArrSelectedArr.push(it.code)
- }
- })
-
- const temp = this.rolesAll.filter(it => it.code === item.code)// 杩囨护鍑烘瘡娆￠�変腑鐨勫ぇ椤�
-
- temp.forEach(it => {
- this.dialogFormRoles.roleTreeSelectedArr.push({
- Code: it.code,
- Name: it.name,
- Data: it.children.map(i => i.code)
- })
- })
- }
-
- if (!item.isSelected2) { // 浠庨�変腑鍒版病閫変腑
- console.log('浠庨�変腑鍒版病閫変腑')
- this.dialogFormRoles.rolesArr.forEach((it, ind) => {
- if (it.code === item.code && !item.isSelected2) {
- console.log('杩涙潵浜�')
- console.log(this.dialogFormRoles.rolesArrSelectedArr, 78)
- this.dialogFormRoles.rolesArrSelectedArr.forEach((i, i1) => {
- if (i === it.code) {
- this.dialogFormRoles.rolesArrSelectedArr.splice(i1, 1)
- }
- })
- this.dialogFormRoles.roleTreeSelectedArr.forEach((i, i1) => {
- if (i.Code === it.code) {
- this.dialogFormRoles.roleTreeSelectedArr.splice(i1, 1)
- }
- })
- }
- })
- }
-
- this.$refs.roleTree.setCheckedKeys(this.dialogFormRoles.rolesArrSelectedArr)
- // this.$refs.roleTree.getCheckedKeys()//鍙兘鑾峰彇鍒扮涓�涓爲褰�
-
- this.dialogFormRoles.rolesArrSelectedArr = [...new Set(this.dialogFormRoles.rolesArrSelectedArr)]// 鏁扮粍鍘婚噸
- // 鏁扮粍涓璞＄浉鍚岀殑鍘婚噸
- // this.dialogFormRoles.roleTreeSelectedArr = this.dialogFormRoles.roleTreeSelectedArr.filter((currentValue, currentIndex, selfArr) => {
- // return selfArr.findIndex(item => item.code === currentValue.Code) === currentIndex
- // })
- 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.getMesOrderStepReportSelectUserGroup()
- },
- // 鐢熶骇鐝粍鎺掑簭
- 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>
-
-<style lang="scss" scoped>
-$main_color: #42b983;
-::v-deep .el-button--primary {
- background-color: $main_color !important;
- height: 30px;
- display: flex;
- align-items: center;
- //border: 1px solid $main_color;
- border: none;
- padding: 0 20px;
-}
-
-::v-deep .el-button--primary:hover {
- border: none;
-}
-
-::v-deep .el-button--info {
- //background-color: $main_color !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
-}
-
-::v-deep .el-dialog__footer {
- display: flex;
- justify-content: flex-end;
-}
-
-.footerButton {
- display: flex;
- justify-content: end;
-}
-
-::v-deep .el-button--default {
- background-color: #ffffff !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-button--default:hover {
- color: #606266;
-}
-
-::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;
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
-}
-
-::v-deep .el-input__inner {
- height: 30px;
- line-height: 30px;
-}
-
-::v-deep .el-table .caret-wrapper {
- transform: scale(0.8);
-}
-
-::v-deep .cell {
- display: flex !important;
- align-items: center !important;
- justify-content: space-between !important;
-}
-
-::v-deep .el-button--text {
- color: $main_color;
- font-size: 14px;
- cursor: pointer;
-}
-
-.operationClass {
- height: 23px;
- display: flex;
- justify-content: space-between;
- align-items: center;
-}
-
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
-}
-
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
- margin: 10px 30px 0px 0;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color;
-}
-
-::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
- margin: 10px 30px 0px 0;
-}
-
-.dialogVisibleRoles {
- .myCheckboxGroup {
- display: flex;
- flex-wrap: wrap;
-
- .myCheckbox {
- border: 1px solid #eee;
- display: flex;
- min-width: 100px;
- padding: 10px;
- margin: 10px 30px 0 0;
- border-radius: 5px;
- cursor: default;
-
- .myCheckboxInput {
- margin: 1px 5px 0 0;
- cursor: pointer;
- }
-
- }
-
- input[type=checkbox] {
- cursor: pointer;
- position: relative;
- width: 14px;
- height: 14px;
- font-size: 14px;
- }
-
- input[type=checkbox]::after {
- position: absolute;
- top: 0;
- color: $main_color;
- width: 14px;
- height: 14px;
- display: inline-block;
- visibility: visible;
- padding-left: 0;
- text-align: center;
- content: ' ';
- border-radius: 3px
- }
-
- input[type=checkbox]:checked::after {
- content: "鉁�";
- //content: "鈭�";
- color: #fff;
- font-size: 12px;
- font-weight: bold;
- background-color: $main_color;
- }
- }
-}
-
-.body ::v-deep .el-divider {
- border: 1px solid #eee;
- width: 99%;
- margin: 10px auto;
-}
-
-.body ::v-deep .el-form-item {
- margin-bottom: 0;
-}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select-dropdown__item.selected {
- color: $main_color;
-}
-
-::v-deep .el-input__inner:focus {
- border-color: #42b983 !important;
-}
-
-//::v-deep .el-cascader:not(.is-disabled):hover .el-input__inner:focus {
-// border-color: #42b983 !important;
-//}
-</style>
-<style lang="scss">
-.elCascader {
- //.el-cascader-node.in-active-path, .el-cascader-node.is-active, .el-cascader-node.is-selectable.in-checked-path {
- // color: #42b983 ;
- //}
- .el-cascader-node.is-selectable.in-checked-path {
- color: #42b983;
- }
-
- .el-radio__input.is-checked .el-radio__inner {
- background-color: #42b983;
- border-color: #42b983;
- }
-
- .el-radio__input.is-checked .el-radio__inner:hover {
- border-color: #42b983;
- }
-
- .el-input__inner {
- border-color: #42b983 !important;
- }
-
-}
-</style>
diff --git a/src/views/scgl/gd.vue b/src/views/scgl/gd.vue
index 29cf57b..df43f3c 100644
--- a/src/views/scgl/gd.vue
+++ b/src/views/scgl/gd.vue
@@ -1,7 +1,14 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div style="padding: 10px 5px 0 0">
+
+ <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-connection" @click="send('send')">娲惧彂</el-button>
+ <el-button icon="el-icon-switch-button" @click="orderClose">宸ュ崟鍏抽棴</el-button>
+ </div>
+
+ <div class="bodyTopFormGroup">
<el-form
ref="form"
:model="form"
@@ -65,7 +72,7 @@
type="date"
size="mini"
:clearable="false"
- style="width: 200px;"
+ class="dateMini"
format="yyyy-MM-dd"
placeholder="閫夋嫨鏃ユ湡"
/>
@@ -92,19 +99,13 @@
</div>
</el-form>
</div>
- <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-connection" @click="send('send')">娲惧彂</el-button>
- <el-button type="primary" icon="el-icon-switch-button" @click="orderClose">宸ュ崟鍏抽棴</el-button>
- </div>
- <el-divider />
+
<div class="elTableDiv">
<el-table
:data="tableData"
:height="tableHeight+'px'"
border
- stripe
+ :row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -230,13 +231,17 @@
/>
<el-table-column
label="鎿嶄綔"
- width="140"
+ width="120"
fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="check(row)">宸ュ簭浠诲姟</el-button>
- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
+ <el-tooltip class="item" effect="dark" content="宸ュ簭浠诲姟" placement="top">
+ <i class="el-icon-tickets" style="cursor: pointer;color: #42b983;margin-right: 15px" @click="check(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>
@@ -249,7 +254,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getMesOrderSearch"
/>
@@ -432,7 +437,7 @@
<el-table
:data="searchTableData"
border
- stripe
+ :row-class-name="tableRowClassName"
height="300"
style="width: 100%;"
highlight-current-row
@@ -443,6 +448,7 @@
prop="seq"
label="搴忓彿"
width="50"
+ fixed
/>
<el-table-column
prop="stepcode"
@@ -464,6 +470,7 @@
<el-table-column
prop="descr"
label="宸ュ簭鎻忚堪"
+ fixed="right"
/>
</el-table>
</el-dialog>
@@ -495,7 +502,7 @@
<el-table
:data="taskTableData"
border
- stripe
+ :row-class-name="tableRowClassName"
height="300"
style="width: 100%;"
highlight-current-row
@@ -506,6 +513,7 @@
prop="seq"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="wo_code"
@@ -544,6 +552,7 @@
<el-table-column
prop="ng_qty"
label="涓嶈壇鏁伴噺"
+ fixed="right"
/>
</el-table>
@@ -610,7 +619,7 @@
id="qrCode"
style="width: 22%;height:97px;
margin-top: 20px;
- overflow-x: scroll;display: flex;
+ overflow-y: scroll;display: flex;
justify-content: center;
position: relative;"
>
@@ -870,6 +879,9 @@
this.username = getCookie('username')
},
methods: {
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ },
handleRequest() {
this.getMesOrderSearch().then(res => {
if (res.code === '200') {
@@ -1186,12 +1198,12 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 110
- this.isIpad = window.innerHeight < 769
- if (this.isIpad) {
- this.tableHeight = this.tableHeight - 30
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 260
+ if (window.innerHeight < 769) {
+ this.tableHeight = this.tableHeight - 20
}
+ this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
})
},
// 宸ヨ壓璺嚎鏀惧ぇ闀滅偣鍑�
@@ -1321,53 +1333,10 @@
<style lang="scss" scoped>
$main_color: #42b983;
-::v-deep .el-button--primary {
- background-color: $main_color !important;
- height: 30px;
- display: flex;
- align-items: center;
- //border: 1px solid $main_color;
- border: none;
- padding: 0 20px;
-}
-::v-deep .el-button--primary:hover {
- border: none;
+.el-date-editor{
+ font-size: 14px;
}
-
-::v-deep .el-button--info {
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
-}
-
-::v-deep .el-dialog__footer {
- display: flex;
- justify-content: flex-end;
-}
-
-.footerButton {
- display: flex;
- justify-content: end;
-}
-
-::v-deep .el-button--default {
- background-color: #ffffff !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-button--default:hover {
- color: #606266;
-}
-
::v-deep .el-dialog__body {
padding: 20px 100px !important;
}
@@ -1380,37 +1349,8 @@
padding: 20px 20px !important;
}
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- background-color: $main_color;
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
-}
-
-::v-deep .el-input__inner {
- height: 30px;
- line-height: 30px;
-}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-
::v-deep .el-table .caret-wrapper {
transform: scale(0.8);
-}
-
-::v-deep .cell {
- display: flex !important;
- align-items: center !important;
- justify-content: space-between !important;
}
::v-deep .el-button--text {
@@ -1426,45 +1366,8 @@
align-items: center;
}
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
-}
-
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
- margin: 10px 30px 0px 0;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color;
-}
-
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
margin: 10px 30px 0px 0;
-}
-
-.body ::v-deep .el-divider {
- border: 1px solid #eee;
- width: 99%;
- margin: 10px auto;
}
.body ::v-deep .el-form-item {
@@ -1473,26 +1376,6 @@
.elForm ::v-deep .el-form-item {
margin-bottom: 0;
-}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select-dropdown__item.selected {
- color: $main_color;
-}
-
-::v-deep .el-checkbox__inner:hover {
- border-color: $main_color;
-}
-
-::v-deep .el-textarea__inner:focus {
- border-color: $main_color;
}
.elTableDiv {
@@ -1534,3 +1417,117 @@
color: #000 !important;
}
</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 100px !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;
+}
+
+.dateMini {
+ ::v-deep .el-input__inner {
+ line-height: 34px;
+ height: 34px;
+ width: 200px;
+ display: flex;
+ font-size: 14px !important;
+ align-items: center !important;
+ }
+
+ ::v-deep .el-input__prefix{
+ margin-top: -3px;
+ }
+ //::v-deep .el-range__icon{
+ // line-height: 28px;
+ //}
+}
+
+</style>
+<style>
+
+.el-table .custom-row {
+ background: #f8f8fa;
+}
+</style>
diff --git a/src/views/scgl/scdd.vue b/src/views/scgl/scdd.vue
index 653a70b..1c1de64 100644
--- a/src/views/scgl/scdd.vue
+++ b/src/views/scgl/scdd.vue
@@ -56,14 +56,14 @@
<el-form-item label="鍒涘缓浜哄憳" style=" display: flex;">
<el-input v-model="form.creatuser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
- <el-form-item label="棰勮寮�宸ユ椂闂�" label-width="100px" style=" display: flex;font-size: 14px">
+ <el-form-item label="棰勮寮�宸ユ椂闂�" label-width="100px" style=" display: flex;font-size: 14px;margin-top: 3px">
<el-date-picker
v-model="form.paystartdate"
type="daterange"
range-separator="~"
class="timeMini"
size="mini"
- style="width: 225px;display: flex"
+ style="width: 250px;display: flex;line-height: 34px;height: 34px;font-size: 14px!important;"
:clearable="false"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
@@ -71,7 +71,7 @@
<!-- :picker-options="expireTimeOption"-->
</el-form-item>
- <el-form-item label="棰勮瀹屽伐鏃堕棿" label-width="100px" style=" display: flex;font-size: 14px">
+ <el-form-item label="棰勮瀹屽伐鏃堕棿" label-width="100px" style=" display: flex;font-size: 14px;margin-top: 3px">
<el-date-picker
v-model="form.payenddate"
type="daterange"
@@ -79,7 +79,7 @@
class="timeMini"
range-separator="~"
start-placeholder="寮�濮嬫棩鏈�"
- style="width: 225px;display: flex"
+ style="width: 250px;display: flex;line-height: 34px ;height: 34px ;font-size: 14px !important;"
end-placeholder="缁撴潫鏃ユ湡"
size="mini"
/>
@@ -253,7 +253,10 @@
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">涓嬭揪</el-button>
+ <el-tooltip class="item" effect="dark" content="涓嬭揪" placement="top">
+ <!-- <el-button type="text" @click="edit('edit',row)">涓嬭揪</el-button>-->
+ <i class="el-icon-bottom" style="color:#42b983;cursor: pointer;margin-left: 5px" @click="edit('edit',row)" />
+ </el-tooltip>
</div>
</template>
</el-table-column>
@@ -266,7 +269,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getErpOrderSearch"
/>
@@ -699,6 +702,15 @@
<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
+::v-deep .el-range-input{
+ font-size: 14px !important;
+}
+::v-deep .el-range__icon{
+ line-height: 28px !important;
+}
+::v-deep .el-range-separator{
+ line-height: 28px !important;
+}
::v-deep .el-range-input{
font-size: 14px ;
}
diff --git a/src/views/scgl/sckbg.vue b/src/views/scgl/sckbg.vue
index db79de5..a70ce4e 100644
--- a/src/views/scgl/sckbg.vue
+++ b/src/views/scgl/sckbg.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <div class="body" style="padding: 0;height: 100%" :style="{height:mainHeight+'px'}">
+ <div class="body" style="padding-top: 10px;" :style="{height:mainHeight+'px'}">
<el-tabs ref="elTabs" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="鐢熶骇鍒楄〃">
<div style="margin-left: 10px;margin-top:10px;display: flex;justify-content: space-between">
@@ -32,7 +32,7 @@
:data="tableData"
:height="isIpad? (tableHeight+50):tableHeight"
border
- stripe
+ :row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -125,6 +125,7 @@
label="璁″垝寮�宸ユ棩鏈�"
width="185"
sortable="custom"
+ fixed="right"
/>
<!-- <el-table-column-->
<!-- label="鎿嶄綔"-->
@@ -147,7 +148,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getMesOrderStepSearch"
/>
@@ -194,7 +195,7 @@
:data="WXtableData"
:height="isIpad? (tableHeight+50):tableHeight"
border
- stripe
+ :row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -286,6 +287,7 @@
label="璁″垝寮�宸ユ棩鏈�"
width="185"
sortable="custom"
+ fixed="right"
/>
<!-- <el-table-column-->
<!-- label="鎿嶄綔"-->
@@ -308,7 +310,7 @@
:page.sync="WXform.page"
:limit.sync="WXform.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getMesOrderStepSearch"
/>
@@ -453,7 +455,7 @@
<el-table
:data="userTableData"
border
- stripe
+ :row-class-name="tableRowClassName"
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
height="180"
@@ -464,6 +466,7 @@
width="100"
label="搴忓彿"
type="index"
+ fixed
/>
<el-table-column
prop="username"
@@ -490,6 +493,7 @@
<el-table-column
prop="RowNum"
label="鎿嶄綔"
+ fixed="right"
>
<template slot-scope="{row}">
<div class="operationClass">
@@ -507,7 +511,7 @@
:page.sync="Userform.page"
:limit.sync="Userform.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getMesOrderStepSearch"
/>
@@ -941,6 +945,9 @@
// webapp_ws_autoupdate(true)
},
methods: {
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ },
async getMesOrderStepSearch() {
const res = await MesOrderStepSearch(this.form)
if (res.code === '200') {
@@ -1251,6 +1258,10 @@
},
// 鐢ㄦ埛鍒楄〃淇濆瓨
userSave(row) {
+ console.log(row, 123)
+ if (row.usercode === '') {
+ return this.$message.info('浜哄憳鍚嶇О涓嶈兘涓虹┖锛�')
+ }
this.userTableData.forEach(item => {
if (item.number === row.number) {
item.isVisible = 0
@@ -1504,8 +1515,8 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 50
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 220
this.isIpad = window.innerHeight < 769
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 50
@@ -1518,124 +1529,15 @@
<style lang="scss" scoped>
$main_color: #42b983;
-::v-deep .el-button--primary {
- background-color: $main_color !important;
- height: 30px;
- display: flex;
- align-items: center;
- //border: 1px solid $main_color;
- border: none;
- padding: 0 20px;
-}
-
-::v-deep .el-button--primary:hover {
- border: none;
-}
-
-::v-deep .el-button--info {
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
-}
-
-::v-deep .el-dialog__footer {
- display: flex;
- justify-content: flex-end;
-}
-
-.footerButton {
- display: flex;
- justify-content: end;
-}
-
-::v-deep .el-button--default {
- background-color: #ffffff !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-button--default:hover {
- color: #606266;
-}
-
-::v-deep .el-dialog__body {
- padding: 20px 100px !important;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- background-color: $main_color;
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
-}
-
-::v-deep .el-input__inner {
- height: 30px;
- line-height: 30px;
-}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-table .caret-wrapper {
- transform: scale(0.8);
-}
-
-::v-deep .cell {
- display: flex !important;
- align-items: center !important;
- justify-content: space-between !important;
-}
-
-::v-deep .el-button--text {
- color: $main_color;
+.el-button--text{
font-size: 14px;
cursor: pointer;
}
-
.operationClass {
height: 23px;
display: flex;
justify-content: space-between;
align-items: center;
-}
-
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
-}
-
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
- color: $main_color !important;
}
::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
@@ -1648,36 +1550,6 @@
::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
margin: 10px 30px 0px 0;
-}
-
-.body ::v-deep .el-divider {
- border: 1px solid #eee;
- width: 99%;
- margin: 10px auto;
-}
-
-.body ::v-deep .el-form-item {
- margin-bottom: 0;
-}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select .el-input__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select-dropdown__item.selected {
- color: $main_color;
-}
-
-::v-deep .el-checkbox__inner:hover {
- border-color: $main_color;
-}
-
-::v-deep .el-textarea__inner:focus {
- border-color: $main_color;
}
//.dialogVisible{
@@ -1703,3 +1575,95 @@
}
</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 100px !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;
+}
+
+</style>
+<style>
+
+.el-table .custom-row {
+ background: #f8f8fa;
+}
+</style>
diff --git a/src/views/xtsy/index.vue b/src/views/xtsy/index.vue
index 684729f..0d6325c 100644
--- a/src/views/xtsy/index.vue
+++ b/src/views/xtsy/index.vue
@@ -1,6 +1,6 @@
<template>
<!-- <div>-->
- <div class="body" style=" padding: 30px 10px 0 20px;background-color: #eee;" :style="{height:mainHeight+'px'}">
+ <div class="body" style=" padding: 30px 10px 0 20px;background-color: #eaecef;" :style="{height:mainHeight+'px'}">
<div style="">
<div class="title"><i class="el-icon-s-fold" style="margin-right: 5px" />瀹炴椂鏁版嵁</div>
<div class="top">
diff --git a/src/views/xtsz/bmgz.vue b/src/views/xtsz/bmgz.vue
index b2b5ba2..12dfea6 100644
--- a/src/views/xtsz/bmgz.vue
+++ b/src/views/xtsz/bmgz.vue
@@ -1,7 +1,7 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div style="padding: 10px 5px 0 0">
+ <div class="bodyTopFormGroup">
<el-form
ref="form"
:model="form"
@@ -34,7 +34,7 @@
</div>
</el-form>
</div>
- <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-upload2" @click="upload">瀵煎叆</el-button>-->
@@ -45,7 +45,7 @@
:data="tableData"
:height="tableHeight"
border
- stripe
+ :row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -60,6 +60,7 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="right_name"
@@ -98,10 +99,15 @@
</el-table-column>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ </el-tooltip>
+ <!-- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>-->
<!-- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>-->
</div>
</template>
@@ -115,7 +121,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getEncodingRules"
/>
@@ -264,6 +270,9 @@
this.getHeight()
},
methods: {
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ },
async getEncodingRules() {
const res = await EncodingRules(this.form)
this.tableData = res.data
@@ -372,8 +381,8 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 140
})
}
}
@@ -382,29 +391,60 @@
<style lang="scss" scoped>
$main_color: #42b983;
+
+::v-deep .el-input-number__decrease,::v-deep .el-input-number__increase {
+ background-color: $main_color;
+ color: #FFFFFF;
+ line-height: 31px;
+ height: 31px;
+ margin-top: 3px;
+}
+
+</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;
- height: 30px;
- display: flex;
- align-items: center;
- //border: 1px solid $main_color;
- border: none;
- padding: 0 20px;
+ //background-color: $main_color !important;
}
-::v-deep .el-button--primary:hover {
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
border: none;
}
-::v-deep .el-button--info {
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
}
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
+::v-deep .el-dialog__body {
+ padding: 20px 100px !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 {
@@ -412,106 +452,30 @@
justify-content: flex-end;
}
-.footerButton {
- display: flex;
- justify-content: end;
-}
-
-::v-deep .el-button--default {
- background-color: #ffffff !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-button--default:hover {
- color: #606266;
-}
-
-::v-deep .el-dialog__body {
- padding: 20px 100px !important;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- background-color: $main_color;
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
-}
-
-::v-deep .el-input__inner {
- height: 30px;
- line-height: 30px;
-}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-
::v-deep .el-table .caret-wrapper {
transform: scale(0.8);
}
::v-deep .cell {
- display: flex !important;
- align-items: center !important;
- justify-content: space-between !important;
-}
-
-::v-deep .el-button--text {
- color: $main_color;
- font-size: 14px;
- cursor: pointer;
-}
-
-.operationClass {
- height: 23px;
display: flex;
- justify-content: space-between;
align-items: center;
+ justify-content: space-between;
}
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
+::v-deep .el-table::before {
+ height: 0;
}
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
}
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
+::v-deep .el-table__body .el-table__row.hover-row td{
+ background-color: #eaecef ;
}
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
- margin: 10px 30px 0px 0;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color;
-}
-
-::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
- margin: 10px 30px 0px 0;
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
}
.body ::v-deep .el-divider {
@@ -523,33 +487,14 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
}
-::v-deep .el-select .el-input__inner:focus {
- border-color: $main_color;
-}
+</style>
+<style>
-::v-deep .el-select-dropdown__item.selected {
- color: $main_color;
+.el-table .custom-row {
+ background: #f8f8fa;
}
-
-::v-deep .el-checkbox__inner:hover {
- border-color: $main_color;
-}
-
-::v-deep .el-textarea__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-input-number__decrease,::v-deep .el-input-number__increase {
- background-color: $main_color;
- color: #FFFFFF;
- line-height: 31px;
- height: 31px;
- margin-top: 3px;
-}
-
</style>
diff --git a/src/views/zlgl/gxjy.vue b/src/views/zlgl/gxjy.vue
index 70b27a2..fccc514 100644
--- a/src/views/zlgl/gxjy.vue
+++ b/src/views/zlgl/gxjy.vue
@@ -1,12 +1,15 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div style="margin-left: 10px;margin-top:10px;display: flex;flex-direction: column">
+ <div style="padding-top: 10px;display: flex;flex-direction: column">
<div style="margin-bottom: 15px;font-size: 14px">
<i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />鎵爜淇℃伅
</div>
<div style="display: flex;align-items: center">
- <div style="width: 90px;display: flex"><div style="color: red;width:10px">*</div>鎵弿鏉＄爜锛�</div>
+ <div style="width: 90px;display: flex">
+ <div style="color: red;width:10px">*</div>
+ 鎵弿鏉＄爜锛�
+ </div>
<el-input
v-model="form.orderstepqrcode"
name="GXproduceCode"
@@ -15,8 +18,8 @@
/>
</div>
<!-- 鍏」淇℃伅 -->
- <div v-if="!isIpad" style="display:flex;margin-top: 10px;align-items: center; line-height: 50px">
- <div style="display: flex;">
+ <div v-if="!isIpad" style="background:#f8f8fa ;display:flex;margin-top: 10px;align-items: center; line-height: 50px">
+ <div style="display: flex; margin-left: 10px">
<div style="display: flex;margin-right: 50px">
<div style="width: 90px">宸ュ崟缂栫爜锛�</div>
<div style="width: 200px">{{ form.wo_code }}</div>
@@ -47,7 +50,10 @@
</div>
</div>
</div>
- <div v-if="isIpad" style="display:flex;margin-top: 10px;align-items: center;line-height: 30px; flex-direction: column">
+ <div
+ v-if="isIpad"
+ style="display:flex;margin-top: 10px;align-items: center;line-height: 30px; flex-direction: column"
+ >
<div style="display: flex; justify-content: flex-start;width: 100%">
<div style="display: flex;margin-right: 50px">
<div style="width: 90px">宸ュ崟缂栫爜锛�</div>
@@ -83,7 +89,10 @@
<i class="el-icon-s-operation" style="color:#42b983; margin-right: 5px" />妫�楠屾爣鍑嗕俊鎭�
</div>
<div style="display: flex;align-items: center">
- <div style="width: 90px;display: flex"><div style="color: red;width:10px">*</div>妫�楠屾爣鍑嗭細</div>
+ <div style="width: 90px;display: flex">
+ <div style="color: red;width:10px">*</div>
+ 妫�楠屾爣鍑嗭細
+ </div>
<el-select
v-model="checkStandard"
style="width: 200px;"
@@ -98,7 +107,10 @@
:value="item.code"
/>
</el-select>
- <div style="width: 90px;margin-left: 50px;display: flex"><div style="color: red;width:10px">*</div>妫�楠屼汉鍛橈細</div>
+ <div style="width: 90px;margin-left: 50px;display: flex">
+ <div style="color: red;width:10px">*</div>
+ 妫�楠屼汉鍛橈細
+ </div>
<el-select
v-model="checkUser"
style="width: 200px;"
@@ -123,14 +135,13 @@
<el-table
ref="multipleTable"
:data="JYTableData"
- :height="(tableHeight-195)+'px'"
+ :height="tableHeight+'px'"
border
- stripe
+ :row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
- :row-class-name="tableRowClassName"
@selection-change="handleSelectionChange"
@cell-dblclick="cellDblclick"
>
@@ -138,6 +149,7 @@
type="index"
label="搴忓彿"
width="100"
+ fixed
/>
<!-- <el-table-column-->
<!-- prop="code"-->
@@ -184,7 +196,8 @@
/>
<div
v-else
- > {{ scope.row.stepcheckitem_desc }}</div>
+ > {{ scope.row.stepcheckitem_desc }}
+ </div>
</template>
</el-table-column>
@@ -244,7 +257,10 @@
<div style="display: flex;margin-top: 20px;align-items: center">
<div style="display: flex;margin-right: 50px;align-items: center">
- <div style="width: 90px;display: flex"><div style="color: red;width:10px">*</div>妫�楠岀粨鏋滐細</div>
+ <div style="width: 90px;display: flex">
+ <div style="color: red;width:10px">*</div>
+ 妫�楠岀粨鏋滐細
+ </div>
<el-select
v-model="checkResult"
style="width: 200px;"
@@ -601,7 +617,8 @@
// this.tabClickIndex = row.index
// this.tabClickLabel = column.label
// break
- default: return
+ default:
+ return
}
},
// 鍥炶溅浜嬩欢
@@ -612,14 +629,15 @@
tableRowClassName({ row, rowIndex }) {
// 鎶婃瘡涓�琛岀殑绱㈠紩鏀捐繘row
row.index = rowIndex
+ return 'custom-row'
},
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 100
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 450
- this.isIpad = window.innerHeight < 769
+ this.isIpad = window.innerHeight < 769 && window.innerWidth < 1367
})
}
}
@@ -627,30 +645,61 @@
</script>
<style lang="scss" scoped>
+::v-deep .el-select .el-input .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+</style>
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
$main_color: #42b983;
+.el-button--text {
+ font-size: 14px;
+ cursor: pointer;
+}
+
+.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;
- height: 30px;
- display: flex;
- align-items: center;
- //border: 1px solid $main_color;
- border: none;
- padding: 0 20px;
+ //background-color: $main_color !important;
}
-::v-deep .el-button--primary:hover {
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
border: none;
}
-::v-deep .el-button--info {
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
}
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
+::v-deep .el-dialog__body {
+ padding: 20px 100px !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 {
@@ -658,106 +707,30 @@
justify-content: flex-end;
}
-.footerButton {
- display: flex;
- justify-content: end;
-}
-
-::v-deep .el-button--default {
- background-color: #ffffff !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-button--default:hover {
- color: #606266;
-}
-
-::v-deep .el-dialog__body {
- padding: 20px 100px !important;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- background-color: $main_color;
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
-}
-
-::v-deep .el-input__inner {
- height: 30px;
- line-height: 30px;
-}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-
::v-deep .el-table .caret-wrapper {
transform: scale(0.8);
}
::v-deep .cell {
- display: flex !important;
- align-items: center !important;
- justify-content: space-between !important;
-}
-
-::v-deep .el-button--text {
- color: $main_color;
- font-size: 14px;
- cursor: pointer;
-}
-
-.operationClass {
- height: 23px;
display: flex;
- justify-content: space-between;
align-items: center;
+ justify-content: space-between;
}
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
+::v-deep .el-table::before {
+ height: 0;
}
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
}
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
}
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
- margin: 10px 30px 0px 0;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color;
-}
-
-::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
- margin: 10px 30px 0px 0;
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
}
.body ::v-deep .el-divider {
@@ -770,29 +743,14 @@
margin-bottom: 0;
}
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
}
-::v-deep .el-select .el-input__inner:focus {
- border-color: $main_color;
-}
+</style>
+<style>
-::v-deep .el-select-dropdown__item.selected {
- color: $main_color;
-}
-
-::v-deep .el-checkbox__inner:hover {
- border-color: $main_color;
-}
-
-::v-deep .el-textarea__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select .el-input .el-select__caret {
- display: flex;
- align-items: center;
- justify-content: center;
+.el-table .custom-row {
+ background: #f8f8fa;
}
</style>
diff --git a/src/views/zlgl/gxjybz.vue b/src/views/zlgl/gxjybz.vue
index 9b90356..222ee23 100644
--- a/src/views/zlgl/gxjybz.vue
+++ b/src/views/zlgl/gxjybz.vue
@@ -1,7 +1,12 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div style="padding: 10px 5px 0 0">
+
+ <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"
@@ -26,18 +31,12 @@
</div>
</el-form>
</div>
- <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-upload2" @click="upload">瀵煎叆</el-button>-->
- </div>
- <el-divider />
<div class="elTableDiv">
<el-table
:data="tableData"
:height="tableHeight+'px'"
border
- stripe
+ :row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -52,6 +51,7 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="code"
@@ -80,12 +80,21 @@
/>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="check('check',row)">鏌ョ湅</el-button>
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
+
+ <el-tooltip class="item" effect="dark" content="鏌ョ湅" placement="top">
+ <i class="el-icon-view" style="color: #42b983;cursor: pointer;margin-right: 15px;" @click="check('check',row)" />
+ </el-tooltip>
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i class="el-icon-edit-outline" @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>
@@ -98,7 +107,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getStepCheckStanedSearch"
/>
@@ -138,14 +147,15 @@
<i class="el-icon-s-comment" style="color:#42b983;" /> 妫�楠岄」淇℃伅锛�
</div>
<div style="margin-bottom: 10px">
- <el-button type="primary" @click="JYadd">鏂板</el-button>
+ <el-button v-if="operation==='add'" type="primary" @click="JYadd">鏂板</el-button>
</div>
<div>
<el-table
+ ref="JYTableData"
:data="JYTableData"
height="260px"
border
- stripe
+ :row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -155,6 +165,7 @@
<el-table-column
type="index"
width="100"
+ fixed
/>
<el-table-column
prop="code"
@@ -322,6 +333,9 @@
this.getHeight()
},
methods: {
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
+ },
handleRequest() {
this.getStepCheckStanedSearch().then(res => {
if (res.code === '200') {
@@ -367,6 +381,9 @@
add(operation) {
this.operation = operation
this.dialogVisible = true
+ this.$nextTick(() => {
+ this.$refs.JYTableData.doLayout()
+ })
},
// 淇敼鎸夐挳
edit(operation, row) {
@@ -393,6 +410,9 @@
item.descr = item.stepcheckitem_desc
item.number = number
this.JYSelectedArr.push(item.code)
+ })
+ this.$nextTick(() => {
+ this.$refs.JYTableData.doLayout()
})
},
// 鍒犻櫎鎸夐挳
@@ -460,8 +480,8 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 50
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 200
this.isIpad = window.innerHeight < 769
// if (window.innerHeight < 769) {
// this.tableHeight = this.tableHeight - 50
@@ -564,31 +584,59 @@
}
</script>
+<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
+.el-button--text{
+ font-size: 14px;
+ cursor: pointer;
+}
+::v-deep .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.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;
- height: 30px;
- display: flex;
- align-items: center;
- //border: 1px solid $main_color;
- border: none;
- padding: 0 20px;
+ //background-color: $main_color !important;
}
-::v-deep .el-button--primary:hover {
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
border: none;
}
-::v-deep .el-button--info {
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
}
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
+::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 {
@@ -596,110 +644,30 @@
justify-content: flex-end;
}
-.footerButton {
- display: flex;
- justify-content: end;
-}
-
-::v-deep .el-button--default {
- background-color: #ffffff !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-button--default:hover {
- color: #606266;
-}
-
-//::v-deep .el-dialog__body {
-// padding: 20px 100px !important;
-//}
-
-::v-deep .el-dialog__body {
- padding: 20px 20px !important;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- background-color: $main_color;
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
-}
-
-::v-deep .el-input__inner {
- height: 30px;
- line-height: 30px;
-}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-
::v-deep .el-table .caret-wrapper {
transform: scale(0.8);
}
::v-deep .cell {
- display: flex !important;
- align-items: center !important;
- justify-content: space-between !important;
-}
-
-::v-deep .el-button--text {
- color: $main_color;
- font-size: 14px;
- cursor: pointer;
-}
-
-.operationClass {
- height: 23px;
display: flex;
- justify-content: space-between;
align-items: center;
+ justify-content: space-between;
}
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
+::v-deep .el-table::before {
+ height: 0;
}
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
}
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
+::v-deep .el-table__body .el-table__row.hover-row td{
+ background-color: #eaecef ;
}
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
- margin: 10px 30px 0px 0;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color;
-}
-
-::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
- margin: 10px 30px 0px 0;
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
}
.body ::v-deep .el-divider {
@@ -711,31 +679,14 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
}
-::v-deep .el-select .el-input__inner:focus {
- border-color: $main_color;
-}
+</style>
+<style>
-::v-deep .el-select-dropdown__item.selected {
- color: $main_color;
+.el-table .custom-row {
+ background: #f8f8fa;
}
-
-::v-deep .el-checkbox__inner:hover {
- border-color: $main_color;
-}
-
-::v-deep .el-textarea__inner:focus {
- border-color: $main_color;
-}
-
-::v-deep .el-select__caret {
- display: flex;
- align-items: center;
- justify-content: center;
-}
-
</style>
diff --git a/src/views/zlgl/gxjyxm.vue b/src/views/zlgl/gxjyxm.vue
index 4c5e13b..2d3482a 100644
--- a/src/views/zlgl/gxjyxm.vue
+++ b/src/views/zlgl/gxjyxm.vue
@@ -1,7 +1,12 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div style="padding: 10px 5px 0 0">
+
+ <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"
@@ -26,18 +31,12 @@
</div>
</el-form>
</div>
- <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-upload2" @click="upload">瀵煎叆</el-button>-->
- </div>
- <el-divider />
<div class="elTableDiv">
<el-table
:data="tableData"
:height="tableHeight+'px'"
border
- stripe
+ :row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -52,6 +51,7 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="code"
@@ -80,11 +80,17 @@
/>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i class="el-icon-edit-outline" @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>
@@ -97,7 +103,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getStepCheckItemSearch"
/>
@@ -296,40 +302,63 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 50
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 200
// if (window.innerHeight < 769) {
// this.tableHeight = this.tableHeight - 50
// }
})
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
}
}
}
</script>
+<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-::v-deep .el-button--primary {
- background-color: $main_color !important;
- height: 30px;
- display: flex;
- align-items: center;
- //border: 1px solid $main_color;
- border: none;
- padding: 0 20px;
+.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+ color: $main_color;
+ cursor: pointer;
}
-::v-deep .el-button--primary:hover {
- border: none;
-}
-::v-deep .el-button--info {
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
+.el-icon-edit-outline{
+ margin-right: 15px;
}
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
+::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 100px !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 {
@@ -337,105 +366,30 @@
justify-content: flex-end;
}
-.footerButton {
- display: flex;
- justify-content: end;
-}
-
-::v-deep .el-button--default {
- background-color: #ffffff !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-button--default:hover {
- color: #606266;
-}
-
-::v-deep .el-dialog__body {
- padding: 20px 100px !important;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- background-color: $main_color;
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
-}
-
-::v-deep .el-input__inner {
- height: 30px;
- line-height: 30px;
-}
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-
::v-deep .el-table .caret-wrapper {
transform: scale(0.8);
}
::v-deep .cell {
- display: flex !important;
- align-items: center !important;
- justify-content: space-between !important;
-}
-
-::v-deep .el-button--text {
- color: $main_color;
- font-size: 14px;
- cursor: pointer;
-}
-
-.operationClass {
- height: 23px;
display: flex;
- justify-content: space-between;
align-items: center;
+ justify-content: space-between;
}
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
+::v-deep .el-table::before {
+ height: 0;
}
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
}
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
+::v-deep .el-table__body .el-table__row.hover-row td{
+ background-color: #eaecef ;
}
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
- margin: 10px 30px 0px 0;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color;
-}
-
-::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
- margin: 10px 30px 0px 0;
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
}
.body ::v-deep .el-divider {
@@ -447,23 +401,14 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
}
-::v-deep .el-select .el-input__inner:focus{
- border-color: $main_color;
-}
+</style>
+<style>
-::v-deep .el-select-dropdown__item.selected{
- color: $main_color;
+.el-table .custom-row {
+ background: #f8f8fa;
}
-::v-deep .el-checkbox__inner:hover{
- border-color: $main_color;
-}
-::v-deep .el-textarea__inner:focus{
- border-color: $main_color;
-}
-
</style>
diff --git a/src/views/zlgl/qxdy.vue b/src/views/zlgl/qxdy.vue
index 7b5ca66..0e4f587 100644
--- a/src/views/zlgl/qxdy.vue
+++ b/src/views/zlgl/qxdy.vue
@@ -1,7 +1,12 @@
<template>
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div style="padding: 10px 5px 0 0">
+
+ <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"
@@ -27,18 +32,12 @@
</div>
</el-form>
</div>
- <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-upload2" @click="upload">瀵煎叆</el-button>-->
- </div>
- <el-divider />
<div class="elTableDiv">
<el-table
:data="tableData"
:height="tableHeight+'px'"
border
- stripe
+ :row-class-name="tableRowClassName"
:style="{width: 100+'%',height:tableHeight+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -53,6 +52,7 @@
prop="RowNum"
width="50"
label="搴忓彿"
+ fixed
/>
<el-table-column
prop="code"
@@ -81,11 +81,18 @@
/>
<el-table-column
label="鎿嶄綔"
+ fixed="right"
+ width="120"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
- <el-button type="text" @click="del(row)">鍒犻櫎</el-button>
+ <el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
+ <i class="el-icon-edit-outline" @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>
@@ -98,7 +105,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getDedectSearch"
/>
@@ -296,40 +303,63 @@
// 鑾峰彇椤甸潰楂樺害
getHeight() {
this.$nextTick(() => {
- this.mainHeight = window.innerHeight - 250
- this.tableHeight = this.mainHeight - 50
+ this.mainHeight = window.innerHeight - 85
+ this.tableHeight = this.mainHeight - 200
// if (window.innerHeight < 769) {
// this.tableHeight = this.tableHeight - 50
// }
})
+ },
+ tableRowClassName({ row, rowIndex }) {
+ return 'custom-row'
}
}
}
</script>
+<!--鍏叡椤甸潰鏍峰紡-->
<style lang="scss" scoped>
$main_color: #42b983;
-::v-deep .el-button--primary {
- background-color: $main_color !important;
- height: 30px;
- display: flex;
- align-items: center;
- //border: 1px solid $main_color;
- border: none;
- padding: 0 20px;
+.el-icon-share ,.el-icon-delete,.el-icon-edit-outline{
+ color: $main_color;
+ cursor: pointer;
}
-::v-deep .el-button--primary:hover {
- border: none;
-}
-::v-deep .el-button--info {
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
+.el-icon-edit-outline{
+ margin-right: 15px;
}
-::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
- background-color: $main_color !important;
+::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 100px !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 {
@@ -337,105 +367,30 @@
justify-content: flex-end;
}
-.footerButton {
- display: flex;
- justify-content: end;
-}
-
-::v-deep .el-button--default {
- background-color: #ffffff !important;
- height: 30px;
- display: flex;
- align-items: center;
- padding: 0 20px;
-}
-
-::v-deep .el-button--default:hover {
- color: #606266;
-}
-
-::v-deep .el-dialog__body {
- padding: 20px 100px !important;
-}
-
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- background-color: $main_color;
- border-color: $main_color;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
- border-color: $main_color;
- background-color: $main_color;
-}
-
-::v-deep .el-input__inner {
- height: 30px;
- line-height: 30px;
-}
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
-}
-
::v-deep .el-table .caret-wrapper {
transform: scale(0.8);
}
::v-deep .cell {
- display: flex !important;
- align-items: center !important;
- justify-content: space-between !important;
-}
-
-::v-deep .el-button--text {
- color: $main_color;
- font-size: 14px;
- cursor: pointer;
-}
-
-.operationClass {
- height: 23px;
display: flex;
- justify-content: space-between;
align-items: center;
+ justify-content: space-between;
}
-.el-icon-share {
- color: $main_color;
- cursor: pointer;
+::v-deep .el-table::before {
+ height: 0;
}
-.el-checkbox.is-bordered.is-checked {
- border-color: $main_color;
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
}
-::v-deep .el-radio__input.is-checked .el-radio__inner {
- border-color: $main_color;
- background: $main_color;
+::v-deep .el-table__body .el-table__row.hover-row td{
+ background-color: #eaecef ;
}
-::v-deep .el-checkbox__input.is-indeterminate .el-checkbox__inner {
- border-color: $main_color;
- background: $main_color;
-}
-
-::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
- color: $main_color !important;
-}
-
-::v-deep .el-checkbox.is-bordered + .el-checkbox.is-bordered {
- margin: 10px 30px 0px 0;
-}
-
-::v-deep .el-radio__input.is-checked + .el-radio__label {
- color: $main_color;
-}
-
-::v-deep .el-radio.is-bordered + .el-radio.is-bordered {
- margin: 10px 30px 0px 0;
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
}
.body ::v-deep .el-divider {
@@ -447,23 +402,14 @@
.body ::v-deep .el-form-item {
margin-bottom: 0;
}
-
-::v-deep .el-input__inner:focus {
- border-color: $main_color;
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
}
-::v-deep .el-select .el-input__inner:focus{
- border-color: $main_color;
-}
+</style>
+<style>
-::v-deep .el-select-dropdown__item.selected{
- color: $main_color;
+.el-table .custom-row {
+ background: #f8f8fa;
}
-::v-deep .el-checkbox__inner:hover{
- border-color: $main_color;
-}
-::v-deep .el-textarea__inner:focus{
- border-color: $main_color;
-}
-
</style>
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 296eba2..2858bba 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -224,7 +224,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getInventoryFileSelect"
/>
@@ -447,7 +447,7 @@
:page.sync="officeForm.page"
:limit.sync="officeForm.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getUomSearch"
/>
diff --git a/src/views/zzmx/gxdy.vue b/src/views/zzmx/gxdy.vue
index d295912..43564bf 100644
--- a/src/views/zzmx/gxdy.vue
+++ b/src/views/zzmx/gxdy.vue
@@ -199,7 +199,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getStepSearch"
/>
diff --git a/src/views/zzmx/jpgj.vue b/src/views/zzmx/jpgj.vue
index 1f7c250..64a65eb 100644
--- a/src/views/zzmx/jpgj.vue
+++ b/src/views/zzmx/jpgj.vue
@@ -209,7 +209,7 @@
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getBeatRateSearch"
/>
@@ -424,7 +424,7 @@
:limit.sync="eqpTable.rows"
align="right"
style="padding-top: 20px;"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getEqpTable"
/>
--
Gitblit v1.9.3