恢复

src/apps/AppCooperationPropaganda/AppCooperationPropaganda.vue

@@ -22,7 +22,7 @@
         <div>共需<span class="num">{{ item.groupOwnerCount || 0 }}</span>名成员完成群发，目前已完成<span class="num">{{ item.completionRate || 0 }}%</span></div>
         <div>
           创建部门：
-          <span v-if="item.createUserDept"><AiOpenData type="departmentName" :openid="item.createUserDept" style="display: inline-block" /></span>
+          <span v-if="item.createUserDeptName">{{ item.createUserDeptName }}</span>
           <!-- <span v-if="item.createUserSecondDept"><AiOpenData type="departmentName" :openid="item.createUserSecondDept" style="display: inline-block" /></span> -->
         </div>
       </div>

src/apps/AppCooperationPropaganda/cooperationDetail.vue

@@ -78,17 +78,8 @@
 
           <AiTable
             :data="tableData"
-            :colConfigs="colConfigs"
+            :colConfigs="tabIndex == 0 ? colConfigs0 : colConfigs1"
-            v-if="tableData.length"
+            v-if="tableData.length"/>
-          >
-            <u-td slot="groupOwnerId" slot-scope="{ row }" style="border: none;">
-              <AiOpenData
-                v-if="row.groupOwnerId"
-                type="userName"
-                :openid="row.groupOwnerId"
-              />
-            </u-td>
-          </AiTable>
           <AiEmpty v-if="!tableData.length" description="暂无数据"></AiEmpty>
         </div>
       </div>
@@ -124,19 +115,19 @@ export default {
     };
   },
   computed: {
-    colConfigs() {
+    colConfigs0() {
       return [
-        { slot: "groupOwnerId", label: "成员" },
+        { prop: "groupOwnerName", label: "成员" },
         { label: "预计送达居民", prop: "groupCount" },
       ];
     },
-    // colConfigs1() {
+    colConfigs1() {
-    //   return [
+      return [
-    //     { label: "居民群", prop: "groupName" },
+        { label: "居民群", prop: "groupName" },
-    //     { label: "群人数", prop: "memberCount" },
+        { label: "群人数", prop: "memberCount" },
-    //     { slot: "groupOwnerId", label: "群主" },
+        { slot: "groupOwnerId", label: "群主" },
-    //   ];
+      ];
-    // },
+    },
   },
   onLoad(o) {
     this.id = o.id;

src/apps/AppCooperationPropaganda/detail.vue

@@ -10,23 +10,22 @@
         <div class="item">
           <span>创建人</span>
           <span>
-            <AiOpenData type="userName" :openid="data.createUserId"></AiOpenData>
+            {{ data.createUserName }}
           </span>
         </div>
         <div class="item" v-if="data.enableExamine == 1">
           <span>审批人</span>
           <span>
             <span v-for="(item, index) in approver" :key="index" style="color: #333;">
-              <AiOpenData type="userName" :openid="item.examineUserId" style="display: inline-block"></AiOpenData>
+              {{ item.examineUserName }}
-              <span v-if="approver.length>1">、</span>
+              <span v-show="index < approver.length - 1">、</span>
             </span>
           </span>
         </div>
         <div class="item">
           <span>所在部门</span>
           <span style="display: flex;">
-            <div v-if="data.createUserDept"><AiOpenData type="departmentName" :openid="data.createUserDept" style="display: inline-block;"></AiOpenData></div>
+            <div v-if="data.createUserDeptName">{{ data.createUserDeptName }}</div>
-            <!-- <div v-if="data.createUserSecondDept"><AiOpenData type="departmentName" :openId="data.createUserSecondDept" style="display: inline-block"></AiOpenData></div> -->
           </span>
         </div>
         <div class="item">

src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue

@@ -19,7 +19,7 @@
         <div>共需<span class="num">{{ item.groupOwnerCount || 0 }}</span>名成员完成群发，目前已完成<span class="num">{{ item.completionRate || 0 }}%</span></div>
         <div>
           创建部门：
-          <span v-if="item.createUserDeptName">{{ item.createUserDeptName }}</span>
+          <span v-if="item.createUserDept"><AiOpenData type="departmentName" :openid="item.createUserDept" style="display: inline-block" /></span>
         </div>
       </div>
     </div>

src/project/saas/AppCooperationPropaganda/cooperationDetail.vue

@@ -89,7 +89,16 @@
           <AiTable
             :data="tableData"
             :colConfigs="tabIndex == 0 ? colConfigs0 : colConfigs1"
-            v-if="tableData.length"/>
+            v-if="tableData.length"
+          >
+            <u-td slot="groupOwnerId" slot-scope="{ row }" style="border: none;">
+              <AiOpenData
+                v-if="row.groupOwnerId"
+                type="userName"
+                :openid="row.groupOwnerId"
+              />
+            </u-td>
+          </AiTable>
           <AiEmpty v-if="!tableData.length" description="暂无数据"></AiEmpty>
         </div>
       </div>
@@ -133,7 +142,7 @@ export default {
   computed: {
     colConfigs0() {
       return [
-        { prop: "groupOwnerName", label: "成员" },
+        { slot: "groupOwnerId", label: "成员" },
         { label: "预计送达居民群", prop: "groupCount" },
       ];
     },

src/project/saas/AppCooperationPropaganda/detail.vue

@@ -9,21 +9,24 @@
         </div>
         <div class="item">
           <span>创建人</span>
-          <span>{{ data.createUserName }}</span>
+          <span>
+            <AiOpenData type="userName" :openid="data.createUserId"></AiOpenData>
+          </span>
         </div>
         <div class="item" v-if="data.enableExamine == 1">
           <span>审批人</span>
           <span>
             <span v-for="(item, index) in approver" :key="index" style="color: #333;">
-              {{ item.examineUserName }}
+              <AiOpenData type="userName" :openid="item.examineUserId" style="display: inline-block"></AiOpenData>
-              <span v-show="index < approver.length - 1">、</span>
+              <span v-if="approver.length>1">、</span>
             </span>
           </span>
         </div>
         <div class="item">
           <span>所在部门</span>
           <span style="display: flex;">
-            <div v-if="data.createUserDeptName">{{ data.createUserDeptName }}</div>
+            <div v-if="data.createUserDept"><AiOpenData type="departmentName" :openid="data.createUserDept" style="display: inline-block;"></AiOpenData></div>
+            <!-- <div v-if="data.createUserSecondDept"><AiOpenData type="departmentName" :openId="data.createUserSecondDept" style="display: inline-block"></AiOpenData></div> -->
           </span>
         </div>
         <div class="item">