diff --git a/src/manifest.json b/src/manifest.json
index 090968fb..5e9463ef 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -115,7 +115,7 @@
}
},
"/hzl": {
- "target": "http://192.168.1.87:39000/",
+ "target": "http://192.168.1.87:39010/",
"changeOrigin": true,
"pathRewrite": {
"^/hzl": "/"
diff --git a/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue b/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
index 61ba26bb..d5caa478 100644
--- a/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/AppCooperationPropagandaBeta.vue
@@ -154,7 +154,7 @@ export default {
},
toDetail(item) {
if(this.tabIndex == 0) {
- uni.navigateTo({url: `./cooperationDetail?id=${item.id}&time=${item.createTime}`})
+ uni.navigateTo({url: `./cooperationDetail?id=${item.id}&type=${this.sendType}`})
} else {
uni.navigateTo({url: `./circleDetail??id=${item.id}&type=${this.sendType}`})
}
diff --git a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
index f063230f..0a7f54fa 100644
--- a/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/addPropaganda.vue
@@ -154,40 +154,10 @@ export default {
choiceTime: '', // 定时发送时间
sendScope: '', // 0：全部居民群、1：按部门选择、2：按网格选择
sendType: '0', // 0：立即发送、1：定时发送
- wxGroups: [ // 发送范围
- // {
- // corpId: "ww596787bb70f08288",
- // errorCode: null,
- // errorMsg: null,
- // groupCount: 1,
- // groupIds: "wrytYEDgAAA5MGVJ3Ttb6ycbmxJ2Zv-Q",
- // groupNames: "111",
- // groupOwnerId: "d41d8cd98f00b204e9800998ecf8427e",
- // groupOwnerName: "张硕",
- // id: null,
- // msgId: null,
- // sendStatus: null,
- // sendTime: null,
- // taskId: null,
- // },
- // {
- // corpId: "ww596787bb70f08288",
- // errorCode: null,
- // errorMsg: null,
- // groupCount: 4,
- // groupIds: "wrytYEDgAA-Llt9H1jr40WT1_RfOstWQ,wrytYEDgAADava7QSJGicwZg09nG_GXg,wrytYEDgAAKG6qd39fHWFkrTiT9vsSQQ,wrytYEDgAAPxVpqyzf4kwzwvtdE0nqbQ",
- // groupNames: "慧政务需求沟通,临汾市政法委企微项目沟通,淄博企微项目沟通群,未命名群聊",
- // groupOwnerId: "XieJin",
- // groupOwnerName: "谢晋",
- // id: null,
- // msgId: null,
- // sendStatus: null,
- // sendTime: null,
- // taskId: null,
- // }
- ], // 送达居民群
+ wxGroups: [], // 送达居民群
filterCriteria: '',
taskEndTime: '', // 任务结束时间
+ sendChannel: 0,
},
forms: {
taskTitle: '',
diff --git a/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue b/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue
index 2dd39c45..7dda11ae 100644
--- a/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/circleDetail.vue
@@ -70,8 +70,6 @@ import echarts from "echarts";
export default {
data() {
return {
- tabs: ["成员统计", "居民群统计"],
- tabIndex: 0,
pieEcharts: null,
subIndex: 0,
tableData: [],
@@ -129,7 +127,7 @@ export default {
});
this.currentClickTime = +new Date();
let time = this.currentClickTime - this.firstClickTime;
- if (time >= 3600000) {
+ if (time >= 3600000) {
this.$http.post("/app/whchatmomentstask/remindSend", null, {
params: {
id: this.id,
diff --git a/src/project/huizhili/AppCooperationPropaganda/cooperationDetail.vue b/src/project/huizhili/AppCooperationPropaganda/cooperationDetail.vue
index 2cbc6f1b..59599d51 100644
--- a/src/project/huizhili/AppCooperationPropaganda/cooperationDetail.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/cooperationDetail.vue
@@ -20,7 +20,7 @@
{{ detail.taskTitle }} {{ $dict.getLabel('mstStatus', detail.status) }}
- 创建时间: {{ createTime }}
+ 创建时间: {{ info.createTime }}
@@ -108,7 +108,6 @@ export default {
subIndex0: 0,
subIndex1: 0,
tableData: [],
- createTime: "",
id: "",
info: {},
current: 1,
@@ -128,6 +127,7 @@ export default {
],
update0: true,
update1: false,
+ type: '',
};
},
computed: {
@@ -147,7 +147,7 @@ export default {
},
onLoad(o) {
this.id = o.id;
- this.createTime = o.time;
+ this.type = o.type
},
methods: {
tabClick(index) {
@@ -185,7 +185,7 @@ export default {
},
toDetail() {
- uni.navigateTo({ url: `./detail?id=${this.id}` });
+ uni.navigateTo({ url: `./detail?id=${this.id}&type=${this.type}` });
},
// 提醒发送
remindSend() {
diff --git a/src/project/huizhili/AppCooperationPropaganda/selectGridMember.vue b/src/project/huizhili/AppCooperationPropaganda/selectGridMember.vue
index 26fd3c4c..a8b074b8 100644
--- a/src/project/huizhili/AppCooperationPropaganda/selectGridMember.vue
+++ b/src/project/huizhili/AppCooperationPropaganda/selectGridMember.vue
@@ -59,7 +59,7 @@ export default {
this.$http.post('/app/appgirdinfo/listByInfo').then((res) => {
if (res?.data) {
let parents = res.data.map(e => e.parentGirdId)
- this.allData = res.data.map(e => ({...e, hasChildren: parents.includes(e.id)}))
+ this.allData = res.data.map(e => ({...e, isChecked: this.selected.find(i=> i.id == e.id), hasChildren: parents.includes(e.id)}))
this.gridInit()
}
}).then(()=> {
@@ -78,9 +78,7 @@ export default {
},
getGridsAndUsersByParent(id) {
- this.treeList = this.allData.filter(e => (e.parentGirdId == id)).map(v=> ({...v,isChecked:this.selected.find(i=>i.id == v.id)}))
- this.treeList
- this.$forceUpdate()
+ this.treeList = this.allData.filter(e => (e.parentGirdId == id)).map(v=> ({...v, isChecked: this.selected.find(i=>i.id == v.id)}))
},
girdNameClick(row, index) {
this.userList = []
@@ -97,7 +95,7 @@ export default {
if(row.isChecked) {
this.selected.push(row)
} else {
- let index=this.selected.findIndex(item=>row.id===item.id)
+ let index=this.selected.findIndex(item=>row.id == item.id)
index >= 0 && this.selected.splice(index, 1)
}
uni.setStorageSync('girdSelect', this.selected)