宣发

src/project/saas/AppCooperationPropaganda/cooperationDetail.vue

@@ -55,7 +55,7 @@
       <div class="list_content">
         <div class="list_card">
           <div class="tab">
-            <u-subsection :list="subsection" :current="subIndex"></u-subsection>
+            <u-subsection :list="subsection" :current="subIndex" @change="changeSub"></u-subsection>
           </div>
           <AiTable
             :data="tableData"
@@ -172,6 +172,11 @@ export default {
       }
     },
 
+    changeSub(index) {
+      this.subIndex = index;
+      this.getStatistics()
+    },
+
     getStatistics() {
       this.$http
         .post(`/app/appmasssendingtask/detailStatistics`, null, {

src/project/saas/AppCooperationPropaganda/detail.vue

@@ -9,11 +9,16 @@
         </div>
         <div class="item">
           <span>创建人</span>
-          <span>{{ data.createUserId }}</span>
+          <span>
+            <AiOpenData type="userName" :openId="data.createUserId"></AiOpenData>
+          </span>
         </div>
         <div class="item">
           <span>所在部门</span>
-          <span>{{ data.createUserDept }}</span>
+          <span>
+            <span v-if="data.createUserDept">/<AiOpenData type="userName" :openId="data.createUserDept" style="display: inline-block"></AiOpenData></span>
+            <span v-if="data.createUserSecondDept">/<AiOpenData type="userName" :openId="data.createUserSecondDept" style="display: inline-block"></AiOpenData></span>
+          </span>
         </div>
         <div class="item">
           <span>群发时间</span>
@@ -111,6 +116,7 @@ export default {
   },
   onShow() {
     document.title = "群发审批"
+    this.getDetail()
   }
 }
 </script>

src/project/saas/AppCooperationPropaganda/selectUser.vue

@@ -52,21 +52,21 @@ export default {
         params: {}
       }).then(res => {
         if (res?.data) {
-          this.userList = res.data.records.map(e => ({userId: e.createUserId, isChecked: this.isSelected(e.id)}))
-          console.log(this.userList, '123456');
+          let userArr = res.data.records.map(e => ({userId: e.createUserId, isChecked: this.isSelected(e.id)}))
+          // 数组去重
+          this.userList = []
+          userArr.forEach(item=> {
+            if(!this.userList.find(o=> o.userId === item.userId)) {
+              this.userList.push(item)
+            }
+          })
         }
       })
     },
     itemCheck(row) {
+      this.userList.forEach(e => e.isChecked = false)
       row.isChecked = !row.isChecked
-      if (row.isChecked) {
-        this.selected[0] = row
-      }
-      console.log(this.selected, '胡很顾及到凤凰国际');
-      //  else {
-      //   let index = this.selected.findIndex(e => e.id == row.id)
-      //   this.selected.splice(index, 1)
-      // }
+      this.selected[0] = this.userList.filter(e => e.isChecked == true)
       this.$forceUpdate()
     },
     submit() {

src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue

@@ -554,6 +554,7 @@ export default {
         ],
       });
     },
+    // ...mapActions(['initOpenData', 'transCanvas']),
     // 宣发明细
     getColData() {
       this.$http
@@ -563,13 +564,27 @@ export default {
           },
         })
         .then((res) => {
-          if (res?.data) {
-            console.log(res);
-            this.colData = res.data;
-          }
+          // if(res.data && res.data.length) {
+          //   this.isDepartData = true
+          //   let items = [], xData = [], yData = []
+          //   res.data.map((item) => {
+          //     var i = {type: 'departmentName', id: item.deptId, corpid: this.user.info.corpId}
+          //     items.push(i)
+          //     yData.push(item.taskCount)
+          //   })
+          //   this.initOpenData({canvas:true})
+          //   this.transCanvas(items).then((data) => {
+          //     data.items.map((i) => {
+          //       xData.push(i.data)
+          //     })
+          //     this.getColumnarEcharts(xData, yData)
+          //   })
+          // }else {
+          //   this.isDepartData = false
+          // }
         });
     },
-    getColumnarEcharts() {
+    getColumnarEcharts(xData, yData) {
       this.columnarEcharts = echarts.init(
         document.getElementById("columnarEcharts")
       );
@@ -589,7 +604,7 @@ export default {
           axisLine: {
             show: false,
           },
-          data: ["卫健委", "法院", "团委", "扶贫办", "警察局"],
+          data: xData,
         },
         yAxis: {
           type: "value",
@@ -602,7 +617,7 @@ export default {
         },
         series: [
           {
-            data: [120, 200, 150, 80, 70, 110, 130],
+            data: yData,
             itemStyle: {
               normal: {
                 color: "#5087ec",