Skip to content

bdc / bdcdj-web

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

Merge branch 'dev'

2 parents 3aa73533 482b1aaa
Inline Side-by-side
Showing 17 changed files with 179 additions and 69 deletions
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-11 09:51:07
* @LastEditTime: 2023-07-12 13:26:37
*/
import request from "@/utils/request";
let SERVER = window.config
......@@ -71,3 +71,16 @@ export function getLpbTj(zrzbsm) {
method: "get",
});
}
/**
* @description:楼盘查询- 根据bsmSlsq查询自然幢标识码
* @param {*} data
* @author: renchao
*/
export function getZrzbsm(bsm) {
return request({
url: SERVER.SERVERAPI + "/rest/zhcx/search/getZrzbsmList?bsmSlsq=" + bsm,
method: "post",
data: bsm,
});
}
\ No newline at end of file
......
......@@ -130,8 +130,8 @@
.ls-title {
padding: 16px;
color: #ffffff;
background: linear-gradient(3deg, #409eff, #a7cbee);
color: #4a4e56;
// background: linear-gradient(3deg, #edf0f7, #f4f5f6);
font-size: 16px;
}
......@@ -167,7 +167,7 @@
right: 26px;
font-size: 24px;
cursor: pointer;
color: #409eff;
color: #4a4e56;
}
/deep/.el-loading-mask {
......
......@@ -459,7 +459,7 @@ aside {
.icon {
position: absolute;
top: 12px;
right: 0px;
right: -4px;
transform: rotate(45deg);
color: #fff;
font-size: 12px;
......
......@@ -33,10 +33,7 @@
<p v-if="item.operate=='D'">{{ item.qllxmc }} <span class="tpcolor">(删除)</span></p>
<p v-else >{{ item.qllxmc }} <span class="tpcolor">({{ item.operate=="U"?"编辑":"新增" }})</span></p>
</div>
<i
class="el-icon-delete"
@click.stop="handleDel(item)"
></i>
<i class="el-icon-delete" @click.stop="handleDel(item)" v-if="delel"></i>
</el-menu-item>
</el-menu>
</div>
......@@ -86,6 +83,7 @@ export default {
activeIndex: "0",
// 折叠
isShowdrawer: true,
delel: true,
//批量操作按钮名称
batchButtonName: "",
//左侧菜单数据集合
......@@ -104,6 +102,7 @@ export default {
};
},
mounted() {
this.delel=this.$parent.isEdit
this.loadBdcdylist();
this.getleftMenubl();
......
......@@ -70,7 +70,7 @@
}
},
{
prop: "sqrmc",
prop: "ywrmc",
label: "姓名/名称"
},
{
......@@ -121,7 +121,7 @@
this.$nextTick(() => {
if (val.length == 0 || !val) {
that.tableDataList = _.cloneDeep([{
sqrmc: '',
ywrmc: '',
dlrzjlx: '',
dlrzjh: '',
fr: ''
......
......@@ -282,9 +282,9 @@
<el-date-picker
v-model="ruleForm.diyaq.zwlxqssj"
type="date"
placeholder="选择日期"
value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
......@@ -294,9 +294,9 @@
<el-date-picker
v-model="ruleForm.diyaq.zwlxjssj"
type="date"
placeholder="选择日期"
value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
......@@ -419,8 +419,8 @@
v-model="ruleForm.qlxx.zxsj"
type="date"
placeholder="选择日期"
value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
......
......@@ -175,7 +175,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="房屋结构：">
<el-form-item label="房屋结构：" prop="fdcq2.fwjg" :rules="rules.fwjgrules">
<el-select v-model="ruleForm.fdcq2.fwjg">
<el-option
v-for="item in dictData['A46']"
......@@ -407,6 +407,7 @@ export default {
ruleForm: {},
//传递参数\
rules: {
bdcqzhrules:[
{ required: true, message: "不动产权证号：", trigger: "change" },
],
......@@ -414,6 +415,7 @@ export default {
djjgrules: [{ required: true, message: "登记机构", trigger: "change" }],
dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
djsjrules: [{ required: true, message: "登记时间", trigger: "change" }],
fwjgrules: [{ required: true, message: "房屋结构", trigger: "change" }],
},
};
},
......
......@@ -62,9 +62,9 @@
<el-date-picker
v-model="item.shkssj"
type="date"
placeholder="选择日期"
value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
>
</el-date-picker>
</el-form-item>
......
......@@ -6,6 +6,7 @@
import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
import { getPrintTemplateByCode } from "@/api/system";
import { getPrintApplicationInfo } from "@/api/fqsq";
import { getQllxByBdcdyid } from "@/api/djbbl.js";
import { uploadUndo } from "@/api/clxx";
import { deleteFlow } from "@/api/djbbl";
import { getLodop } from "@/utils/LodopFuncs"
......@@ -137,7 +138,17 @@ export default {
// break;
case "B5":
this.$refs.Menu.loadBdcdylist("add")
if (this.currentSelectProps.bdcdyid) {
getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
(res) => {
if (res.code === 200) {
this.$refs.qllxlist.qllxlistdata = res.result;
this.$refs.qllxlist.dialogVisible = true;
}
}
);
}
// this.$refs.Menu.loadBdcdylist("add")
// this.$popupDialog("选择新增权力类型", "djbworkflow/djbBook/components/qllxcloseDailog", this.currentSelectProps, '50%', true)
......
......@@ -149,18 +149,18 @@
// this.supplementarylist = res.result;
// })
// },
getQllxByBdcdyid () {
if (this.currentSelectProps.bdcdyid) {
getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
(res) => {
if (res.code === 200) {
this.$refs.qllxlist.qllxlistdata = res.result;
this.$refs.qllxlist.dialogVisible = true;
}
}
);
}
},
// getQllxByBdcdyid () {
// if (this.currentSelectProps.bdcdyid) {
// getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
// (res) => {
// if (res.code === 200) {
// this.$refs.qllxlist.qllxlistdata = res.result;
// this.$refs.qllxlist.dialogVisible = true;
// }
// }
// );
// }
// },
// 获取右侧选项卡
getCurrentSelectProps (val) {
this.bsmRepair= val.bsmRepair
......
......@@ -155,18 +155,18 @@ export default {
// this.supplementarylist = res.result;
// })
// },
getQllxByBdcdyid() {
if (this.currentSelectProps.bdcdyid) {
getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
(res) => {
if (res.code === 200) {
this.$refs.qllxlist.qllxlistdata = res.result;
this.$refs.qllxlist.dialogVisible = true;
}
}
);
}
},
// getQllxByBdcdyid() {
// if (this.currentSelectProps.bdcdyid) {
// getQllxByBdcdyid({ bdcdyid: this.currentSelectProps.bdcdyid }).then(
// (res) => {
// if (res.code === 200) {
// this.$refs.qllxlist.qllxlistdata = res.result;
// this.$refs.qllxlist.dialogVisible = true;
// }
// }
// );
// }
// },
// 获取右侧选项卡
getCurrentSelectProps(val) {
this.bsmRepair= val.bsmRepair
......
......@@ -197,6 +197,7 @@ export default {
djywmc: '',
enabled: '1',
flowid: '',
flowparams: '',
djqxcl: '',
sfqydjyymb: '1',
djyy: ''
......
......@@ -50,6 +50,11 @@
<el-input v-model="form.ywDetail.flowid"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="流程参数" prop="flowparams">
<el-input v-model="form.ywDetail.flowparams"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-12 16:33:18
-->
<template>
<div class='dblistDialog'>
<el-table
v-if="formData.result"
:data="formData.result"
height="200">
<el-table-column
prop="ywh"
width="110"
label="业务号">
</el-table-column>
<el-table-column
prop="msg"
label="详细信息">
</el-table-column>
</el-table>
</div>
</template>
<script>
export default {
props: {
formData: {
type: Object,
default: {}
}
}
}
</script>
<style scoped lang='scss'>
@import "~@/styles/public.scss";
</style>
\ No newline at end of file
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-12 14:20:58
-->
<template>
<div>
图形定位
</div>
</template>
<script>
export default {
props: {
formData: {
type: Object,
default: {}
}
},
data () {
return {
}
},
methods: {
}
}
</script>
<style scoped lang='scss'>
</style>
\ No newline at end of file
......@@ -44,9 +44,9 @@
v-model='scope.row.qssj'
type="date"
:disabled="disabled"
placeholder="选择日期"
value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
@blur="addrow(scope.row)">
</el-date-picker>
</template>
......@@ -57,9 +57,9 @@
v-model='scope.row.jssj'
type="date"
:disabled="disabled"
placeholder="选择日期"
value-format="yyyy/MM/dd HH:mm:ss"
format="yyyy/MM/dd"
placeholder="选择日期"
value-format="yyyy-MM-dd HH:mm:ss"
format="yyyy-MM-dd"
@blur="addrow(scope.row)">
</el-date-picker>
</template>
......
/*
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-06-26 17:03:07
* @LastEditTime: 2023-07-12 16:33:59
*/
import { getWorkFlowImage } from "@/api/workflow/jsydsyqFlow.js";
import { getPrintTemplateByCode } from "@/api/system";
......@@ -16,7 +16,8 @@ import {
getNextLinkInfo,
} from "@/api/fqsq.js";
import { mapGetters } from 'vuex'
import { log } from "bpmn-js-token-simulation";
import { getZrzbsm } from "@/api/lpb";
import { ywPopupDialog } from "@/utils/popup.js";
export default {
data () {
return {
......@@ -76,7 +77,7 @@ export default {
rejectedTaskSet: {},
finishedSequenceFlowSet: result.finishedSequenceFlowIds
},
handlinglist:result.runningTasks,
handlinglist: result.runningTasks,
allCommentList: result.finishedTasks
}, '80%', true)
})
......@@ -114,7 +115,6 @@ export default {
getPrintTemplateByCode({ tmpno: 'dysqs' }).then(res => {
if (res.code == 200) {
getPrintApplicationInfo(this.currentSelectProps).then(infoRes => {
console.log(infoRes, 'infoRes');
if (infoRes.code == 200) {
//打开模板设计
let LODOP = getLodop(document.getElementById('LODOP_OB'), document.getElementById('LODOP_EM'));
......@@ -139,9 +139,22 @@ export default {
)
break;
case "B8":
this.$popupDialog('楼盘表', 'lpb/index', {
bsm: ''
}, '90%', true)
getZrzbsm(this.bsmSlsq).then((res) => {
if (res.code === 200) {
this.$popupDialog('楼盘表', 'lpb/index', {
bsm: res.result[0]
}, '90%', true)
} else {
this.$message.error(res.message)
}
})
.catch((err) => {
this.$message.error(err)
});
break;
// 图形定位
case "B-TXDW":
this.$popupDialog('图形定位', 'workflow/components/dialog/txdw', {}, '60%', true)
break;
case "back": //退回按钮
this.$popupDialog("退回", "workflow/components/th", {
......@@ -179,7 +192,7 @@ export default {
formdata.append("bsmSlsq", this.bsmSlsq);
formdata.append("bestepid", this.bestepid);
this.$confirm("请确认是否登簿", "提示", {
iconClass: "el-icon-question", //自定义图标样式
iconClass: "el-icon-info", //自定义图标样式
confirmButtonText: "确认", //确认按钮文字更换
cancelButtonText: "取消", //取消按钮文字更换
showClose: true, //是否显示右上角关闭按钮
......@@ -188,18 +201,20 @@ export default {
record(formdata).then((res) => {
if (res.code === 200) {
if (res.result.length === 1) {
res.result[0].state ? that.$alert("登簿成功!") : that.$alert(res.result[0].msg);;
console.log(res.result, 'res.result');
res.result[0].state ? that.$message({
message: '登簿成功',
type: 'success'
}) : ywPopupDialog("登簿明细", "workflow/components/dialog/dblist", { result: res.result }, '30%')
}
else {
that.$alert('<div>' + res.result[0].ywh + ',' + res.result[0].msg + '</div>', '登簿明细', {
dangerouslyUseHTMLString: true
});
ywPopupDialog("登簿明细", "workflow/components/dialog/dblist", { result: res.result }, '30%')
}
} else {
that.$alert(res.message);
that.$message.error(res.message)
}
});
});
})
})
break;
case "rm":
this.del()
......