From 6829565222b45d4b65f9a8e8bfff4530bc215227 Mon Sep 17 00:00:00 2001 From: makaba <985019473@qq.com> Date: Mon, 4 Mar 2024 09:54:37 +0800 Subject: [PATCH 01/12] =?UTF-8?q?task=20=E5=90=88=E5=90=8C=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20=E5=80=9F=E6=AC=BE=E8=AE=A1=E5=88=92=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=99=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sunVillage_info/informationFunPlan.vue | 50 +++++++++++++++- .../sunVillage_info/informationFunPlanAdd.vue | 59 +++++++++++++++---- 2 files changed, 96 insertions(+), 13 deletions(-) diff --git a/src/views/sunVillage_info/informationFunPlan.vue b/src/views/sunVillage_info/informationFunPlan.vue index 4462f13a..eadcc015 100644 --- a/src/views/sunVillage_info/informationFunPlan.vue +++ b/src/views/sunVillage_info/informationFunPlan.vue @@ -38,6 +38,7 @@ @@ -45,11 +46,17 @@ + +
+ 附件 + +
+ diff --git a/src/views/sunVillage_info/informationFunPlanAdd.vue b/src/views/sunVillage_info/informationFunPlanAdd.vue index 272abb18..6e8faac6 100644 --- a/src/views/sunVillage_info/informationFunPlanAdd.vue +++ b/src/views/sunVillage_info/informationFunPlanAdd.vue @@ -24,12 +24,12 @@ @cancel="showCollectionPay = false"/> - - + + - + @@ -76,6 +76,11 @@ settlementAmount:'', remark:'', }, + errorMessages: { + orderNum: '', + settlementDate: '', + settlementAmount: '', + }, queryParams:{ /* pageNum:1, pageSize:10, @@ -154,15 +159,45 @@ onSubmit(){ - this.form.contractionId = this.contractionId; - addPlan(this.form).then((response) => { - if (response.code == 200){ - this.$notify({ type: 'success', message: '新增成功' }); - setTimeout(function(){ - history.back(-1); - },2000) - } - }); + event.preventDefault(); // 阻止表单默认提交行为 + + // 清除之前的错误消息 + this.errorMessages.orderNum = ''; + this.errorMessages.settlementDate = ''; + this.errorMessages.settlementAmount = ''; + + let isValid = true; + + // 验证结款序号 + if (!this.form.orderNum) { + this.errorMessages.orderNum = '结款序号不能为空'; + isValid = false; + } + + // 验证结款日期 + if (!this.form.settlementDate) { + this.errorMessages.settlementDate = '结款日期不能为空'; + isValid = false; + } + + // 验证结款金额 + if (!this.form.settlementAmount) { + this.errorMessages.settlementAmount = '结款金额不能为空'; + isValid = false; + } + + // 如果验证通过，进行提交处理 + if (isValid) { + this.form.contractionId = this.contractionId; + addPlan(this.form).then((response) => { + if (response.code == 200) { + this.$notify({type: 'success', message: '新增成功'}); + setTimeout(function () { + history.back(-1); + }, 2000) + } + }); + } } }, } From 684ea390fa8bad80e9da81d4ff1f8e0e85909bf5 Mon Sep 17 00:00:00 2001 From: makaba <985019473@qq.com> Date: Mon, 4 Mar 2024 10:06:59 +0800 Subject: [PATCH 02/12] =?UTF-8?q?Revert=20"task=20=E5=90=88=E5=90=8C?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20=E5=80=9F=E6=AC=BE=E8=AE=A1=E5=88=92=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=99=84=E4=BB=B6"=20=E6=92=A4=E9=94=80?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=94=99=E8=AF=AF=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 68295652 --- .../sunVillage_info/informationFunPlan.vue | 50 +--------------- .../sunVillage_info/informationFunPlanAdd.vue | 59 ++++--------------- 2 files changed, 13 insertions(+), 96 deletions(-) diff --git a/src/views/sunVillage_info/informationFunPlan.vue b/src/views/sunVillage_info/informationFunPlan.vue index eadcc015..4462f13a 100644 --- a/src/views/sunVillage_info/informationFunPlan.vue +++ b/src/views/sunVillage_info/informationFunPlan.vue @@ -38,7 +38,6 @@ @@ -46,17 +45,11 @@ - -
- 附件 - -
- diff --git a/src/views/sunVillage_info/informationFunPlanAdd.vue b/src/views/sunVillage_info/informationFunPlanAdd.vue index 6e8faac6..272abb18 100644 --- a/src/views/sunVillage_info/informationFunPlanAdd.vue +++ b/src/views/sunVillage_info/informationFunPlanAdd.vue @@ -24,12 +24,12 @@ @cancel="showCollectionPay = false"/> - - + + - + @@ -76,11 +76,6 @@ settlementAmount:'', remark:'', }, - errorMessages: { - orderNum: '', - settlementDate: '', - settlementAmount: '', - }, queryParams:{ /* pageNum:1, pageSize:10, @@ -159,45 +154,15 @@ onSubmit(){ - event.preventDefault(); // 阻止表单默认提交行为 - - // 清除之前的错误消息 - this.errorMessages.orderNum = ''; - this.errorMessages.settlementDate = ''; - this.errorMessages.settlementAmount = ''; - - let isValid = true; - - // 验证结款序号 - if (!this.form.orderNum) { - this.errorMessages.orderNum = '结款序号不能为空'; - isValid = false; - } - - // 验证结款日期 - if (!this.form.settlementDate) { - this.errorMessages.settlementDate = '结款日期不能为空'; - isValid = false; - } - - // 验证结款金额 - if (!this.form.settlementAmount) { - this.errorMessages.settlementAmount = '结款金额不能为空'; - isValid = false; - } - - // 如果验证通过，进行提交处理 - if (isValid) { - this.form.contractionId = this.contractionId; - addPlan(this.form).then((response) => { - if (response.code == 200) { - this.$notify({type: 'success', message: '新增成功'}); - setTimeout(function () { - history.back(-1); - }, 2000) - } - }); - } + this.form.contractionId = this.contractionId; + addPlan(this.form).then((response) => { + if (response.code == 200){ + this.$notify({ type: 'success', message: '新增成功' }); + setTimeout(function(){ + history.back(-1); + },2000) + } + }); } }, } From f6efcae38724d83b17d3cab278fdae81fc86519a Mon Sep 17 00:00:00 2001 From: QI_YUJIE <2878090898@qq.com> Date: Thu, 7 Mar 2024 16:08:22 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Map/MapGisTagDTGCopy.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Map/MapGisTagDTGCopy.vue b/src/components/Map/MapGisTagDTGCopy.vue index 6f0340f9..adad61ae 100644 --- a/src/components/Map/MapGisTagDTGCopy.vue +++ b/src/components/Map/MapGisTagDTGCopy.vue @@ -8,7 +8,7 @@ -
备注信息：黄色标记表示该资产，蓝色标记是本账套已标记的其他资产
+
备注：黄色标记表示该资产，蓝色标记表示本账套已标记的其他资产
From 0ed6900354fe20e53259bf10e6fc100f76861998 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, 12 Mar 2024 17:25:00 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E9=98=B3=E5=85=89=E6=9D=91=E5=8A=A1?= =?UTF-8?q?=EF=BC=9A=E8=B5=84=E4=BA=A7=E8=B4=9F=E5=80=BA=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 3 +- package-lock.json | 11 +- package.json | 1 + src/api/sunVillage_info/fixedAssets.js | 16 + .../images/sunVillage_info/index_block_23.png | Bin 0 -> 3726 bytes src/router/index.js | 9 + src/utils/finance.js | 259 ++++++ .../sunVillage_info/detailed_liabilities.vue | 752 ++++++++++++++++++ 8 files changed, 1047 insertions(+), 4 deletions(-) create mode 100644 src/assets/images/sunVillage_info/index_block_23.png create mode 100644 src/utils/finance.js create mode 100644 src/views/sunVillage_info/detailed_liabilities.vue diff --git a/config/index.js b/config/index.js index a6a51a11..a4cef1bf 100644 --- a/config/index.js +++ b/config/index.js @@ -14,7 +14,8 @@ module.exports = { // 请求的目标主机 // target: 'http://116.255.223.226:8082/nsgk_test/', // 公网测试环境 // target: `http://192.168.0.116:8091/nsgk_api/`, // 内网测试环境 - target: 'http://localhost:8080/', + //target: 'http://localhost:8080/', + target: 'http://192.168.0.106:8080/', changeOrigin: true, pathRewrite: { '^/api': '' diff --git a/package-lock.json b/package-lock.json index 90449a49..2f2c2ab2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1351,6 +1351,11 @@ "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==" }, + "bignumber.js": { + "version": "9.1.2", + "resolved": "https://registry.npmmirror.com/bignumber.js/-/bignumber.js-9.1.2.tgz", + "integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==" + }, "binary-extensions": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz", @@ -4281,7 +4286,7 @@ "fastclick": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/fastclick/-/fastclick-1.0.6.tgz", - "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo=", + "integrity": "sha512-cXyDBT4g0uWl/Xe75QspBDAgAWQ0lkPi/zgp6YFEUHj6WV6VIZl7R6TiDZhdOVU3W4ehp/8tG61Jev1jit+ztQ==", "dev": true }, "fastparse": { @@ -4436,7 +4441,7 @@ "font-awesome.css": { "version": "4.7.2", "resolved": "https://registry.npmjs.org/font-awesome.css/-/font-awesome.css-4.7.2.tgz", - "integrity": "sha1-B1pCARQo8gJyVO9phgx1ergWyVI=" + "integrity": "sha512-FIyRbig4PDY15NGzejM3b8OQ/lWvId8PHnE4CnuDtc8/YYs07cvnqLCyfvIJPwJl5SA/Rq+9jAe9W+Fr1pv0DA==" }, "for-in": { "version": "1.0.2", @@ -12355,7 +12360,7 @@ "vue-html5-editor": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/vue-html5-editor/-/vue-html5-editor-1.1.1.tgz", - "integrity": "sha1-WRAhCoMNjI00eaHx/shHMZKqA7M=", + "integrity": "sha512-Ckmb8djta+XQMUQaxRcCUNBXEzjPF5p6c2nQ5ICcIuR8eYz4b0HAGzXlSDfL3ZxkrVHO2Hx0VrUORLu2Lwem4g==", "dev": true }, "vue-lazyload": { diff --git a/package.json b/package.json index b7acc1be..de93cd5c 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "build": "node build/build.js" }, "dependencies": { + "bignumber.js": "^9.1.2", "@vant/area-data": "^1.2.2", "axios": "^0.21.1", "echarts": "^5.3.3", diff --git a/src/api/sunVillage_info/fixedAssets.js b/src/api/sunVillage_info/fixedAssets.js index acb99fbf..7c16ccc9 100644 --- a/src/api/sunVillage_info/fixedAssets.js +++ b/src/api/sunVillage_info/fixedAssets.js @@ -1166,4 +1166,20 @@ export function assetResourceDetail(id, parms) { }); } +// 公式科目模板分类列表 +export function expressionReportByCategory(name) { + return request({ + url: '/finance/expressionReport/category/' + name, + method: 'get', + }) +} + +//查询资产负债表(公式报表模板) +export const assetLiabilityReportByExpTpl = (data) => { + return request({ + url: '/finance/report/assetLiabilityReportByExpTpl', + method: 'get', + params: data + }) +} diff --git a/src/assets/images/sunVillage_info/index_block_23.png b/src/assets/images/sunVillage_info/index_block_23.png new file mode 100644 index 0000000000000000000000000000000000000000..611f4e34a4ca2f331d639180103c62bfb33ebbec GIT binary patch literal 3726 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 literal 0 HcmV?d00001 diff --git a/src/router/index.js b/src/router/index.js index 4019c168..bcfe9e18 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4245,6 +4245,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/resourceDetail'], resolve) }, + { ////阳光村务（新）-- 修改资源 + path: '/sunVillage_info/detailed_liabilities', + name: 'sunVillageInfoDetailedLiabilities', + meta: { + title: '负债表', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/detailed_liabilities'], resolve) + }, { ////农业综合行政执法公众平台 path: '/lawEnforcement/index_new', name: 'lawEnforcementIndexNew', diff --git a/src/utils/finance.js b/src/utils/finance.js new file mode 100644 index 00000000..8dac27d2 --- /dev/null +++ b/src/utils/finance.js @@ -0,0 +1,259 @@ +import {numFormat} from "@/utils/index"; +import BigNumber from "bignumber.js"; + +export const FINANCE = { + CONFIG_KEY: '_Finance_config', + EXPRESSION_REPORT_TEMPLATE: { + ASSET_AND_LIABILITY: "资产负债表", + QUARTER_REPORT: "季度报表", + INCOME_DISTRIBUTION_REPORT: "收益分配表", + }, + + VOUCHER_CACHE_LIFECYCLE: 300000, + + getConfig(name, defVal) { + let config = localStorage.getItem(this.CONFIG_KEY); + if(config) + { + config = JSON.parse(config); + if(config.hasOwnProperty(name)) + return config[name]; + } + return defVal; + }, + setConfig(name, val) { + let config = localStorage.getItem(this.CONFIG_KEY); + if(!config) + config = {}; + else + config = JSON.parse(config); + config[name] = val; + localStorage.setItem(this.CONFIG_KEY, JSON.stringify(config)); + }, + makeSubjectsTree(SubjectsList, subjectTypes) { + let func = (pid) => { + let arr = null; + for(let v of SubjectsList) + { + let parentId = v.parentId || v.subjectId.substr(0, v.subjectId.length - 3) || null; + if(parentId == pid) + { + if(!arr) arr = []; + let a = func(v.subjectId); + if(a) + { + v.children = a; + v.is_last = 'N'; + } + else + v.is_last = 'Y'; + v.disabled = false; + v.label = v.subjectId + ' ' + v.subjectName; + v.label2 = v.subjectId + ' ' + v.subjectNameAll; + v.id = v.subjectId; + arr.push(v); + } + } + return arr; + }; + let res = func(null) || []; + if(!subjectTypes) + return res; + let r = []; + res.forEach((x) => { + let subjectIdStart = x.subjectId[0]; + let item = r.find((y) => y.subjectId == subjectIdStart); + if(!item) + { + let type = subjectTypes.find((y) => y.dictValue == subjectIdStart); + if(!type) + return; + item = { + id: type.dictValue, + subjectId: type.dictValue, + label: type.dictLabel, + label2: type.dictLabel, + sortFlag: type.dictSort, + is_last: 'N', + subjectName: '', + subjectNameAll: '', + children: [], + disabled: true, + }; + r.push(item); + } + item.children.push(x); + }); + r.sort((a, b) => a.dictSort - b.dictSort); + return r; + }, + makeSubjectsTree_filter(SubjectsList, subjectTypes, filterFunc) { + let func = (pid) => { + let arr = null; + for(let v of SubjectsList) + { + let parentId = v.parentId || v.subjectId.substr(0, v.subjectId.length - 3) || null; + if(parentId == pid) + { + if(!arr) arr = []; + let a = func(v.subjectId); + if(a) + { + v.children = a; + v.is_last = 'N'; + } + else + v.is_last = 'Y'; + v.label = v.subjectId + ' ' + v.subjectName; + v.label2 = v.subjectId + ' ' + v.subjectNameAll; + v.disabled = !filterFunc(v); + arr.push(v); + } + } + return arr; + }; + let filter_func = (children) => { + let res = null; + if(children) + { + let newChildren = []; + for(let v of children) + { + let b = filterFunc(v); + let arr = filter_func(v.children); + if(!arr) + delete v.children; + else + { + v.children = arr; + b = true; + } + if(b) + newChildren.push(v); + } + let r = newChildren.length > 0; + if(r) + res = newChildren; + } + return res; + }; + let res = filter_func(func(null) || []) || []; + let r = []; + res.forEach((x) => { + let subjectIdStart = x.subjectId[0]; + let item = r.find((y) => y.subjectId == subjectIdStart); + if(!item) + { + let type = subjectTypes.find((y) => y.dictValue == subjectIdStart); + if(!type) + return; + item = { + id: type.dictValue, + label: type.dictLabel, + label2: type.dictLabel, + subjectId: type.dictValue, + sortFlag: type.dictSort, + is_last: 'N', + subjectNameAll: '', + children: [], + disabled: true, + }; + r.push(item); + } + item.children.push(x); + }); + r.sort((a, b) => a.dictSort - b.dictSort); + return r; + }, + /*数字每隔3位一位小数: 0返回空白 */ + formatNum(value) { + if(value === undefined || value === null) + return ''; + if(typeof(value) === "string") + { + if(value.indexOf(',') !== -1) + return value; + value = Number(value); + if(isNaN(value)) + return ''; + } + if(value === 0) + return ''; + return numFormat(value); + }, + formatList(list) { + if(!list || !Array.isArray(list) && !list.length && arguments.length > 1) + return []; + list.forEach((x) => { + for(let i = 1; i < arguments.length; i++) + { + let k = arguments[i]; + if(!x.hasOwnProperty(k)) + continue; + x[k] = this.formatNum(x[k]); + } + }); + return list; + }, + obtainAssetSubject(str) { + if(!str) + return null; + let i = str.indexOf(":"); + if(i > 0) + return str.substring(0, i); + else if(/^\d+$/g.test(str)) + return str; + else + return null; + }, + Number(a) { + return new BigNumber(a, 10); + }, + zero() { + return new BigNumber(0, 10); + }, + add(a, b) { + if(!(a instanceof BigNumber)) + a = new BigNumber(a, 10); + if(!(b instanceof BigNumber)) + b = new BigNumber(b, 10); + return a.plus(b, 10); + }, + subtract(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); + }, + neg(a) { + if(!(a instanceof BigNumber)) + a = new BigNumber(a, 10); + return a.negated(); + }, + isZero(a) { + if(!(a instanceof BigNumber)) + a = new BigNumber(a, 10); + return a.isZero(); + }, + toNumber(a) { + if(typeof(a) === 'number') + return a; + if(a instanceof BigNumber) + return a.toNumber(); + return Number(a); + }, + calcFontSizeFromTextLength(text, baseSize) { + if(!text) + return baseSize; + const N = 28; + let length = 0; + for(let i = 0; i < text.length; i++) + { + length += text.charCodeAt(i) > 127 ? 2 : 1; + } + const r = Math.round(baseSize - (Math.max(length / N, 1.0)) + 1); + //console.log(text, r); + return r; + }, +}; diff --git a/src/views/sunVillage_info/detailed_liabilities.vue b/src/views/sunVillage_info/detailed_liabilities.vue new file mode 100644 index 00000000..f7c7e6c3 --- /dev/null +++ b/src/views/sunVillage_info/detailed_liabilities.vue @@ -0,0 +1,752 @@ + + + + + From 7c4a89f336155c987770a127e0ee52a66697e6b5 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, 12 Mar 2024 17:29:24 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E9=98=B3=E5=85=89=E6=9D=91=E5=8A=A1?= =?UTF-8?q?=EF=BC=9A=E6=98=8E=E7=BB=86=E8=B4=A6=E6=97=A5=E6=9C=9F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sunVillage_info/detailed_ledger.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/sunVillage_info/detailed_ledger.vue b/src/views/sunVillage_info/detailed_ledger.vue index 30248810..b458ed52 100644 --- a/src/views/sunVillage_info/detailed_ledger.vue +++ b/src/views/sunVillage_info/detailed_ledger.vue @@ -30,7 +30,7 @@
-
2022
+
{{queryParams.startDate.substr(0,4)}}
月
日
From 107834174f7241484d3592373e24131cdb0c6383 Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Wed, 13 Mar 2024 13:17:30 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=BB=98=E8=AE=A4=E5=9C=B0=E5=9D=80?= 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 a4cef1bf..adc7b121 100644 --- a/config/index.js +++ b/config/index.js @@ -14,8 +14,8 @@ module.exports = { // 请求的目标主机 // target: 'http://116.255.223.226:8082/nsgk_test/', // 公网测试环境 // target: `http://192.168.0.116:8091/nsgk_api/`, // 内网测试环境 - //target: 'http://localhost:8080/', - target: 'http://192.168.0.106:8080/', + target: 'http://localhost:8080/', + //target: 'http://192.168.0.106:8080/', changeOrigin: true, pathRewrite: { '^/api': '' From 11e845297c6329538861f49b4692428648091f14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BA=9E=E4=B8=9C=E6=97=AD?= <850374051@qq.com> Date: Wed, 13 Mar 2024 13:36:26 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E9=98=B3=E5=85=89=E6=9D=91=E5=8A=A1?= =?UTF-8?q?=EF=BC=9A=E6=98=8E=E7=BB=86=E8=B4=A6=E8=A1=A8=E5=A4=B4=E9=94=81?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sunVillage_info/detailed_ledger.vue | 97 +++++++++++++------ 1 file changed, 66 insertions(+), 31 deletions(-) diff --git a/src/views/sunVillage_info/detailed_ledger.vue b/src/views/sunVillage_info/detailed_ledger.vue index b458ed52..b7fb8400 100644 --- a/src/views/sunVillage_info/detailed_ledger.vue +++ b/src/views/sunVillage_info/detailed_ledger.vue @@ -26,6 +26,7 @@
+
@@ -38,34 +39,29 @@ 凭证字 - - {{item.month}} - {{item.day}} - -
{{item.voucherWordNum}}
- + + 摘要 + 借方 + 贷方 + 方向 + 余额 -
- - 摘要 - 借方 - 贷方 - 方向 - 余额 - +
+ + {{item.month}} + {{item.day}} + +
{{item.voucherWordNum}}
+ + +
- + {{item.voucherSummary}} @@ -87,7 +83,7 @@
- +
Date: Wed, 13 Mar 2024 13:48:48 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20logo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/logo.png | Bin 6849 -> 4826 bytes public/favicon.ico | Bin 4286 -> 4826 bytes src/assets/logo.png | Bin 6849 -> 4826 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/build/logo.png b/build/logo.png index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..86b915a6e6f7b40cd3353b6513dffb6458a8d798 100644 GIT binary patch literal 4826 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 diff --git a/src/assets/logo.png b/src/assets/logo.png index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..86b915a6e6f7b40cd3353b6513dffb6458a8d798 100644 GIT binary patch literal 4826 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 Date: Wed, 13 Mar 2024 14:18:08 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E9=98=B3=E5=85=89=E6=9D=91=E5=8A=A1?= =?UTF-8?q?=EF=BC=9A=E6=98=8E=E7=BB=86=E8=B4=A6=E5=88=97=E5=AE=BD=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=81=E8=B4=9F=E5=80=BA=E8=A1=A8=E5=88=97=E5=AE=BD?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sunVillage_info/detailed_ledger.vue | 6 +++--- src/views/sunVillage_info/detailed_liabilities.vue | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/views/sunVillage_info/detailed_ledger.vue b/src/views/sunVillage_info/detailed_ledger.vue index b7fb8400..539202ba 100644 --- a/src/views/sunVillage_info/detailed_ledger.vue +++ b/src/views/sunVillage_info/detailed_ledger.vue @@ -51,7 +51,7 @@
-
+
{{item.month}} {{item.day}} @@ -499,7 +499,7 @@ export default { height: 110px; background: #2facfe; border-radius: 8px; - width: 30%; + width: 20%; .year_m{ border-right: 1px solid #fff; .year_text{ @@ -517,7 +517,7 @@ export default { justify-content: center; padding-bottom: 10px; .ubs{ - width: 94px; + width: 64px; height: 43px; background: #cbeaff; font-size: 30px; diff --git a/src/views/sunVillage_info/detailed_liabilities.vue b/src/views/sunVillage_info/detailed_liabilities.vue index f7c7e6c3..e33078ab 100644 --- a/src/views/sunVillage_info/detailed_liabilities.vue +++ b/src/views/sunVillage_info/detailed_liabilities.vue @@ -157,10 +157,14 @@ this.initPage(); }, onConfirm(time) { + console.log(this.format(time,'yyyy-MM')) this.date = this.format(time,'yyyy年MM月'); this.searchDate.bookDate = this.format(time,'yyyy-MM'); this.initPage(); this.showPickerTime = false; + let dealDays = this.searchDate.bookDate.split("-"); + this.accountingYear = dealDays[0]; //当前帐套年 + this.accountingMonth = dealDays[1]; //当前帐套月 }, onConfirmExpression(data){ this.searchDate.templateName = data.name; @@ -214,7 +218,7 @@ overflow-x: scroll; .datagrid { min-height: 100PX; - width: 300%; + width: 250%; .header { background: #f8f8f9; font-weight: bold; From 082fd3c58b1dd25ddc981d6516736a4d8a569103 Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Wed, 13 Mar 2024 16:02:53 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sunVillage_info/detailed_liabilities.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/sunVillage_info/detailed_liabilities.vue b/src/views/sunVillage_info/detailed_liabilities.vue index e33078ab..e40cc868 100644 --- a/src/views/sunVillage_info/detailed_liabilities.vue +++ b/src/views/sunVillage_info/detailed_liabilities.vue @@ -47,9 +47,9 @@
-
编制单位：{{ this.$store.getters.bookName }}
+
单位：{{ this.$store.getters.bookName }}
{{ accountingYear }}年{{ accountingMonth }}期
-
金额单位:元
+
金额:元
From ae15302d44ae0ca094532d320e7f9f6daa96984c Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Wed, 13 Mar 2024 16:03:27 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=20=E7=AE=80=E5=8C=96?= =?UTF-8?q?=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/sunVillage_info/detailed_liabilities.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/sunVillage_info/detailed_liabilities.vue b/src/views/sunVillage_info/detailed_liabilities.vue index e40cc868..726867be 100644 --- a/src/views/sunVillage_info/detailed_liabilities.vue +++ b/src/views/sunVillage_info/detailed_liabilities.vue @@ -47,7 +47,7 @@
-
单位：{{ this.$store.getters.bookName }}
+
单位:{{ this.$store.getters.bookName }}
{{ accountingYear }}年{{ accountingMonth }}期
金额:元
From 6390d7d48836addd2d4364026d97d452265491a4 Mon Sep 17 00:00:00 2001 From: zzl <961867786@qq.com> Date: Wed, 13 Mar 2024 16:03:55 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2f2c2ab2..1457118d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4286,7 +4286,7 @@ "fastclick": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/fastclick/-/fastclick-1.0.6.tgz", - "integrity": "sha512-cXyDBT4g0uWl/Xe75QspBDAgAWQ0lkPi/zgp6YFEUHj6WV6VIZl7R6TiDZhdOVU3W4ehp/8tG61Jev1jit+ztQ==", + "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo=", "dev": true }, "fastparse": { @@ -4441,7 +4441,7 @@ "font-awesome.css": { "version": "4.7.2", "resolved": "https://registry.npmjs.org/font-awesome.css/-/font-awesome.css-4.7.2.tgz", - "integrity": "sha512-FIyRbig4PDY15NGzejM3b8OQ/lWvId8PHnE4CnuDtc8/YYs07cvnqLCyfvIJPwJl5SA/Rq+9jAe9W+Fr1pv0DA==" + "integrity": "sha1-B1pCARQo8gJyVO9phgx1ergWyVI=" }, "for-in": { "version": "1.0.2", @@ -12360,7 +12360,7 @@ "vue-html5-editor": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/vue-html5-editor/-/vue-html5-editor-1.1.1.tgz", - "integrity": "sha512-Ckmb8djta+XQMUQaxRcCUNBXEzjPF5p6c2nQ5ICcIuR8eYz4b0HAGzXlSDfL3ZxkrVHO2Hx0VrUORLu2Lwem4g==", + "integrity": "sha1-WRAhCoMNjI00eaHx/shHMZKqA7M=", "dev": true }, "vue-lazyload": {