diff --git a/config/index.js b/config/index.js index fe397f12..2c5eeffb 100644 --- a/config/index.js +++ b/config/index.js @@ -12,8 +12,8 @@ module.exports = { proxyTable: { "/api": { // 请求的目标主机 - // target: 'http://116.255.223.226:8081/nsgk_test/', - target: 'http://localhost:8080/', + target: 'http://116.255.223.226:8081/nsgk_test/', + // target: 'http://localhost:8080/', changeOrigin: true, pathRewrite: { '^/api': '' diff --git a/src/api/onlineHome/bankAgriculture/paymentApproval.js b/src/api/onlineHome/bankAgriculture/paymentApproval.js index e91352d0..0a795451 100644 --- a/src/api/onlineHome/bankAgriculture/paymentApproval.js +++ b/src/api/onlineHome/bankAgriculture/paymentApproval.js @@ -345,3 +345,12 @@ export function selectApprovalByTemplateId(templateId) { method: 'get' }) } + +// 撤回 +export function updateTYinnongTransferFoStatus(data) { + return request({ + url: '/yinnong/transfer/updateTYinnongTransferFoStatus', + method: 'post', + data: data + }) +} diff --git a/src/assets/images/sunVillage_info/name_icon.png b/src/assets/images/sunVillage_info/name_icon.png new file mode 100644 index 00000000..9126df85 Binary files /dev/null and b/src/assets/images/sunVillage_info/name_icon.png differ diff --git a/src/permission.js b/src/permission.js index 52a1618c..5aeff49c 100644 --- a/src/permission.js +++ b/src/permission.js @@ -121,6 +121,7 @@ const whiteList = [ '/sunVillage_info/list_issues_detail', //详情页 '/sunVillage_info/list_finance_detail', //详情页 '/sunVillage_info/list_finance_ranking', //详情页 + '/sunVillage_info/list_tourists_ranking', //详情页 ] router.beforeEach((to, from, next) => { diff --git a/src/router/index.js b/src/router/index.js index 23305844..64f37da8 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3079,6 +3079,15 @@ export const constantRoutes = [ hidden: true, }, component: (resolve) => require(['@/views/sunVillage_info/list_issues_edit'], resolve) + }, + { ////阳光村务（新）-- 合同信息 + path: '/sunVillage_info/list_tourists_ranking', + name: 'sunVillageInfoListTouristsRanking', + meta: { + title: '零工公式公布榜', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_tourists_ranking'], resolve) } ]; diff --git a/src/views/sunVillage_info/list_finance_ranking.vue b/src/views/sunVillage_info/list_finance_ranking.vue index 60999b51..f84290f8 100644 --- a/src/views/sunVillage_info/list_finance_ranking.vue +++ b/src/views/sunVillage_info/list_finance_ranking.vue @@ -1,61 +1,86 @@ diff --git a/src/views/sunVillage_info/list_tourists.vue b/src/views/sunVillage_info/list_tourists.vue index 9a30956a..6e12b407 100644 --- a/src/views/sunVillage_info/list_tourists.vue +++ b/src/views/sunVillage_info/list_tourists.vue @@ -45,6 +45,9 @@
+
+ +
@@ -169,6 +172,9 @@ goEdit(id){ this.$router.push({path:'/sunVillage_info/list_tourists_edit',query: {id:id,type:'finance'}}) }, + goRanking(id,time){ + this.$router.push({path:'/sunVillage_info/list_tourists_ranking',query: {id:id,time:time}}) + }, goRemove(id){ this.$dialog.alert({ title: '提示', @@ -376,6 +382,7 @@ } &.view{ background: #3494ff; + margin-left: 28px; .icon { width: 29px; height: 21px; @@ -384,6 +391,16 @@ display: block; } } + &.list{ + background: #79cf13; + .icon { + width: 29px; + height: 21px; + background: url('../../assets/images/sunVillage_info/list_icon_10.png') no-repeat; + background-size: 100% 100%; + display: block; + } + } } } } diff --git a/src/views/sunVillage_info/list_tourists_ranking.vue b/src/views/sunVillage_info/list_tourists_ranking.vue new file mode 100644 index 00000000..af1111d2 --- /dev/null +++ b/src/views/sunVillage_info/list_tourists_ranking.vue @@ -0,0 +1,553 @@ + + + + + diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue index d77b5ef0..4c95e27b 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList.vue @@ -43,6 +43,9 @@ + + + @@ -51,7 +54,7 @@ diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue index b90fad2f..fbc118c2 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList11.vue @@ -41,6 +41,9 @@ + + + @@ -63,7 +66,8 @@ export default { pageNum:1, pageSize:10, cashType: '11', - } + }, + form:{} }; }, created() { @@ -137,7 +141,30 @@ export default { .catch(() => { // on cancel }); - } + }, + cancelApply(row) { + console.log(row) + const instanceId = row.instanceId; + this.form.id = row.id; + this.form.auditStatus = "0"; + this.form.applyUserId = ""; + this.form.applyUserName = ""; + this.form.applyTime = ""; + this.form.instanceId = ""; + this.form.processKey = ""; + let that = this; + this.$dialog.confirm({ + message: '您确认撤回待审数据？', + }) + .then(function () { + return updateTYinnongTransferFoStatus(that.form).then(response => { + setTimeout(function(){ + history.go(0) + },2000) + that.$toast.success('撤回成功'); + }); + }) + }, }, } diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList12.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList12.vue index b40908fe..959108e0 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList12.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList12.vue @@ -41,6 +41,9 @@ + + + @@ -63,7 +66,8 @@ export default { pageNum:1, pageSize:100, cashType: '12', - } + }, + form:{} }; }, created() { @@ -136,7 +140,30 @@ export default { .catch(() => { // on cancel }); - } + }, + cancelApply(row) { + console.log(row) + const instanceId = row.instanceId; + this.form.id = row.id; + this.form.auditStatus = "0"; + this.form.applyUserId = ""; + this.form.applyUserName = ""; + this.form.applyTime = ""; + this.form.instanceId = ""; + this.form.processKey = ""; + let that = this; + this.$dialog.confirm({ + message: '您确认撤回待审数据？', + }) + .then(function () { + return updateTYinnongTransferFoStatus(that.form).then(response => { + setTimeout(function(){ + history.go(0) + },2000) + that.$toast.success('撤回成功'); + }); + }) + }, }, } diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList2.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList2.vue index 357ff9a1..529304a5 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalList2.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalList2.vue @@ -41,6 +41,9 @@ + + + @@ -49,7 +52,7 @@