Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
2a1d29be by tianhaohao@pashanhoo.com
Options

Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

2 parents 8ad1c49d a9ee7796
Inline Side-by-side
Showing 13 changed files with 138 additions and 78 deletions
...@@ -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 }
...@@ -229,4 +232,4 @@ ...@@ -229,4 +232,4 @@
229 position: absolute; 232 position: absolute;
230 left: 0; 233 left: 0;
231 bottom: 0; 234 bottom: 0;
232 } 235 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -173,10 +173,15 @@ export default { ...@@ -173,10 +173,15 @@ export default {
173 .bgc{ 173 .bgc{
174 174
175 td{ 175 td{
176 background-color: rgb(182, 203, 207) !important; 176 // background-color: rgb(182, 203, 207) !important;
177 177
178 } 178 }
179 } 179 }
180 .xxTable tr td{
181
182 min-width: 520px!important;
183
184 }
180 .red{ 185 .red{
181 color: red; 186 color: red;
182 } 187 }
......
...@@ -72,6 +72,8 @@ export default { ...@@ -72,6 +72,8 @@ export default {
72 //左侧树形结构数据 72 //左侧树形结构数据
73 treedata: [], 73 treedata: [],
74 sfqdata: [], 74 sfqdata: [],
75 keyy: "",
76 iskey: "",
75 activeName: 0, 77 activeName: 0,
76 // 查询参数 78 // 查询参数
77 queryForm: {}, 79 queryForm: {},
...@@ -167,28 +169,28 @@ export default { ...@@ -167,28 +169,28 @@ export default {
167 getBdcqljqtsx({ 169 getBdcqljqtsx({
168 bdcdyid: val.bdcdyid, 170 bdcdyid: val.bdcdyid,
169 bdcdyh: val.bdcdyh, 171 bdcdyh: val.bdcdyh,
170 }).then((res) => { 172 }).then((res) => {
171 if (res.code === 200) { 173 if (res.code === 200) {
172 if (this.sfqdata.some((item) => item.bdcdyid === val.bdcdyid)) { 174 if (this.sfqdata.some((item) => item.bdcdyid === val.bdcdyid)) {
173 let index= this.sfqdata.findIndex((item) => { 175 let index = this.sfqdata.findIndex((item) => {
174 return item.bdcdyid ==val.bdcdyid; 176 return item.bdcdyid == val.bdcdyid;
175 }); 177 });
176 this.activeName=index 178 this.activeName = index
177 this.setstyle(index,0); 179 this.setstyle(index, 0, this.iskey);
178 } else { 180 } else {
179 this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid)); 181 this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
180 this.activeName = this.sfqdata.length - 1; 182 this.activeName = this.sfqdata.length - 1;
181 this.$nextTick(() => { 183 this.$nextTick(() => {
182 this.setstyle(this.sfqdata.length - 1,0); 184 this.setstyle(this.sfqdata.length - 1, 0, this.iskey);
183 }) 185 })
186 }
184 } 187 }
185 } 188 });
186 });
187 this.currentSelectProps = { 189 this.currentSelectProps = {
188 bdcdyid: val.bdcdyid, 190 bdcdyid: val.bdcdyid,
189 bdcdyh: val.bdcdyh, 191 bdcdyh: val.bdcdyh,
190 qllx: this.formData.qllx, 192 qllx: this.currentSelectProps.qllx,
191 bsmQlxx: this.formData.bsmQlxx, 193 bsmQlxx: this.currentSelectProps.bsmQlxx,
192 }; 194 };
193 }, 195 },
194 /** 196 /**
...@@ -201,9 +203,7 @@ export default { ...@@ -201,9 +203,7 @@ export default {
201 bdcdyh: val, 203 bdcdyh: val,
202 }).then((res) => { 204 }).then((res) => {
203 if (res.code === 200) { 205 if (res.code === 200) {
204 this.treedata = loadTreeData( 206 this.treedata = loadTreeData(val);
205 val
206 );
207 this.sfqdata.push( 207 this.sfqdata.push(
208 loadsfqData(res.result, val, this.currentSelectProps.bdcdyid) 208 loadsfqData(res.result, val, this.currentSelectProps.bdcdyid)
209 ); 209 );
...@@ -211,14 +211,22 @@ export default { ...@@ -211,14 +211,22 @@ export default {
211 this.defaultNode = getNode( 211 this.defaultNode = getNode(
212 this.currentSelectProps.qllx, 212 this.currentSelectProps.qllx,
213 { linShi: 0, xianShi: 0, liShi: 0 }, 213 { linShi: 0, xianShi: 0, liShi: 0 },
214 "" 214 res.result.bdcdylx|| ""
215 ); 215 );
216 this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点 216 this.sfqdata[0].children.forEach((item, index) => {
217 this.loadComponent(this.defaultNode.form); 217 if (item.id == this.defaultNode.id) {
218 this.setstyle(0,0); 218 this.iskey = index
219 }); 219 }
220 } 220 })
221 }); 221 // this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
222 // this.loadComponent(this.defaultNode.form);
223
224 this.setstyle(0, 0, this.iskey);
225
226
227 });
228 }
229 });
222 this.currentSelectProps = { 230 this.currentSelectProps = {
223 bdcdyid: this.currentSelectProps.bdcdyid, 231 bdcdyid: this.currentSelectProps.bdcdyid,
224 bdcdyh: this.currentSelectProps.bdcdyh, 232 bdcdyh: this.currentSelectProps.bdcdyh,
...@@ -244,35 +252,50 @@ export default { ...@@ -244,35 +252,50 @@ export default {
244 * @author: renchao 252 * @author: renchao
245 * 设置样式和点击定位到当前功能 253 * 设置样式和点击定位到当前功能
246 */ 254 */
247 setstyle(newindex,index) { 255 setstyle (newindex, index, key) {
248 if(index==0){ 256 if (key != undefined || this.keyy == index) {
249 this.loadComponent(this.$refs.sfq[newindex].$children[0].$attrs.re.form); 257 if (key != undefined) {
250 } 258 this.keyy = key
251 let dpme = this.$refs.sfq[newindex].$children[0].$el 259 }
252 if (index != 0) { 260 this.loadComponent(this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form);
253 dpme.style.backgroundColor = "#ffffff"; 261 let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
254 dpme.style.color = "black"; 262 dpme.style.backgroundColor = "#f5f5f5";
255 dpme.style.border = "none"; 263 dpme.style.color = "#0079fe";
256 } else { 264 dpme.style.borderRight = "4px solid #0079fe";
257 dpme.style.backgroundColor = "#f5f5f5"; 265 } else {
258 dpme.style.color = "#0079fe"; 266 let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
259 dpme.style.borderRight = "4px solid #0079fe"; 267 dpme.style.backgroundColor = "#ffffff";
260 } 268 dpme.style.color = "black";
261 }, 269 dpme.style.border = "none";
270 }
271
272
273
274
275 },
262 /** 276 /**
263 * @description: addlist 277 * @description: addlist
264 * @param {*} data 278 * @param {*} data
265 * @author: renchao 279 * @author: renchao
266 * 新增列表功能 280 * 新增列表功能
267 */ 281 */
268 addlist(data, index) { 282 addlist (data, index) {
269 let newindex= this.sfqdata.findIndex((item) => { 283 if (index != undefined) {
270 return item.bdcdyid ==data.bdcdyid; 284 let newindex = this.sfqdata.findIndex((item) => {
271 }); 285 return item.bdcdyid == data.bdcdyid;
272 this.setstyle(newindex,index); 286 });
273 this.currentSelectProps.bdcdyid = data.bdcdyid; 287 this.setstyle(newindex, index);
274 this.loadComponent(data.form); 288 this.currentSelectProps.bdcdyid = data.bdcdyid;
275 }, 289 this.loadComponent(data.form);
290 } else {
291 let newindex = this.sfqdata.findIndex((item) => {
292 return item.bdcdyid == data.bdcdyid;
293 });
294 this.setstyle(newindex, index, this.iskey);
295 this.currentSelectProps.bdcdyid = data.bdcdyid;
296 }
297
298 },
276 /** 299 /**
277 * @description: loadComponent 300 * @description: loadComponent
278 * @param {*} form 301 * @param {*} form
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-25 16:39:06 4 * @LastEditTime: 2023-08-28 09:02:00
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">
...@@ -183,8 +183,9 @@ ...@@ -183,8 +183,9 @@
183 ); 183 );
184 setTimeout(() => { 184 setTimeout(() => {
185 that.ruleForm.tmpcontent = document.getElementById("S1").value; 185 that.ruleForm.tmpcontent = document.getElementById("S1").value;
186 debugger
186 if (that.ruleForm.tmpno == 'zsdy') { 187 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'>"); 188 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);//打印包含背景图 189 LODOP.SET_SHOW_MODE("BKIMG_PRINT", 1);//打印包含背景图
189 LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4"); 190 LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4");
190 } 191 }
......
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 <p class="title-detail">{{ item.zl }}</p> 23 <el-tooltip effect="dark" :content="item.zl" placement="top">
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 <p class="title-detail">{{ item.zl }}</p> 22 <el-tooltip effect="dark" :content="item.zl" placement="top">
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>
36 <p class="title-detail">{{ item.zl }}</p> 38 <el-tooltip effect="dark" :content="item.zl" placement="top">
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>
......
...@@ -182,7 +182,7 @@ export default { ...@@ -182,7 +182,7 @@ export default {
182 } 182 }
183 }); 183 });
184 this.$endLoading(); 184 this.$endLoading();
185 185
186 } 186 }
187 187
188 }); 188 });
...@@ -239,7 +239,7 @@ export default { ...@@ -239,7 +239,7 @@ export default {
239 * @author: renchao 239 * @author: renchao
240 */ 240 */
241 add(val) { 241 add(val) {
242 if (val != "") { 242 if (val != ""&&this.tableData.length>0) {
243 this.$set(this.tableData[this.currentindex], "shyj", val); 243 this.$set(this.tableData[this.currentindex], "shyj", val);
244 } 244 }
245 }, 245 },
......
...@@ -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 }
...@@ -228,4 +231,4 @@ ...@@ -228,4 +231,4 @@
228 position: absolute; 231 position: absolute;
229 left: 0; 232 left: 0;
230 bottom: 0; 233 bottom: 0;
231 } 234 }
...\ 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-23 15:07:51 4 * @LastEditTime: 2023-08-28 09:56:03
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -349,4 +349,16 @@ ...@@ -349,4 +349,16 @@
349 </script> 349 </script>
350 <style scoped lang="scss"> 350 <style scoped lang="scss">
351 @import "~@/styles/public.scss"; 351 @import "~@/styles/public.scss";
352 /deep/ .back{
353 display: inline-block;
354 font-size: 14px;
355 width: 20px;
356 height: 20px;
357 border-radius: 10px;
358 line-height: 20px;
359 margin-right: 4px;
360 text-align: center;
361 background-color: rgba(171,12,12,0.1);
362 color: #B44747;
363 }
352 </style> 364 </style>
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-08-23 15:06:21 4 * @LastEditTime: 2023-08-28 09:01:00
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 let vm = null 7 let vm = null
...@@ -48,7 +48,14 @@ class data extends filter { ...@@ -48,7 +48,14 @@ class data extends filter {
48 { 48 {
49 prop: "zbhj", 49 prop: "zbhj",
50 label: "在办环节", 50 label: "在办环节",
51 width: '80' 51 width: '80',
52 render: (h, scope) => {
53 if (scope.row.stepnum > 1) {
54 return <span><span class="back">退</span>{scope.row.zbhj}</span>
55 }else{
56 return <span>{scope.row.zbhj}</span>
57 }
58 }
52 }, 59 },
53 { 60 {
54 label: '业务号', 61 label: '业务号',
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
69 </el-col> 69 </el-col>
70 <el-col :span="8"> 70 <el-col :span="8">
71 <el-form-item label="坐落："> 71 <el-form-item label="坐落：">
72 <el-input v-model="ruleForm.sldy.zl"></el-input> 72 <el-input maxlength="100" v-model="ruleForm.sldy.zl"></el-input>
73 </el-form-item> 73 </el-form-item>
74 </el-col> 74 </el-col>
75 </el-row> 75 </el-row>
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
68 </el-col> 68 </el-col>
69 <el-col :span="8"> 69 <el-col :span="8">
70 <el-form-item label="坐落："> 70 <el-form-item label="坐落：">
71 <el-input v-model="ruleForm.sldy.zl" disabled></el-input> 71 <el-input maxlength="100" v-model="ruleForm.sldy.zl" disabled></el-input>
72 </el-form-item> 72 </el-form-item>
73 </el-col> 73 </el-col>
74 </el-row> 74 </el-row>
......
...@@ -70,8 +70,8 @@ ...@@ -70,8 +70,8 @@
70 </el-form-item> 70 </el-form-item>
71 </el-col> 71 </el-col>
72 <el-col :span="8"> 72 <el-col :span="8">
73 <el-form-item label="权利性质："> 73 <el-form-item label="权利性质1：">
74 <el-input v-model="ruleForm.zdjbxx.qlxzmc"></el-input> 74 <el-input maxlength="25" v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
75 </el-form-item> 75 </el-form-item>
76 </el-col> 76 </el-col>
77 </el-row> 77 </el-row>
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
121 121
122 <el-col :span="16"> 122 <el-col :span="16">
123 <el-form-item label="坐落："> 123 <el-form-item label="坐落：">
124 <el-input v-model="ruleForm.sldy.zl"></el-input> 124 <el-input maxlength="100" v-model="ruleForm.sldy.zl"></el-input>
125 </el-form-item> 125 </el-form-item>
126 </el-col> 126 </el-col>
127 </el-row> 127 </el-row>
......