Skip to content

bdc / bdcdj-web

Go to a project
Toggle navigation
Toggle navigation pinning
27dd35b0 by renchao@pashanhoo.com
Options

Merge branch 'dev'

2 parents ccfa2c57 0484b558
Inline Side-by-side
Showing 11 changed files with 201 additions and 214 deletions
......@@ -4,82 +4,109 @@
* @LastEditTime: 2023-05-17 10:42:01
-->
<template>
<dialogBox title="转出" @submitForm="submitForm" saveButton="确认转出" width="45%" height='30%' @closeDialog="closeDialog"
v-model="value">
<div class="from-clues">
<!-- 表单部分 -->
<div class="from-clues-header">
<el-form :model="queryForm" ref="queryForm" label-width="120px">
<el-form ref="queryForm" label-width="180px" v-if="this.formData.obj">
<el-form-item label="下一环节名称:">
{{this.tableData.taskName}}
{{ this.formData.obj.taskName }}
</el-form-item>
<el-form-item label="下一环节办理人:">
{{this.usernames}}
{{ this.formData.obj.usernames.join("，") }}
</el-form-item>
</el-form>
<el-form ref="queryForm" label-width="180px" v-else>
<el-form-item label="">
此环节为流程最后环节，转出后流程将结束
</el-form-item>
</el-form>
<div class="invalid-reson">转出原因：</div>
<el-input
v-model="shyj"
placeholder="请输入转出原因"
type="textarea"
:rows="4"
></el-input>
<el-button style="float: right" @click="cancelBack">取消转出</el-button>
<el-button type="primary" @click="submitForm" style="float: right"
>确定转出</el-button
>
</div>
</div>
</dialogBox>
</template>
<script>
import { completeTask, getNextLinkInfo } from "@/api/workFlow.js"
export default {
components: {
},
import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
import { popupCacel } from "@/utils/popup.js";
export default {
components: {},
props: {
value: { type: Boolean, default: false },
queryForm: { type: Object, default: false }
formData: {
type: Object,
default: {},
},
},
data () {
data() {
return {
tableData: {},
usernames: '',
}
queryForm: {},
shyj: "",
};
},
methods: {
/**
* @description: tablelistFn
* @author: renchao
*/
tablelistFn () {
getNextLinkInfo(this.queryForm).then(res => {
if (res.code === 200) {
this.tableData = res.result
if (res.result.usernames) {
this.usernames = String(res.result.usernames)
}
}
})
mounted() {
// this.queryForm= this.queryForm.obj
console.log("formDataformDataformData", this.formData);
},
methods: {
/**
* @description: submitForm
* @author: renchao
*/
submitForm () {
completeTask(this.queryForm).then(res => {
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('转件成功')
this.$message.success("转件成功");
// setTimeout(() => {
// window.opener = null;
// window.open("about:blank", "_self");
// window.close();
// this.$emit("input", false);
// }, 1000);
popupCacel();
setTimeout(() => {
window.opener = null;
window.open("about:blank", "_self");
// 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)
this.$emit("input", false);
}, 1000);
}else{
this.$message.error(res.message);
}
})
});
},
/**
* @description: closeDialog
* @author: renchao
*/
closeDialog () {
this.$emit("input", false);
cancelBack() {
popupCacel();
},
}
}
},
};
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "~@/styles/mixin.scss";
.el-button {
margin-top: 20px;
margin-right: 10px;
}
</style>
......
......@@ -403,7 +403,7 @@ export default {
djjgrules: [{ required: true, message: "登记机构", trigger: "blur" }],
dbrrules: [{ required: true, message: "登簿人", trigger: "blur" }],
djsjrules: [{ required: true, message: "登记时间", trigger: "blur" }],
djlxrules: [{ required: true, message: "登记类型", trigger: "blur" }],
djlxrules: [{ required: true, message: "登记类型", trigger: "change" }],
},
};
},
......
......@@ -325,18 +325,25 @@ export default {
* @author: renchao
*/
sendToNext (obj) {
this.$popupDialog("转出", "workflow/components/zc", {
this.$popupDialog("转出", "djbworkflow/components/zc", {
obj:obj,
bsmSlsq: this.bsmSlsq,
bestepid: this.bestepid
tabList: this.tabList
}, '800px', true)
},
//转出最后一个流程
/**
* @description: sendToEnd
* @description: 转出最后一个流程
* @author: renchao
*/
sendToEnd () {
this.$popupDialog("转出", "djbworkflow/components/zc", {
obj:"",
bsmSlsq: this.bsmSlsq,
tabList: this.tabList
}, '800px', true)
},
//批量操作
/**
* @description: 批量操作
......
......@@ -154,18 +154,10 @@
}
})
}
});
});
}
},
// 获取右侧选项卡
/**
* @description: 获取右侧选项卡
......
......@@ -4,82 +4,109 @@
* @LastEditTime: 2023-05-17 10:42:01
-->
<template>
<dialogBox title="转出" @submitForm="submitForm" saveButton="确认转出" width="45%" height='30%' @closeDialog="closeDialog"
v-model="value">
<div class="from-clues">
<!-- 表单部分 -->
<div class="from-clues-header">
<el-form :model="queryForm" ref="queryForm" label-width="120px">
<el-form ref="queryForm" label-width="180px" v-if="this.formData.obj">
<el-form-item label="下一环节名称:">
{{this.tableData.taskName}}
{{ this.formData.obj.taskName }}
</el-form-item>
<el-form-item label="下一环节办理人:">
{{this.usernames}}
{{ this.formData.obj.usernames.join("，") }}
</el-form-item>
</el-form>
<el-form ref="queryForm" label-width="180px" v-else>
<el-form-item label="">
此环节为流程最后环节，转出后流程将结束
</el-form-item>
</el-form>
<div class="invalid-reson">转出原因：</div>
<el-input
v-model="shyj"
placeholder="请输入转出原因"
type="textarea"
:rows="4"
></el-input>
<el-button style="float: right" @click="cancelBack">取消转出</el-button>
<el-button type="primary" @click="submitForm" style="float: right"
>确定转出</el-button
>
</div>
</div>
</dialogBox>
</template>
<script>
import { completeTask, getNextLinkInfo } from "@/api/workFlow.js"
export default {
components: {
},
import { completeTask, getNextLinkInfo } from "@/api/workFlow.js";
import { popupCacel } from "@/utils/popup.js";
export default {
components: {},
props: {
value: { type: Boolean, default: false },
queryForm: { type: Object, default: false }
formData: {
type: Object,
default: {},
},
},
data () {
data() {
return {
tableData: {},
usernames: '',
}
queryForm: {},
shyj: "",
};
},
methods: {
/**
* @description: tablelistFn
* @author: renchao
*/
tablelistFn () {
getNextLinkInfo(this.queryForm).then(res => {
if (res.code === 200) {
this.tableData = res.result
if (res.result.usernames) {
this.usernames = String(res.result.usernames)
}
}
})
mounted() {
// this.queryForm= this.queryForm.obj
console.log("formDataformDataformData", this.formData);
},
methods: {
/**
* @description: submitForm
* @author: renchao
*/
submitForm () {
completeTask(this.queryForm).then(res => {
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('转件成功')
this.$message.success("转件成功");
// setTimeout(() => {
// window.opener = null;
// window.open("about:blank", "_self");
// window.close();
// this.$emit("input", false);
// }, 1000);
popupCacel();
setTimeout(() => {
window.opener = null;
window.open("about:blank", "_self");
// 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)
this.$emit("input", false);
}, 1000);
}else{
this.$message.error(res.message);
}
})
});
},
/**
* @description: closeDialog
* @author: renchao
*/
closeDialog () {
this.$emit("input", false);
cancelBack() {
popupCacel();
},
}
}
},
};
</script>
<style scoped lang="scss">
@import "~@/styles/mixin.scss";
@import "~@/styles/mixin.scss";
.el-button {
margin-top: 20px;
margin-right: 10px;
}
</style>
......
......@@ -274,109 +274,24 @@ export default {
* @author: renchao
*/
sendToNext (obj) {
const h = this.$createElement;
this.$msgbox({
title: "您确定转出吗?",
message: h("div", { style: "margin: auto" }, [
h("span", null, "下个环节名称："),
h("i", { style: "color: teal" }, obj.taskName),
h("div", null, ""),
h("span", null, "下个环节经办人： "),
h("i", { style: "color: teal" }, obj.usernames.join("，")),
]),
showCancelButton: true,
beforeClose: (action, instance, done) => {
if (action === "confirm") {
instance.confirmButtonLoading = true;
instance.confirmButtonText = "执行中...";
completeTask({
this.$popupDialog("转出", "djbworkflow/components/zc", {
obj:obj,
bsmSlsq: this.bsmSlsq,
shyj: "this.bestepid",
stepform: JSON.stringify(this.tabList),
}).then((res) => {
if (res.code === 200) {
instance.confirmButtonLoading = false;
this.$message.success("转件成功");
// 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);
} else {
instance.confirmButtonLoading = false;
instance.confirmButtonText = "确定";
let msgArr = res.message.split('；'),
listMsg = []
msgArr.forEach(item => {
let parts = item.split('：')
listMsg.push({ ywh: parts[0], msg: parts[1] })
})
this.$msgbox.close()
ywPopupDialog("转出错误明细", "workflow/components/dialog/dblist", { result: listMsg }, '33%', true)
}
});
} else {
done();
}
},
}).then((action) => {
this.$message({
type: "info",
message: "action: " + action,
});
});
tabList: this.tabList
}, '800px', true)
},
//转出最后一个流程
/**
* @description: sendToEnd
* @description: 转出最后一个流程
* @param {*} obj
* @author: renchao
*/
sendToEnd () {
let that = this
const h = this.$createElement;
this.$msgbox({
title: "您确定转出吗？",
message: "此环节为流程最后环节，转出后流程将结束",
showCancelButton: true,
beforeClose: (action, instance, done) => {
if (action === "confirm") {
instance.confirmButtonLoading = true;
instance.confirmButtonText = "执行中...";
completeTask({
sendToNext (obj) {
this.$popupDialog("转出", "djbworkflow/components/zc", {
obj:"",
bsmSlsq: this.bsmSlsq,
shyj: "this.bestepid",
stepform: JSON.stringify(this.tabList),
}).then((res) => {
if (res.code === 200) {
instance.confirmButtonLoading = false;
that.$message.success("转件成功");
localStorage.setItem('transfer', true)
// window.opener.location.reload(); //刷新父窗口
if (window.opener && window.opener.getBpageList) {
window.opener.getBpageList();
} else {
window.opener.frames[0].getBpageList();
}
window.close();
that.$emit("input", false);
} else {
instance.confirmButtonLoading = false;
instance.confirmButtonText = "确定";
this.$message.error(res.message);
}
})
} else {
done();
}
},
}).then((action) => {
this.$message({
type: "info",
message: "action: " + action
})
})
tabList: this.tabList
}, '800px', true)
},
//批量操作
/**
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-07-21 09:50:20
* @LastEditTime: 2023-07-21 14:13:57
-->
<template>
<div class="slxx">
......@@ -68,11 +68,6 @@
<el-input disabled v-model="ruleForm.fdcq2.tdsyqx"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="8">
<el-form-item label="房屋用途：">
<el-input disabled v-model="ruleForm.qlxx.ytmc"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="8">
<el-form-item label="规划用途名称：">
<el-input disabled v-model="ruleForm.zdjbxx.ghytmc"></el-input>
......@@ -215,7 +210,7 @@
import { Init, saveData } from "@/api/workflow/fwsyqFlow.js";
import { mapGetters } from "vuex";
export default {
created () {
mounted () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
......@@ -243,9 +238,24 @@
tdytOption: [],
czrOptions: [],
ruleForm: {
flow: {
ywh: ''
},
qlxx: {
mj: ''
},
sldy: {
gyfs: ''
},
slsq: {
},
fdcq2: {
zyjzmj: '',
ftjzmj: ''
},
zdjbxx: {
ghytmc: ''
}
},
//传递参数
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-07-20 09:30:11
* @LastEditTime: 2023-07-21 14:16:07
-->
<template>
<div class="slxx">
......@@ -208,7 +208,7 @@
import { Init, saveData } from "@/api/workflow/fwsyqFlow.js";
import { mapGetters } from "vuex";
export default {
async created () {
mounted () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
......
<!--
* @Description: 受理信息
* @Autor: renchao
* @LastEditTime: 2023-07-20 16:12:16
* @LastEditTime: 2023-07-21 14:16:25
-->
<template>
<div class="slxx">
......@@ -154,7 +154,7 @@
import { BatchInit, Init, saveBatchData, saveData } from "@/api/workflow/fwsyqFlow.js";
import { mapGetters } from "vuex";
export default {
created (callbackfn, thisArg) {
mounted (callbackfn, thisArg) {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
......@@ -167,12 +167,11 @@
this.ruleForm = res.result;
this.splicingFdcq2Info();
}
});
})
},
components: { qlrCommonTable },
computed: {
...mapGetters(["dictData", "flag"]),
...mapGetters(["dictData", "flag"])
},
data () {
return {
......
......@@ -191,7 +191,7 @@
import { Init } from "@/api/workflow/fwsyqFlow.js";
import { mapGetters } from "vuex";
export default {
async created () {
mounted () {
this.ableOperation = this.$parent.currentSelectTab.ableOperation
this.propsParam = this.$attrs;
var formdata = new FormData();
......
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-07-21 13:46:08
* @LastEditTime: 2023-07-21 14:17:26
-->
<template>
<div class="from-clues">
......@@ -311,6 +311,17 @@
}
})
},
handleSelectionChange (val) {
if (this.sqywInfo.sqywdylx == "1") {
if (val.length > 1) {
this.bdcdysz = [...val[val.length - 1]];
} else {
this.bdcdysz = val;
}
} else {
this.bdcdysz = val;
}
},
/**
* @description: select
* @param {*} selection
......@@ -326,7 +337,6 @@
if (selection.length == 0) return
this.$refs.table.toggleRowSelection(row, true);
}
},
/**
* @description: handleRowClick
......@@ -356,7 +366,7 @@
} else {
this.$refs.table.toggleRowSelection(row);
}
},
}
}
}
</script>
......