diff --git a/packages/wxwork/AppMassNotification/components/Add.vue b/packages/wxwork/AppMassNotification/components/Add.vue
index fa28190b..7933039e 100644
--- a/packages/wxwork/AppMassNotification/components/Add.vue
+++ b/packages/wxwork/AppMassNotification/components/Add.vue
@@ -15,20 +15,16 @@
-
居民群
居民
-
-
-
@@ -131,11 +127,7 @@ export default {
contentType: 'text',
fileList: [],
organization: '',
- deptList: [{
- corpId: "",
- objList: [],
- tagId: [],
- }],
+ deptList: [],
},
tags: [],
subTags: {},
@@ -151,10 +143,6 @@ export default {
imgs: [],
videos: [],
files: [],
- // orgIdList: '',
- // orgNameList: [],
- // orgSelect: '',
- // orgAllList: [],
rules: {
content: [{required: true, message: '请输入群发内容'}],
messageSource: [{required: true, message: '请选择群发方式'}],
@@ -162,7 +150,6 @@ export default {
},
}
},
-
computed: {
...mapState(['user']),
tagsChange() {
@@ -174,37 +161,16 @@ export default {
return this.form.areaId = this.areaId.toString();
},
},
- // watch: {
- // orgNameList: {
- // handler: function (v) {
- // this.orgSelect = `已选择${v.length}个组织`
- // }
- // }
- // },
-
created() {
if (this.$route.query.id) {
this.getInfo()
}
this.areaRootId = [this.user.info.areaId.substr(0, 6), '000000'].join("")
},
-
-
methods: {
handleAreaSelect(v) {
this.areaName = v?.[0]?.label
},
-
- // 标签
- // getSubTags() {
- // this.instance.post(`/app/wxcp/wxgroupchattag/listAllByCorp?dvcpId=${this.orgIdList}`).then(res => {
- // if (res?.data) {
- // console.log(res);
- // this.subTags = res.data.records
- // }
- // })
- // },
-
getInfo() {
this.instance.post(`/app/pushmessage/detail?id=${this.$route.query.id}`).then(res => {
if (res?.data) {
@@ -270,7 +236,7 @@ export default {
cancel(isRefresh) {
this.$emit('change', {
type: 'List',
- isRefresh: isRefresh ? true : false
+ isRefresh: !!isRefresh
})
}
}
diff --git a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
index 3f14a1cc..fb94055b 100644
--- a/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
+++ b/packages/wxwork/AppMassNotification/components/SelectDeptUser.vue
@@ -46,7 +46,7 @@ export default {
},
computed: {
selectText: v => v.value?.length > 0 ? "已选择" : "请选择",
- tagAction: v => v.source == 1 ? '/app/wxcp/wxgroupchattag/listAllByCorp' : '/app/wxcp/wxcorptag/listAllByCorp'
+ tagAction: v => v.source == 2 ? '/app/wxcp/wxgroupchattag/listAllByCorp' : '/app/wxcp/wxcorptag/listAllByCorp'
},
data() {
return {
@@ -80,7 +80,10 @@ export default {
},
getTagsByCorp(dvcpCorpId) {
return this.instance.post(this.tagAction, null, {
- params: {dvcpCorpId, size: 9999}
+ params: {
+ dvcpCorpId,
+ size: 9999
+ }
}).then(res => {
if (res?.data) {
return this.tagOps = res.data.records || []
@@ -105,7 +108,7 @@ export default {
params: {departmentId, status: 1, cid}
}).then(res => {
if (res?.data) {
- res.data = res.data.map(e => ({...e, kind: "user"}))
+ res.data = res.data.map(e => ({...e, kind: "user", checked: false}))
this.options = [this.options, res.data].flat()
}
})
@@ -157,7 +160,6 @@ export default {
return !!this.selected.find(e => e.uid == uid)
},
handleCheck(row, i) {
- row.checked = !row.checked
if (row.checked) {
this.selected.push(row)
} else {
diff --git a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
index 3801c1b9..87f996a1 100644
--- a/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
+++ b/project/sanjianxi/apps/AppScoreRules/AppScoreRules.vue
@@ -81,10 +81,10 @@
-
- 常规
- 区间
- 阶梯
+
+ 常规
+ 区间
+ 阶梯
@@ -193,7 +193,10 @@ export default {
],
tableData: [],
dialog: false,
- form: {ladderRule: []},
+ form: {
+ ladderRule: [],
+ pass: 0,
+ },
formRules: {
eventType: [{required: true, message: "请选择事件/类型", trigger: "change"}],
scoringCycle: [{required: true, message: "请选择周期范围", trigger: "change"}],
@@ -206,6 +209,7 @@ export default {
integralData: [],
innerVisible: false,
table: {},
+
};
},
created() {
@@ -252,8 +256,9 @@ export default {
})
},
- typeChange() {
- this.form.integral = ''
+ typeChange(val) {
+ // console.log(val);
+ this.form.pass = val
},
handleInputFrom(event) {