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 @@
}
.menu-con {
width: 87%;
width: 93%;
}
.batchDel {
......@@ -55,8 +55,10 @@
.title-detail {
display: flex;
flex-wrap: wrap;
width: 100%;
overflow: hidden;
text-overflow: ellipsis; //文本溢出显示省略号
white-space: nowrap; //文本不会换行
}
.title-batch {
......@@ -209,7 +211,8 @@
box-sizing: border-box;
width: 70px;
margin: 0 5px;
.icon{
.icon {
font-size: 10px;
}
}
......@@ -229,4 +232,4 @@
position: absolute;
left: 0;
bottom: 0;
}
}
\ No newline at end of file
......
......@@ -173,10 +173,15 @@ export default {
.bgc{
td{
background-color: rgb(182, 203, 207) !important;
// background-color: rgb(182, 203, 207) !important;
}
}
.xxTable tr td{
min-width: 520px!important;
}
.red{
color: red;
}
......
......@@ -72,6 +72,8 @@ export default {
//左侧树形结构数据
treedata: [],
sfqdata: [],
keyy: "",
iskey: "",
activeName: 0,
// 查询参数
queryForm: {},
......@@ -167,28 +169,28 @@ export default {
getBdcqljqtsx({
bdcdyid: val.bdcdyid,
bdcdyh: val.bdcdyh,
}).then((res) => {
if (res.code === 200) {
if (this.sfqdata.some((item) => item.bdcdyid === val.bdcdyid)) {
let index= this.sfqdata.findIndex((item) => {
return item.bdcdyid ==val.bdcdyid;
});
this.activeName=index
this.setstyle(index,0);
} else {
this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
this.activeName = this.sfqdata.length - 1;
this.$nextTick(() => {
this.setstyle(this.sfqdata.length - 1,0);
})
}).then((res) => {
if (res.code === 200) {
if (this.sfqdata.some((item) => item.bdcdyid === val.bdcdyid)) {
let index = this.sfqdata.findIndex((item) => {
return item.bdcdyid == val.bdcdyid;
});
this.activeName = index
this.setstyle(index, 0, this.iskey);
} else {
this.sfqdata.push(loadsfqData(res.result, val.bdcdyh, val.bdcdyid));
this.activeName = this.sfqdata.length - 1;
this.$nextTick(() => {
this.setstyle(this.sfqdata.length - 1, 0, this.iskey);
})
}
}
}
});
});
this.currentSelectProps = {
bdcdyid: val.bdcdyid,
bdcdyh: val.bdcdyh,
qllx: this.formData.qllx,
bsmQlxx: this.formData.bsmQlxx,
qllx: this.currentSelectProps.qllx,
bsmQlxx: this.currentSelectProps.bsmQlxx,
};
},
/**
......@@ -201,9 +203,7 @@ export default {
bdcdyh: val,
}).then((res) => {
if (res.code === 200) {
this.treedata = loadTreeData(
val
);
this.treedata = loadTreeData(val);
this.sfqdata.push(
loadsfqData(res.result, val, this.currentSelectProps.bdcdyid)
);
......@@ -211,14 +211,22 @@ export default {
this.defaultNode = getNode(
this.currentSelectProps.qllx,
{ linShi: 0, xianShi: 0, liShi: 0 },
""
);
this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
this.loadComponent(this.defaultNode.form);
this.setstyle(0,0);
});
}
});
res.result.bdcdylx|| ""
);
this.sfqdata[0].children.forEach((item, index) => {
if (item.id == this.defaultNode.id) {
this.iskey = index
}
})
// this.$refs.tree.setCurrentKey(this.defaultNode.id); //data[0].id为默认选中的节点
// this.loadComponent(this.defaultNode.form);
this.setstyle(0, 0, this.iskey);
});
}
});
this.currentSelectProps = {
bdcdyid: this.currentSelectProps.bdcdyid,
bdcdyh: this.currentSelectProps.bdcdyh,
......@@ -244,35 +252,50 @@ export default {
* @author: renchao
* 设置样式和点击定位到当前功能
*/
setstyle(newindex,index) {
if(index==0){
this.loadComponent(this.$refs.sfq[newindex].$children[0].$attrs.re.form);
}
let dpme = this.$refs.sfq[newindex].$children[0].$el
if (index != 0) {
dpme.style.backgroundColor = "#ffffff";
dpme.style.color = "black";
dpme.style.border = "none";
} else {
dpme.style.backgroundColor = "#f5f5f5";
dpme.style.color = "#0079fe";
dpme.style.borderRight = "4px solid #0079fe";
}
},
setstyle (newindex, index, key) {
if (key != undefined || this.keyy == index) {
if (key != undefined) {
this.keyy = key
}
this.loadComponent(this.$refs.sfq[newindex].$children[this.keyy].$attrs.re.form);
let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
dpme.style.backgroundColor = "#f5f5f5";
dpme.style.color = "#0079fe";
dpme.style.borderRight = "4px solid #0079fe";
} else {
let dpme = this.$refs.sfq[newindex].$children[this.keyy].$el
dpme.style.backgroundColor = "#ffffff";
dpme.style.color = "black";
dpme.style.border = "none";
}
},
/**
* @description: addlist
* @param {*} data
* @author: renchao
* 新增列表功能
*/
addlist(data, index) {
let newindex= this.sfqdata.findIndex((item) => {
return item.bdcdyid ==data.bdcdyid;
});
this.setstyle(newindex,index);
this.currentSelectProps.bdcdyid = data.bdcdyid;
this.loadComponent(data.form);
},
addlist (data, index) {
if (index != undefined) {
let newindex = this.sfqdata.findIndex((item) => {
return item.bdcdyid == data.bdcdyid;
});
this.setstyle(newindex, index);
this.currentSelectProps.bdcdyid = data.bdcdyid;
this.loadComponent(data.form);
} else {
let newindex = this.sfqdata.findIndex((item) => {
return item.bdcdyid == data.bdcdyid;
});
this.setstyle(newindex, index, this.iskey);
this.currentSelectProps.bdcdyid = data.bdcdyid;
}
},
/**
* @description: loadComponent
* @param {*} form
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-25 16:39:06
* @LastEditTime: 2023-08-28 09:02:00
-->
<template>
<el-form ref="ruleForm" :model="ruleForm" label-width="100px" :rules="rules">
......@@ -183,8 +183,9 @@
);
setTimeout(() => {
that.ruleForm.tmpcontent = document.getElementById("S1").value;
debugger
if (that.ruleForm.tmpno == 'zsdy') {
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'>");
LODOP.ADD_PRINT_SETUP_BKIMG("<img border='0' src='http://192.168.2.38:9000/bdcdj/zhengshu_image/bdcqzs2.jpg'>");
LODOP.SET_SHOW_MODE("BKIMG_PRINT", 1);//打印包含背景图
LODOP.SET_PRINT_PAGESIZE(1, 0, 0, "B4");
}
......
<!--
* @Description: workFrame左侧菜单列表-普通
* @Autor: renchao
* @LastEditTime: 2023-07-25 14:55:49
* @LastEditTime: 2023-08-28 08:44:31
-->
<template>
<div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
......@@ -20,7 +20,9 @@
<p class="dot" v-if="item.issave == '0'"></p>
<div class="menu-con">
<p>{{ item.bdcdyh }}</p>
<p class="title-detail">{{ item.zl }}</p>
<el-tooltip effect="dark" :content="item.zl" placement="top">
<p class="title-detail">{{ item.zl }}</p>
</el-tooltip>
</div>
<i class="el-icon-delete" v-if="unitData.length > 1" @click.stop="handleDel(item)"></i>
</el-menu-item>
......
<!--
* @Description: workFrame左侧菜单列表-分割
* @Autor: renchao
* @LastEditTime: 2023-07-25 14:52:40
* @LastEditTime: 2023-08-28 08:46:04
-->
<template>
<div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
......@@ -19,7 +19,9 @@
<el-menu-item v-for="(item, index) in aroundUnitData" :index="index.toString()" :key="index">
<div>
<p>{{ item.bdcdyh }}</p>
<p class="title-detail">{{ item.zl }}</p>
<el-tooltip effect="dark" :content="item.zl" placement="top">
<p class="title-detail">{{ item.zl }}</p>
</el-tooltip>
</div>
<i class="el-icon-delete" v-if="aroundUnitData.length > 1" @click.stop="handleDel(item)"></i>
</el-menu-item>
......@@ -33,7 +35,9 @@
<span class="dot" v-if="item.issave == '0'"></span>
<div>
<p>{{ item.bdcdyh }}</p>
<p class="title-detail">{{ item.zl }}</p>
<el-tooltip effect="dark" :content="item.zl" placement="top">
<p class="title-detail">{{ item.zl }}</p>
</el-tooltip>
</div>
<i class="el-icon-delete" v-if="afterUnitData.length > 1" @click.stop="handleDel(item)"></i>
</el-menu-item>
......
......@@ -182,7 +182,7 @@ export default {
}
});
this.$endLoading();
}
});
......@@ -239,7 +239,7 @@ export default {
* @author: renchao
*/
add(val) {
if (val != "") {
if (val != ""&&this.tableData.length>0) {
this.$set(this.tableData[this.currentindex], "shyj", val);
}
},
......
......@@ -40,7 +40,7 @@
}
.menu-con {
width: 87%;
width: 93%;
}
.batchDel {
......@@ -54,8 +54,10 @@
}
.title-detail {
word-wrap: break-word;
width: 100%;
overflow: hidden;
text-overflow: ellipsis; //文本溢出显示省略号
white-space: nowrap; //文本不会换行
}
.title-batch {
......@@ -208,7 +210,8 @@
box-sizing: border-box;
width: 70px;
margin: 0 5px;
.icon{
.icon {
font-size: 10px;
}
}
......@@ -228,4 +231,4 @@
position: absolute;
left: 0;
bottom: 0;
}
}
\ No newline at end of file
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-23 15:07:51
* @LastEditTime: 2023-08-28 09:56:03
-->
<template>
<div class="from-clues">
......@@ -349,4 +349,16 @@
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
/deep/ .back{
display: inline-block;
font-size: 14px;
width: 20px;
height: 20px;
border-radius: 10px;
line-height: 20px;
margin-right: 4px;
text-align: center;
background-color: rgba(171,12,12,0.1);
color: #B44747;
}
</style>
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-08-23 15:06:21
* @LastEditTime: 2023-08-28 09:01:00
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -48,7 +48,14 @@ class data extends filter {
{
prop: "zbhj",
label: "在办环节",
width: '80'
width: '80',
render: (h, scope) => {
if (scope.row.stepnum > 1) {
return <span><span class="back">退</span>{scope.row.zbhj}</span>
}else{
return <span>{scope.row.zbhj}</span>
}
}
},
{
label: '业务号',
......
......@@ -69,7 +69,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="坐落：">
<el-input v-model="ruleForm.sldy.zl"></el-input>
<el-input maxlength="100" v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -68,7 +68,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="坐落：">
<el-input v-model="ruleForm.sldy.zl" disabled></el-input>
<el-input maxlength="100" v-model="ruleForm.sldy.zl" disabled></el-input>
</el-form-item>
</el-col>
</el-row>
......
......@@ -70,8 +70,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="权利性质：">
<el-input v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
<el-form-item label="权利性质1：">
<el-input maxlength="25" v-model="ruleForm.zdjbxx.qlxzmc"></el-input>
</el-form-item>
</el-col>
</el-row>
......@@ -121,7 +121,7 @@
<el-col :span="16">
<el-form-item label="坐落：">
<el-input v-model="ruleForm.sldy.zl"></el-input>
<el-input maxlength="100" v-model="ruleForm.sldy.zl"></el-input>
</el-form-item>
</el-col>
</el-row>
......