From 8f0e8897b14b68a6cd92ef22432bf3f4cbf148a2 Mon Sep 17 00:00:00 2001 From: hbao Date: Mon, 8 Aug 2022 11:56:59 +0800 Subject: [PATCH 01/67] =?UTF-8?q?=E5=AD=97=E5=85=B8=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- static/dictyType.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/static/dictyType.json b/static/dictyType.json index 701f0db2..bbf05a46 100644 --- a/static/dictyType.json +++ b/static/dictyType.json @@ -2594,6 +2594,22 @@ "update_by": "", "update_time": "" }, + { + "dict_code": "2669", + "dict_sort": "60", + "dictLabel": "农户", + "dictValue": "60", + "dict_type": "obligee_type", + "css_class": "", + "list_class": "default", + "is_default": "N", + "status": "0", + "remark": "", + "create_by": "admin", + "create_time": "18/7/2021 11:38:51", + "update_by": "", + "update_time": "" + }, { "dict_code": "1059", "dict_sort": "99", From 243becd5a86e1cc4657fea5d2bf4e49d3c3a1e20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Tue, 9 Aug 2022 16:49:06 +0800 Subject: [PATCH 02/67] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 4 +- src/router/index.js | 20 ++ .../paymentAccount/paymentAccountAdd.vue | 3 + .../paymentAccount/paymentAccountModify.vue | 3 + .../paymentApproval/approvalAdd.vue | 77 ++++- .../paymentApproval/collectionAdd.vue | 274 ++++++++++++++++++ .../paymentApproval/collectionAdd2.vue | 274 ++++++++++++++++++ 7 files changed, 643 insertions(+), 12 deletions(-) create mode 100644 src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd.vue create mode 100644 src/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2.vue diff --git a/config/index.js b/config/index.js index 7e58e1c7..eebba6a7 100644 --- a/config/index.js +++ b/config/index.js @@ -12,8 +12,8 @@ module.exports = { proxyTable: { "/api": { // 请求的目标主机 - //target: 'http://116.255.135.38: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/router/index.js b/src/router/index.js index 27542f2e..c8b3bfac 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1795,6 +1795,7 @@ export const constantRoutes = [ meta: { title: '添加银行卡转账申请', hidden: true, + keepAlive: true }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd'], resolve) }, @@ -1804,6 +1805,7 @@ export const constantRoutes = [ meta: { title: '添加信用卡还款申请', hidden: true, + keepAlive: true }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd2'], resolve) }, @@ -1861,6 +1863,24 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/approvalAdd12'], resolve) }, + { + path: '/yinnong/approval/collectionAdd', + name: 'approvalCollectionAdd', + meta: { + title: '添加收款账户信息', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/collectionAdd'], resolve) + }, + { + path: '/yinnong/approval/collectionAdd2', + name: 'approvalCollectionAdd2', + meta: { + title: '添加收款账户信息', + hidden: true, + }, + component: (resolve) => require(['@/views/yinnong/bankAgriculture/paymentApproval/collectionAdd2'], resolve) + }, { path: '/yinnong/approvalApproval', name: 'approvalApproval', diff --git a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue index 2829ba19..8c40e4be 100644 --- a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue +++ b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountAdd.vue @@ -407,7 +407,10 @@ onConfirmTaccountId(val){ this.showTaccountId = false this.taccountId = val.text + console.log(val) this.$set(this.form, "taccountId", val.value); + this.$set(this.form, "cifNo", val.cifNo); + this.$set(this.form, "accountNo", val.accountNo); this.taccountIdOptions.map(res => { if(res.id==val.value){ if(this.form.villageAccountType === '3'){ diff --git a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue index 5a34aa2f..c3a647f6 100644 --- a/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue +++ b/src/views/yinnong/bankAgriculture/paymentAccount/paymentAccountModify.vue @@ -463,7 +463,10 @@ onConfirmTaccountId(val){ this.showTaccountId = false this.taccountId = val.text + console.log(val) this.$set(this.form, "taccountId", val.value); + this.$set(this.form, "cifNo", val.cifNo); + this.$set(this.form, "accountNo", val.accountNo); this.taccountIdOptions.map(res => { if(res.id==val.value){ if(this.form.villageAccountType === '3'){ diff --git a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue index 5d290836..ab3b01df 100644 --- a/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue +++ b/src/views/yinnong/bankAgriculture/paymentApproval/approvalAdd.vue @@ -4,7 +4,7 @@ left-arrow fixed placeholder - @click-left="$router.back(-1)" + @click-left="goBack" > 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 @@ From 56f4c1eeef299a17914aa99cf03d4ff1de0d45ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Tue, 23 Aug 2022 14:38:26 +0800 Subject: [PATCH 30/67] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/index.js b/config/index.js index 2c5eeffb..689c3c16 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': '' From 712e83e4042ff13ee9f31fbf0609f18be3ec1f41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Tue, 23 Aug 2022 16:46:41 +0800 Subject: [PATCH 31/67] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/sunVillage_info/fixedAssets.js | 43 ++ .../images/sunVillage_info/index_block_6.png | Bin 0 -> 5090 bytes src/router/index.js | 36 ++ src/views/sunVillage_info/index.vue | 7 +- src/views/sunVillage_info/list_finance.vue | 1 + .../sunVillage_info/list_finance_add.vue | 5 +- .../sunVillage_info/list_finance_edit.vue | 5 +- src/views/sunVillage_info/list_issues.vue | 1 + src/views/sunVillage_info/list_issues_add.vue | 5 +- .../sunVillage_info/list_issues_edit.vue | 5 +- src/views/sunVillage_info/list_register.vue | 428 ++++++++++++++++++ .../sunVillage_info/list_register_add.vue | 232 ++++++++++ .../sunVillage_info/list_register_detail.vue | 225 +++++++++ .../sunVillage_info/list_register_edit.vue | 241 ++++++++++ src/views/sunVillage_info/list_tourists.vue | 1 + .../sunVillage_info/list_tourists_add.vue | 5 +- .../sunVillage_info/list_tourists_edit.vue | 5 +- 17 files changed, 1238 insertions(+), 7 deletions(-) create mode 100644 src/assets/images/sunVillage_info/index_block_6.png create mode 100644 src/views/sunVillage_info/list_register.vue create mode 100644 src/views/sunVillage_info/list_register_add.vue create mode 100644 src/views/sunVillage_info/list_register_detail.vue create mode 100644 src/views/sunVillage_info/list_register_edit.vue diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js index 2d7d15eb..c27f492e 100644 --- a/src/api/sunVillage_info/fixedAssets.js +++ b/src/api/sunVillage_info/fixedAssets.js @@ -262,3 +262,46 @@ export function majorEventOpenRemove(id) { method: 'get' }) } + +// 查询零工登记列表 +export function listOddjob(query) { + return request({ + url: '/subcontract/oddjob/list', + method: 'get', + params: query + }) +} + +// 新增零工登记 +export function addOddjob(data) { + return request({ + url: '/subcontract/oddjob/add', + method: 'post', + data: data + }) +} + +// 修改零工登记 +export function updateOddjob(data) { + return request({ + url: '/subcontract/oddjob/edit', + method: 'post', + data: data + }) +} + +// 查询零工登记详细 +export function getOddjob(id) { + return request({ + url: '/subcontract/oddjob/get/' + id, + method: 'get' + }) +} + +// 删除零工登记 +export function delOddjob(id) { + return request({ + url: '/subcontract/oddjob/remove/' + id, + method: 'get' + }) +} diff --git a/src/assets/images/sunVillage_info/index_block_6.png b/src/assets/images/sunVillage_info/index_block_6.png new file mode 100644 index 0000000000000000000000000000000000000000..ef105bf2eec33087af58688239f0e55a24eee2bd GIT binary patch literal 5090 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 Z0Wy7=D;(<2j_>{JhS4=f7wR|!{~HE#^_c(w literal 0 HcmV?d00001 diff --git a/src/router/index.js b/src/router/index.js index 64f37da8..c07532a0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3088,6 +3088,42 @@ export const constantRoutes = [ hidden: true, }, component: (resolve) => require(['@/views/sunVillage_info/list_tourists_ranking'], resolve) + }, + { ////阳光村务（新）-- 合同信息 + path: '/sunVillage_info/list_register', + name: 'sunVillageInfoListRegister', + meta: { + title: '零工登记', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_register'], resolve) + }, + { ////阳光村务（新）-- 合同信息 + path: '/sunVillage_info/list_register_add', + name: 'sunVillageInfoListRegisterAdd', + meta: { + title: '新增零工登记', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_register_add'], resolve) + }, + { ////阳光村务（新）-- 合同信息 + path: '/sunVillage_info/list_register_edit', + name: 'sunVillageInfoListRegisterEdit', + meta: { + title: '新增零工登记', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_register_edit'], resolve) + }, + { ////阳光村务（新）-- 合同信息 + path: '/sunVillage_info/list_register_detail', + name: 'sunVillageInfoListRegisterDetail', + meta: { + title: '查看零工登记', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_register_detail'], resolve) } ]; diff --git a/src/views/sunVillage_info/index.vue b/src/views/sunVillage_info/index.vue index f99b464c..8c24f8aa 100644 --- a/src/views/sunVillage_info/index.vue +++ b/src/views/sunVillage_info/index.vue @@ -37,6 +37,7 @@
财务公开榜 零工公开榜 + 零工登记 重大事项 固定资产 合同登记 @@ -246,7 +247,7 @@ align-items: center; justify-content: center; padding-top: 120px; - &:nth-child(3){ + &:nth-child(3n){ margin-right: 0; } &.n_1{ @@ -269,6 +270,10 @@ background: url('../../assets/images/sunVillage_info/index_block_5.png') no-repeat; background-size: 100% 100%; } + &.n_6 { + background: url('../../assets/images/sunVillage_info/index_block_6.png') no-repeat; + background-size: 100% 100%; + } } } } diff --git a/src/views/sunVillage_info/list_finance.vue b/src/views/sunVillage_info/list_finance.vue index 6462ec4d..52ef4eae 100644 --- a/src/views/sunVillage_info/list_finance.vue +++ b/src/views/sunVillage_info/list_finance.vue @@ -180,6 +180,7 @@ this.$dialog.alert({ title: '提示', message: '确认删除？', + showCancelButton:true, }) .then(() => { openRemove(id).then(response => { diff --git a/src/views/sunVillage_info/list_finance_add.vue b/src/views/sunVillage_info/list_finance_add.vue index 77a43ed3..db9a1f3e 100644 --- a/src/views/sunVillage_info/list_finance_add.vue +++ b/src/views/sunVillage_info/list_finance_add.vue @@ -43,7 +43,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/src/views/sunVillage_info/user.vue b/src/views/sunVillage_info/user.vue new file mode 100644 index 00000000..896ca056 --- /dev/null +++ b/src/views/sunVillage_info/user.vue @@ -0,0 +1,204 @@ + + + + + From f0bcc592edc69a00b8dbc65114d6517dc97d0068 Mon Sep 17 00:00:00 2001 From: zhaochengke Date: Thu, 25 Aug 2022 11:39:10 +0800 Subject: [PATCH 44/67] =?UTF-8?q?=E7=BA=A7=E8=81=94=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/form/FieldCalender.vue | 4 +- src/components/form/FieldCascader.vue | 255 ++++++++++++++++++++++++ src/components/form/FieldCheckbox.vue | 5 +- src/components/form/FieldDatePicker.vue | 6 +- src/components/form/FieldRadio.vue | 9 +- src/components/form/FieldSelect.vue | 9 +- 6 files changed, 280 insertions(+), 8 deletions(-) create mode 100644 src/components/form/FieldCascader.vue diff --git a/src/components/form/FieldCalender.vue b/src/components/form/FieldCalender.vue index 120859a7..d4cc5b2c 100644 --- a/src/components/form/FieldCalender.vue +++ b/src/components/form/FieldCalender.vue @@ -1,3 +1,4 @@ +