diff --git a/project/tianfuxing/AppLevelList/AppLevelList.vue b/project/tianfuxing/AppLevelList/AppLevelList.vue
index 121103ff..5742bf89 100644
--- a/project/tianfuxing/AppLevelList/AppLevelList.vue
+++ b/project/tianfuxing/AppLevelList/AppLevelList.vue
@@ -5,34 +5,34 @@
-
-
- 添加
-
-
-
-
- 上移
- 下移
- 编辑
- 删除
+
+
+ {{row.beginIntegral}}-{{row.endIntegral}}
+
+
+
+
+ 编辑
-
+
-
-
+
+
-
-
- -
-
+
+
+
+ -
+
+
+
@@ -51,9 +51,6 @@ export default {
},
data() {
return {
- search: {
- title: '',
- },
tableData: [],
page: {
size: 10,
@@ -61,35 +58,20 @@ export default {
total: 0,
},
visible: false,
- dialog: {
- title: '',
- },
dialogInfo: {},
formRules: {
- banner: [{required: true, message: '请添加banner封面', trigger: 'blur'}],
- title: [{required: true, message: '请输入主页名称', trigger: 'blur'}],
+ levelTitle: [{required: true, message: '请输入等级名称', trigger: 'blur'}],
+ beginIntegral: [{required: true, message: '请输入积分范围', trigger: 'blur' },
+ {pattern: /^([1-9]\d*|0)(\.\d{1,2})?$/, message: '请输入正数且最多只能保留两位小数'}],
+ endIntegral: [{required: true, message: '请输入积分范围', trigger: 'blur' },
+ {pattern: /^([1-9]\d*|0)(\.\d{1,2})?$/, message: '请输入正数且最多只能保留两位小数'}],
},
colConfigs: [
- {prop: 'showIndex', label: '等级', width: 120, align: 'center'},
- {prop: 'title', label: '等级名称', width: 150, align: 'center'},
- {prop: 'title', label: '积分范围', align: 'center'},
- {slot: 'option', label: '操作', width: 200, align: 'center'},
+ {prop: 'level', label: '等级', width: 120, align: 'center'},
+ {prop: 'levelTitle', label: '等级名称', align: 'center'},
+ {slot: 'beginIntegral'},
+ {slot: 'option'},
],
- miniAppColConfigs: [
- {prop: 'showIndex', label: '序号', width: 80, align: 'center'},
- {prop: 'icon', label: 'icon图片', slot: 'icon', align: 'center'},
- {prop: 'title', label: '积分范围',},
- {slot: 'option', label: '操作', align: 'center'},
- ],
- miniAppFormRules: {
- icon: [{required: true, message: '请添加icon图片', trigger: 'blur'}],
- title: [{required: true, message: '请输入应用名称', trigger: 'blur'}],
- accessPath: [{ required: true, message: '请输入页面路径', trigger: 'blur' }]
- },
- miniAppDialog: false,
- miniAppInfo: {},
- isAddMiniApp: false,
- editMiniIndex: '',
}
},
computed: {
@@ -101,28 +83,19 @@ export default {
mounted() {
},
methods: {
- add(row, title) {
- this.dialog.title = title
+ add(row) {
this.visible = true
- if(row && row.id) {
- this.instance.post(`/app/appwxapplication/queryDetailById?id=${row.id}`).then(res => {
- if (res?.code == 0) {
- this.dialogInfo = res.data
- this.dialogInfo.bannerList = [{url: this.dialogInfo.banner}]
- this.dialogInfo.wxApplicationList = this.dialogInfo.wxApplicationList || []
- }
- })
- }else {
- this.dialogInfo = {}
- this.dialogInfo.wxApplicationList = []
- }
+ this.dialogInfo = {...row}
},
addConfirm() {
this.$refs.ruleForm.validate((valid) => {
if (valid) {
- this.instance.post(`/app/appwxapplication/addOrUpdate`, {...this.dialogInfo}).then(res => {
+ if(Number(this.dialogInfo.beginIntegral) >= Number(this.dialogInfo.endIntegral)) {
+ return this.$message.error('请输入正确的积分范围')
+ }
+ this.instance.post(`/appintegrallevel/addOrUpdate`, {...this.dialogInfo}).then(res => {
if (res?.code == 0) {
- this.$message.success('新增成功')
+ this.$message.success('等级修改成功')
this.visible = false
this.getList()
}
@@ -130,101 +103,14 @@ export default {
}
})
},
- remove(id) {
- this.$confirm('删除后不可恢复，是否要删除该配置？', {
- type: 'error',
- }).then(() => {
- this.instance.post(`/app/appwxapplication/delete?ids=${id}`).then((res) => {
- if (res.code == 0) {
- this.$message.success('删除成功！')
- this.getList()
- }
- })
- })
- },
- addMiniApp(row, isAddMiniApp, index) {
- this.miniAppInfo = row || {}
- if(this.miniAppInfo.icon) {
- this.miniAppInfo.iconList = [{url: this.miniAppInfo.icon}]
- this.editMiniIndex = index
- }
- this.miniAppDialog = true
- this.isAddMiniApp = isAddMiniApp
- },
- removeMiniApp(row) {
- this.$confirm('删除后不可恢复，是否要删除该应用？', {
- type: 'error',
- }).then(() => {
- var showIndex = row.showIndex
- this.dialogInfo.wxApplicationList.map((item) => {
- if(item.showIndex > showIndex) {
- item.showIndex = item.showIndex - 1
- }
- })
- this.dialogInfo.wxApplicationList.splice(row.showIndex-1, 1)
- })
- },
- addMiniAppConfirm() {
- this.$refs.miniApppRuleForm.validate((valid) => {
- if (valid) {
- if(this.isAddMiniApp) { //新增
- this.miniAppInfo.showIndex = this.dialogInfo.wxApplicationList.length + 1
- this.dialogInfo.wxApplicationList.push(this.miniAppInfo)
- }else {
- this.dialogInfo.wxApplicationList[this.editMiniIndex] = this.miniAppInfo
- }
- this.miniAppDialog = false
- }
- })
- },
- top(row) {
- var list = JSON.parse(JSON.stringify(this.dialogInfo.wxApplicationList))
- var oldRow = list[row.showIndex - 2]
- oldRow.showIndex ++
- row.showIndex --
- list[row.showIndex - 1] = row
- list[row.showIndex] = oldRow
- this.$set(this.dialogInfo, 'wxApplicationList', list)
- },
- next(row) {
- var list = JSON.parse(JSON.stringify(this.dialogInfo.wxApplicationList))
- var oldRow = list[row.showIndex]
- oldRow.showIndex --
- row.showIndex ++
- list[row.showIndex-1] = row
- list[oldRow.showIndex-1] = oldRow
- this.$set(this.dialogInfo, 'wxApplicationList', list)
- },
- changeBanner(e) {
- this.dialogInfo.bannerList = e
- this.dialogInfo.banner = e[0].url
- },
- changeIcon(e) {
- this.miniAppInfo.iconList = e
- this.miniAppInfo.icon = e[0].url
- },
getList() {
- this.instance.post(`/app/appwxapplication/list`, null, {
+ this.instance.post(`/appintegrallevel/list`, null, {
params: {
- ...this.search,
...this.page,
},
- })
- .then((res) => {
+ }).then((res) => {
if (res.code == 0) {
- res.data.records.map((item) => {
- item.appNames = ''
- item.wxApplicationList.map((app, index) => {
- if(index == 0) {
- item.appNames = app.title
- }
- if(index > 0) {
- item.appNames = item.appNames + `,${app.title}`
- }
- })
- })
this.tableData = res.data.records
-
this.page.total = res.data.total
}
})
@@ -235,26 +121,15 @@ export default {
}
-
diff --git a/project/tianfuxing/AppTaskReview/AppTaskReview.vue b/project/tianfuxing/AppTaskReview/AppTaskReview.vue
index 1d1adebf..7bd00a82 100644
--- a/project/tianfuxing/AppTaskReview/AppTaskReview.vue
+++ b/project/tianfuxing/AppTaskReview/AppTaskReview.vue
@@ -3,22 +3,21 @@
-
+
-
+
-
+
-
+
通过
拒绝
@@ -75,18 +74,17 @@ export default {
computed: {
colConfigs() {
return [
- {slot: "title", align: "left"},
- {prop: "organizationName", label: "上传人", align: "center"},
- {prop: "electionMethod", label: "任务分类", align: "center",dict:"electionMethod"},
- {prop: "chooseNumber", label: "上传时间", align: "center"},
- {prop: "chooseNumber", label: "状态", align: "center"},
- {prop: "chooseNumber", label: "处理人", align: "center"},
+ {slot: "accessUrl", align: "left"},
+ {prop: "userName", label: "上传人", align: "center"},
+ {prop: "type", label: "任务分类", align: "center",dict:"electionMethod"},
+ {prop: "createTime", label: "上传时间", align: "center"},
+ {prop: "status", label: "状态", align: "center"},
+ {prop: "auditUserName", label: "处理人", align: "center"},
{slot: "options", },
]
},
rules() {
return {
- integralCalcType: [{required: true, message: '请选择类型', trigger: 'change'}],
integral: [{required: true, message: '请输入积分', trigger: 'blur' },
{pattern: /^([1-9]\d*|0)(\.\d{1,2})?$/, message: '请输入正数且最多只能保留两位小数'}],
}
@@ -97,13 +95,7 @@ export default {
this.$refs.form.validate((valid)=> {
if(valid) {
this.flag = true
- this.instance.post(`/app/appintegraluser/changeIntegral`,{
- ids: this.form.ids,
- eventDesc: this.form.eventDesc,
- enclosure: this.form.enclosure, // 附件
- integralCalcType: this.form.integralCalcType,
- integral: this.form.integral,
- }).then(res => {
+ this.instance.post(`/appwechatescalation/examine?id=${this.form.id}&pass=1&integral=${this.integral}`).then(res => {
if(res?.code == 0) {
this.$message.success('审核成功')
setTimeout(() =>{
@@ -125,16 +117,16 @@ export default {
},
refuse(row) {
this.$confirm('确定拒绝该任务？').then(() => {
- // this.instance.post(`/app/appvillagepicturealbum/delete?ids=${row.id}`).then(res => {
- // if (res.code == 0) {
- // this.$message.success('审核成功')
- // this.getList()
- // }
- // })
+ this.instance.post(`/appwechatescalation/examine?id=${row.id}&pass=0`).then(res => {
+ if (res.code == 0) {
+ this.$message.success('审核成功')
+ this.getList()
+ }
+ })
})
},
getList() {
- this.instance.post(`/app/appgeneralelectioninfo/list`,null,{
+ this.instance.post(`/appwechatescalation/list`,null,{
params: {
...this.page,
...this.search,
diff --git a/project/tianfuxing/AppUserList/AppUserList.vue b/project/tianfuxing/AppUserList/AppUserList.vue
index 2e7cdc5f..913201cb 100644
--- a/project/tianfuxing/AppUserList/AppUserList.vue
+++ b/project/tianfuxing/AppUserList/AppUserList.vue
@@ -5,7 +5,7 @@
-
+
@@ -51,7 +51,7 @@ export default {
data () {
return {
search: {
- title: '',
+ realName: '',
},
page: {
current: 1,
@@ -78,7 +78,7 @@ export default {
{prop: "organizationName", label: "手机号", align: "center"},
{prop: "electionMethod", label: "等级", align: "center",dict:"electionMethod"},
{prop: "chooseNumber", label: "积分数量", align: "center", sortable: "custom"},
- {slot: "options", },
+ {slot: "options"},
]
},
rules() {
@@ -133,7 +133,7 @@ export default {
},
getList() {
- this.instance.post(`/app/appgeneralelectioninfo/list`,null,{
+ this.instance.post(`/appwechatuser/list`,null,{
params: {
...this.page,
...this.search,
@@ -145,63 +145,6 @@ export default {
}
})
},
- toAdd(id) {
- this.$emit('change', {
- type: 'electionAdd',
- params: {
- id: id || '',
- }
- })
- },
- handleDelete(id) {
- this.$confirm('确定删除该数据？').then(() => {
- this.instance.post(`/app/appgeneralelectioninfo/delete?ids=${id}`).then(res=>{
- if(res.code == 0) {
- this.$message.success('删除成功！')
- this.getList()
- }
- })
- })
- },
- reset() {
- this.search = {
- status: '',
- title: '',
- }
- this.getList()
- },
- // 开启、结束
- startEnd(id, status) {
- let title = ''
- let bool = null
- let tips = ''
- if(status == 0) {
- title = '未到投票开始时间，确定要提前开始吗？'
- bool = true
- tips = '开启成功'
- } else if(status == 1) {
- title = '投票正在进行中，确定要提前结束吗？'
- bool = false
- tips = '结束成功'
- }
- this.$confirm(title).then(() => {
- this.instance.post(`/app/appgeneralelectioninfo/start-end?id=${id}&start=${bool}`).then(res=>{
- if(res.code == 0) {
- this.$message.success(tips)
- this.getList()
- }
- })
- })
- },
- // 统计
- toStatistics(id) {
- this.$emit('change', {
- type: 'Statistics',
- params: {
- id: id || '',
- }
- })
- },
}
}