diff --git a/examples/router/axios.js b/examples/router/axios.js
index 39162cdd..6d780491 100644
--- a/examples/router/axios.js
+++ b/examples/router/axios.js
@@ -15,6 +15,8 @@ instance.interceptors.request.use(config => {
config.baseURL = "/saas"
} else if (/\/tianfuxing/.test(location.pathname)) {
config.baseURL = "/tfx"
+ } else if (/\/qianxinan/.test(location.pathname)) {
+ config.baseURL = "/qxn"
} else if (/\/xiushan/.test(location.pathname)) {
config.baseURL = "/xsjr"
} else if (/project\/oms/.test(location.pathname)) {
diff --git a/project/pidu/app/AppGridMemberScore/components/ApplyList.vue b/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
index 64255ac1..470d23d2 100644
--- a/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
+++ b/project/pidu/app/AppGridMemberScore/components/ApplyList.vue
@@ -46,11 +46,27 @@
- 审核
+ 审核
+
+
+
+
+
+
+ 请根据申请事项和凭证选是否审核通过
+
+
@@ -91,7 +107,13 @@
}
],
tableData: [],
- total: 0
+ total: 0,
+ form: {applyIntegral: '', id: ''},
+ rules: {
+ applyIntegral: [{required: true, message: '请输入积分', trigger: 'blur' },
+ {pattern: /^([1-9]\d*|0)(\.\d{1,2})?$/, message: '请输入正数且最多只能保留两位小数'}],
+ },
+ dialog: false,
}
},
@@ -115,29 +137,29 @@
})
},
- operation (id) {
- this.$confirm('请根据申请事项和凭证选是否审核通过', {
- confirmButtonText: '审核通过',
- cancelButtonText: '审核拒绝',
- distinguishCancelAndClose: true
- }).then(() => {
- this.instance.post(`/app/appintegralmemberapply/auditApply?id=${id}&opType=1`).then(res => {
- if (res.code == 0) {
- this.$message.success('审核通过成功')
- this.getList()
- }
- })
- }).catch(action => {
- if (action === 'cancel') {
- this.instance.post(`/app/appintegralmemberapply/auditApply?id=${id}&opType=2`).then(res => {
- if (res.code == 0) {
- this.$message.success('审核拒绝成功')
- this.getList()
- }
- })
+ operation (row) {
+ this.dialog = true
+ this.form = {...row}
+ },
+
+ onConfirm() {
+ this.instance.post(`/app/appintegralmemberapply/auditApply?id=${this.form.id}&opType=1&applyIntegral=${this.form.applyIntegral}`).then(res => {
+ if (res.code == 0) {
+ this.$message.success('审核通过成功')
+ this.dialog = false
+ this.getList()
}
})
- }
+ },
+ onCancel() {
+ this.instance.post(`/app/appintegralmemberapply/auditApply?id=${this.form.id}&opType=2&applyIntegral=${this.form.applyIntegral}`).then(res => {
+ if (res.code == 0) {
+ this.$message.success('审核拒绝成功')
+ this.dialog = false
+ this.getList()
+ }
+ })
+ }
}
}
diff --git a/project/qianxinan/AppPointsDetails/AppPointsDetails.vue b/project/qianxinan/AppPointsDetails/AppPointsDetails.vue
index bf585ec1..9d6d6d96 100644
--- a/project/qianxinan/AppPointsDetails/AppPointsDetails.vue
+++ b/project/qianxinan/AppPointsDetails/AppPointsDetails.vue
@@ -9,10 +9,10 @@
:props="defaultProps" :show-all-levels="false" @change="gridChange">
-
导入
-
+ -->
@@ -129,7 +129,7 @@ export default {
{ prop: "girdName", label: '所属网格' },
{ prop: "integral", label: '积分余额', align: "center", sortable: "custom" },
{ prop: "totalIntegral", label: '累计积分', align: "center", sortable: "custom" },
- { prop: "usedIntegral", label: '已用积分', align: "center", sortable: "custom" },
+ // { prop: "usedIntegral", label: '已用积分', align: "center", sortable: "custom" },
{ slot: "options" },
]
},
diff --git a/vue.config.js b/vue.config.js
index fed6a8c0..babd81cf 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -127,6 +127,14 @@ module.exports = {
//地址重写
'^/tfx': '/'
}
+ },
+ '/qxn': {
+ target: 'http://192.168.1.87:12000',
+ changeOrigin: true,
+ pathRewrite: {
+ //地址重写
+ '^/qxn': '/'
+ }
}
},
disableHostCheck: true