c17c8196 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents dc41809e 01a048ed
Showing 43 changed files with 473 additions and 274 deletions
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-08 15:19:43
* @LastEditTime: 2023-07-24 14:10:29
-->
<template>
<section class="app-main">
<transition name="fade-transform" mode="out-in">
<keep-alive :include="['dbx', 'ybx','jtfc', 'dydjb', 'sqcxjl', 'jdcx','djbcx',
'lpcx','zslqcx', 'zxgcdycx', 'zsrk', 'zsff','zssyjl','dictionaries', 'sqywgz', 'qtjfjmb',
'xttz','flfg']">
<router-view />
</keep-alive>
</transition>
</section>
</template>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:41:45
-->
<template>
<div class="from-clues">
<div class="invalid-title">
<i class="el-icon-question invalid-icon"></i>
<div class="invalid-body">您是否确定终止该业务办理?</div>
</div>
<div class="invalid-reson">终止原因:</div>
<el-input
v-model="stopMessage"
placeholder="请输入终止原因"
type="textarea"
:rows="4"></el-input>
<el-button style="float: right">取消</el-button>
<el-button type="primary" @click="onSubmit" style="float: right">退件</el-button>
</div>
</template>
<script>
import { stopTask } from "@/api/workFlow.js";
export default {
props: {
formData: {
type: Object,
default: {},
},
},
data () {
return {
stopMessage: "",
};
},
methods: {
/**
* @description: onSubmit
* @author: renchao
*/
onSubmit () {
stopTask({
bsmSlsq: this.formData.bsmSlsq,
bestepid: this.formData.bestepid,
stopMessage: this.stopMessage,
}).then((res) => {
this.$message.success("终止成功");
setTimeout(() => {
// window.opener.location.reload(); //刷新父窗口
if (window.opener && window.opener.getBpageList) {
window.opener.getBpageList();
} else {
window.opener.frames[0].getBpageList();
}
window.close();
this.$emit("input", false);
}, 1000);
});
},
},
};
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
.invalid-title {
display: flex;
align-content: center;
.invalid-icon {
color: rgb(254, 148, 0);
font-size: 34px;
margin-right: 10px;
}
.invalid-body {
line-height: 40px;
margin-bottom: 10px;
}
}
.invalid-reson {
margin-bottom: 10px;
}
.dialog-footer {
margin-top: 10px;
display: flex;
justify-content: flex-end;
}
</style>
......@@ -20,13 +20,15 @@
此环节为流程最后环节,转出后流程将结束
</el-form-item>
</el-form>
<div class="invalid-reson">转出原因</div>
<div class="invalid-reson">审批意见</div>
<el-input
class="opinion"
v-model="shyj"
placeholder="请输入转出原因"
placeholder="请输入审批意见"
type="textarea"
:rows="4"
></el-input>
<!-- <el-button class="opinion_btn" @click="commonOpinion">常用意见</el-button> -->
<el-button style="float: right" @click="cancelBack">取消转出</el-button>
<el-button type="primary" @click="submitForm" style="float: right"
>确定转出</el-button
......@@ -38,36 +40,56 @@
<script>
import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
import { popupCacel } from "@/utils/popup.js";
import { mapGetters } from "vuex";
export default {
components: {},
computed: {
},
props: {
formData: {
type: Object,
default: {},
},
},
data() {
return {
queryForm: {},
shyj: "",
};
},
watch: {
yjsqOptions: {
handler(val) {
this.add(val);
},
deep: true,
immediate: true,
},
},
mounted() {
// this.queryForm= this.queryForm.obj
console.log("formDataformDataformData", this.formData);
},
methods: {
/**
* @description: submitForm
* @author: renchao
*/
commonOpinion() {
this.$popup('常用意见',"workflow/components/dialog/commonOpinion",{
title:"常用意见",
width: '75%', // 初始化75% 不需要改的话 可以直接不要
formData:{}, // 父组件传给子组件的参数
cancel: function () {}, //取消事件的回调 没有按钮可以不需要
confirm: function () {} //确认事件的回调 没有按钮可以不需要
})
},
submitForm() {
this.queryForm = {
bsmSlsq: this.formData.bsmSlsq,
shyj: this.shyj,
stepform: JSON.stringify(this.formData.tabList),
};
console.log("this.queryForm", this.queryForm);
completeTask(this.queryForm).then((res) => {
if (res.code === 200) {
this.$message.success("转件成功");
......@@ -88,12 +110,23 @@ export default {
window.close();
this.$emit("input", false);
}, 1000);
}else{
} else {
this.$message.error(res.message);
}
});
},
/**
* @description: add
* @param {*} val
* @author: renchao
*/
add(val) {
if (val != "") {
this.shyj;
}
},
/**
* @description: closeDialog
* @author: renchao
*/
......@@ -109,4 +142,15 @@ export default {
margin-top: 20px;
margin-right: 10px;
}
.opinion {
position: relative;
font-size: 14px;
}
.opinion_btn {
position: absolute;
right: 35px;
bottom: 80px;
}
</style>
......
......@@ -476,7 +476,7 @@ export default {
*/
ssQlxxchange(val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ssywh;
this.ruleForm.qlxx.ssywh = val.ywh;
},
/**
* @description: djlxchange
......
......@@ -654,7 +654,7 @@ export default {
*/
ssQlxxchange(val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ssywh;
this.ruleForm.qlxx.ssywh = val.ywh;
},
djlxchange(val) {
if (val == null || val == 100) {
......
......@@ -405,7 +405,7 @@ export default {
*/
ssQlxxchange(val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ssywh;
this.ruleForm.qlxx.ssywh = val.ywh;
},
/**
* @description: djlxchange
......
......@@ -465,7 +465,7 @@
*/
ssQlxxchange (val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ssywh;
this.ruleForm.qlxx.ssywh = val.ywh;
},
/**
* @description: djlxchange
......
......@@ -367,7 +367,7 @@ export default {
*/
ssQlxxchange(val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ssywh;
this.ruleForm.qlxx.ssywh = val.ywh;
},
/**
* @description: djlxchange
......
......@@ -422,7 +422,7 @@ export default {
*/
ssQlxxchange(val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ssywh;
this.ruleForm.qlxx.ssywh = val.ywh;
},
/**
* @description: djlxchange
......
......@@ -445,7 +445,7 @@ export default {
*/
ssQlxxchange(val) {
this.ruleForm.ssQlxx = val;
this.ruleForm.qlxx.ssywh = val.ssywh;
this.ruleForm.qlxx.ssywh = val.ywh;
},
/**
* @description: djlxchange
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 09:50:51
* @LastEditTime: 2023-07-21 11:23:22
-->
<template>
<div class="edit">
......@@ -16,14 +16,16 @@
:style="{ height: lpbContentHight + 'px' }"
v-show="bjztFlag">
<!-- 楼盘表主体 -->
<div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
<div class="lp-overview" :style="{ width: lpbContentwidth + 'px','margin-right': formData.onlyShow ? '10px' : 0 }">
<lpbContent
ref="lpbContent"
:zrzbsm="formData.bsm"
:onlyShow="formData.onlyShow"
:unitData="formData.unitData"
:key="time"></lpbContent>
</div>
<!-- 右侧图例 -->
<div class="lp-legend">
<div class="lp-legend" v-if="formData.onlyShow">
<div class="handleCol">
<div class="btn" @click="legendToggle">
<i v-show="!legendToggleFlag" class="el-icon-d-arrow-left"></i>
......@@ -182,7 +184,9 @@
props: {
formData: {
type: Object,
default: {},
default: () => {
return {}
}
},
},
components: {
......@@ -404,30 +408,30 @@
}
}
});
getLpbQsxtj(this.formData.bsm).then((res) => {
if (res.code === 200) {
this.qsxList = [
{
name: "坐落",
bsms: res.result.zl.bsms,
color: "#2591FD",
ts: res.result.zl.bsms.length,
},
{
name: "分层分户图",
bsms: res.result.fcfht.bsms,
color: "#2591FD",
ts: res.result.fcfht.bsms.length,
},
{
name: "室号",
bsms: res.result.shbw.bsms,
color: "#2591FD",
ts: res.result.shbw.bsms.length,
},
];
}
});
// getLpbQsxtj(this.formData.bsm).then((res) => {
// if (res.code === 200) {
// this.qsxList = [
// {
// name: "坐落",
// bsms: res.result.zl.bsms,
// color: "#2591FD",
// ts: res.result.zl.bsms.length,
// },
// {
// name: "分层分户图",
// bsms: res.result.fcfht.bsms,
// color: "#2591FD",
// ts: res.result.fcfht.bsms.length,
// },
// {
// name: "室号",
// bsms: res.result.shbw.bsms,
// color: "#2591FD",
// ts: res.result.shbw.bsms.length,
// },
// ];
// }
// });
},
},
computed: {},
......@@ -488,7 +492,6 @@
border: 1px solid rgb(236, 236, 236);
border-top: 0;
border-bottom: 0;
margin-right: 10px;
box-sizing: border-box;
}
......
......@@ -2,7 +2,7 @@
* @Author: yangwei
* @Date: 2023-02-28 15:47:12
* @LastEditors: yangwei
* @LastEditTime: 2023-06-16 16:14:51
* @LastEditTime: 2023-07-21 14:39:12
* @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ch.vue
* @Description:
*
......@@ -86,7 +86,8 @@ export default {
openMenu:{value:'openMenu',default:null},
selectAll:{value:'selectAll',default:null},
changeChoosedObj:{value:'changeChoosedObj',default:null},
clearChangeChoosedObj:{value:'clearChangeChoosedObj',default:null}
clearChangeChoosedObj:{value:'clearChangeChoosedObj',default:null},
getBsmList:{value:'getBsmList',default:null}
},
props: {
ch: {
......@@ -102,15 +103,31 @@ export default {
hbsmList: [],
//选中层bsm合集
cbsmList: [],
//选中户qszt集合
hqsztList: [],
//区分单双击事件的定时器
time: null,
// 边框颜色
borderColor:'rgb(230, 230, 230)'
borderColor:'rgb(230, 230, 230)',
// 申请单元列表数据
unitIdList:[]
};
},
mounted() {},
mounted() {
// 根据申请单元列表数据处理选中户
if(window.unitData.length){
window.unitData.forEach(e => {
this.unitIdList.push(e.bdcdyid)
})
this.ch.forEach((c) => {
c.hs.forEach((h) => {
if (h.dyhbsm.indexOf(this.unitIdList) > -1) {
h.select = true;
// 使用hbsmList时,需要去重
this.hbsmList.push(h.bsm)
}
});
});
}
},
methods: {
// 层选中事件
/**
......@@ -120,17 +137,24 @@ export default {
* @author: renchao
*/
handleClickC(e, item) {
//判断点击的层是否选中
// if (e.target.className.indexOf("tdSelect") == -1) {
// //未选中→选中
// e.target.className += " tdSelect"; //加边框
// this.cbsmList.push(item.bsm);
// } else {
// //选中→未选中
// e.target.className = "floor";
// this.cbsmList = this.cbsmList.filter((i) => i != item.bsm);
// }
// this.$parent.getCbsm(this.cbsmList);
// 判断点击的层是否选中
if (e.target.className.indexOf("tdSelect") == -1) {
//未选中→选中
item.hs.forEach((h) => {
//加边框
e.target.className += " tdSelect";
h.select = true;
// 使用hbsmList时,需要去重
this.hbsmList.push(h.bsm)
});
} else {
//选中→未选中
item.hs.forEach((h) => {
e.target.className = "floor";
h.select = false;
this.hbsmList = this.hbsmList.filter((i) => i != h.bsm);
});
}
},
//户单击事件
/**
......@@ -141,6 +165,26 @@ export default {
* @author: renchao
*/
handleClickH(e, bsm, hs) {
let self = this;
// 开启延时器,200ms的间隔区分单击和双击,解决双击时执行两次单击事件
clearTimeout(self.time);
self.time = setTimeout(() => {
// this.closeMenu();
//判断点击的户是否选中
if (!hs.select) {
//未选中→选中
//加边框
hs.select = true;
// 将户bsm放进hbsmList
self.hbsmList.push(bsm);
} else {
//选中→未选中
hs.select = false;
self.hbsmList = self.hbsmList.filter((i) => i != bsm);
}
//更新当前选中户数据
this.$forceUpdate();
}, 200);
},
// 户单元状态点击事件
/**
......@@ -151,7 +195,7 @@ export default {
* @author: renchao
*/
hDyztClick(e, bsm, hs) {
// this.handleClickH(e.target.parentNode, bsm, hs);
this.handleClickH(e.target.parentNode, bsm, hs);
},
//户双击事件
/**
......@@ -191,21 +235,51 @@ export default {
// item.style.border = `1px solid ${this.borderColor}`
});
},
//清除选中
clearChoosed(){
//清除选中户
this.zdySelectAll(false)
//清除选中层
this.cbsmList = [];
this.$refs.cBsm && this.$refs.cBsm.forEach((item)=>{
item.className = 'floor'
})
},
},
watch: {
selectAll: {
handler(val) {
this.zdySelectAll(val.selectAll);
val.cancelChoosed && this.clearChoosed()
},
immediate: true,
deep: true,
},
hbsmList(val){
let list = []
val.length && val.forEach((i)=>{
this.ch.forEach((c) => {
c.hs.forEach((h) => {
if (i == h.bsm) {
list.push(
{
bdcdyh:h.bdcdyh,
bsm:h.bsm,
dyhbsm:h.dyhbsm
}
)
}
});
});
})
this.getBsmList(list)
},
changeChoosedObj: {
handler(val) {
//清除选中户
this.borderColor = 'rgb(230, 230, 230)';
this.zdySelectAll(false,true)
if (val.bsms.length) {
//清除选中户
this.zdySelectAll(false,true)
this.$refs.hBsm.forEach((item) => {
val.bsms.forEach((i,ind) => {
if (item.dataset.bsm == i) {
......@@ -214,19 +288,17 @@ export default {
window.lpbContent.$refs.lpbContent.scrollTop = item.offsetTop;
window.lpbContent.$refs.lpbContent.scrollLeft = item.offsetLeft;
}
item.style.border = '1px solid '+ val.color;
// item.style.backgroundColor = val.color;
// item.style.border = '1px solid '+ val.color;
// 背景色高亮
item.style.backgroundColor = val.color;
}
});
});
}else{
this.borderColor = 'rgb(230, 230, 230)'
}
},
immediate: true,
deep: true,
},
}
},
};
</script>
......
<template>
<div class="lpbContent-wrap" ref="lpbContentWrap">
<div class="lpbContent" ref="lpbContent">
<div class="lpbContent" ref="lpbContent" :style="{ 'height': 'calc(100% - '+ lpbContentHeight +'px)'}">
<!-- 纵向倒序排列 逻辑幢位于独立幢单元和独立层户的上方 -->
<div class="ch-zdy-wrap">
<!-- 幢单元 -->
<zdy-cpn v-if="lpbData.zdys.length" :zdys="lpbData.zdys" />
<zdy-cpn v-if="lpbData.zdys.length" :zdys="lpbData.zdys" :onlyShow="onlyShow"/>
<!-- 独立层户 -->
<ch-cpn v-if="lpbData.cs.length" :ch="lpbData.cs" />
</div>
<!-- 逻辑幢 -->
<ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" />
<ljzs-cpn v-if="lpbData.ljzs.length" :ljzs="lpbData.ljzs" :onlyShow="onlyShow"/>
</div>
<!-- 自然幢名称 -->
<p class="lpb-xmmc">
<!-- <el-checkbox @change="zdySelectAll($event)">{{
<p class="lpb-xmmc" :style="{ 'border-bottom': onlyShow ? 0 : '1px solid #e6e6e6'}">
<el-checkbox @change="zdySelectAll($event)" v-if="!onlyShow">{{
lpbData.xmmc
}}</el-checkbox> -->
{{lpbData.xmmc}}
}}</el-checkbox>
<span v-else>{{lpbData.xmmc}}</span>
</p>
<el-button type="primary" class="save-btn" v-if="!onlyShow" @click="saveLpb">保存</el-button>
<!-- 右键菜单 -->
<ul
v-show="lpbChVisible"
......@@ -40,7 +41,8 @@ export default {
openMenu: this.openMenu,
selectAll: this.selectAllObj,
changeChoosedObj:this.changeChoosedObj,
clearChangeChoosedObj:this.clearChangeChoosedObj
clearChangeChoosedObj:this.clearChangeChoosedObj,
getBsmList:this.getBsmList
};
},
name: "",
......@@ -58,6 +60,10 @@ export default {
type: Boolean,
default: true,
},
onlyShow:{
type: Boolean,
default: true,
}
},
data() {
return {
......@@ -79,7 +85,9 @@ export default {
changeChoosedObj:{
bsms:[],
color:''
}
},
// 选中户bsm合集
bsmList:[]
};
},
mounted() {
......@@ -87,6 +95,24 @@ export default {
window.lpbContent = this;
},
methods: {
/**
* @description: 获取当前楼盘表选中户信息
* @param {Array} bsmList
* @author: renchao
*/
getBsmList(bsmList){
this.bsmList = bsmList;
},
/**
* @description: 保存当前楼盘表
* @author: renchao
*/
saveLpb(){
// todo 调用保存接口 传入参数待定
console.log(this.bsmList,'this.bsmList');
// 保存成功后关闭弹框
this.$popupCacel()
},
// 改变户选中状态
/**
* @description: 改变户选中状态
......@@ -125,8 +151,8 @@ export default {
getLpb(zrzbsm, scyclx, actual) {
getLpb(zrzbsm, scyclx).then((res) => {
if (res.code == 200) {
res.result.ljzs = res.result.ljzs.sort(this.compare("place"));
this.lpbData = res.result == null ? this.lpbData : res.result;
res.result.lpb.ljzs = res.result.lpb.ljzs.sort(this.compare("place"));
this.lpbData = res.result.lpb == null ? this.lpbData : res.result.lpb;
// this.$nextTick(() => {
// //渲染楼盘表
// this.dataChange();
......@@ -182,6 +208,11 @@ export default {
};
},
},
computed:{
lpbContentHeight(){
return this.onlyShow ? 36 : 76
}
},
watch: {
//户右键菜单显示时,监听到鼠标点击时关闭户右键菜单
lpbChVisible(value) {
......@@ -190,7 +221,7 @@ export default {
} else {
document.body.removeEventListener("click", this.closeMenu);
}
},
}
},
};
</script>
......@@ -201,7 +232,6 @@ export default {
overflow: hidden;
.lpbContent {
width: 100%;
height: calc(100% - 36px);
position: relative;
overflow: scroll;
-webkit-user-select: none;
......@@ -221,6 +251,10 @@ export default {
border: 0;
border-top: 1px solid #e6e6e6;
}
.save-btn{
display: block;
margin: 5px auto;
}
// 自定义右键菜单样式
.contextmenu {
margin: 0;
......
......@@ -2,7 +2,7 @@
* @Author: yangwei
* @Date: 2023-02-28 17:25:45
* @LastEditors: yangwei
* @LastEditTime: 2023-07-11 10:05:55
* @LastEditTime: 2023-07-21 14:59:46
* @FilePath: \bdcdj-web\src\views\lpb\lpbContent\ljzs.vue
* @Description:
*
......@@ -20,11 +20,13 @@
"
>
<!-- 逻辑幢名称 -->
<p class="lpb-xmmc ljz-xmmc">{{ ljz.ljzmc }}</p>
<p class="lpb-xmmc ljz-xmmc">
<span>{{ljz.ljzmc}}</span>
</p>
<!-- 独立层户 -->
<ch-cpn v-if="ljz.cs.length" :ch="ljz.cs" />
<!-- 幢单元 -->
<zdy-cpn v-if="ljz.zdys.length" :zdys="ljz.zdys" />
<zdy-cpn v-if="ljz.zdys.length" :zdys="ljz.zdys" :onlyShow="onlyShow"/>
</div>
</div>
</div>
......@@ -40,7 +42,7 @@
<!-- 独立层户 -->
<ch-cpn v-if="ljzarr[0].cs.length" :ch="ljzarr[0].cs" />
<!-- 幢单元 -->
<zdy-cpn v-if="ljzarr[0].zdys.length" :zdys="ljzarr[0].zdys" />
<zdy-cpn v-if="ljzarr[0].zdys.length" :zdys="ljzarr[0].zdys" :onlyShow="onlyShow"/>
</div>
</div>
</div>
......@@ -59,12 +61,15 @@ export default {
return [];
},
},
onlyShow:{
type: Boolean,
default: true,
}
},
data() {
return {
};
},
mounted() {
console.log(this.ljzsCptd);
},
......
......@@ -2,7 +2,7 @@
* @Author: yangwei
* @Date: 2023-02-28 16:29:04
* @LastEditors: yangwei
* @LastEditTime: 2023-06-08 13:58:58
* @LastEditTime: 2023-07-21 14:55:30
* @FilePath: \bdcdj-web\src\views\lpb\lpbContent\zdys.vue
* @Description:
*
......@@ -13,10 +13,10 @@
<div v-for="zdy in realZdys" :key="zdy.bsm">
<!-- 幢单元名称 -->
<p class="lpb-xmmc">
<!-- <el-checkbox @change="zdySelectAll($event,zdy.bsm)">{{
<el-checkbox @change="zdySelectAll($event,zdy.bsm)" v-if="!onlyShow">{{
zdy.zdymc
}}</el-checkbox> -->
{{zdy.zdymc}}
}}</el-checkbox>
<span v-else>aaa{{zdy.zdymc}}</span>
</p>
<!-- 每个幢单元下的层户 -->
<ch-cpn :ref="zdy.bsm" :ch="zdy.cs" />
......@@ -36,6 +36,10 @@ export default {
return [];
},
},
onlyShow:{
type: Boolean,
default: true,
}
},
data() {
return {};
......
......@@ -44,12 +44,12 @@
</div>
</template>
<script>
import { mapGetters } from "vuex";
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./dydjbdata";
import addDydjb from "./components/addDydjb.vue";
import { getSqcxPage } from "@/api/jtfc.js";
export default {
import { mapGetters } from "vuex";
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./dydjbdata";
import addDydjb from "./components/addDydjb.vue";
import { getSqcxPage } from "@/api/jtfc.js";
export default {
name: "dydjb",
components: { addDydjb },
mixins: [table],
......@@ -76,6 +76,9 @@ export default {
},
};
},
activated () {
this.queryClick();
},
methods: {
// 初始化数据
/**
......@@ -121,8 +124,8 @@ export default {
this.sqcxBsm = ''
}
},
};
};
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-28 14:45:20
* @LastEditTime: 2023-07-24 11:27:00
-->
<template>
<div class="from-clues">
......@@ -70,6 +70,9 @@
},
};
},
activated () {
this.queryClick();
},
methods: {
// 初始化数据
queryClick () {
......
......@@ -36,14 +36,14 @@
<el-row>
<el-col :span="6">
<el-form-item label="开始日期" class="marginbtm0">
<el-date-picker class="width100" v-model="queryForm.sqr" type="date" placeholder="开始日期"
<el-date-picker class="width100" v-model="queryForm.kssj" type="date" placeholder="开始日期"
value-format="yyyy-MM-dd" clearable>
</el-date-picker>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="结束日期" class="marginbtm0">
<el-date-picker class="width100" v-model="queryForm.sqr" type="date" placeholder="结束日期"
<el-date-picker class="width100" v-model="queryForm.jssj" type="date" placeholder="结束日期"
value-format="yyyy-MM-dd" clearable>
</el-date-picker>
</el-form-item>
......@@ -67,10 +67,10 @@
</div>
</template>
<script>
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./sqcxjldata";
import { getSqcxPage } from "@/api/jtfc.js";
export default {
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./sqcxjldata";
import { getSqcxPage } from "@/api/jtfc.js";
export default {
name: "sqcxjl",
mixins: [table],
mounted () {
......@@ -90,6 +90,9 @@ export default {
},
};
},
activated () {
this.queryClick();
},
methods: {
// 初始化数据
/**
......@@ -128,12 +131,12 @@ export default {
})
}
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
.marginbtm0 {
margin-bottom: 0
}
.marginbtm0 {
margin-bottom: 0;
}
</style>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-13 16:31:56
* @LastEditTime: 2023-07-24 14:09:53
-->
<template>
<div class="from-clues">
......@@ -69,6 +69,9 @@
}
}
},
activated () {
this.queryClick()
},
methods: {
// 初始化数据
/**
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 16:04:47
* @LastEditTime: 2023-07-24 14:12:17
-->
<template>
<div class="from-clues">
......@@ -46,6 +46,9 @@
sendThis(this);
this.queryClick()
},
activated () {
this.queryClick()
},
data () {
return {
isDialog: false,
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 14:09:29
* @LastEditTime: 2023-07-24 14:11:31
-->
<template>
<div class="from-clues">
......@@ -63,6 +63,9 @@
bsmMb: ''
}
},
activated () {
this.queryClick()
},
methods: {
// 初始化数据
/**
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 14:11:05
* @LastEditTime: 2023-07-24 09:47:54
-->
<template>
<div>
......@@ -364,7 +364,12 @@
height: 75vh;
overflow-y: scroll;
}
/deep/.el-radio__label {
display: inline-block !important;
}
/deep/.el-radio {
margin-right: 5px;
}
.el-radio-group {
white-space: nowrap;
}
......
......@@ -47,7 +47,7 @@
import { datas, sendThis } from "./sqywgzdata";
import { getSysSqdjywBysearch, getDjlxInfo } from "@/api/sysSqdjyw.js";
export default {
name: "djbcx",
name: "sqywgz",
components: {
editDialog,
componentDialog,
......@@ -57,6 +57,9 @@
sendThis(this);
this.queryClick();
},
activated () {
this.queryClick()
},
data () {
return {
qllxmc: "",
......
......@@ -37,11 +37,11 @@
</div>
</template>
<script>
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./xttzdata";
import { getSysNoticeList, deleteSysNotice, publishNotice, unPublishNotice } from "@/api/sysNotice.js"
import addDialog from "./components/addDialog.vue";
export default {
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./xttzdata";
import { getSysNoticeList, deleteSysNotice, publishNotice, unPublishNotice } from "@/api/sysNotice.js"
import addDialog from "./components/addDialog.vue";
export default {
name: "xttz",
components: { addDialog },
mixins: [table],
......@@ -49,6 +49,9 @@ export default {
sendThis(this);
this.queryClick()
},
activated () {
this.queryClick()
},
data () {
return {
isDialog: false,
......@@ -180,8 +183,8 @@ export default {
window.open(href, '_blank');
}
},
};
};
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-05 09:55:42
* @LastEditTime: 2023-07-24 08:53:26
-->
<template>
<div class="clxx">
......@@ -69,8 +69,8 @@
created () {
this.clmlInitList(1)
},
mounted() {
this.ableOperation=this.$parent.ableOperation
mounted () {
this.ableOperation = this.$parent.ableOperation
},
methods: {
// 自动预览
......@@ -151,7 +151,7 @@
*/
updateList (val) {
let that = this
if (val.children.length != []) { //删除最后一张图片时 val=null
if (val.children.length != 0) { //删除最后一张图片时 val=null
this.tableData.forEach(item => {
if (item.bsmSj === val.bsmSj) {
item.children = val.children
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-18 10:53:49
* @LastEditTime: 2023-07-24 10:22:41
-->
<template>
<el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="100px">
......@@ -123,6 +123,9 @@
getUnclaimedBdcqz({ bsmSlsq: Vue.prototype.$currentRoute.query.bsmSlsq }).then(res => {
if (res.code === 200) {
this.tableData.data = res.result.list;
if(this.tableData.data.length>0) {
this.ruleForm.lzrxm = this.tableData.data[0].qlr
}
this.ruleForm.fzrmc = res.result.fzrmc
this.ruleForm.fzsj = res.result.fzsj
this.ruleForm.fzsl = res.result.fzsl
......@@ -151,12 +154,13 @@
* @author: renchao
*/
handleSubmit () {
this.$refs.ruleForm.validate(valid => {
if (valid) {
issueCertificate(this.ruleForm).then(res => {
if (res.code == 200) {
this.$message.success('保存成功');
//刷新列表
store.dispatch('user/refreshPage', true)
this.$popupCacel()
} else {
this.$message.error(res.message)
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-20 16:58:04
* @LastEditTime: 2023-07-24 10:15:01
-->
<template>
<div class="from-clues">
......
<!--
* @Description: workFrame左侧菜单列表-普通
* @Autor: renchao
* @LastEditTime: 2023-07-20 15:37:33
* @LastEditTime: 2023-07-24 14:14:01
-->
<template>
<div class="leftmenu" :class="{ 'animation-map-drawer': isShowdrawer }">
......@@ -92,6 +92,7 @@
leftMenu(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.unitData = res.result;
window.unitData = res.result;
this.currentSelectProps = res.result[0];
this.$emit('getCurrentSelectProps', this.currentSelectProps);
this.judgeBatchShow();
......@@ -176,6 +177,7 @@
* @author: renchao
*/
batchUnitClick () {
debugger
this.currentSelectProps.batchOperation = true;
// this.activeIndex = "-1";
this.$parent.stepForm(0);
......
......@@ -15,13 +15,14 @@
placeholder="请输入终止原因"
type="textarea"
:rows="4"></el-input>
<el-button style="float: right">取消</el-button>
<el-button style="float: right" @click="cancelBack">取消</el-button>
<el-button type="primary" @click="onSubmit" style="float: right">退件</el-button>
</div>
</template>
<script>
import { stopTask } from "@/api/workFlow.js";
import { popupCacel } from "@/utils/popup.js";
export default {
props: {
formData: {
......@@ -58,6 +59,13 @@
}, 1000);
});
},
/**
* @description: closeDialog
* @author: renchao
*/
cancelBack() {
popupCacel();
},
},
};
</script>
......
......@@ -20,13 +20,19 @@
此环节为流程最后环节,转出后流程将结束
</el-form-item>
</el-form>
<div class="invalid-reson">转出原因</div>
<div class="invalid-reson">审批意见</div>
<el-input
class="opinion"
v-model="shyj"
placeholder="请输入转出原因"
placeholder="请输入审批意见"
type="textarea"
:rows="4"
></el-input>
<!-- <el-button
class="opinion_btn"
@click="commonOpinion"
>常用意见</el-button
> -->
<el-button style="float: right" @click="cancelBack">取消转出</el-button>
<el-button type="primary" @click="submitForm" style="float: right"
>确定转出</el-button
......@@ -38,36 +44,59 @@
<script>
import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
import { popupCacel } from "@/utils/popup.js";
import { mapGetters } from 'vuex'
export default {
components: {},
props: {
formData: {
type: Object,
default: {},
},
},
computed: {
...mapGetters(['yjsqOptions'])
},
data() {
return {
queryForm: {},
shyj: "",
};
},
watch: {
// yjsqOptions: {
// handler (val) {
// if(val){
// this.shyj = val
// }
// },
// },
},
mounted() {
// this.queryForm= this.queryForm.obj
console.log("formDataformDataformData", this.formData);
},
methods: {
/**
* @description: submitForm
* @author: renchao
*/
commonOpinion() {
this.$popupDialog(
"常用意见",
"workflow/components/dialog/commonOpinion",
{},
"70%",
true
);
},
submitForm() {
this.queryForm = {
bsmSlsq: this.formData.bsmSlsq,
shyj: this.shyj,
stepform: JSON.stringify(this.formData.tabList),
};
console.log("this.queryForm", this.queryForm);
completeTask(this.queryForm).then((res) => {
if (res.code === 200) {
this.$message.success("转件成功");
......@@ -88,11 +117,12 @@ export default {
window.close();
this.$emit("input", false);
}, 1000);
}else{
} else {
this.$message.error(res.message);
}
});
},
/**
* @description: closeDialog
* @author: renchao
......@@ -109,4 +139,17 @@ export default {
margin-top: 20px;
margin-right: 10px;
}
.opinion {
position: relative;
font-size: 14px;
}
.opinion_btn {
position: absolute;
right: 35px;
bottom: 80px;
}
</style>
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:38:57
* @LastEditTime: 2023-07-24 10:24:48
*/
import filter from '@/utils/filter.js'
let vm = null
......@@ -23,8 +23,13 @@ class data extends filter {
width: '50'
},
{
prop: "fzrmc",
label: "发证人"
},
{
prop: "bdcqzlx",
label: "不动产权证类型",
width: '130',
render: (h, scope) => {
return (
<div>
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-21 13:45:48
* @LastEditTime: 2023-07-24 14:14:22
*/
import { getPrintTemplateByCode } from "@/api/print";
import { uploadUndo } from "@/api/clxx";
......@@ -155,7 +155,9 @@ export default {
getZrzbsmList(this.bsmSlsq).then((res) => {
if (res.code === 200) {
this.$popupDialog('楼盘表', 'lpb/index', {
bsm: res.result[0]
bsm: res.result[0],
onlyShow:false,
unitData:window.unitData
}, '90%', true)
} else {
this.$message.error(res.message)
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-24 15:31:00
* @LastEditTime: 2023-07-24 09:39:34
-->
<template>
<div class="container">
......@@ -159,7 +159,12 @@
//获取单元对应的所有表单信息
this.tabList = res.result;
//默认加载第一个表单信息
let arr = res.result.filter(item => item.defaultForm)
if (arr.length > 0) {
this.tabName = arr[0].value;
} else {
this.tabName = res.result[0].value;
}
this.ableOperation = this.tabList[0].ableOperation
//批量操作无分屏按钮
if (index != null) {
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-05-17 10:42:49
* @LastEditTime: 2023-07-24 11:25:15
-->
<template>
<div class="from-clues">
......@@ -106,7 +106,6 @@
import { datas, sendThis } from "./dbxdata";
import { searchTaskToDo } from "@/api/workflow/search.js";
import { judgeUserTaskPermission, deleteFlow, claimTask } from "@/api/workFlow.js";
import { log } from 'bpmn-js-token-simulation';
export default {
name: "dbx",
components: { searchBox },
......@@ -144,6 +143,9 @@
immediate: true,
},
},
activated () {
this.queryClick();
},
methods: {
// 列表渲染接口
/**
......@@ -225,7 +227,7 @@
if (res.code == 200) {
if (res.result) {
//有任务权限
if(item.sjlx=="3"){
if (item.sjlx == "3") {
const { href } = this.$router.resolve(
"/djbworkFrame?bsmSlsq=" +
item.bsmSlsq +
......@@ -236,7 +238,7 @@
item.djywbm
);
window.open(href, `djbworkFrame${item.bsmSlsq}`);
}else{
} else {
const { href } = this.$router.resolve(
"/workFrame?bsmSlsq=" +
item.bsmSlsq +
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 14:38:31
* @LastEditTime: 2023-07-24 11:26:06
-->
<template>
<div class="from-clues">
......@@ -166,6 +166,9 @@
},
};
},
activated () {
this.queryClick();
},
methods: {
// 列表渲染接口
/**
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 13:59:35
* @LastEditTime: 2023-07-24 14:04:15
-->
<template>
<div class="from-clues">
......@@ -137,11 +137,14 @@
},
qllxs: [],
isDialog: false,
djbxxData: {},
};
djbxxData: {}
}
},
computed: {
...mapGetters(["dictData"]),
...mapGetters(["dictData"])
},
activated () {
this.queryClick()
},
methods: {
// 初始化数据
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 13:59:55
* @LastEditTime: 2023-07-24 14:02:07
-->
<template>
<div class="from-clues">
......@@ -110,6 +110,9 @@
}
}
},
activated () {
this.queryClick()
},
methods: {
// 初始化数据
/**
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-19 14:00:03
* @LastEditTime: 2023-07-24 14:04:47
-->
<template>
<div class="from-clues">
......@@ -78,6 +78,9 @@
}
}
},
activated () {
this.queryClick()
},
methods: {
// 初始化数据
/**
......@@ -116,13 +119,10 @@
* @author: renchao
*/
openlpbClick (scope) {
this.$popup('楼盘表', 'lpb/index', {
width: '90%',
height: "92%",
formData: {
bsm: scope.row.bsm
}
})
this.$popupDialog('楼盘表', 'lpb/index', {
bsm: scope.row.bsm,
onlyShow: true
}, '90%', true)
}
}
}
......
......@@ -58,7 +58,7 @@
import { getBdcqzReceiveList } from "@/api/search.js"
import { bdcqzPreview } from "@/api/bdcqz.js"
export default {
components: {},
name: "zslqcx",
mixins: [table],
mounted () {
sendThis(this);
......@@ -79,6 +79,9 @@
},
};
},
activated () {
this.queryClick();
},
methods: {
// 查询
/**
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-19 13:32:04
* @LastEditTime: 2023-07-24 14:07:02
-->
<template>
<div class="from-clues">
......@@ -50,7 +50,7 @@
import { datas, sendThis } from "./zxgcdycx";
import { getZjgcdyList } from "@/api/search.js"
export default {
components: {},
name: "zxgcdycx",
mixins: [table],
mounted () {
sendThis(this);
......@@ -69,6 +69,9 @@
},
};
},
activated () {
this.queryClick()
},
methods: {
// 查询
/**
......
......@@ -44,15 +44,18 @@
</div>
</template>
<script>
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./zsffdata";
import { getZsglffList, removeZsgl, confirmZsff } from "@/api/zsgl.js"
export default {
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./zsffdata";
import { getZsglffList, removeZsgl, confirmZsff } from "@/api/zsgl.js"
export default {
name: "zsff",
mixins: [table],
mounted () {
sendThis(this);
},
activated () {
this.queryClick()
},
data () {
return {
value: '',
......@@ -169,12 +172,12 @@ export default {
})
}
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
/deep/.el-icon-date {
/deep/.el-icon-date {
display: none;
}
}
</style>
......
......@@ -42,15 +42,18 @@
</div>
</template>
<script>
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./zsrkdata";
import { getZsglrkList, removeZsgl, verifyZsrk } from "@/api/zsgl.js";
export default {
import table from "@/utils/mixin/table";
import { datas, sendThis } from "./zsrkdata";
import { getZsglrkList, removeZsgl, verifyZsrk } from "@/api/zsgl.js";
export default {
name: "zsrk",
mixins: [table],
mounted () {
sendThis(this);
},
activated () {
this.queryClick()
},
data () {
return {
ruleForm: {
......@@ -166,8 +169,8 @@ export default {
})
}
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
......
......@@ -47,10 +47,10 @@
</div>
</template>
<script>
import table from "@/utils/mixin/table";
import { getZssyqkList } from "@/api/zsgl.js"
import { datas, sendThis } from "./zssyjldata";
export default {
import table from "@/utils/mixin/table";
import { getZssyqkList } from "@/api/zsgl.js"
import { datas, sendThis } from "./zssyjldata";
export default {
name: "zssyjl",
mixins: [table],
mounted () {
......@@ -75,6 +75,9 @@ export default {
]
};
},
activated () {
this.queryClick()
},
methods: {
/**
* @description: queryClick
......@@ -101,8 +104,8 @@ export default {
})
}
}
}
}
</script>
<style scoped lang="scss">
@import "~@/styles/public.scss";
@import "~@/styles/public.scss";
</style>
......