Merge remote-tracking branch 'origin/dev' into dev

src/components/AiTable.vue

@@ -6,7 +6,7 @@
       </u-tr>
       <u-tr v-for="(row,j) in data" :key="j">
         <u-td v-for="(col,i) in colConfigs" :key="i" :width="col.width">
-          <slot v-if="col.slot" :name="col.slot"/>
+          <slot v-if="col.slot" :name="col.slot" :row="row"/>
           <p v-else-if="col.dict">{{ $dict.getLabel(col.dict, row[col.prop]) }}</p>
           <p v-else>{{ row[col.prop] || "-" }}</p>
         </u-td>

src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue

@@ -129,32 +129,29 @@ export default {
       this.startTime = '',
       this.endTime = ''
       this.userIdList = []
-      // uni.clearStorageSync('userSelect')  //清空会导致状态字典出问题
+      this.createUserId = ''
+      uni.clearStorageSync('userSelect')
       this.current = 1
       this.list = []
-      this.getList()
+      this.$dict.load(['mstStatus']).then(() => {
+        this.getList()
+      })
+      this.filterShow = false
     },
 
     selectConfirm() {
       if(this.userIdList.length) {
         this.createUserId = this.userIdList?.[0].userId
-        console.log(this.userIdList,'userIdList');
-        console.log(this.createUserId,'createUserId');
       }
 
-      // let arr = this.userIdList
-      // console.log(arr[0],222);
-      // console.log(this.userIdList,111);
-
-
       this.start = this.startTime,
       this.end = this.endTime
       let startTmp = this.start.split("-");
       let endTmp = this.end.split("-");
       let stT = new Date(startTmp[0], startTmp[1], startTmp[2]);
       let edT = new Date(endTmp[0], endTmp[1], endTmp[2]);
-      if (stT.getTime() >= edT.getTime()) {
-        this.$u.toast("开始日期不能大于或等于结束日期！");
+      if (stT.getTime() > edT.getTime()) {
+        this.$u.toast("开始日期不能大于结束日期！");
         this.filterShow = true
         return
       }
@@ -172,7 +169,6 @@ export default {
   },
   onShow() {
     document.title = '群发居民群'
-    this.getList()
     this.$dict.load(['mstStatus']).then(() => {
       this.getList()
     })

src/project/saas/AppCooperationPropaganda/cooperationDetail.vue

@@ -65,11 +65,9 @@
             :data="tableData"
             :colConfigs="tabIndex==0? colConfigs0 : colConfigs1"
             v-if="tableData.length">
-            <u-td slot="groupOwnerId" align="center">
-              <template #slot="{ row }">
-                <p>{{row}}</p>
-                <AiOpenData v-if="row.groupOwnerId" type="userName" :openid="row.groupOwnerId"/>
-              </template>
+            <u-td slot="groupOwnerId" slot-scope="{row}">
+              <!-- <p>{{row.groupOwnerId}}</p> -->
+              <AiOpenData v-if="row.groupOwnerId" type="userName" :openid="row.groupOwnerId"/>
             </u-td>
           </AiTable>
           <AiEmpty v-if="!tableData.length" description="暂无数据"></AiEmpty>
@@ -115,7 +113,7 @@ export default {
       return [
         { label: "居民群",prop: "groupName" },
         { label: "群人数", prop: "memberCount"},
-        { slot: "groupOwnerId",label: "群主"}
+        { slot: "groupOwnerId",label: "群主" }
       ];
     },
   },

src/project/saas/AppCooperationPropaganda/detail.vue

@@ -65,7 +65,7 @@
           </div>
           <!-- 小程序 -->
           <div class="miniapp" v-show="miniapp.length">
-            <p>小程序地址</p>
+            <p>小程序</p>
             <div v-for="(item, index) in miniapp" :key="index">{{item.mpTitle}}</div>
           </div>
         </div>

src/project/saas/AppCooperationPropaganda/selectUser.vue

@@ -3,8 +3,8 @@
     <div class="header-middle">
       <div class="userCards" v-for="e in userList" :key="e.userId">
         <div class="imges">
-          <div class="imgselect" :class="{ checked: e.isChecked }" @click.stop="itemCheck(e)" />
-          <img src="./images/tx@2x.png" alt="" class="avatras"/> {{e.userId}}
+          <div class="imgselect" :class="{ 'checked': e.isChecked }" @click.stop="itemCheck(e)" />
+          <img src="./images/tx@2x.png" alt="" class="avatras"/>
         </div>
         <div class="rights fill">
           <div class="applicationNames">
@@ -41,11 +41,10 @@ export default {
   onLoad() {
     this.selected = uni.getStorageSync('userSelect') || []
     this.getDeptsAndUsersByParent()
-    console.log(this.selected);
   },
   methods: {
     isSelected(id) {
-      return !!this.selected.find(e => e.id == id)
+      return this.selected.userId===id
     },
     getDeptsAndUsersByParent() {
       this.userList = []
@@ -53,8 +52,7 @@ export default {
         params: {}
       }).then(res => {
         if (res?.data) {
-          let userArr = res.data.records.map(e => ({userId: e.createUserId, isChecked: this.isSelected(e.id)}))
-          // 数组去重
+          let userArr = res.data.records.map(e => ({userId: e.createUserId, isChecked: this.isSelected(e.createUserId)}))
           this.userList = []
           userArr.forEach(item=> {
             if(!this.userList.find(o=> o.userId === item.userId)) {
@@ -66,15 +64,17 @@ export default {
     },
     itemCheck(row) {
       this.userList.forEach(e => e.isChecked = false)
-      row.isChecked = !row.isChecked
-      this.selected[0] = this.userList.filter(e => e.isChecked == true)
-      this.$forceUpdate()
+      const index = this.userList.findIndex(o => {
+        return row.userId===o.userId
+      })
+      this.userList[index].isChecked = true
+      this.selected = this.userList[index]
     },
     submit() {
-      if(!this.selected.length) {
+      if(!this.selected.userId) {
         return this.$u.toast('请选择创建人')
       }
-      uni.$emit("pagePicker:custom", this.selected)
+      uni.$emit("pagePicker:custom", [this.selected])
       uni.setStorageSync('userSelect', this.selected)
       uni.navigateBack()
     },

src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue

@@ -218,7 +218,7 @@ export default {
       nowDate: "",
       calendarList: [],
       colData: {},
-      detailType: '0',
+      detailType: 0,
       timeType: "",
       departId: "",
       startTime: "",
@@ -255,7 +255,7 @@ export default {
     ...mapState(['user'])
   },
   methods: {
-    ...mapActions(['initOpenData', 'transCanvas']),
+    ...mapActions(['initOpenData', 'transCanvas','selectEnterpriseContact']),
     checkTime(index) {
       if (index == 3) {
         this.timeSelect = index;
@@ -278,6 +278,8 @@ export default {
       this.end = "";
       this.departId = "";
       this.departmentId = "";
+      this.getBrokenDate()
+      this.filterShow = false;
     },
 
     selectConfirm() {
@@ -286,7 +288,7 @@ export default {
         this.start = this.startTime;
         this.end = this.endTime;
       } else {
-        this.detailType = this.timeSelect;
+        this.detailType = this.timeSelect || 0;
       }
       this.departId = this.departmentId
       this.getBrokenDate();
@@ -308,8 +310,8 @@ export default {
       let endTmp = this.end.split("-");
       let stT = new Date(startTmp[0], startTmp[1], startTmp[2]);
       let edT = new Date(endTmp[0], endTmp[1], endTmp[2]);
-      if (stT.getTime() >= edT.getTime()) {
-        this.$u.toast("开始日期不能大于或等于结束日期！");
+      if (stT.getTime() > edT.getTime()) {
+        this.$u.toast("开始日期不能大于结束日期！");
         this.customShow = true
         return
       }
@@ -561,24 +563,26 @@ export default {
           },
         })
         .then((res) => {
-          if(res?.data) {
-            let items = [], xData = [], yData = []
-            res.data.map((item) => {
-              const i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId}
-              items.push(i)
-              yData.push(item.taskCount)
-            })
-            
-            this.initOpenData({canvas:true})
-
-            this.transCanvas(items).then((data) => {
-              console.log(data.items,"data.items");
-              data.items.map((a) => {
-                xData.push(a.data)
+          if (res.code ===0) {
+            if(res.data && res.data.length) {
+              let items = [], xData = [], yData = []
+              res.data.forEach((item) => {
+                const i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId}
+                items.push(i)
+                yData.push(item.taskCount)
               })
-              console.log(xData, yData, '111222');
-              this.getColumnarEcharts(xData, yData)
-            })
+             
+              this.initOpenData({canvas:true})
+              setTimeout(() => {
+                this.transCanvas(items).then((data) => {
+                  data.items.map((a) => {
+                    xData.push(a.data)
+                  })
+                  this.getColumnarEcharts(xData, yData)
+                })
+              },600)
+              
+            }
           }
         });
     },
@@ -627,9 +631,7 @@ export default {
         ],
       });
     },
-
     // 选择部门
-    ...mapActions(['selectEnterpriseContact']),
     getDept() {
       this.selectEnterpriseContact({
         fromDepartmentId: 0,