diff --git a/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue index d2e1336b..46306e20 100644 --- a/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue +++ b/src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue @@ -22,7 +22,7 @@
共需{{ item.groupOwnerCount || 0 }}名成员完成群发,目前已完成{{ item.completionRate || 0 }}%
创建部门: - + {{ item.createUserDeptName }}
diff --git a/src/apps/AppCooperationPropaganda/cooperationDetail.vue b/src/apps/AppCooperationPropaganda/cooperationDetail.vue index 2d8f9769..17e4ea3a 100644 --- a/src/apps/AppCooperationPropaganda/cooperationDetail.vue +++ b/src/apps/AppCooperationPropaganda/cooperationDetail.vue @@ -78,17 +78,8 @@ - - - - + :colConfigs="tabIndex == 0 ? colConfigs0 : colConfigs1" + v-if="tableData.length"/> @@ -124,19 +115,19 @@ export default { }; }, computed: { - colConfigs() { + colConfigs0() { return [ - { slot: "groupOwnerId", label: "成员" }, + { prop: "groupOwnerName", label: "成员" }, { label: "预计送达居民", prop: "groupCount" }, ]; }, - // colConfigs1() { - // return [ - // { label: "居民群", prop: "groupName" }, - // { label: "群人数", prop: "memberCount" }, - // { slot: "groupOwnerId", label: "群主" }, - // ]; - // }, + colConfigs1() { + return [ + { label: "居民群", prop: "groupName" }, + { label: "群人数", prop: "memberCount" }, + { slot: "groupOwnerId", label: "群主" }, + ]; + }, }, onLoad(o) { this.id = o.id; diff --git a/src/apps/AppCooperationPropaganda/detail.vue b/src/apps/AppCooperationPropaganda/detail.vue index 34caa14e..1a6061e2 100644 --- a/src/apps/AppCooperationPropaganda/detail.vue +++ b/src/apps/AppCooperationPropaganda/detail.vue @@ -10,23 +10,22 @@
创建人 - + {{ data.createUserName }}
审批人 - - + {{ item.examineUserName }} +
所在部门 -
- +
{{ data.createUserDeptName }}
diff --git a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue index f093b28c..d93698e0 100644 --- a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue +++ b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue @@ -19,7 +19,7 @@
共需{{ item.groupOwnerCount || 0 }}名成员完成群发,目前已完成{{ item.completionRate || 0 }}%
创建部门: - {{ item.createUserDeptName }} +
diff --git a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue index 3fcb37a9..06908978 100644 --- a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue +++ b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue @@ -89,7 +89,16 @@ + v-if="tableData.length" + > + + + + @@ -133,7 +142,7 @@ export default { computed: { colConfigs0() { return [ - { prop: "groupOwnerName", label: "成员" }, + { slot: "groupOwnerId", label: "成员" }, { label: "预计送达居民群", prop: "groupCount" }, ]; }, diff --git a/src/project/saas/AppCooperationPropaganda/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue index ee4dfb76..34caa14e 100644 --- a/src/project/saas/AppCooperationPropaganda/detail.vue +++ b/src/project/saas/AppCooperationPropaganda/detail.vue @@ -9,21 +9,24 @@
创建人 - {{ data.createUserName }} + + +
审批人 - {{ item.examineUserName }} - + +
所在部门 -
{{ data.createUserDeptName }}
+
+