diff --git a/src/components/AiTable.vue b/src/components/AiTable.vue index ce106c86..1674f408 100644 --- a/src/components/AiTable.vue +++ b/src/components/AiTable.vue @@ -6,7 +6,7 @@ - +

{{ $dict.getLabel(col.dict, row[col.prop]) }}

{{ row[col.prop] || "-" }}

diff --git a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue index 25e984fc..b9f73daa 100644 --- a/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue +++ b/src/project/saas/AppCooperationPropaganda/AppCooperationPropaganda.vue @@ -129,24 +129,21 @@ 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("-"); @@ -172,7 +169,7 @@ export default { }, onShow() { document.title = '群发居民群' - this.getList() + // this.getList() this.$dict.load(['mstStatus']).then(() => { this.getList() }) diff --git a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue index c085fb36..8caa9d95 100644 --- a/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue +++ b/src/project/saas/AppCooperationPropaganda/cooperationDetail.vue @@ -65,11 +65,8 @@ :data="tableData" :colConfigs="tabIndex==0? colConfigs0 : colConfigs1" v-if="tableData.length"> - - + + @@ -107,7 +104,7 @@ export default { computed: { colConfigs0() { return [ - { slot: "groupOwnerId",label: "成员" }, + { slot: "groupOwnerId",label: "成员",prop: "groupOwnerId" }, { label: "预计送达居民群", prop: "groupCount" } ]; }, @@ -115,7 +112,7 @@ export default { return [ { label: "居民群",prop: "groupName" }, { label: "群人数", prop: "memberCount"}, - { slot: "groupOwnerId",label: "群主"} + { slot: "groupOwnerId",label: "群主",prop: "groupOwnerId" } ]; }, }, diff --git a/src/project/saas/AppCooperationPropaganda/detail.vue b/src/project/saas/AppCooperationPropaganda/detail.vue index 95b0eea3..0f10b181 100644 --- a/src/project/saas/AppCooperationPropaganda/detail.vue +++ b/src/project/saas/AppCooperationPropaganda/detail.vue @@ -65,7 +65,7 @@
-

小程序地址

+

小程序

{{item.mpTitle}}
diff --git a/src/project/saas/AppCooperationPropaganda/selectUser.vue b/src/project/saas/AppCooperationPropaganda/selectUser.vue index 8d1b8d12..f7effd3a 100644 --- a/src/project/saas/AppCooperationPropaganda/selectUser.vue +++ b/src/project/saas/AppCooperationPropaganda/selectUser.vue @@ -3,7 +3,7 @@
-
+
{{e.userId}}
@@ -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,7 +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=> { @@ -61,20 +60,27 @@ export default { this.userList.push(item) } }) + } }) }, 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] + console.log( this.selected) + // this.$forceUpdate() }, 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() }, diff --git a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue index 631b77dd..577f8915 100644 --- a/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue +++ b/src/project/saas/AppPropagandaStatistics/AppPropagandaStatistics.vue @@ -218,7 +218,7 @@ export default { nowDate: "", calendarList: [], colData: {}, - detailType: '0', + detailType: 0, timeType: "", departId: "", startTime: "", @@ -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(); @@ -563,7 +565,7 @@ export default { .then((res) => { if(res?.data) { let items = [], xData = [], yData = [] - res.data.map((item) => { + res.data.forEach((item) => { const i = {type: 'departmentName', id: item.deptId, corpid: this.user.corpId} items.push(i) yData.push(item.taskCount) @@ -572,9 +574,10 @@ export default { this.initOpenData({canvas:true}) this.transCanvas(items).then((data) => { - console.log(data.items,"data.items"); + // console.log(data.items,"data.items"); data.items.map((a) => { xData.push(a.data) + console.log( xData) }) console.log(xData, yData, '111222'); this.getColumnarEcharts(xData, yData)