Skip to content

bdc / bdcdj-web

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

Merge branch 'dev'

2 parents b9bc6f41 a5e669ff
Inline Side-by-side
Showing 19 changed files with 138 additions and 88 deletions
...@@ -210,9 +210,14 @@ aside { ...@@ -210,9 +210,14 @@ aside {
210 .ellipsis-line { 210 .ellipsis-line {
211 display: inline-block; 211 display: inline-block;
212 width: 300px !important; 212 width: 300px !important;
213 word-break: break-all;
214 text-overflow: ellipsis;
215 display: -webkit-box;
216 -webkit-box-orient: vertical;
217 -webkit-line-clamp: 2;
218 /* 这里是超出几行省略 */
213 overflow: hidden; 219 overflow: hidden;
214 text-overflow: ellipsis; //文本溢出显示省略号 220 margin: 0 auto;
215 white-space: nowrap; //文本不会换行
216 } 221 }
217 222
218 .tooltip-width { 223 .tooltip-width {
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 } 40 }
41 41
42 .menu-con { 42 .menu-con {
43 width: 87%; 43 width: 93%;
44 } 44 }
45 45
46 .batchDel { 46 .batchDel {
...@@ -55,8 +55,10 @@ ...@@ -55,8 +55,10 @@
55 55
56 .title-detail { 56 .title-detail {
57 display: flex; 57 display: flex;
58 flex-wrap: wrap;
59 width: 100%; 58 width: 100%;
59 overflow: hidden;
60 text-overflow: ellipsis; //文本溢出显示省略号
61 white-space: nowrap; //文本不会换行
60 } 62 }
61 63
62 .title-batch { 64 .title-batch {
...@@ -209,7 +211,8 @@ ...@@ -209,7 +211,8 @@
209 box-sizing: border-box; 211 box-sizing: border-box;
210 width: 70px; 212 width: 70px;
211 margin: 0 5px; 213 margin: 0 5px;
212 .icon{ 214
215 .icon {
213 font-size: 10px; 216 font-size: 10px;
214 } 217 }
215 } 218 }
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-19 09:52:13 4 * @LastEditTime: 2023-08-25 17:06:44
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -50,11 +50,14 @@ ...@@ -50,11 +50,14 @@
50 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 50 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
51 正在注销 51 正在注销
52 </div> 52 </div>
53 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
54 53
55 <span v-if="!['djyy','fj'].includes(item.prop)"> 54 <p v-if="!['djyy','fj'].includes(item.prop)">
56 {{ row[item.prop] }} 55 <span v-if="item.prop == 'qszt'">
56 {{ getQsztName(row[item.prop]) }}
57 </span> 57 </span>
58 <span v-else>{{ row[item.prop] }}</span>
59 </p>
60
58 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 61 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
59 <span class="ellipsis-line"> 62 <span class="ellipsis-line">
60 {{ row[item.prop] }} 63 {{ row[item.prop] }}
......
...@@ -58,13 +58,14 @@ ...@@ -58,13 +58,14 @@
58 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 58 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
59 正在注销 59 正在注销
60 </div> 60 </div>
61
62 <p v-if="!['djyy','fj'].includes(item.prop)">
61 <span v-if="item.prop == 'qszt'"> 63 <span v-if="item.prop == 'qszt'">
62 {{ getQsztName(row[item.prop]) }} 64 {{ getQsztName(row[item.prop]) }}
63 </span> 65 </span>
66 <span v-else>{{ row[item.prop] }}</span>
67 </p>
64 68
65 <span v-if="!['djyy','fj'].includes(item.prop)">
66 {{ row[item.prop] }}
67 </span>
68 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 69 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
69 <span class="ellipsis-line"> 70 <span class="ellipsis-line">
70 {{ row[item.prop] }} 71 {{ row[item.prop] }}
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-23 15:54:23 4 * @LastEditTime: 2023-08-25 17:12:43
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -52,13 +52,14 @@ ...@@ -52,13 +52,14 @@
52 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 52 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
53 正在注销 53 正在注销
54 </div> 54 </div>
55
56 <p v-if="!['djyy','fj'].includes(item.prop)">
55 <span v-if="item.prop == 'qszt'"> 57 <span v-if="item.prop == 'qszt'">
56 {{ getQsztName(row[item.prop]) }} 58 {{ getQsztName(row[item.prop]) }}
57 </span> 59 </span>
60 <span v-else>{{ row[item.prop] }}</span>
61 </p>
58 62
59 <span v-if="!['djyy','fj'].includes(item.prop)">
60 {{ row[item.prop] }}
61 </span>
62 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 63 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
63 <span class="ellipsis-line"> 64 <span class="ellipsis-line">
64 {{ row[item.prop] }} 65 {{ row[item.prop] }}
......
...@@ -52,7 +52,9 @@ ...@@ -52,7 +52,9 @@
52 </span> 52 </span>
53 </el-tooltip> 53 </el-tooltip>
54 54
55 <span v-if="(item.prop !== 'qszt' && item.prop !== 'djyy'&& item.prop !== 'fj') && !judge(item.label)"> {{ row[item.prop] }}</span> 55 <span v-if="(item.prop !== 'qszt' && item.prop !== 'djyy'&& item.prop !== 'fj') && !judge(item.label)">
56 {{ row[item.prop] }}
57 </span>
56 <div class="many" v-if="judge(item.label)"> 58 <div class="many" v-if="judge(item.label)">
57 <div v-for="(label, index) in row.djQlxxFdcqxmDoList" :key="index"> 59 <div v-for="(label, index) in row.djQlxxFdcqxmDoList" :key="index">
58 {{ label[item.prop] }} 60 {{ label[item.prop] }}
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-24 16:14:57 4 * @LastEditTime: 2023-08-25 17:17:06
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -58,13 +58,14 @@ ...@@ -58,13 +58,14 @@
58 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 58 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
59 正在注销 59 正在注销
60 </div> 60 </div>
61
62 <p v-if="!['djyy','fj'].includes(item.prop)">
61 <span v-if="item.prop == 'qszt'"> 63 <span v-if="item.prop == 'qszt'">
62 {{ getQsztName(row[item.prop]) }} 64 {{ getQsztName(row[item.prop]) }}
63 </span> 65 </span>
66 <span v-else>{{ row[item.prop] }}</span>
67 </p>
64 68
65 <span v-if="!['djyy','fj'].includes(item.prop)">
66 {{ row[item.prop] }}
67 </span>
68 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 69 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
69 <span class="ellipsis-line"> 70 <span class="ellipsis-line">
70 {{ row[item.prop] }} 71 {{ row[item.prop] }}
......
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
47 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 47 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
48 正在注销 48 正在注销
49 </div> 49 </div>
50
51 <p v-if="!['djyy','fj'].includes(item.prop)">
50 <span v-if="item.prop == 'qszt'"> 52 <span v-if="item.prop == 'qszt'">
51 {{ getQsztName(row[item.prop]) }} 53 {{ getQsztName(row[item.prop]) }}
52 </span> 54 </span>
53 55 <span v-else>{{ row[item.prop] }}</span>
54 <span v-if="!['djyy','fj'].includes(item.prop)"> 56 </p>
55 {{ row[item.prop] }}
56 </span>
57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
58 <span class="ellipsis-line"> 58 <span class="ellipsis-line">
59 {{ row[item.prop] }} 59 {{ row[item.prop] }}
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-16 11:29:20 4 * @LastEditTime: 2023-08-25 17:16:32
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
13 <el-checkbox 13 <el-checkbox
14 v-for="item in qsztList" 14 v-for="item in qsztList"
15 :key="item.value" 15 :key="item.value"
16 :label="item.value" 16 :label="item.value">{{ item.label }}</el-checkbox>
17 >{{ item.label }}</el-checkbox>
18 </el-checkbox-group> 17 </el-checkbox-group>
19 </div> 18 </div>
20 </div> 19 </div>
...@@ -35,8 +34,7 @@ ...@@ -35,8 +34,7 @@
35 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '', 34 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
36 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '', 35 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
37 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '' 36 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
38 ]" 37 ]">
39 >
40 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 38 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
41 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 39 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
42 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 40 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
...@@ -45,9 +43,19 @@ ...@@ -45,9 +43,19 @@
45 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">正在补录</div> 43 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">正在补录</div>
46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">正在申请</div> 44 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">正在申请</div>
47 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">正在注销</div> 45 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">正在注销</div>
48 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
49 46
47 <p v-if="!['djyy','fj'].includes(item.prop)">
48 <span v-if="item.prop == 'qszt'">
49 {{ getQsztName(row[item.prop]) }}
50 </span>
50 <span v-else>{{ row[item.prop] }}</span> 51 <span v-else>{{ row[item.prop] }}</span>
52 </p>
53 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
54 <span class="ellipsis-line">
55 {{ row[item.prop] }}
56 </span>
57 </el-tooltip>
58
51 </td> 59 </td>
52 <td v-for="count in emptycolNum" :key="~count"></td> 60 <td v-for="count in emptycolNum" :key="~count"></td>
53 </tr> 61 </tr>
...@@ -58,11 +66,11 @@ ...@@ -58,11 +66,11 @@
58 </template> 66 </template>
59 67
60 <script> 68 <script>
61 import { datas } from "./qlxxFormData.js"; 69 import { datas } from "./qlxxFormData.js";
62 import { getSjlx, getDictLeabel } from "@/utils/dictionary.js"; 70 import { getSjlx, getDictLeabel } from "@/utils/dictionary.js";
63 import { getLqList } from "@/api/djbDetail.js"; 71 import { getLqList } from "@/api/djbDetail.js";
64 export default { 72 export default {
65 data() { 73 data () {
66 return { 74 return {
67 title: "林权登记信息", 75 title: "林权登记信息",
68 qsztList: datas.columns().qsztList, 76 qsztList: datas.columns().qsztList,
...@@ -77,7 +85,7 @@ export default { ...@@ -77,7 +85,7 @@ export default {
77 columns: datas.columns().LDSYQ, 85 columns: datas.columns().LDSYQ,
78 }; 86 };
79 }, 87 },
80 created() { 88 created () {
81 this.loadData(); 89 this.loadData();
82 }, 90 },
83 methods: { 91 methods: {
...@@ -85,7 +93,7 @@ export default { ...@@ -85,7 +93,7 @@ export default {
85 * @description: loadData 93 * @description: loadData
86 * @author: renchao 94 * @author: renchao
87 */ 95 */
88 loadData() { 96 loadData () {
89 if (this.$parent.addRepairRecord) { 97 if (this.$parent.addRepairRecord) {
90 this.columns.unshift({ 98 this.columns.unshift({
91 prop: "cz", 99 prop: "cz",
...@@ -118,7 +126,7 @@ export default { ...@@ -118,7 +126,7 @@ export default {
118 * @description: checkChange 126 * @description: checkChange
119 * @author: renchao 127 * @author: renchao
120 */ 128 */
121 checkChange() { 129 checkChange () {
122 if (this.checkList.length === 0) { 130 if (this.checkList.length === 0) {
123 this.tableData = []; 131 this.tableData = [];
124 this.emptycolNum = datas.columns().emptycolNum; 132 this.emptycolNum = datas.columns().emptycolNum;
...@@ -131,7 +139,7 @@ export default { ...@@ -131,7 +139,7 @@ export default {
131 * @param {*} code 139 * @param {*} code
132 * @author: renchao 140 * @author: renchao
133 */ 141 */
134 getQsztName(code) { 142 getQsztName (code) {
135 let name = ""; 143 let name = "";
136 for (let item of this.qsztList) { 144 for (let item of this.qsztList) {
137 if (item.value == code) { 145 if (item.value == code) {
...@@ -148,7 +156,7 @@ export default { ...@@ -148,7 +156,7 @@ export default {
148 * @param {*} del 156 * @param {*} del
149 * @author: renchao 157 * @author: renchao
150 */ 158 */
151 editDialog(row, del) { 159 editDialog (row, del) {
152 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", { 160 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
153 confirmButtonText: "确定", 161 confirmButtonText: "确定",
154 cancelButtonText: "取消", 162 cancelButtonText: "取消",
...@@ -170,10 +178,10 @@ export default { ...@@ -170,10 +178,10 @@ export default {
170 }); 178 });
171 }, 179 },
172 }, 180 },
173 }; 181 };
174 </script> 182 </script>
175 183
176 <style lang="scss" scoped> 184 <style lang="scss" scoped>
177 @import "./qlxxCommon.scss"; 185 @import "./qlxxCommon.scss";
178 </style> 186 </style>
179 187
...\ No newline at end of file ...\ No newline at end of file
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-24 16:15:05 4 * @LastEditTime: 2023-08-25 17:19:17
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -47,13 +47,13 @@ ...@@ -47,13 +47,13 @@
47 <div class="icon" v-if="row.qlzt == '4'"> 47 <div class="icon" v-if="row.qlzt == '4'">
48 正在注销 48 正在注销
49 </div> 49 </div>
50
51 <p v-if="!['djyy','fj'].includes(item.prop)">
50 <span v-if="item.prop == 'qszt'"> 52 <span v-if="item.prop == 'qszt'">
51 {{ getQsztName(row[item.prop]) }} 53 {{ getQsztName(row[item.prop]) }}
52 </span> 54 </span>
53 55 <span v-else>{{ row[item.prop] }}</span>
54 <span v-if="!['djyy','fj'].includes(item.prop)"> 56 </p>
55 {{ row[item.prop] }}
56 </span>
57 57
58 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 58 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
59 <span class="ellipsis-line"> 59 <span class="ellipsis-line">
...@@ -93,13 +93,14 @@ ...@@ -93,13 +93,14 @@
93 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 93 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
94 正在注销 94 正在注销
95 </div> 95 </div>
96
97 <p v-if="!['djyy','fj'].includes(item.prop)">
96 <span v-if="item.prop == 'qszt'"> 98 <span v-if="item.prop == 'qszt'">
97 {{ getQsztName(row[item.prop]) }} 99 {{ getQsztName(row[item.prop]) }}
98 </span> 100 </span>
101 <span v-else>{{ row[item.prop] }}</span>
102 </p>
99 103
100 <span v-if="!['djyy','fj'].includes(item.prop)">
101 {{ row[item.prop] }}
102 </span>
103 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 104 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
104 <span class="ellipsis-line"> 105 <span class="ellipsis-line">
105 {{ row[item.prop] }} 106 {{ row[item.prop] }}
......
...@@ -23,8 +23,7 @@ ...@@ -23,8 +23,7 @@
23 <el-checkbox 23 <el-checkbox
24 v-for="item in qsztList" 24 v-for="item in qsztList"
25 :key="item.value" 25 :key="item.value"
26 :label="item.value" 26 :label="item.value">{{ item.label }}</el-checkbox>
27 >{{ item.label }}</el-checkbox>
28 </el-checkbox-group> 27 </el-checkbox-group>
29 </div> 28 </div>
30 </div> 29 </div>
...@@ -45,8 +44,7 @@ ...@@ -45,8 +44,7 @@
45 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '', 44 item.prop == 'qszt' && row.qlzt == '2' ? 'linshiIcon' : '',
46 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '', 45 item.prop == 'qszt' && row.qlzt == '1' ? 'xianshiIcon' : '',
47 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : '' 46 item.prop == 'qszt' && row.qlzt == '4' ? 'zhuxiaoIcon' : ''
48 ]" 47 ]">
49 >
50 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'"> 48 <div class="setbut" v-if="item.prop == 'cz'&&row.sjlx !='系统数据'">
51 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button> 49 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row)">编辑</el-button>
52 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button> 50 <el-button type="text" icon="el-icon-edit-outline" @click="editDialog(row,'D')">删除</el-button>
...@@ -55,9 +53,23 @@ ...@@ -55,9 +53,23 @@
55 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">正在补录</div> 53 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '2'">正在补录</div>
56 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">正在申请</div> 54 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '3'">正在申请</div>
57 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">正在注销</div> 55 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">正在注销</div>
58 <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
59 56
57 <!-- <span v-if="item.prop == 'qszt'">{{ getQsztName(row[item.prop]) }}</span>
58 <span v-else>{{ row[item.prop] }}</span> -->
59
60 <p v-if="!['djyy','fj'].includes(item.prop)">
61 <span v-if="item.prop == 'qszt'">
62 {{ getQsztName(row[item.prop]) }}
63 </span>
60 <span v-else>{{ row[item.prop] }}</span> 64 <span v-else>{{ row[item.prop] }}</span>
65 </p>
66
67 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
68 <span class="ellipsis-line">
69 {{ row[item.prop] }}
70 </span>
71 </el-tooltip>
72
61 </td> 73 </td>
62 <td v-for="count in emptycolNum" :key="~count"></td> 74 <td v-for="count in emptycolNum" :key="~count"></td>
63 </tr> 75 </tr>
...@@ -68,11 +80,11 @@ ...@@ -68,11 +80,11 @@
68 </template> 80 </template>
69 81
70 <script> 82 <script>
71 import { datas } from "./qlxxFormData.js"; 83 import { datas } from "./qlxxFormData.js";
72 import { getSjlx } from "@/utils/dictionary.js"; 84 import { getSjlx } from "@/utils/dictionary.js";
73 import { getLqList } from "@/api/djbDetail.js"; 85 import { getLqList } from "@/api/djbDetail.js";
74 export default { 86 export default {
75 data() { 87 data () {
76 return { 88 return {
77 title: "林权登记信息", 89 title: "林权登记信息",
78 qsztList: datas.columns().qsztList, 90 qsztList: datas.columns().qsztList,
...@@ -87,7 +99,7 @@ export default { ...@@ -87,7 +99,7 @@ export default {
87 columns: datas.columns().LDSYQ, 99 columns: datas.columns().LDSYQ,
88 }; 100 };
89 }, 101 },
90 created() { 102 created () {
91 this.loadData(); 103 this.loadData();
92 }, 104 },
93 methods: { 105 methods: {
...@@ -95,7 +107,7 @@ export default { ...@@ -95,7 +107,7 @@ export default {
95 * @description: loadData 107 * @description: loadData
96 * @author: renchao 108 * @author: renchao
97 */ 109 */
98 loadData() { 110 loadData () {
99 if (this.$parent.addRepairRecord) { 111 if (this.$parent.addRepairRecord) {
100 this.columns.unshift({ 112 this.columns.unshift({
101 prop: "cz", 113 prop: "cz",
...@@ -125,7 +137,7 @@ export default { ...@@ -125,7 +137,7 @@ export default {
125 * @description: checkChange 137 * @description: checkChange
126 * @author: renchao 138 * @author: renchao
127 */ 139 */
128 checkChange() { 140 checkChange () {
129 if (this.checkList.length === 0) { 141 if (this.checkList.length === 0) {
130 this.tableData = []; 142 this.tableData = [];
131 this.emptycolNum = datas.columns().emptycolNum; 143 this.emptycolNum = datas.columns().emptycolNum;
...@@ -138,7 +150,7 @@ export default { ...@@ -138,7 +150,7 @@ export default {
138 * @param {*} code 150 * @param {*} code
139 * @author: renchao 151 * @author: renchao
140 */ 152 */
141 getQsztName(code) { 153 getQsztName (code) {
142 let name = ""; 154 let name = "";
143 for (let item of this.qsztList) { 155 for (let item of this.qsztList) {
144 if (item.value == code) { 156 if (item.value == code) {
...@@ -155,7 +167,7 @@ export default { ...@@ -155,7 +167,7 @@ export default {
155 * @param {*} del 167 * @param {*} del
156 * @author: renchao 168 * @author: renchao
157 */ 169 */
158 editDialog(row, del) { 170 editDialog (row, del) {
159 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", { 171 this.$confirm("此操作将新增一条补录信息, 是否继续?", "提示", {
160 confirmButtonText: "确定", 172 confirmButtonText: "确定",
161 cancelButtonText: "取消", 173 cancelButtonText: "取消",
...@@ -177,10 +189,10 @@ export default { ...@@ -177,10 +189,10 @@ export default {
177 }); 189 });
178 }, 190 },
179 }, 191 },
180 }; 192 };
181 </script> 193 </script>
182 194
183 <style lang="scss" scoped> 195 <style lang="scss" scoped>
184 @import "./qlxxCommon.scss"; 196 @import "./qlxxCommon.scss";
185 </style> 197 </style>
186 198
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -47,13 +47,14 @@ ...@@ -47,13 +47,14 @@
47 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 47 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
48 正在注销 48 正在注销
49 </div> 49 </div>
50
51 <p v-if="!['djyy','fj'].includes(item.prop)">
50 <span v-if="item.prop == 'qszt'"> 52 <span v-if="item.prop == 'qszt'">
51 {{ getQsztName(row[item.prop]) }} 53 {{ getQsztName(row[item.prop]) }}
52 </span> 54 </span>
55 <span v-else>{{ row[item.prop] }}</span>
56 </p>
53 57
54 <span v-if="!['djyy','fj'].includes(item.prop)">
55 {{ row[item.prop] }}
56 </span>
57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 58 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
58 <span class="ellipsis-line"> 59 <span class="ellipsis-line">
59 {{ row[item.prop] }} 60 {{ row[item.prop] }}
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-24 16:15:42 4 * @LastEditTime: 2023-08-25 17:14:29
5 --> 5 -->
6 <template> 6 <template>
7 <div class="djxxTable"> 7 <div class="djxxTable">
...@@ -46,13 +46,14 @@ ...@@ -46,13 +46,14 @@
46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
47 正在注销 47 正在注销
48 </div> 48 </div>
49
50 <p v-if="!['djyy','fj'].includes(item.prop)">
49 <span v-if="item.prop == 'qszt'"> 51 <span v-if="item.prop == 'qszt'">
50 {{ getQsztName(row[item.prop]) }} 52 {{ getQsztName(row[item.prop]) }}
51 </span> 53 </span>
54 <span v-else>{{ row[item.prop] }}</span>
55 </p>
52 56
53 <span v-if="!['djyy','fj'].includes(item.prop)">
54 {{ row[item.prop] }}
55 </span>
56 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
57 <span class="ellipsis-line"> 58 <span class="ellipsis-line">
58 {{ row[item.prop] }} 59 {{ row[item.prop] }}
......
...@@ -46,13 +46,14 @@ ...@@ -46,13 +46,14 @@
46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
47 正在注销 47 正在注销
48 </div> 48 </div>
49
50 <p v-if="!['djyy','fj'].includes(item.prop)">
49 <span v-if="item.prop == 'qszt'"> 51 <span v-if="item.prop == 'qszt'">
50 {{ getQsztName(row[item.prop]) }} 52 {{ getQsztName(row[item.prop]) }}
51 </span> 53 </span>
54 <span v-else>{{ row[item.prop] }}</span>
55 </p>
52 56
53 <span v-if="!['djyy','fj'].includes(item.prop)">
54 {{ row[item.prop] }}
55 </span>
56 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
57 <span class="ellipsis-line"> 58 <span class="ellipsis-line">
58 {{ row[item.prop] }} 59 {{ row[item.prop] }}
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-25 16:39:06 4 * @LastEditTime: 2023-08-25 17:35:22
5 --> 5 -->
6 <template> 6 <template>
7 <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules"> 7 <el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
184 setTimeout(() => { 184 setTimeout(() => {
185 that.ruleForm.tmpcontent = document.getElementById("S1").value; 185 that.ruleForm.tmpcontent = document.getElementById("S1").value;
186 if (that.ruleForm.tmpno == 'zsdy') { 186 if (that.ruleForm.tmpno == 'zsdy') {
187 LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='http://192.168.2.38:9000/bdcdj/zhengshu_image/bdcqzs2.jpg?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=KRMCXFVDPWMN0919UI1J%2F20230825%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20230825T080608Z&X-Amz-Expires=604800&X-Amz-Security-Token=eyJhbGciOiJIUzUxMiIsInR5cCI6IkpXVCJ9.eyJhY2Nlc3NLZXkiOiJLUk1DWEZWRFBXTU4wOTE5VUkxSiIsImV4cCI6MTY5Mjk1NDI1NiwicGFyZW50IjoibWluaW9hZG1pbiJ9.OOHyJOL0zk9n3pSdWC-uIMztKL2wwHM0DsFJr1sjhxTMlbSVnCWluQpf94D4fEq35c0Us2Mi7KKINDnojwox6A&X-Amz-SignedHeaders=host&versionId=null&X-Amz-Signature=67b9cea9b1e1386e3ec826ddd1e33e514715aabbb671be991df72f5e47b20c45'>"); 187 LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='http://192.168.2.38:9000/bdcdj/zhengshu_image/bdcqzs2.jpg'>");
188 LODOP.SET_SHOW_MODE("BKIMG_PRINT", 1);//打印包含背景图 188 LODOP.SET_SHOW_MODE("BKIMG_PRINT", 1);//打印包含背景图
189 LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4"); 189 LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4");
190 } 190 }
......
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-普通 2 * @Description: workFrame左侧菜单列表-普通
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-25 14:55:49 4 * @LastEditTime: 2023-08-28 08:44:31
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -20,7 +20,9 @@ ...@@ -20,7 +20,9 @@
20 <p class="dot" v-if="item.issave == '0'"></p> 20 <p class="dot" v-if="item.issave == '0'"></p>
21 <div class="menu-con"> 21 <div class="menu-con">
22 <p>{{ item.bdcdyh }}</p> 22 <p>{{ item.bdcdyh }}</p>
23 <el-tooltip effect="dark" :content="item.zl" placement="top">
23 <p class="title-detail">{{ item.zl }}</p> 24 <p class="title-detail">{{ item.zl }}</p>
25 </el-tooltip>
24 </div> 26 </div>
25 <i class="el-icon-delete" v-if="unitData.length > 1" @click.stop="handleDel(item)"></i> 27 <i class="el-icon-delete" v-if="unitData.length > 1" @click.stop="handleDel(item)"></i>
26 </el-menu-item> 28 </el-menu-item>
......
1 <!-- 1 <!--
2 * @Description: workFrame左侧菜单列表-分割 2 * @Description: workFrame左侧菜单列表-分割
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-25 14:52:40 4 * @LastEditTime: 2023-08-28 08:46:04
5 --> 5 -->
6 <template> 6 <template>
7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }"> 7 <div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
...@@ -19,7 +19,9 @@ ...@@ -19,7 +19,9 @@
19 <el-menu-item v-for="(item, index) in aroundUnitData" :index="index.toString()" :key="index"> 19 <el-menu-item v-for="(item, index) in aroundUnitData" :index="index.toString()" :key="index">
20 <div> 20 <div>
21 <p>{{ item.bdcdyh }}</p> 21 <p>{{ item.bdcdyh }}</p>
22 <el-tooltip effect="dark" :content="item.zl" placement="top">
22 <p class="title-detail">{{ item.zl }}</p> 23 <p class="title-detail">{{ item.zl }}</p>
24 </el-tooltip>
23 </div> 25 </div>
24 <i class="el-icon-delete" v-if="aroundUnitData.length > 1" @click.stop="handleDel(item)"></i> 26 <i class="el-icon-delete" v-if="aroundUnitData.length > 1" @click.stop="handleDel(item)"></i>
25 </el-menu-item> 27 </el-menu-item>
...@@ -33,7 +35,9 @@ ...@@ -33,7 +35,9 @@
33 <span class="dot" v-if="item.issave == '0'"></span> 35 <span class="dot" v-if="item.issave == '0'"></span>
34 <div> 36 <div>
35 <p>{{ item.bdcdyh }}</p> 37 <p>{{ item.bdcdyh }}</p>
38 <el-tooltip effect="dark" :content="item.zl" placement="top">
36 <p class="title-detail">{{ item.zl }}</p> 39 <p class="title-detail">{{ item.zl }}</p>
40 </el-tooltip>
37 </div> 41 </div>
38 <i class="el-icon-delete" v-if="afterUnitData.length > 1" @click.stop="handleDel(item)"></i> 42 <i class="el-icon-delete" v-if="afterUnitData.length > 1" @click.stop="handleDel(item)"></i>
39 </el-menu-item> 43 </el-menu-item>
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
40 } 40 }
41 41
42 .menu-con { 42 .menu-con {
43 width: 87%; 43 width: 93%;
44 } 44 }
45 45
46 .batchDel { 46 .batchDel {
...@@ -54,8 +54,10 @@ ...@@ -54,8 +54,10 @@
54 } 54 }
55 55
56 .title-detail { 56 .title-detail {
57 word-wrap: break-word;
58 width: 100%; 57 width: 100%;
58 overflow: hidden;
59 text-overflow: ellipsis; //文本溢出显示省略号
60 white-space: nowrap; //文本不会换行
59 } 61 }
60 62
61 .title-batch { 63 .title-batch {
...@@ -208,7 +210,8 @@ ...@@ -208,7 +210,8 @@
208 box-sizing: border-box; 210 box-sizing: border-box;
209 width: 70px; 211 width: 70px;
210 margin: 0 5px; 212 margin: 0 5px;
211 .icon{ 213
214 .icon {
212 font-size: 10px; 215 font-size: 10px;
213 } 216 }
214 } 217 }
......
...@@ -46,13 +46,14 @@ ...@@ -46,13 +46,14 @@
46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'"> 46 <div class="icon" v-if="item.prop == 'qszt' && row.qlzt == '4'">
47 正在注销 47 正在注销
48 </div> 48 </div>
49
50 <p v-if="!['djyy','fj'].includes(item.prop)">
49 <span v-if="item.prop == 'qszt'"> 51 <span v-if="item.prop == 'qszt'">
50 {{ getQsztName(row[item.prop]) }} 52 {{ getQsztName(row[item.prop]) }}
51 </span> 53 </span>
54 <span v-else>{{ row[item.prop] }}</span>
55 </p>
52 56
53 <span v-if="!['djyy','fj'].includes(item.prop)">
54 {{ row[item.prop] }}
55 </span>
56 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width"> 57 <el-tooltip v-else effect="dark" :content="row[item.prop]" placement="top" popper-class="tooltip-width">
57 <span class="ellipsis-line"> 58 <span class="ellipsis-line">
58 {{ row[item.prop] }} 59 {{ row[item.prop] }}
......