Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
7439149d by jiaozeping@pashanhoo.com
Options

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

2 parents a8d933fa cd41322a
Expand all
Inline Side-by-side
Showing 12 changed files with 248 additions and 96 deletions
......@@ -184,3 +184,11 @@ export function getSlsqBdcqzList (params) {
params
})
}
// 终止任务
export function stopTask (data) {
return request({
url: '/business/workFlow/stopTask',
method: 'post',
data
})
}
......
......@@ -12,5 +12,8 @@ const getters = {
addDict: state => state.dict.addDict,
dictData: state => state.dict.dictData,
djbxx: state => state.djbxx.djbxx,
// 受理信息
oldDetail: state => state.slxx.oldDetail,
newDetail: state => state.slxx.newDetail
}
export default getters
......
const state = {
oldDetail: {},
newDetail: {}
}
const mutations = {
SET_OLDDETAIL: (state, data) => {
state.oldDetail = data
},
SET_NEWDETAIL: (state, data) => {
state.newDetail = data
}
}
const actions = {
setQlrxxOld ({ commit }, data) {
commit('SET_OLDDETAIL', data)
},
setQlrxxNew ({ commit }, data) {
commit('SET_NEWDETAIL', data)
}
}
export default {
namespaced: true,
state,
mutations,
actions
}
const state = {
bsmSqyw: '',
djqxObj: {
djqxbm: "",
djqxmc: ""
},
djywbm: ''
}
const mutations = {
SET_BSMSQYW: (state, data) => {
state.bsmSqyw = data
},
SET_DJQXOBJ: (state, data) => {
state.djqxObj = data
},
SET_DJYWBM: (state, data) => {
state.djywbm = data
},
}
const actions = {
setBsmSqyw ({ commit }, data) {
commit('SET_BSMSQYW', data)
},
setDjqxObj ({ commit }, data) {
commit('SET_DJQXOBJ', data)
},
setDjywbm ({ commit }, data) {
commit('SET_DJYWBM', data)
}
}
export default {
namespaced: true,
state,
mutations,
actions
}
<template>
<div>
<lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :data="tableDataList">
<lb-table :column="column" :maxHeight="300" heightNumSetting :pagination="false" :key="key" :data="tableDataList">
</lb-table>
<addQlr v-model="dialog" :details="details" @updateDetail="updateDetail" />
</div>
......@@ -29,6 +29,7 @@ export default {
},
data () {
return {
key: 0,
dataIndex: 0,
dialog: false,
details: {},
......@@ -103,7 +104,12 @@ export default {
handler: function (val, oldVal) {
let that = this
if (val.length == 0 || !val) {
that.tableDataList = [{}]
that.tableDataList = _.cloneDeep([{
sqrmc: '',
dlrzjlx: '',
dlrzjh: '',
fr: ''
}])
} else {
that.tableDataList = _.cloneDeep(val)
}
......@@ -111,13 +117,6 @@ export default {
immediate: true,
deep: true
},
'$route.query.bsmSlsq': {
handler (newValue, oldValue) {
// 获取列表数据
// this.details =
},
deep: true
},
gyfs: {
handler (newVal, oldValue) {
let dataList = _.cloneDeep(this.InformationTable)
......@@ -140,6 +139,7 @@ export default {
methods: {
updateDetail (value) {
this.tableDataList[this.dataIndex] = value
this.key++
this.$emit('upDateQlrxxList', this.tableDataList)
},
// 添加
......@@ -154,6 +154,7 @@ export default {
readClick () { },
// 修改
handleEdit (index, row) {
console.log(row, 'rowrowrowrowrow');
this.dataIndex = index
this.dialog = true
this.details = row
......
......@@ -12,8 +12,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="姓名/名称" prop="xm">
<el-input v-model="ruleForm.xm" maxlegth="15"></el-input>
<el-form-item label="姓名/名称" prop="sqrmc">
<el-input v-model="ruleForm.sqrmc" maxlegth="15"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -32,8 +32,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="联系电话" prop="lxdh" :rules="$rules.common.phone">
<el-input v-model="ruleForm.lxdh" maxlength="11"></el-input>
<el-form-item label="联系电话" prop="dh" :rules="$rules.common.phone">
<el-input v-model="ruleForm.dh" maxlength="11"></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
......@@ -142,6 +142,7 @@ import { mapGetters } from 'vuex'
export default {
props: {
value: { type: Boolean, default: false },
details: { type: Object, default: {} }
},
computed: {
...mapGetters(["dictData"]),
......@@ -151,10 +152,10 @@ export default {
myValue: this.value,
ruleForm: {
qlrlx: '',
xm: '',
sqrmc: '',
zjzl: '',
zjh: '',
lxdh: '',
dh: '',
xb: '',
frmc: '',
gjdq: '',
......@@ -174,11 +175,11 @@ export default {
qlrlx: [
{ required: true, message: '权利人类型', trigger: 'change' }
],
xm: [
sqrmc: [
{ required: true, message: '姓名/名称', trigger: 'blur' }
],
zjzl: [
{ required: true, message: '证件种类', trigger: 'chagyfsnge' }
{ required: true, message: '证件种类', trigger: 'change' }
],
zjh: [
{ required: true, message: '证件号', trigger: 'blur' }
......@@ -188,8 +189,14 @@ export default {
},
watch: {
value (val) {
this.myValue = val;
this.myValue = _.cloneDeep(val)
},
details: {
handler: function (val, oldVal) {
this.ruleForm = val
},
deep: true
}
},
methods: {
closeDialog () {
......@@ -198,7 +205,18 @@ export default {
},
submitForm () {
this.$emit("input", false);
this.$emit("updateDetail", this.ruleForm);
this.$emit("updateDetail", _.cloneDeep(this.ruleForm));
// this.$refs['ruleForm'].validate((valid) => {
// if (valid) {
// this.$message({
// message: '修改成功!',
// type: 'success'
// })
// } else {
// this.$message.error('请完善必填项');
// }
// })
}
}
}
......
<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>
</div>
</template>
<script>
import { stopTask } from "@/api/fqsq.js"
export default {
props: {
formData: {
type: Object,
default: {}
}
},
data () {
return {
stopMessage: ''
}
},
methods: {
childFn () {
stopTask({
bsmSlsq: this.formData.bsmSlsq,
bestepid: this.formData.bestepid,
stopMessage: this.stopMessage
}).then(res => {
this.$message.success('终止成功')
setTimeout(() => {
window.opener = null;
window.open("about:blank", "_self");
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>
......@@ -6,7 +6,7 @@
<ul style="margin-bottom:15px">
<li v-for="(item,index) in dataList" class="listDetail" :key="index">
<p class="icon">
<el-radio v-model="radio"></el-radio>
<el-radio v-model="selectActivity" :label="item.activityId" @change="changeSelectItem(item)"></el-radio>
</p>
<p>{{item.activityName}}</p>
<p v-for="(child,childIndex) in item.userInfos" :key="childIndex">{{child.name}}</p>
......@@ -31,8 +31,10 @@ export default {
},
data () {
return {
selectActivity: '',
dataList: [],
outstepopinion: ''
outstepopinion: '',
selectItem: {}
}
},
created () {
......@@ -40,12 +42,31 @@ export default {
},
methods: {
childFn () {
console.log(1111);
this.selectItem.outstepopinion = this.outstepopinion;
sendBackTask({
bsmSlsq: this.formData.bsmSlsq,
backNodeList: [this.selectItem]
}).then(res => {
this.$message.success('退回成功')
setTimeout(() => {
window.opener = null;
window.open("about:blank", "_self");
window.close();
this.$emit('input', false)
}, 1000);
})
},
changeSelectItem(item){
this.selectItem = item
},
getBackNode () {
getTaskBackNode(this.formData).then(res => {
if (res.code == 200) {
// this.dataList = res.result
this.dataList = res.result
if(res.result){
this.selectActivity = res.result[0].activityId
this.selectItem = res.result[0]
}
}
})
}
......@@ -81,4 +102,7 @@ export default {
min-height: 90px !important;
}
}
/deep/.el-radio .el-radio__label {
display: none;
}
</style>
......
......@@ -18,6 +18,7 @@
</el-form-item>
</el-form>
</div>
<div class="aaaa">{{bdcqz.bdcqzlx == '1' ? '不动产权证书' : '不动产权证明'}}</div>
<div class="zsyl-box">
<div class="zsyl-left">
<div class="zsyl-title">
......@@ -219,4 +220,10 @@ export default {
background: rgb(251,249,229);
}
}
.aaaa{
background: #FAFBE5;
text-align: center;
padding-top: 10px;
font-size: 20px;
}
</style>
......
......@@ -54,7 +54,7 @@
</div>
<!-- 表单内容区域 -->
<div class="rightContainer">
<el-tabs v-model="tabName" @tab-click="tabClick">
<el-tabs v-model="tabName" :before-leave="beforeLeave">
<el-tab-pane :label="item.name" :name="item.value" v-for="item in tabList" :key="item.value">
</el-tab-pane>
</el-tabs>
......@@ -63,10 +63,6 @@
</div>
</div>
<fqsqDialog v-model="isDialog" :djywbm="$route.query.sqywbm" :isJump="true" @updateDialog="updateDialog" />
<!-- <dialogBox title="流程图" width="60%" v-model="myValue" @closeDialog="closeDialog">
<process-viewer :key="`designer-${loadIndex}`" style="height:500px" :xml="xmlData" :finished-info="finishedInfo"
:all-comment-list="historyTaskList" @ch="changeLoadIndex" />
</dialogBox> -->
</div>
</template>
......@@ -82,6 +78,7 @@ import {
getNextLinkInfo,
completeTask,
} from "@/api/fqsq.js";
import { mapGetters } from "vuex"
import { deleteBdcdy } from "@/api/ywbl.js";
import ProcessViewer from './components/processViewer.vue'
import { getWorkFlowImage } from "@/api/jsydsyqFlow.js";
......@@ -135,6 +132,9 @@ export default {
this.loadBdcdylist();
this.flowInitParam();
},
computed: {
...mapGetters(["oldDetail", "newDetail"])
},
methods: {
changeLoadIndex () {
this.loadIndex++
......@@ -318,7 +318,7 @@ export default {
this.$popup({
title: "退回",
editItem: "workflow/components/th",
height: "330px",
height: "400px",
width: '30%',
formData: {
bsmSlsq: this.bsmSlsq,
......@@ -343,10 +343,29 @@ export default {
}
});
break;
case "stop": //终止按钮
this.$popup({
title: "终止",
editItem: "workflow/components/stop",
height: "330px",
width: '30%',
formData: {
bsmSlsq: this.bsmSlsq,
bestepid: this.bestepid,
},
btnShow: true,
cancel: () => {
console.log("取消回调");
},
confirm: () => {
console.log("确认回调");
},
})
break;
case "signout":
window.close();
break;
case "record":
case "B9":
var formdata = new FormData();
formdata.append("bsmSlsq", this.bsmSlsq);
formdata.append("bestepid", this.bestepid);
......@@ -386,8 +405,14 @@ export default {
}
},
//表单选项卡事件
tabClick (tab, event) {
this.getFromRouter(tab.name);
beforeLeave (activeName, oldActiveName) {
console.log(this.oldDetail, this.newDetail);
if (!_.isEqual(this.oldDetail, this.newDetail)) {
this.$message.error('界面内容有所变化,请先保存')
return false
} else {
if (activeName && activeName != 0) this.getFromRouter(activeName)
}
},
//切换选项卡内容组件
getFromRouter (tabname) {
......
......@@ -184,13 +184,18 @@ export default {
formdata.append("bsmSldy", this.propsParam.bsmSldy);
Init(formdata).then((res) => {
if (res.code === 200 && res.result) {
this.ruleForm = {}
this.ruleForm = {
...res.result,
...res.result.zdjbxxdatas,
...res.result.qlxxdatas,
...res.result.jsydsyqdatas
}
this.$store.dispatch('slxx/setQlrxxOld', {
qlrxx: this.ruleForm.qlrxx,
fj: this.ruleForm.fj,
gyfs: this.ruleForm.gyfs,
djyy: this.ruleForm.djyy
})
}
})
},
......@@ -198,34 +203,24 @@ export default {
computed: {
...mapGetters(["dictData", "flag"])
},
watch: {
ruleForm: {
handler: function (newValue) {
this.$store.dispatch('slxx/setQlrxxNew', {
qlrxx: this.ruleForm.qlrxx,
fj: this.ruleForm.fj,
gyfs: this.ruleForm.gyfs,
djyy: this.ruleForm.djyy
})
},
deep: true
}
},
data () {
return {
disabled: true,
czrOptions: [],
ruleForm: {
// ywh: "",
// slry: "",
// slsj: "",
// qllx: "",
// djlx: "",
// djqx: "",
// zddm: "",
// bdcdyh: "",
// qlxzmc: "",
// zdmj: "",
// zl: "",
// tdyt: "",
// qlsdfs: "",
// qdjg: "",
// tdsyqx: "",
// syqqzsj: "",
// fj: "",
// qlrxx: [],
// djyy: "",
// gyfs: "1",
// sffbcz: "",
// czr: "",
},
ruleForm: {},
//传递参数
propsParam: {},
rules: {}
......@@ -234,7 +229,13 @@ export default {
methods: {
// 更新权利人信息
upDateQlrxxList (val) {
this.ruleForm.qlrxx = val
this.ruleForm.qlrxx = _.cloneDeep(val)
// this.$store.dispatch('slxx/setQlrxxNew', {
// qlrxx: this.ruleForm.qlrxx,
// fj: this.ruleForm.fj,
// gyfs: this.ruleForm.gyfs,
// djyy: this.ruleForm.djyy
// })
},
list (bsmSldy) {
var formdata = new FormData();
......