Skip to content

bdc / bdcjg-web

Go to a project
Toggle navigation
Toggle navigation pinning
9642781a by xiaomiao
Options

上报弹框样式调整整理

1 parent 4e621960
Expand all
Inline Side-by-side
Showing 17 changed files with 584 additions and 222 deletions
1 .itemForm {
2 position: relative;
3 padding: 10px;
4
5 /deep/.el-select {
6 width: 100%;
7 }
8
9 /deep/.el-form-item__error {
10 right: 25px;
11 top: 15px;
12 text-align: right;
13 pointer-events: none;
14 }
15
16 /deep/.el-date-editor {
17 width: 100%;
18 }
19
20 /deep/.el-date-editor--date {
21 width: 100%;
22 }
23
24 /deep/.el-cascader {
25 width: 100%;
26 }
27
28 // table 样式
29 /deep/.el-form-item__label {
30 border-right: none;
31 text-align: center;
32 padding: 0;
33 color: #05bbdb;
34 line-height: 16px;
35 font-size: 12px;
36 margin-top: 8px !important;
37 }
38
39 /deep/.el-form-item__content {
40 display: flex;
41 margin-right: -1px;
42 }
43
44 .obligee-item-name,
45 .receivingInfo-item-name,
46 .auditInfo-item-name {
47 background: url("~@/image/itembg.png") no-repeat;
48 background-size: 100% 100%;
49 color: #FFFFFF;
50 }
51
52 /deep/.el-textarea__inner {
53 margin: 5px;
54 width: 96%;
55 background: none;
56 color: #FFFFFF;
57 border-radius: 2px;
58 border: 1px solid #6BC1FC;
59 }
60
61 /deep/.el-input-number {
62 width: 100%;
63 }
64
65 /deep/.el-input-number__increase {
66 background: #05275B;
67 color: #FFFFFF;
68 border: none;
69 right: 7px;
70 top: 2px;
71 }
72
73 /deep/.el-input-number__decrease {
74 background: #05275B;
75 color: #FFFFFF;
76 border: none;
77 right: 7px;
78 bottom: 10px;
79 }
80
81 /deep/.el-input__inner {
82 margin: 5px;
83 width: 96%;
84 background: #05275B;
85 border-radius: 2px;
86 border: 1px solid #6BC1FC;
87 text-align: left;
88
89 }
90
91 /deep/.el-form-item {
92 margin-bottom: 0;
93 margin-top: -1px;
94 }
95
96 .item-label {
97 display: flex;
98 align-items: flex-end;
99 flex-direction: column;
100 font-size: 12px;
101 flex: 0 0 90px;
102 margin-right: 3px;
103
104 p {
105 line-height: 16px;
106 white-space: nowrap;
107 text-align: right;
108 }
109
110 p:nth-child(1) {
111 position: relative;
112 right: 5px;
113 }
114 }
115 }
...\ No newline at end of file ...\ No newline at end of file
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
18 </div> 18 </div>
19 </template> 19 </template>
20 <script> 20 <script>
21 import { getReceiveDataReportResult } from "@/api/dataReport.js"; 21 import { getReceiveDataReportResult } from "@/api/dataReport.js";
22 export default { 22 export default {
23 components: {}, 23 components: {},
24 props: { 24 props: {
25 formData: { 25 formData: {
...@@ -40,43 +40,7 @@ export default { ...@@ -40,43 +40,7 @@ export default {
40 this.ERRORINFO = data.ERRORINFO 40 this.ERRORINFO = data.ERRORINFO
41 }) 41 })
42 } 42 }
43 } 43 }
44 </script> 44 </script>
45 <style scoped lang='scss'> 45 <style scoped lang='scss'>
46 .result {
47 padding: 15px;
48 height: 100%;
49
50 /deep/.el-textarea__inner {
51 height: 50%;
52 color: #ffffff;
53 border: none !important;
54 color: #ffffff;
55 }
56
57 &-con {
58 background: #04275B;
59 border-radius: 2px;
60 padding: 10px;
61 box-sizing: border-box;
62 height: 49%;
63
64 p {
65 color: #2997E8;
66 font-size: 14px;
67 position: relative;
68 padding-left: 10px;
69 }
70
71 p::before {
72 position: absolute;
73 content: '';
74 width: 3px;
75 height: 10px;
76 background-color: #2997E8;
77 left: 0;
78 top: 3px;
79 }
80 }
81 }
82 </style> 46 </style>
......
...@@ -16,11 +16,5 @@ export default { ...@@ -16,11 +16,5 @@ export default {
16 </script> 16 </script>
17 17
18 <style scoped lang="scss"> 18 <style scoped lang="scss">
19 /deep/.el-textarea__inner { 19
20 height: 67vh !important;
21 border: none !important;
22 background-color: #08346F !important;
23 color: #ffffff;
24 border: none !important;
25 }
26 </style> 20 </style>
......
1 // .dialogCon {
2 // background: #031A46;
3 // -webkit-box-shadow: inset 0px 0px 12px 0px #02d9fd;
4 // box-shadow: inset 0px 0px 12px 0px #02d9fd;
5 // border-radius: 0px 2px 2px 2px;
6 // border: 1px solid #6BC1FC;
7 // padding: 15px;
8 // }
...@@ -505,6 +505,14 @@ ...@@ -505,6 +505,14 @@
505 border-radius: 2px; 505 border-radius: 2px;
506 border: 1px solid #6BC1FC; 506 border: 1px solid #6BC1FC;
507 margin: 0 18px 10px 18px; 507 margin: 0 18px 10px 18px;
508
509 // .el-form-item__label {
510 // color: #fff;
511 // }
512
513 // .el-form-item__content {
514 // color: #fff;
515 // }
508 } 516 }
509 517
510 .item-content-input { 518 .item-content-input {
...@@ -645,6 +653,14 @@ ...@@ -645,6 +653,14 @@
645 653
646 // 登簿日志弹出框 654 // 登簿日志弹出框
647 .entryJournal { 655 .entryJournal {
656 .el-textarea__inner {
657 height: 67vh !important;
658 border: none !important;
659 background-color: #08346F !important;
660 color: #ffffff;
661 border: none !important;
662 }
663
648 .el-tabs__header { 664 .el-tabs__header {
649 margin: 0; 665 margin: 0;
650 } 666 }
...@@ -1065,12 +1081,15 @@ ...@@ -1065,12 +1081,15 @@
1065 .informationbase { 1081 .informationbase {
1066 margin: 0.1875rem 1.0417rem; 1082 margin: 0.1875rem 1.0417rem;
1067 overflow-y: auto; 1083 overflow-y: auto;
1084
1068 .form-wrapper { 1085 .form-wrapper {
1069 padding: 0px 120px 0px; 1086 padding: 0px 120px 0px;
1087
1070 .el-form-item { 1088 .el-form-item {
1071 /deep/.el-form-item__label { 1089 /deep/.el-form-item__label {
1072 color: #ffffff; 1090 color: #ffffff;
1073 } 1091 }
1092
1074 ::v-deep .el-input .el-input__inner { 1093 ::v-deep .el-input .el-input__inner {
1075 padding: 0 8px; 1094 padding: 0 8px;
1076 height: 40px; 1095 height: 40px;
...@@ -1078,13 +1097,131 @@ ...@@ -1078,13 +1097,131 @@
1078 border: 1px solid #6bc1fc; 1097 border: 1px solid #6bc1fc;
1079 } 1098 }
1080 } 1099 }
1100
1081 .el-form-item--small.el-form-item { 1101 .el-form-item--small.el-form-item {
1082 margin-bottom: 16px; 1102 margin-bottom: 16px;
1083 } 1103 }
1084 } 1104 }
1105
1085 .bottom-wrapper { 1106 .bottom-wrapper {
1086 padding: 0px 120px 0px; 1107 padding: 0px 120px 0px;
1087 text-align: center; 1108 text-align: center;
1088 } 1109 }
1089 } 1110 }
1090 1111
1112 // 权利人信息样式
1113 .itemForm {
1114 position: relative;
1115 padding: 10px;
1116
1117 /deep/.el-select {
1118 width: 100%;
1119 }
1120
1121 /deep/.el-form-item__error {
1122 right: 25px;
1123 top: 15px;
1124 text-align: right;
1125 pointer-events: none;
1126 }
1127
1128 /deep/.el-date-editor {
1129 width: 100%;
1130 }
1131
1132 /deep/.el-date-editor--date {
1133 width: 100%;
1134 }
1135
1136 /deep/.el-cascader {
1137 width: 100%;
1138 }
1139
1140 // table 样式
1141 /deep/.el-form-item__label {
1142 border-right: none;
1143 text-align: center;
1144 padding: 0;
1145 color: #05bbdb;
1146 line-height: 16px;
1147 font-size: 12px;
1148 margin-top: 8px !important;
1149 }
1150
1151 /deep/.el-form-item__content {
1152 display: flex;
1153 margin-right: -1px;
1154 }
1155
1156 .obligee-item-name,
1157 .receivingInfo-item-name,
1158 .auditInfo-item-name {
1159 background: url("~@/image/itembg.png") no-repeat;
1160 background-size: 100% 100%;
1161 color: #FFFFFF;
1162 }
1163
1164 /deep/.el-textarea__inner {
1165 margin: 5px;
1166 width: 96%;
1167 background: none;
1168 color: #FFFFFF;
1169 border-radius: 2px;
1170 border: 1px solid #6BC1FC;
1171 }
1172
1173 /deep/.el-input-number {
1174 width: 100%;
1175 }
1176
1177 /deep/.el-input-number__increase {
1178 background: #05275B;
1179 color: #FFFFFF;
1180 border: none;
1181 right: 7px;
1182 top: 2px;
1183 }
1184
1185 /deep/.el-input-number__decrease {
1186 background: #05275B;
1187 color: #FFFFFF;
1188 border: none;
1189 right: 7px;
1190 bottom: 10px;
1191 }
1192
1193 /deep/.el-input__inner {
1194 margin: 5px;
1195 width: 96%;
1196 background: #05275B;
1197 border-radius: 2px;
1198 border: 1px solid #6BC1FC;
1199 text-align: left;
1200
1201 }
1202
1203 /deep/.el-form-item {
1204 margin-bottom: 0;
1205 margin-top: -1px;
1206 }
1207
1208 .item-label {
1209 display: flex;
1210 align-items: flex-end;
1211 flex-direction: column;
1212 font-size: 12px;
1213 flex: 0 0 90px;
1214 margin-right: 3px;
1215
1216 p {
1217 line-height: 16px;
1218 white-space: nowrap;
1219 text-align: right;
1220 }
1221
1222 p:nth-child(1) {
1223 position: relative;
1224 right: 5px;
1225 }
1226 }
1227 }
......
...@@ -85,7 +85,6 @@ input[type="number"] { ...@@ -85,7 +85,6 @@ input[type="number"] {
85 // to fixed https://github.com/ElemeFE/element/issues/2461 85 // to fixed https://github.com/ElemeFE/element/issues/2461
86 // refine element ui upload 86 // refine element ui upload
87 .el-input.is-disabled .el-input__inner { 87 .el-input.is-disabled .el-input__inner {
88 color: #FFFFFF !important;
89 background-color: transparent !important; 88 background-color: transparent !important;
90 border: 1px solid #224C7C !important; 89 border: 1px solid #224C7C !important;
91 } 90 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-03-20 14:45:57 4 * @LastEditTime: 2023-03-28 14:11:01
5 --> 5 -->
6 <!-- 6 <!--
7 功能：结果 7 功能：结果
...@@ -18,8 +18,8 @@ ...@@ -18,8 +18,8 @@
18 </div> 18 </div>
19 </template> 19 </template>
20 <script> 20 <script>
21 import { getReceiveDataReportResult } from "@/api/dataReport.js"; 21 import { getReceiveDataReportResult } from "@/api/dataReport.js";
22 export default { 22 export default {
23 components: {}, 23 components: {},
24 props: { 24 props: {
25 formData: { 25 formData: {
...@@ -40,10 +40,10 @@ export default { ...@@ -40,10 +40,10 @@ export default {
40 this.ERRORINFO = data.ERRORINFO 40 this.ERRORINFO = data.ERRORINFO
41 }) 41 })
42 } 42 }
43 } 43 }
44 </script> 44 </script>
45 <style scoped lang='scss'> 45 <style scoped lang='scss'>
46 .result { 46 .result {
47 padding: 15px; 47 padding: 15px;
48 48
49 p { 49 p {
...@@ -51,12 +51,12 @@ export default { ...@@ -51,12 +51,12 @@ export default {
51 line-height: 26px; 51 line-height: 26px;
52 font-size: 18px; 52 font-size: 18px;
53 } 53 }
54 } 54 }
55 55
56 /deep/.el-textarea__inner { 56 /deep/.el-textarea__inner {
57 min-height: 33vh !important; 57 min-height: 33vh !important;
58 background-color: #08346F !important; 58 background-color: #08346f !important;
59 color: #ffffff; 59 color: #ffffff;
60 border: none !important; 60 border: none !important;
61 } 61 }
62 </style> 62 </style>
......
1 import filter from '@/utils/filter.js'
2 class data extends filter {
3 constructor() {
4 super()
5 }
6 columns () {
7 return [
8 {
9 prop: "name",
10 label: "区县代码",
11 width: 130
12 },
13 {
14 prop: "description",
15 label: "业务号"
16 },
17 {
18 prop: "description",
19 label: "受理业务名称"
20 },
21 {
22 prop: "description",
23 label: "受理业务编码"
24 },
25 {
26 prop: "description",
27 label: "受理时间"
28 },
29 {
30 prop: "description",
31 label: "登记时间"
32 },
33 {
34 prop: "description",
35 label: "接收时间"
36 },
37 {
38 prop: "description",
39 label: "读取时间"
40 }
41 ]
42 }
43 }
44 export default new data()
1 <!-- 新增 & 修改角色 -->
2 <template>
3 <dialogBox
4 class="PersonnelDialog"
5 :title="title"
6 :width="'567px'"
7 :isMain="true"
8 @closeDialog="close"
9 @submitForm="submitForm"
10 v-model="myValue">
11 <div class="dialogCon">
12 <el-form ref="form" :model="dialogForm" :rules="rules" label-width="82px">
13 <el-row :gutter="24">
14 <el-col :span="23">
15 <el-form-item label="角色名称:" prop="roleName">
16 <el-input
17 v-model="dialogForm.roleName"
18 clearable
19 placeholder="角色名称" />
20 </el-form-item>
21 </el-col>
22 </el-row>
23 <el-row>
24 <el-col :span="23">
25 <el-form-item label="备注:" class="form-item-mb0">
26 <el-input
27 v-model="dialogForm.roleTextArea"
28 clearable
29 :rows="10"
30 type="textarea"
31 placeholder="备注" />
32 </el-form-item>
33 </el-col>
34 </el-row>
35 </el-form>
36 </div>
37 <!-- <template slot="footer">
38 <el-button
39 class="cancel-button"
40 @click="handleCloseDialog">取消</el-button>
41
42 <el-button
43 type="primary"
44 @click="handleSaveRole()">保存</el-button>
45 </template> -->
46 </dialogBox>
47 </template>
48
49 <script>
50 import Dialog from "@/components/Dialog/";
51 import { api, httpAction } from '@/api/manageApi'
52 export default {
53 components: {
54 Dialog
55 },
56 props: {
57 value: { type: Boolean, default: false },
58 },
59 data () {
60 return {
61 myValue: this.value,
62 title: '',
63 showAddEditDialog: false,
64 menuType: '',
65 roleId: '',
66 sort: 0,
67 dialogForm: {
68 roleName: '',
69 roleType: '',
70 roleTextArea: ''
71 },
72 rules: {
73 roleName: [
74 { required: true, message: '请输入角色名称', trigger: 'blur' }
75 ],
76 },
77 roleTypeOptions: [
78 { name: '定制', value: '定制' },
79 { name: '其他', value: '其他' }
80 ]
81 }
82 },
83 watch: {
84 value (val) {
85 this.myValue = val
86 }
87 },
88 methods: {
89 // 保存新增或关闭事件
90 submitForm () {
91 this.$refs.form.validate((valid) => {
92 if (valid) {
93 try {
94 const params = {
95 category: 2,
96 description: this.dialogForm.roleTextArea,
97 name: this.dialogForm.roleName,
98 sort: this.sort,
99 type: this.dialogForm.roleType
100 }
101 if (this.roleId) {
102 params.id = this.roleId
103 httpAction(`${api.roles}/${params.id}`, params, 'post').then(
104 (res) => {
105 if (res.status === 1) {
106 this.$message.success({
107 message: '修改成功',
108 showClose: true
109 })
110 this.dialogForm = {
111 roleName: '',
112 }
113 // this.showAddEditDialog = val
114 this.$emit('ok')
115 } else {
116 this.$message.error({
117 message: res.message,
118 showClose: true
119 })
120 }
121 }
122 )
123 } else {
124 httpAction(api.roles, params, 'post').then((res) => {
125 if (res.status === 1) {
126 this.$message.success({
127 message: '新增成功',
128 showClose: true
129 })
130 this.close()
131
132 this.$emit('ok')
133 // this.showAddEditDialog = val
134 this.$emit('ok', this.menuType)
135 } else {
136 this.$message.error({
137 message: res.message,
138 showClose: true
139 })
140 }
141 })
142 }
143 } catch (e) {
144 console.error(e)
145 }
146 }
147 })
148 },
149 resetForm () {
150 this.dialogForm = {
151 roleName: '',
152 }
153 this.$refs.form.resetFields()
154 },
155 close () {
156 this.resetForm()
157 this.$emit('input', false)
158 }
159 }
160 }
161 </script>
162 <style scoped lang="scss">
163 </style>
1 <template>
2 <div class="timedTask from-clues">
3 <div class="from-clues-header">
4 <el-form ref="ruleForm" :model="form" label-width="100px">
5 <el-form-item v-if="BASE_API.THEME=='jg'">
6 <Breadcrumb />
7 </el-form-item>
8 <el-row class="mb-5">
9 <el-col :span="4">
10 <el-form-item label="业务号：" prop="ywh">
11 <el-input v-model="form.ywh" class="width100" clearable placeholder="业务号"></el-input>
12 </el-form-item>
13 </el-col>
14 <el-col :span="4">
15 <el-form-item label="业务名称" prop="ywmc">
16 <el-input v-model.trim="form.rolesName" class="width100" clearable placeholder="业务名称"></el-input>
17 </el-form-item>
18 </el-col>
19 <el-col :span="6">
20 <el-form-item label="开始日期" prop="startTime">
21 <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
22 clearable v-model="form.startTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
23 </el-form-item>
24 </el-col>
25 <el-col :span="6">
26 <el-form-item label="结束日期" prop="endTime">
27 <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd" clearable
28 v-model="form.endTime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
29 </el-form-item>
30 </el-col>
31 <!-- 操作按钮 -->
32 <el-col :span="4" class="btnColRight">
33 <btn nativeType="cz" @click="resetForm">重置</btn>
34 <btn nativeType="cx" @click="handleSearch">查询</btn>
35 </el-col>
36 </el-row>
37 </el-form>
38 </div>
39 <div class="from-clues-content">
40 <lb-table :pagination="false" @size-change="handleSizeChange" :calcHeight="200"
41 @p-current-change="handleCurrentChange" :column="tableData.columns" :data="listdata" :expand-row-keys="keyList"
42 row-key="dictid">
43 </lb-table>
44 </div>
45 </div>
46 </template>
47 <script>
48 import {
49 getUuid,
50 judgeSort,
51 realMove,
52 findParents,
53 removeTreeListItem,
54 } from "@/utils/operation";
55 import { getRolesById, getAuthorityListAction } from "@/api/authorityManage";
56 import { getUserRoles } from "@/api/personnelManage";
57 import data from "./data";
58 import { getMenuInfo } from "@/api/user";
59 import { api, getAction, deleteAction } from "@/api/manageApi";
60 import tableMixin from "@/mixins/tableMixin.js";
61 import EditDialog from "./edit-dialog.vue";
62 import Roleslistdiglog from "./roleslistdiglog.vue";
63 import { mapGetters } from "vuex";
64 import { updateOrder } from "@/api/orders"
65 export default {
66 name: "menus",
67 mixins: [tableMixin],
68 components: {
69 EditDialog,
70 Roleslistdiglog,
71 },
72 data () {
73 return {
74 // 开始结束日期限制
75 pickerOptionsStart: {
76 disabledDate: (time) => {
77 if (this.form.endTime) {
78 return time.getTime() >= new Date(this.form.endTime).getTime()
79 }
80 }
81 },
82 // 结束日期限制
83 pickerOptionsEnd: {
84 disabledDate: (time) => {
85 if (this.form.startTime) {
86 return time.getTime() < new Date(this.form.startTime).getTime()
87 }
88 }
89 },
90 listdata: [],
91 setlistdata: [],
92 // 表单
93 form: {
94 ywh: '',
95 ywmc: '',
96 startTime: '',
97 endTime: '',
98 currentPage: 1
99 },
100 tableData: {
101 columns: [
102 {
103 label: "序号",
104 type: "index",
105 width: "50",
106 index: this.indexMethod,
107 },
108 ]
109 .concat(data.columns())
110 .concat({
111 prop: "state",
112 label: "状态",
113 width: '120',
114 render: (h, scope) => {
115 return (
116 <div>
117 <span class='adopt' v-show={scope.row.state == 3}>上报失败</span>
118 <span class='adopt' v-show={scope.row.state == 2}>上报成功</span>
119 <span class='warehousing' v-show={scope.row.state == 1}>接入上报异常</span>
120 </div>
121 )
122 }
123 })
124 .concat([]),
125 },
126 data: [],
127 }
128 },
129 created () {
130 this.getTableData();
131 },
132 mounted () { },
133 methods: {
134 //查询
135 searchQuery () {
136 if (this.form.rolesName) {
137 this.listdata = this.childrenFn(this.setlistdata, this.form.rolesName);
138 } else {
139 this.getTableData()
140 }
141 },
142 childrenFn (arr, key) {
143 let searchTree = [];
144 arr.forEach((item, index) => {
145 if (item.name.indexOf(key) != -1) {
146
147 searchTree.push(item);
148 }
149 });
150 if (searchTree != undefined && searchTree.length != 0) {
151 return judgeSort(searchTree);
152 }
153 },
154 // 获取角色列表
155 getTableData () {
156 getRolesById([1, 2])
157 .then((res) => {
158 this.listdata = res.content;
159 this.listdata = judgeSort(this.listdata);
160 this.setlistdata = res.content;
161 })
162 .catch((e) => console.error(e));
163 },
164
165
166 },
167 };
168 </script>
169 <style scoped lang="scss">
170 @import "~@/styles/mixin.scss";
171 // @import "~@/styles/public.scss";
172
173 /deep/.el-button.is-disabled.el-button--text {
174 width: 64px;
175 height: 28px;
176 background: rgba(255, 255, 255, 0.1);
177 border-radius: 16px;
178 }
179 </style>
...@@ -159,13 +159,14 @@ ...@@ -159,13 +159,14 @@
159 }, 159 },
160 }, 160 },
161 { 161 {
162 width: "130", 162 width: "200",
163 label: "移动", 163 label: "移动",
164 render: (h, scope) => { 164 render: (h, scope) => {
165 return ( 165 return (
166 <div> 166 <div>
167 <el-button 167 <el-button
168 type="text" 168 type="text"
169 class='movebtnColor'
169 disabled={scope.row.isTop} 170 disabled={scope.row.isTop}
170 onClick={() => { 171 onClick={() => {
171 this.moveUpward(scope.$index, scope.row); 172 this.moveUpward(scope.$index, scope.row);
...@@ -175,6 +176,7 @@ ...@@ -175,6 +176,7 @@
175 </el-button> 176 </el-button>
176 <el-button 177 <el-button
177 type="text" 178 type="text"
179 class='movebtnColor'
178 disabled={scope.row.isBottom} 180 disabled={scope.row.isBottom}
179 onClick={() => { 181 onClick={() => {
180 this.moveDown(scope.$index, scope.row); 182 this.moveDown(scope.$index, scope.row);
...@@ -187,13 +189,14 @@ ...@@ -187,13 +189,14 @@
187 }, 189 },
188 }, 190 },
189 { 191 {
190 width: "100", 192 width: "200",
191 label: "操作", 193 label: "操作",
192 render: (h, scope) => { 194 render: (h, scope) => {
193 return ( 195 return (
194 <div> 196 <div>
195 <el-button 197 <el-button
196 type="text" 198 type="text"
199 class='resetbtnColor'
197 style="margin-right:10px" 200 style="margin-right:10px"
198 onClick={() => { 201 onClick={() => {
199 this.handleAddSubordinate(scope.row); 202 this.handleAddSubordinate(scope.row);
...@@ -203,6 +206,7 @@ ...@@ -203,6 +206,7 @@
203 </el-button> 206 </el-button>
204 <el-button 207 <el-button
205 type="text" 208 type="text"
209 class='delColor'
206 style="margin-left:0" 210 style="margin-left:0"
207 onClick={() => { 211 onClick={() => {
208 this.handleMinus(scope.$index, scope.row); 212 this.handleMinus(scope.$index, scope.row);
......
...@@ -208,9 +208,9 @@ ...@@ -208,9 +208,9 @@
208 message: res.message, 208 message: res.message,
209 showClose: true 209 showClose: true
210 }) 210 })
211 211 close()
212 this.resetForm()
213 this.$emit('ok') 212 this.$emit('ok')
213
214 } else { 214 } else {
215 this.$message.error({ message: res.message, showClose: true }) 215 this.$message.error({ message: res.message, showClose: true })
216 } 216 }
......
...@@ -29,20 +29,20 @@ ...@@ -29,20 +29,20 @@
29 </div> 29 </div>
30 </template> 30 </template>
31 <script> 31 <script>
32 // 定时任务 32 // 定时任务
33 import data from "./data"; 33 import data from "./data";
34 import { deleteAction, getAction, api } from "@/api/manageApi"; 34 import { deleteAction, getAction, api } from "@/api/manageApi";
35 import EditDialog from "./edit-dialog.vue"; 35 import EditDialog from "./edit-dialog.vue";
36 import { mapGetters } from "vuex"; 36 import { mapGetters } from "vuex";
37 import { getMenuInfo } from "@/api/user"; 37 import { getMenuInfo } from "@/api/user";
38 import { 38 import {
39 getUuid, 39 getUuid,
40 judgeSort, 40 judgeSort,
41 realMove, 41 realMove,
42 findParents, 42 findParents,
43 removeTreeListItem, 43 removeTreeListItem,
44 } from "@/utils/operation"; 44 } from "@/utils/operation";
45 export default { 45 export default {
46 name: "menus", 46 name: "menus",
47 components: { 47 components: {
48 EditDialog, 48 EditDialog,
...@@ -153,6 +153,7 @@ export default { ...@@ -153,6 +153,7 @@ export default {
153 // 加载表格数据 153 // 加载表格数据
154 getTableList () { 154 getTableList () {
155 getMenuInfo(this.BASE_API.CODE).then((res) => { 155 getMenuInfo(this.BASE_API.CODE).then((res) => {
156 console.log("/sthj", res);
156 if (res.code === 200) { 157 if (res.code === 200) {
157 this.tablelistData = judgeSort(res.result) 158 this.tablelistData = judgeSort(res.result)
158 this.listData = this.tablelistData 159 this.listData = this.tablelistData
...@@ -166,7 +167,7 @@ export default { ...@@ -166,7 +167,7 @@ export default {
166 conditions: [ 167 conditions: [
167 { 168 {
168 property: "code", 169 property: "code",
169 value: sessionStorage.getItem("products"), 170 value: this.BASE_API.CODE,
170 operator: "EQ", 171 operator: "EQ",
171 }, 172 },
172 ], 173 ],
...@@ -245,14 +246,14 @@ export default { ...@@ -245,14 +246,14 @@ export default {
245 this.getTableList() 246 this.getTableList()
246 }, 247 },
247 }, 248 },
248 }; 249 };
249 </script> 250 </script>
250 <style scoped lang="scss"> 251 <style scoped lang="scss">
251 @import "~@/styles/mixin.scss"; 252 @import "~@/styles/mixin.scss";
252 253
253 // @import "~@/styles/public.scss"; 254 // @import "~@/styles/public.scss";
254 255
255 /deep/.el-table__expand-icon { 256 /deep/.el-table__expand-icon {
256 color: #fff; 257 color: #fff;
257 } 258 }
258 </style> 259 </style>
......
...@@ -29,24 +29,24 @@ ...@@ -29,24 +29,24 @@
29 </div> 29 </div>
30 </template> 30 </template>
31 <script> 31 <script>
32 import { 32 import {
33 getUuid, 33 getUuid,
34 judgeSort, 34 judgeSort,
35 realMove, 35 realMove,
36 findParents, 36 findParents,
37 removeTreeListItem, 37 removeTreeListItem,
38 } from "@/utils/operation"; 38 } from "@/utils/operation";
39 import { getRolesById, getAuthorityListAction } from "@/api/authorityManage"; 39 import { getRolesById, getAuthorityListAction } from "@/api/authorityManage";
40 import { getUserRoles } from "@/api/personnelManage"; 40 import { getUserRoles } from "@/api/personnelManage";
41 import data from "./data"; 41 import data from "./data";
42 import { getMenuInfo } from "@/api/user"; 42 import { getMenuInfo } from "@/api/user";
43 import { api, getAction, deleteAction } from "@/api/manageApi"; 43 import { api, getAction, deleteAction } from "@/api/manageApi";
44 import tableMixin from "@/mixins/tableMixin.js"; 44 import tableMixin from "@/mixins/tableMixin.js";
45 import EditDialog from "./edit-dialog.vue"; 45 import EditDialog from "./edit-dialog.vue";
46 import Roleslistdiglog from "./roleslistdiglog.vue"; 46 import Roleslistdiglog from "./roleslistdiglog.vue";
47 import { mapGetters } from "vuex"; 47 import { mapGetters } from "vuex";
48 import { updateOrder } from "@/api/orders" 48 import { updateOrder } from "@/api/orders"
49 export default { 49 export default {
50 name: "menus", 50 name: "menus",
51 mixins: [tableMixin], 51 mixins: [tableMixin],
52 components: { 52 components: {
...@@ -431,7 +431,7 @@ export default { ...@@ -431,7 +431,7 @@ export default {
431 this.$refs.addEditDialog.menuType = this.menuType; 431 this.$refs.addEditDialog.menuType = this.menuType;
432 this.$refs.addEditDialog.roleId = value.id; 432 this.$refs.addEditDialog.roleId = value.id;
433 this.roleSort = value.sort ? value.sort : 0; 433 this.roleSort = value.sort ? value.sort : 0;
434 this.$refs.addEditDialog.dialogForm.roleType = sessionStorage.getItem("products"); 434 this.$refs.addEditDialog.dialogForm.roleType = this.BASE_API.CODE;
435 if (value.id) { 435 if (value.id) {
436 this.$refs.addEditDialog.dialogForm.roleName = value.name; 436 this.$refs.addEditDialog.dialogForm.roleName = value.name;
437 437
...@@ -503,16 +503,16 @@ export default { ...@@ -503,16 +503,16 @@ export default {
503 this.getTableData(); 503 this.getTableData();
504 }, 504 },
505 }, 505 },
506 }; 506 };
507 </script> 507 </script>
508 <style scoped lang="scss"> 508 <style scoped lang="scss">
509 @import "~@/styles/mixin.scss"; 509 @import "~@/styles/mixin.scss";
510 // @import "~@/styles/public.scss"; 510 // @import "~@/styles/public.scss";
511 511
512 /deep/.el-button.is-disabled.el-button--text { 512 /deep/.el-button.is-disabled.el-button--text {
513 width: 64px; 513 width: 64px;
514 height: 28px; 514 height: 28px;
515 background: rgba(255, 255, 255, 0.1); 515 background: rgba(255, 255, 255, 0.1);
516 border-radius: 16px; 516 border-radius: 16px;
517 } 517 }
518 </style> 518 </style>
......
...@@ -63,24 +63,24 @@ ...@@ -63,24 +63,24 @@
63 return ( 63 return (
64 <div> 64 <div>
65 <el-button type="text" 65 <el-button type="text"
66 size="mini"
66 v-show={scope.row.jobStatus === 0} 67 v-show={scope.row.jobStatus === 0}
67 class='btnColor' 68 class='btnColor'
68 icon="el-icon-video-pause"
69 onClick={() => { this.handleActive(scope.row) }}>激活 69 onClick={() => { this.handleActive(scope.row) }}>激活
70 </el-button> 70 </el-button>
71 <el-button type="text" 71 <el-button type="text"
72 size="mini"
72 v-show={scope.row.jobStatus === -1} 73 v-show={scope.row.jobStatus === -1}
73 class='btnColor' 74 class='btnColor'
74 icon="el-icon-video-pause"
75 onClick={() => { this.recover(scope.row) }}>恢复 75 onClick={() => { this.recover(scope.row) }}>恢复
76 </el-button> 76 </el-button>
77 <el-button type="text" 77 <el-button type="text"
78 icon="el-icon-edit" 78 size="mini"
79 class='btnColor' 79 class='successColor'
80 onClick={() => { this.handleEdit(scope.row) }}>编辑 80 onClick={() => { this.handleEdit(scope.row) }}>编辑
81 </el-button> 81 </el-button>
82 <el-button type="text" 82 <el-button type="text"
83 icon="el-icon-delete" 83 size="mini"
84 class='successColor' 84 class='successColor'
85 v-show={scope.row.jobStatus !== -1} 85 v-show={scope.row.jobStatus !== -1}
86 onClick={() => { this.handleDel(scope.row) }}>删除 86 onClick={() => { this.handleDel(scope.row) }}>删除
......