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/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 37044daf..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', 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/sunVillage_info/index_code.vue b/src/views/sunVillage_info/index_code.vue index 33cd32b5..0d2aa9af 100644 --- a/src/views/sunVillage_info/index_code.vue +++ b/src/views/sunVillage_info/index_code.vue @@ -5,7 +5,10 @@
{{deptName}}
-
{{bookName}}
+
{{bookName}}
+ + +
@@ -65,9 +68,10 @@
diff --git a/src/views/sunVillage_info/list_register_add.vue b/src/views/sunVillage_info/list_register_add.vue index 559b0fd6..6514591f 100644 --- a/src/views/sunVillage_info/list_register_add.vue +++ b/src/views/sunVillage_info/list_register_add.vue @@ -38,9 +38,9 @@ - + - + @@ -61,6 +61,7 @@ import { addOddjob } from "@/api/sunVillage_info/fixedAssets"; import Cookies from "js-cookie"; import request from '@/utils/request' + import {FINANCE} from "@/utils/finance"; export default { name: "certificateList", data() { @@ -113,7 +114,12 @@ this.jobTime = data; this.showBuildTime = false; }, - + calcMoney() { + if(this.form.workNum > 0 && this.form.perMoney > 0) + { + this.form.totalMoney = FINANCE.toNumber(FINANCE.mul(this.form.workNum, this.form.perMoney)); + } + }, }, } diff --git a/src/views/sunVillage_info/list_register_edit.vue b/src/views/sunVillage_info/list_register_edit.vue index b08b22ca..a60a4207 100644 --- a/src/views/sunVillage_info/list_register_edit.vue +++ b/src/views/sunVillage_info/list_register_edit.vue @@ -38,9 +38,9 @@ - + - + @@ -61,6 +61,7 @@ import { addOddjob , getOddjob , updateOddjob } from "@/api/sunVillage_info/fixedAssets"; import Cookies from "js-cookie"; import request from '@/utils/request' + import {FINANCE} from "@/utils/finance"; export default { name: "certificateList", data() { @@ -122,6 +123,12 @@ this.jobTime = data; this.showBuildTime = false; }, + calcMoney() { + if(this.form.workNum > 0 && this.form.perMoney > 0) + { + this.form.totalMoney = FINANCE.toNumber(FINANCE.mul(this.form.workNum, this.form.perMoney)); + } + }, }, } diff --git a/src/views/sunVillage_info/list_tourists_registration_add.vue b/src/views/sunVillage_info/list_tourists_registration_add.vue index 6c3c365f..6782be19 100644 --- a/src/views/sunVillage_info/list_tourists_registration_add.vue +++ b/src/views/sunVillage_info/list_tourists_registration_add.vue @@ -25,8 +25,8 @@ - - + + - + - + - + @@ -72,6 +72,7 @@ import { addOddjob,updateOddjob } from "@/api/sunVillage_info/fixedAssets"; import CommonUpload from "@/components/form/CommonUpload.vue"; import FieldDatePicker from "@/components/form/FieldDatePicker.vue"; + import {FINANCE} from "@/utils/finance"; export default { name: "listTouristsRegistrationAdd", components: {FieldDatePicker, CommonUpload}, @@ -131,6 +132,12 @@ back() { this.$router.back(); }, + calcMoney() { + if(this.form.workNum > 0 && this.form.perMoney > 0) + { + this.form.totalMoney = FINANCE.toNumber(FINANCE.mul(this.form.workNum, this.form.perMoney)); + } + }, }, } diff --git a/src/views/sunVillage_info/list_tourists_registration_edit.vue b/src/views/sunVillage_info/list_tourists_registration_edit.vue index 7cb5d01a..5c20d17b 100644 --- a/src/views/sunVillage_info/list_tourists_registration_edit.vue +++ b/src/views/sunVillage_info/list_tourists_registration_edit.vue @@ -25,8 +25,8 @@ - - + + - + - + - + @@ -72,6 +72,7 @@ import {addOddjob, getOddjob, updateOddjob} from "@/api/sunVillage_info/fixedAssets"; import CommonUpload from "@/components/form/CommonUpload.vue"; import FieldDatePicker from "@/components/form/FieldDatePicker.vue"; + import {FINANCE} from "@/utils/finance"; export default { name: "listTouristsRegistrationEdit", components: {FieldDatePicker, CommonUpload}, @@ -143,6 +144,12 @@ back() { this.$router.back(); }, + calcMoney() { + if(this.form.workNum > 0 && this.form.perMoney > 0) + { + this.form.totalMoney = FINANCE.toNumber(FINANCE.mul(this.form.workNum, this.form.perMoney)); + } + }, }, } diff --git a/src/views/sunVillage_info/otherOpen/otherOpenDetail.vue b/src/views/sunVillage_info/otherOpen/otherOpenDetail.vue new file mode 100644 index 00000000..20d0ad1c --- /dev/null +++ b/src/views/sunVillage_info/otherOpen/otherOpenDetail.vue @@ -0,0 +1,178 @@ + + + diff --git a/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue b/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue new file mode 100644 index 00000000..0e017ab8 --- /dev/null +++ b/src/views/sunVillage_info/otherOpen/otherOpenEdit.vue @@ -0,0 +1,280 @@ + + + diff --git a/src/views/sunVillage_info/otherOpen/otherOpenList.vue b/src/views/sunVillage_info/otherOpen/otherOpenList.vue new file mode 100644 index 00000000..84808d1d --- /dev/null +++ b/src/views/sunVillage_info/otherOpen/otherOpenList.vue @@ -0,0 +1,485 @@ + + + + + diff --git a/src/views/sunVillage_info/otherOpen/otherOpenVisitDetail.vue b/src/views/sunVillage_info/otherOpen/otherOpenVisitDetail.vue new file mode 100644 index 00000000..f71cefef --- /dev/null +++ b/src/views/sunVillage_info/otherOpen/otherOpenVisitDetail.vue @@ -0,0 +1,187 @@ + + + diff --git a/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue b/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue new file mode 100644 index 00000000..36934d60 --- /dev/null +++ b/src/views/sunVillage_info/otherOpen/otherOpenVisitList.vue @@ -0,0 +1,441 @@ + + + + + diff --git a/src/views/sunVillage_info/registration/registrationEdit.vue b/src/views/sunVillage_info/registration/registrationEdit.vue index 45264d40..f52ef9c4 100644 --- a/src/views/sunVillage_info/registration/registrationEdit.vue +++ b/src/views/sunVillage_info/registration/registrationEdit.vue @@ -30,7 +30,7 @@ :border="false" > - + - + - + @@ -69,7 +69,7 @@ import FieldDatePicker from "@/components/form/FieldDatePicker.vue"; import {Toast} from "vant"; export default { - name: "registrationDetail", + name: "registrationEdit", components: {FieldDatePicker, CommonUpload}, data() { return {