diff --git a/src/api/onlineHome/bankAgriculture/paymentApproval.js b/src/api/onlineHome/bankAgriculture/paymentApproval.js index 7d2de691..da5a6384 100644 --- a/src/api/onlineHome/bankAgriculture/paymentApproval.js +++ b/src/api/onlineHome/bankAgriculture/paymentApproval.js @@ -8,6 +8,58 @@ export function listTransfer(query) { params: query }) } +// 查询银行转账待支付列表 +export function payList(query) { + return request({ + url: '/yinnong/transfer/payList', + method: 'get', + params: query + }) +} +// 查询银行转账支付记录列表 +export function payRecordList(query) { + return request({ + url: '/yinnong/transfer/payRecordList', + method: 'get', + params: query + }) +} +// 支付 +export function pay(query) { + return request({ + url: '/yinnong/transfer/pay', + method: 'get', + params: query + }) +} +export function sendSms(query) { + return request({ + url: '/yinnong/transfer/sendSms', + method: 'get', + params: query + }) +} +// 核实结果 +export function transactionStatusQuery(id) { + return request({ + url: '/yinnong/transfer/transactionStatusQuery/' + id, + method: 'get' + }) +} +// 支付复核 +export function editDoubleConfirmationStatus(id) { + return request({ + url: '/yinnong/transfer/editDoubleConfirmationStatus/' + id, + method: 'get' + }) +} +// 重置银行转账=撤回 +export function resetTYinnongTransfer(id) { + return request({ + url: '/yinnong/transfer/resetTYinnongTransfer/' + id, + method: 'get' + }) +} // 查询现金提现申请列表 export function listCash(query) { return request({ @@ -23,16 +75,17 @@ export function getTransfer(id) { method: 'get' }) } - -export function transactionStatusQuery(id) { +//重新申请 +export function reapply(id) { return request({ - url: '/yinnong/transfer/transactionStatusQuery/' + id, + url: '/yinnong/transfer/reapply/' + id, method: 'get' }) } -export function reapply(id) { +//取消支付 +export function reapplyDraft(id) { return request({ - url: '/yinnong/transfer/reapply/' + id, + url: '/yinnong/transfer/reapplyDraft/' + id, method: 'get' }) } diff --git a/src/api/onlineHome/villageAffairs.js b/src/api/onlineHome/villageAffairs.js index f52e05c8..6a31ed94 100644 --- a/src/api/onlineHome/villageAffairs.js +++ b/src/api/onlineHome/villageAffairs.js @@ -17,3 +17,14 @@ export function getVillageAffairs(id) { }) } +// 查询地区下的账套列表 +export function bookListByDept(deptId, bookType) { + return request({ + url: '/open/villageAffairs/public/bookList/' + deptId, + method: 'get', + params: { + bookType, + }, + }) +} + diff --git a/src/api/sunVillage_info/otherOpen.js b/src/api/sunVillage_info/otherOpen.js new file mode 100644 index 00000000..6f46afd1 --- /dev/null +++ b/src/api/sunVillage_info/otherOpen.js @@ -0,0 +1,65 @@ +import request from '@/utils/request' + +// 查询其他公开列表 +export function listOther(query) { + return request({ + url: '/subcontract/other/list', + method: 'get', + params: query + }) +} + +// 查询其他公开详细 +export function getOther(id) { + return request({ + url: '/subcontract/other/get/' + id, + method: 'get' + }) +} + +// 新增其他公开 +export function addOther(data) { + return request({ + url: '/subcontract/other/add', + method: 'post', + data: data + }) +} + +// 修改其他公开 +export function updateOther(data) { + return request({ + url: '/subcontract/other/edit', + method: 'post', + data: data + }) +} + +// 删除其他公开 +export function delOther(id) { + return request({ + url: '/subcontract/other/remove/' + id, + method: 'get' + }) +} + +// 查询其他公开列表 游客 +export function otherOpenList(query) { + return request({ + url: '/open/villageAffairs/public/otherPublicList', + method: 'get', + params: query + }) +} + +// 查询其他公开详细 游客 +export function otherOpenDetail(id) { + return request({ + url: '/open/villageAffairs/public/otherPublicDetail', + method: 'get', + params: { + id, + }, + }) +} + diff --git a/src/assets/images/icon/index_header_focus.png b/src/assets/images/icon/index_header_focus.png new file mode 100644 index 00000000..cbe5e768 Binary files /dev/null and b/src/assets/images/icon/index_header_focus.png differ diff --git a/src/assets/images/sunVillage_info/index_block_zonghegongkai.png b/src/assets/images/sunVillage_info/index_block_zonghegongkai.png new file mode 100644 index 00000000..b12f4364 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_block_zonghegongkai.png differ diff --git a/src/assets/images/sunVillage_info/index_code_btn_zonghegongkai.png b/src/assets/images/sunVillage_info/index_code_btn_zonghegongkai.png new file mode 100644 index 00000000..9f8bca40 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_code_btn_zonghegongkai.png differ diff --git a/src/assets/images/sunVillage_info/index_icon_14.png b/src/assets/images/sunVillage_info/index_icon_14.png new file mode 100644 index 00000000..9dfa910c Binary files /dev/null and b/src/assets/images/sunVillage_info/index_icon_14.png differ diff --git a/src/assets/images/sunVillage_info/index_icon_15.png b/src/assets/images/sunVillage_info/index_icon_15.png new file mode 100644 index 00000000..fc421b16 Binary files /dev/null and b/src/assets/images/sunVillage_info/index_icon_15.png differ diff --git a/src/components/common/PagedList.vue b/src/components/common/PagedList.vue index fb997fcc..544399db 100644 --- a/src/components/common/PagedList.vue +++ b/src/components/common/PagedList.vue @@ -48,6 +48,10 @@ export default { type: Function, default: null, }, + reload: { // 变更此值为true则重新加载数据 监听 + type: Boolean, + default: false, + }, }, components: { }, @@ -177,6 +181,15 @@ export default { console.log('[PagedList]: ', ...arguments); }, }, + watch: { + reload(newVal) { + if(newVal) + { + this.$emit('update:reload', false); + this.getList(); + } + }, + }, } diff --git a/src/components/form/FieldSelect.vue b/src/components/form/FieldSelect.vue index ee2608c0..bebd705b 100644 --- a/src/components/form/FieldSelect.vue +++ b/src/components/form/FieldSelect.vue @@ -14,6 +14,7 @@ :rules="rules" :required="required" :label-width="labelWidth || 'auto'" + :size="size || ''" > @@ -46,6 +47,7 @@ export default { 'remoteUrl', // 远程列表加载地址 String 'onRemoteResponse', // 远程获取到结果的处理回调 String|Function 如果是函数需返回数组, 如果是字符串支持.分割 'clearable', // 点击取消时清空绑定值 + 'size', ], watch: { value: function (newVal, oldVal) { diff --git a/src/permission.js b/src/permission.js index c39603a8..8d6bd2cf 100644 --- a/src/permission.js +++ b/src/permission.js @@ -140,6 +140,8 @@ const whiteList = [ '/sunVillage_info/list_contract_ranking', '/sunVillage_info/identity_check', '/sunVillage_info/assetMapOpen', + '/sunVillage_info/otherOpenVisitIndex', + '/sunVillage_info/otherOpenVisitDetail', // 新型经营主体 'newBusinessEntity/newsBulletin', //新闻公告 diff --git a/src/router/index.js b/src/router/index.js index 82f4d8c8..52364bd5 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3795,6 +3795,51 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/registration/registrationEdit'], resolve) }, + { ////阳光村务(新)-- 综合公开 + path: '/sunVillage_info/otherOpenIndex', + name: 'otherOpenIndex', + meta: { + title: '综合公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/otherOpen/otherOpenList'], resolve) + }, + { ////阳光村务(新)-- 综合公开详情 + path: '/sunVillage_info/otherOpenDetail', + name: 'otherOpenDetail', + meta: { + title: '综合公开详情', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/otherOpen/otherOpenDetail'], resolve) + }, + { ////阳光村务(新)-- 新增/编辑综合公开 + path: '/sunVillage_info/otherOpenEdit', + name: 'otherOpenEdit', + meta: { + title: '编辑综合公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/otherOpen/otherOpenEdit'], resolve) + }, + { ////阳光村务(新)-- 综合公开 游客 + path: '/sunVillage_info/otherOpenVisitIndex', + name: 'otherOpenVisitIndex', + meta: { + title: '综合公开', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/otherOpen/otherOpenVisitList'], resolve) + }, + { ////阳光村务(新)-- 综合公开详情 游客 + path: '/sunVillage_info/otherOpenVisitDetail', + name: 'otherOpenVisitDetail', + meta: { + title: '综合公开详情', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/otherOpen/otherOpenVisitDetail'], resolve) + }, { ////阳光村务(新)-- 发包方审核 path: '/sunVillage_info/list_employer_process', @@ -5584,7 +5629,33 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/recordDetail/recordDetailList'], resolve) }, - + { + path: '/sunVillage_info/paymentPendingList', + name: 'sunVillagePaymentPendingList', + meta: { + title: '待我支付', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/bankAgriculture/paymentPending/approvalList'], resolve) + }, + { + path: '/sunVillage_info/payRecordList', + name: 'sunVillagePayRecordList', + meta: { + title: '支付记录', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/bankAgriculture/paymentPending/payRecordList'], resolve) + }, + { + path: '/sunVillage_info/paymentPendingApprovalDetail', + name: 'sunVillagePaymentPendingApprovalDetail', + meta: { + title: '银农银行卡转账申请', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/bankAgriculture/paymentPending/approvalDetail'], resolve) + }, //<--------------------------------------农业大托管--------------------------------------> { path: '/agriculturalTrusteeship/index', diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 930adb26..bc3c68b3 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -17,6 +17,7 @@ const user = { baseRoutingUrl: '', businessLevel: '', userId:null, + deptId:null, }, mutations: { diff --git a/src/utils/finance.js b/src/utils/finance.js index 8dac27d2..d00466a9 100644 --- a/src/utils/finance.js +++ b/src/utils/finance.js @@ -236,6 +236,27 @@ export const FINANCE = { a = new BigNumber(a, 10); return a.isZero(); }, + sub(a, b) { + if(!(a instanceof BigNumber)) + a = new BigNumber(a, 10); + if(!(b instanceof BigNumber)) + b = new BigNumber(b, 10); + return a.minus(b, 10); + }, + mul(a, b) { + if(!(a instanceof BigNumber)) + a = new BigNumber(a, 10); + if(!(b instanceof BigNumber)) + b = new BigNumber(b, 10); + return a.multipliedBy(b, 10); + }, + div(a, b) { + if(!(a instanceof BigNumber)) + a = new BigNumber(a, 10); + if(!(b instanceof BigNumber)) + b = new BigNumber(b, 10); + return a.div(b, 10); + }, toNumber(a) { if(typeof(a) === 'number') return a; diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue index f35e8858..40800350 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalAdd.vue @@ -204,7 +204,7 @@ - + - + - + @@ -1023,7 +1023,7 @@ this.form.accountType = "1" this.form.isPeers = null this.accountTypeChange(); - }else if(obj.bankType==2||obj.bankType==4){ + }else if(obj.bankType==2||obj.bankType==3){ this.form.accountType = null this.form.isPeers = "Y" this.accountTypeChange1(); diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue index ede69c62..c72b5f8f 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalApproval.vue @@ -54,7 +54,7 @@
- +
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue index 6b40a0a5..f3bd8571 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail.vue @@ -59,7 +59,7 @@
- +
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue index 4c2997f0..c08035b5 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalDetail4.vue @@ -58,7 +58,7 @@
- +
diff --git a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue index a06fd0bf..f3a78a00 100644 --- a/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue +++ b/src/views/onlineHome/bankAgriculture/paymentApproval/approvalModify.vue @@ -204,7 +204,7 @@ - + - + - +