Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
3aa73533 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents 2e59bc54 87af4cd5
Inline Side-by-side
Showing 16 changed files with 73 additions and 82 deletions
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
13 <component :is="editItem" ref='childRef' :key="key" :formData='formData' /> 13 <component :is="editItem" ref='childRef' :key="key" :formData='formData' />
14 </div> 14 </div>
15 <div class="ls-mask-footer" v-if='btnShow'> 15 <div class="ls-mask-footer" v-if='btnShow'>
16 <el-button type="primary" @click="onConfirm">{{ confirmText }}</el-button>
17 <el-button @click="onCancel">{{ cancelText }}</el-button> 16 <el-button @click="onCancel">{{ cancelText }}</el-button>
18 </div> 17 </div>
19 </div> 18 </div>
...@@ -30,7 +29,7 @@ ...@@ -30,7 +29,7 @@
30 editItem: "", 29 editItem: "",
31 isMain: false, 30 isMain: false,
32 formData: undefined,//父组件传递的参数 负责传给子组件 31 formData: undefined,//父组件传递的参数 负责传给子组件
33 btnShow: false, 32 btnShow: true,
34 cancel: function () { }, 33 cancel: function () { },
35 confirm: function () { }, 34 confirm: function () { },
36 cancelText: '取消', 35 cancelText: '取消',
...@@ -141,25 +140,25 @@ ...@@ -141,25 +140,25 @@
141 } 140 }
142 141
143 .mask-content { 142 .mask-content {
144 padding: 20px; 143 padding: 5px 20px 50px 20px;
145 width: 100%; 144 width: 100%;
146 min-height: 30%; 145 min-height: 20%;
147 max-height: 90vh; 146 max-height: 90vh;
148 overflow-y: scroll; 147 overflow-y: scroll;
149 } 148 }
150 149
151 .ls-mask-footer { 150 .ls-mask-footer {
152 height: 50px; 151 height: 33px;
153 display: flex; 152 display: flex;
154 justify-content: center; 153 justify-content: center;
155 width: 100%; 154 width: 100%;
156 position: absolute; 155 position: absolute;
157 border-top: 1px solid $borderColor;
158 bottom: 0; 156 bottom: 0;
159 background: #ffffff; 157 background: #ffffff;
160 border-bottom-left-radius: 5px; 158 border-bottom-left-radius: 5px;
161 border-bottom-right-radius: 5px; 159 border-bottom-right-radius: 5px;
162 overflow: hidden; 160 overflow: hidden;
161 margin-bottom: 10px;
163 } 162 }
164 163
165 /deep/.closeStyle { 164 /deep/.closeStyle {
......
...@@ -458,8 +458,8 @@ aside { ...@@ -458,8 +458,8 @@ aside {
458 458
459 .icon { 459 .icon {
460 position: absolute; 460 position: absolute;
461 top: 9px; 461 top: 12px;
462 right: 5px; 462 right: 0px;
463 transform: rotate(45deg); 463 transform: rotate(45deg);
464 color: #fff; 464 color: #fff;
465 font-size: 12px; 465 font-size: 12px;
...@@ -474,7 +474,7 @@ aside { ...@@ -474,7 +474,7 @@ aside {
474 height: 0; 474 height: 0;
475 border-width: 0px 0px 55px 55px; 475 border-width: 0px 0px 55px 55px;
476 border-style: none solid solid; 476 border-style: none solid solid;
477 border-color: transparent transparent red; 477 border-color: transparent transparent rgb(216, 62, 62);
478 position: absolute; 478 position: absolute;
479 top: 0; 479 top: 0;
480 right: 0; 480 right: 0;
......
1 /* 1 /*
2 * @Description: 弹框组件的封装 2 * @Description: 弹框组件的封装
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-07 09:21:10 4 * @LastEditTime: 2023-07-12 09:58:13
5 */ 5 */
6 import ywPopup from '@/components/ywPopup/index' 6 import ywPopup from '@/components/ywPopup/index'
7 import Popup1 from '@/components/Popup1/index' 7 import Popup1 from '@/components/Popup1/index'
...@@ -23,7 +23,7 @@ export function popupDialog (title, url, params, width = '75%', isMain, height, ...@@ -23,7 +23,7 @@ export function popupDialog (title, url, params, width = '75%', isMain, height,
23 }) 23 })
24 } 24 }
25 25
26 export function ywPopupDialog (title, url, params, width = '75%', isMain, height, btnShow = false, callback, cancel) { 26 export function ywPopupDialog (title, url, params, width = '75%', isMain, height, btnShow = true, callback, cancel) {
27 // Popup.install 27 // Popup.install
28 ywPopup(title, url, { 28 ywPopup(title, url, {
29 height: height, 29 height: height,
......
1 <!-- 1 <!--
2 功能：初始化功能描述 2 * @Description:
3 作者：calliope 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-12 09:55:38
4 --> 5 -->
5 <template> 6 <template>
6 <div class='ywdialog'> 7 <div class='ywdialog'>
7 <el-link type="danger" :underline="false">{{formData.message}}</el-link>
8 <el-table 8 <el-table
9 v-if="formData.result" 9 v-if="formData.result"
10 :data="formData.result" 10 :data="formData.result"
......
1 <!--
2 * @Description:
3 * @Autor: renchao
4 * @LastEditTime: 2023-07-12 09:23:03
5 -->
1 <template> 6 <template>
2 <div class="home"> 7 <div class="home">
3 <div class="home-left"> 8 <div class="home-left">
......
...@@ -22,20 +22,17 @@ ...@@ -22,20 +22,17 @@
22 :class="[ 22 :class="[
23 row.qszt == '2' ? 'lishi' : '', 23 row.qszt == '2' ? 'lishi' : '',
24 row.qszt == '0' ? 'linshi' : '', 24 row.qszt == '0' ? 'linshi' : '',
25 row.qlzt == '4' ? 'linshi' : '',
25 26
26 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '',
27 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '', 27 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
28 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '', 28 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
29 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '', 29 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
30 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '', 30 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
31 ]"> 31 ]">
32 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 32 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
33 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 33 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
34 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 34 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
35 </div> 35 </div>
36 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
37 失效
38 </div>
39 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'"> 36 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
40 有效 37 有效
41 </div> 38 </div>
......
...@@ -24,7 +24,8 @@ ...@@ -24,7 +24,8 @@
24 :class="[ 24 :class="[
25 row.qszt == '2' ? 'lishi' : '', 25 row.qszt == '2' ? 'lishi' : '',
26 row.qszt == '0' ? 'linshi' : '', 26 row.qszt == '0' ? 'linshi' : '',
27 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '', 27 row.qlzt == '4' ? 'linshi' : '',
28
28 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '', 29 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
29 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '', 30 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
30 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '', 31 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
...@@ -40,9 +41,6 @@ ...@@ -40,9 +41,6 @@
40 icon="el-icon-edit-outline" 41 icon="el-icon-edit-outline"
41 @click="editDialog(row, 'D')">删除</el-button> 42 @click="editDialog(row, 'D')">删除</el-button>
42 </div> 43 </div>
43 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
44 失效
45 </div>
46 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'"> 44 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
47 有效 45 有效
48 </div> 46 </div>
......
...@@ -22,21 +22,19 @@ ...@@ -22,21 +22,19 @@
22 v-for="(row, index) in tableData" 22 v-for="(row, index) in tableData"
23 :key="index" 23 :key="index"
24 :class="[ 24 :class="[
25 row.qszt == '2' ? 'lishi' : '', 25 row.qszt == '2' ? 'lishi' : '',
26 row.qszt == '0' ? 'linshi' : '', 26 row.qszt == '0' ? 'linshi' : '',
27 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '', 27 row.qlzt == '4' ? 'linshi' : '',
28 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '', 28
29 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '', 29 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
30 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '', 30 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
31 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '', 31 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
32 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
32 ]"> 33 ]">
33 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 34 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
34 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 35 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
35 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 36 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
36 </div> 37 </div>
37 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
38 失效
39 </div>
40 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'"> 38 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
41 有效 39 有效
42 </div> 40 </div>
......
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
19 <td v-for="(row, index) in tableData" :key="index" :class="[ 19 <td v-for="(row, index) in tableData" :key="index" :class="[
20 row.qszt == '2' ? 'lishi' : '', 20 row.qszt == '2' ? 'lishi' : '',
21 row.qszt == '0' ? 'linshi' : '', 21 row.qszt == '0' ? 'linshi' : '',
22 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '', 22 row.qlzt == '4' ? 'linshi' : '',
23
23 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '', 24 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
24 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '', 25 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
25 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '', 26 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
...@@ -29,9 +30,6 @@ ...@@ -29,9 +30,6 @@
29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 31 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
31 </div> 32 </div>
32 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
33 失效
34 </div>
35 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'"> 33 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
36 有效 34 有效
37 </div> 35 </div>
......
...@@ -24,12 +24,13 @@ ...@@ -24,12 +24,13 @@
24 :class="[ 24 :class="[
25 row.qszt == '2' ? 'lishi' : '', 25 row.qszt == '2' ? 'lishi' : '',
26 row.qszt == '0' ? 'linshi' : '', 26 row.qszt == '0' ? 'linshi' : '',
27 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '', 27 row.qlzt == '4' ? 'linshi' : '',
28
28 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '', 29 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
29 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '', 30 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
30 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '', 31 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
31 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '', 32 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
32 ]"> 33 ]">
33 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 34 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
34 <el-button 35 <el-button
35 type="text" 36 type="text"
...@@ -40,9 +41,6 @@ ...@@ -40,9 +41,6 @@
40 icon="el-icon-edit-outline" 41 icon="el-icon-edit-outline"
41 @click="editDialog(row, 'D')">删除</el-button> 42 @click="editDialog(row, 'D')">删除</el-button>
42 </div> 43 </div>
43 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
44 失效
45 </div>
46 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'"> 44 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
47 有效 45 有效
48 </div> 46 </div>
......
...@@ -19,19 +19,17 @@ ...@@ -19,19 +19,17 @@
19 <td v-for="(row, index) in tableData" :key="index" :class="[ 19 <td v-for="(row, index) in tableData" :key="index" :class="[
20 row.qszt == '2' ? 'lishi' : '', 20 row.qszt == '2' ? 'lishi' : '',
21 row.qszt == '0' ? 'linshi' : '', 21 row.qszt == '0' ? 'linshi' : '',
22 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '', 22 row.qlzt == '4' ? 'linshi' : '',
23
23 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '', 24 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
24 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '', 25 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
25 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '', 26 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
26 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '', 27 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
27 ]"> 28 ]">
28 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 29 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 31 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
31 </div> 32 </div>
32 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
33 失效
34 </div>
35 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'"> 33 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
36 有效 34 有效
37 </div> 35 </div>
......
...@@ -19,19 +19,17 @@ ...@@ -19,19 +19,17 @@
19 <td v-for="(row, index) in tableData" :key="index" :class="[ 19 <td v-for="(row, index) in tableData" :key="index" :class="[
20 row.qszt == '2' ? 'lishi' : '', 20 row.qszt == '2' ? 'lishi' : '',
21 row.qszt == '0' ? 'linshi' : '', 21 row.qszt == '0' ? 'linshi' : '',
22 row.qlzt == '0' ? 'zhuxiaoIcon' : '', 22 row.qlzt == '4' ? 'linshi' : '',
23 row.qlzt == '3' ? 'linshiIcon' : '', 23
24 row.qlzt == '2' ? 'linshiIcon' : '', 24 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
25 row.qlzt == '1' ? 'xianshiIcon' : '', 25 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
26 row.qlzt == '4' ? 'zhuxiaoIcon' : '', 26 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
27 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
27 ]"> 28 ]">
28 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 29 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 31 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
31 </div> 32 </div>
32 <div class="icon" v-if="row.qlzt == '0'">
33 失效
34 </div>
35 <div class="icon" v-if="row.qlzt == '1'"> 33 <div class="icon" v-if="row.qlzt == '1'">
36 有效 34 有效
37 </div> 35 </div>
...@@ -62,15 +60,13 @@ ...@@ -62,15 +60,13 @@
62 <td v-for="(row, index) in tableData" :key="index" :class="[ 60 <td v-for="(row, index) in tableData" :key="index" :class="[
63 row.qszt == '2' ? 'lishi' : '', 61 row.qszt == '2' ? 'lishi' : '',
64 row.qszt == '0' ? 'linshi' : '', 62 row.qszt == '0' ? 'linshi' : '',
65 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '', 63 row.qlzt == '4' ? 'linshi' : '',
64
66 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '', 65 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
67 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '', 66 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
68 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '', 67 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
69 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '', 68 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
70 ]"> 69 ]">
71 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
72 失效
73 </div>
74 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'"> 70 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
75 有效 71 有效
76 </div> 72 </div>
......
...@@ -19,19 +19,17 @@ ...@@ -19,19 +19,17 @@
19 <td v-for="(row, index) in tableData" :key="index" :class="[ 19 <td v-for="(row, index) in tableData" :key="index" :class="[
20 row.qszt == '2' ? 'lishi' : '', 20 row.qszt == '2' ? 'lishi' : '',
21 row.qszt == '0' ? 'linshi' : '', 21 row.qszt == '0' ? 'linshi' : '',
22 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '', 22 row.qlzt == '4' ? 'linshi' : '',
23
23 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '', 24 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
24 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '', 25 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
25 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '', 26 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
26 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '', 27 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
27 ]"> 28 ]">
28 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 29 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 31 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
31 </div> 32 </div>
32 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
33 失效
34 </div>
35 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'"> 33 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
36 有效 34 有效
37 </div> 35 </div>
......
...@@ -18,19 +18,17 @@ ...@@ -18,19 +18,17 @@
18 <td v-for="(row, index) in tableData" :key="index" :class="[ 18 <td v-for="(row, index) in tableData" :key="index" :class="[
19 row.qszt == '2' ? 'lishi' : '', 19 row.qszt == '2' ? 'lishi' : '',
20 row.qszt == '0' ? 'linshi' : '', 20 row.qszt == '0' ? 'linshi' : '',
21 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '', 21 row.qlzt == '4' ? 'linshi' : '',
22
22 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '', 23 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
23 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '', 24 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
24 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '', 25 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
25 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '', 26 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
26 ]"> 27 ]">
27 <div class="setbut" v-if="item.prop == 'cz'"> 28 <div class="setbut" v-if="item.prop == 'cz'">
28 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
30 </div> 31 </div>
31 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
32 失效
33 </div>
34 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'"> 32 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
35 有效 33 有效
36 </div> 34 </div>
......
...@@ -18,19 +18,17 @@ ...@@ -18,19 +18,17 @@
18 <td v-for="(row, index) in tableData" :key="index" :class="[ 18 <td v-for="(row, index) in tableData" :key="index" :class="[
19 row.qszt == '2' ? 'lishi' : '', 19 row.qszt == '2' ? 'lishi' : '',
20 row.qszt == '0' ? 'linshi' : '', 20 row.qszt == '0' ? 'linshi' : '',
21 item.prop == 'qszt' && row.qlzt == '0' ? 'zhuxiaoIcon' : '', 21 row.qlzt == '4' ? 'linshi' : '',
22
22 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '', 23 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
23 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '', 24 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
24 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '', 25 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
25 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '', 26 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
26 ]"> 27 ]">
27 <div class="setbut" v-if="item.prop == 'cz'"> 28 <div class="setbut" v-if="item.prop == 'cz'">
28 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
29 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 30 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
30 </div> 31 </div>
31 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '0'">
32 失效
33 </div>
34 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'"> 32 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
35 有效 33 有效
36 </div> 34 </div>
......
...@@ -27,15 +27,25 @@ ...@@ -27,15 +27,25 @@
27 :class="[ 27 :class="[
28 row.qszt == '2' ? 'lishi' : '', 28 row.qszt == '2' ? 'lishi' : '',
29 row.qszt == '0' ? 'linshi' : '', 29 row.qszt == '0' ? 'linshi' : '',
30 item.prop == 'qszt' && row.qszt == '0' ? 'linshiIcon' : '', 30 row.qlzt == '4' ? 'linshi' : '',
31 item.prop == 'qszt' && row.qszt == '1' ? 'xianshiIcon' : '', 31
32 item.prop == 'qszt' && row.qlzt == '3' ? 'linshiIcon' : '',
33 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
34 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
35 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
32 ]"> 36 ]">
33 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '0'"> 37 <div class="icon" v-if="item.prop == 'qszt' &&row.qlzt == '1'">
34 正在办理
35 </div>
36 <div class="icon" v-if="item.prop == 'qszt' && row.qszt == '1'">
37 有效 38 有效
38 </div> 39 </div>
40 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">
41 正在补录
42 </div>
43 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">
44 正在申请
45 </div>
46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
47 正在注销
48 </div>
39 <span v-if="item.prop == 'qszt'"> 49 <span v-if="item.prop == 'qszt'">
40 {{ getQsztName(row[item.prop]) }} 50 {{ getQsztName(row[item.prop]) }}
41 </span> 51 </span>
......