0) {
+ if (childs[i].subCategory) {
+ if (childs[i].subCategory.length) {
+ this.filterTree(childs[i].subCategory)
+ } else {
+ delete childs[i].subCategory
+ }
+ }
+ }
+ return arr
+ },
async getReplayInfo () {
this.okflag = false
this.$refs["ref_form1"].validate((valid, messageObj) => {
@@ -98,11 +179,20 @@ export default {
app.util.validateRule(messageObj);
} else {
+
if (this.status) {
+
+ if (!this.selCateObj || !this.selCateObj.id) {
+ this.$message.info("请填写事件分类");
+ return false
+ }
this.formData.status = 'closed_case'
} else {
this.formData.status = 'processing'
}
+ this.formData.categoryId = this.selCateObj.id
+ this.formData.categoryList = []
+ this.formData.categoryList.push(this.selCateObj)
this.okflag = true
}
diff --git a/src/views/modules/shequzhili/event/cpts/process-form.vue b/src/views/modules/shequzhili/event/cpts/process-form.vue
index 6ab88929..05efadcc 100644
--- a/src/views/modules/shequzhili/event/cpts/process-form.vue
+++ b/src/views/modules/shequzhili/event/cpts/process-form.vue
@@ -6,26 +6,14 @@
:inline="false"
:rules="dataRule"
class="form">
-
-
-
+
回复
立项
- 转需求
+ 转服务
@@ -33,12 +21,14 @@
+ :eventDetailData="eventDetailData"
+ :eventId="eventId">
+ :eventDetailData="eventDetailData"
+ :eventId="eventId">
@@ -70,24 +60,20 @@ export default {
data () {
return {
-
casOptions: [],
iscascaderShow: 0,
- selCategoryArray: [
-
- ],
+ selCategoryArray: [],
selCateObj: {},
optionProps: {
multiple: false,
value: 'id',
label: 'name',
children: 'subCategory',
-
},
- operationType: '0',
+ operationType: '',
+
- categoryList: [],
replayInfo: {},
demand: {},
project: {},
@@ -105,9 +91,7 @@ export default {
computed: {
dataRule () {
return {
- categoryList: [
- { required: true, message: "分类不能为空", trigger: "blur" },
- ],
+
operationType: [
{ required: true, message: "处理方式不能为空", trigger: "blur" },
],
@@ -149,117 +133,39 @@ export default {
async mounted () {
const { user } = this.$store.state
this.agencyId = user.agencyId
- await this.getCategoryList()
+
if (this.eventId) {
this.eventDetailCopy = JSON.parse(JSON.stringify(this.eventDetailData));
- if (this.eventDetailCopy.parentCategoryId && this.eventDetailCopy.categoryId) {
- this.selCategoryArray = []
- this.selCategoryArray.push(this.eventDetailCopy.parentCategoryId)
- this.selCategoryArray.push(this.eventDetailCopy.categoryId)
-
- this.selCateObj = {
- name: this.eventDetailCopy.categoryName,
- id: this.eventDetailCopy.categoryId
- }
- }
- }
-
+ }
},
methods: {
-
-
- async getCategoryList () {
- const url = "/gov/issue/issueprojectcategorydict/list"
-
- let params = {}
-
- const { data, code, msg } = await requestPost(url, params)
-
- if (code === 0) {
-
- let treeDataNew = this.filterTree(data)
-
- //组织级联数据
- ++this.iscascaderShow
- this.casOptions = []
-
-
- this.casOptions = treeDataNew
-
- } else {
- this.$message.error(msg)
- }
-
- },
-
- handleChangeCate () {
- console.log(this.$refs["myCascader"].getCheckedNodes()[0].data)
- this.selCateObj = this.$refs["myCascader"].getCheckedNodes()[0].data
-
- },
-
- //重构树，去除网格
- filterTree (arr) {
- let childs = arr
- for (let i = childs.length; i--; i > 0) {
- if (childs[i].subCategory) {
- if (childs[i].subCategory.length) {
- this.filterTree(childs[i].subCategory)
- } else {
- delete childs[i].subCategory
- }
- }
- }
- return arr
- },
-
async getProcessInfo () {
-
this.okflag = false
- if (this.selCategoryArray.length === 0) {
- this.$message({
- type: "error",
- message: "请选择分类",
- });
-
- this.okflag = false
- return false
- }
- this.categoryList = []
-
- this.categoryList.push(this.selCategoryArray[1])
+ // this.categoryList = []
+ // this.categoryList.push(this.selCategoryArray[1])
if (this.operationType === '0') {
this.$refs.ref_process_form_replay.getReplayInfo()
if (this.$refs.ref_process_form_replay.okflag) {
-
this.replayInfo = this.$refs.ref_process_form_replay.formData
- this.replayInfo.categoryId = this.categoryList[0]
- this.replayInfo.categoryList = this.categoryList
-
this.okflag = true
} else {
return false
}
-
} else if (this.operationType === '1') {
this.$refs.ref_process_form_project.getProjectInfo()
if (this.$refs.ref_process_form_project.okflag) {
this.project = this.$refs.ref_process_form_project.formData
- this.project.categoryList = []
- this.project.categoryList.push(this.selCateObj)
-
-
//赋值分类信息
this.okflag = true
diff --git a/src/views/modules/shequzhili/event/eventList.vue b/src/views/modules/shequzhili/event/eventList.vue
index ef7066da..c35141f1 100644
--- a/src/views/modules/shequzhili/event/eventList.vue
+++ b/src/views/modules/shequzhili/event/eventList.vue
@@ -436,8 +436,8 @@ export default {
computed: {
maxTableHeight () {
return this.$store.state.inIframe
- ? this.clientHeight - 400 + this.iframeHeigh
- : this.clientHeight - 400;
+ ? this.clientHeight - 410 + this.iframeHeigh
+ : this.clientHeight - 410;
},
...mapGetters(["clientHeight", "iframeHeight"]),
},
diff --git a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue
index c5c4634c..3b26bcec 100644
--- a/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue
+++ b/src/views/modules/visual/communityGovern/duoyuanfuwu/duoyuanDialog.vue
@@ -193,7 +193,25 @@ export default {