From 0ad9db8776cc779f8d48dc0175a9da3ea6aab680 Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Thu, 20 Feb 2025 09:26:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E4=BB=B6=E6=96=B0=E5=A2=9Ebug?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/business/index.js | 19 +-
.../costRecord/component/applyDetail.vue | 109 ++-
src/views/business/reliefRecord/index.vue | 276 +++-----
.../part/partArrived/component/addTools.vue | 6 +-
.../material/repair/scrapLedger/detail.vue | 643 ++++++++++++++++++
.../material/repair/scrapLedger/index.vue | 475 +++++++++++++
6 files changed, 1335 insertions(+), 193 deletions(-)
create mode 100644 src/views/material/repair/scrapLedger/detail.vue
create mode 100644 src/views/material/repair/scrapLedger/index.vue
diff --git a/src/api/business/index.js b/src/api/business/index.js
index 0e62fc4a..ed131492 100644
--- a/src/api/business/index.js
+++ b/src/api/business/index.js
@@ -139,4 +139,21 @@ export function getSltRecordInfo(data) {
method: 'post',
data
})
-}
\ No newline at end of file
+}
+
+// 减免记录查询-列表
+export function getReliefRecordList(query) {
+ return request({
+ url: '/material/derateRecordQuery/getList',
+ method: 'get',
+ params: query
+ })
+}
+
+// 减免记录-删除
+export function deleteRedif(id) {
+ return request({
+ url: '/material/derateRecordQuery/' + id,
+ method: 'delete'
+ })
+}
diff --git a/src/views/business/costRecord/component/applyDetail.vue b/src/views/business/costRecord/component/applyDetail.vue
index 110e290b..5374d60f 100644
--- a/src/views/business/costRecord/component/applyDetail.vue
+++ b/src/views/business/costRecord/component/applyDetail.vue
@@ -64,7 +64,7 @@
{{finishCostName}}
- {{ finishCost }}
+ {{ costAll.toFixed(2) }}
@@ -196,7 +196,7 @@
-
+
费用小计:
{{ loseCost }}
@@ -209,17 +209,17 @@
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.costs.toFixed(2) }}
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.leaseMoney.toFixed(2) }}
@@ -286,6 +286,67 @@ export default {
// this.getProjectList();
},
methods: {
+ // 将数字转换为中文大写金额
+ numberToChinese(num) {
+ const cnNums = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+ const cnIntRadice = ['', '拾', '佰', '仟'];
+ const cnIntUnits = ['', '万', '亿', '兆'];
+ const cnDecUnits = ['角', '分', '毫', '厘'];
+ const cnInteger = '整';
+ const cnIntLast = '元';
+ let integerNum;
+ let decimalNum;
+ let chineseStr = '';
+ let parts;
+ if (num === 0) {
+ return cnNums[0] + cnIntLast + cnInteger;
+ }
+ num = parseFloat(num).toFixed(4);
+ parts = num.split('.');
+ integerNum = parts[0];
+ decimalNum = parts[1];
+ if (parseInt(integerNum, 10) > 0) {
+ let zeroCount = 0;
+ const IntLen = integerNum.length;
+ for (let i = 0; i < IntLen; i++) {
+ const n = integerNum.substr(i, 1);
+ const p = IntLen - i - 1;
+ const q = p / 4;
+ const m = p % 4;
+ if (n === '0') {
+ zeroCount++;
+ } else {
+ if (zeroCount > 0) {
+ chineseStr += cnNums[0];
+ }
+ zeroCount = 0;
+ chineseStr += cnNums[parseInt(n)] + cnIntRadice[m];
+ }
+ if (m === 0 && zeroCount < 4) {
+ chineseStr += cnIntUnits[q];
+ }
+ }
+ chineseStr += cnIntLast;
+ }
+ if (decimalNum !== '') {
+ const decLen = decimalNum.length;
+ for (let i = 0; i < decLen; i++) {
+ const n = decimalNum.substr(i, 1);
+ if (n !== '0') {
+ chineseStr += cnNums[Number(n)] + cnDecUnits[i];
+ }
+ }
+ }
+ if (chineseStr === '') {
+ chineseStr += cnNums[0] + cnIntLast + cnInteger;
+ } else if (decimalNum === '00' || decimalNum === '0000') {
+ chineseStr += cnInteger;
+ }
+ return chineseStr;
+ },
+
+
+
//获取单位类型 ,getUnitList, getProjectList
getUnitList() {
getUnitList().then((response) => {
@@ -315,18 +376,25 @@ export default {
this.loseList = response.data.loseList //丢失费用列表
this.loseCost = this.countCost(this.loseList)
-
+ this.reducList = response.data.reductionList //减免费用列表
+ console.log('111111111111111111',this.reducList)
+ this.reducList.forEach((item) => {
+ this.reducCost = Number(this.reducCost) + Number(item.leaseMoney)
+ })
+ console.log('2222222222222222',this.reducCost)
this.applyList = response.data.relations
this.applyList.forEach((item) => {
item.leaseCost = Number(item.leaseCost)
item.repairCost = Number(item.repairCost)
item.scrapCost = Number(item.scrapCost)
item.loseCost = Number(item.loseCost)
+ item.reductionCost = Number(item.reductionCost)
item.cost =
Number(item.leaseCost) +
Number(item.repairCost) +
Number(item.scrapCost) +
Number(item.loseCost) +
+ Number(item.reductionCost)
Number(item.addCost) -
Number(item.subCost)
})
@@ -335,8 +403,10 @@ export default {
Number(this.leaseCost) +
Number(this.repairCost) +
Number(this.scrapCost) +
- Number(this.loseCost)
+ Number(this.loseCost) +
+ Number(this.reducCost)
this.costAll = costSum
+ this.finishCostName = this.numberToChinese(this.costAll.toFixed(2));
this.subCostFlag = costSum
})
},
@@ -389,6 +459,7 @@ export default {
Number(row.repairCost) +
Number(row.scrapCost) +
Number(row.loseCost) +
+ Number(row.reduceLeaseMoney) +
Number(row.addCost || 0) -
Number(row.subCost || 0)
},
@@ -454,6 +525,14 @@ export default {
`减免费用明细_${new Date().getTime()}.xlsx`,
)
},
+ handleExport5() {
+ const params = this.rowData
+ this.download(
+ 'material/slt_agreement_info/exportReduction',
+ {...params,},
+ `减免费用明细_${new Date().getTime()}.xlsx`,
+ )
+ },
handleExportAll() {
const params = this.rowData
diff --git a/src/views/business/reliefRecord/index.vue b/src/views/business/reliefRecord/index.vue
index 2adb49c6..6b2c4b65 100644
--- a/src/views/business/reliefRecord/index.vue
+++ b/src/views/business/reliefRecord/index.vue
@@ -29,7 +29,7 @@
>
-
+
@@ -57,48 +57,57 @@
-
- 小计:
- {{ scope.$index+1 }}
-
+
+ {{
+ (queryParams.pageNum - 1) * 10 + scope.$index + 1
+ }}
+
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+ 待审核
+ 审核中
+ 已审核
+
+
查看
编辑
+
@@ -296,12 +312,9 @@
+
diff --git a/src/views/material/repair/scrapLedger/index.vue b/src/views/material/repair/scrapLedger/index.vue
new file mode 100644
index 00000000..63502776
--- /dev/null
+++ b/src/views/material/repair/scrapLedger/index.vue
@@ -0,0 +1,475 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 重置
+
+
+
+
+ 导出数据
+
+
+
+
+
+
+
+
+ {{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 验收
+
+
+ 验收单
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 机具配件到货验收单
+
+
+
+ 单据编号:{{printData.code}}
+
+
+ 生产厂家(供应商):{{printData.supplier}}
+
+
+
+ 到货日期:{{printData.arrivalTime}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
供应科:
+
+
+
![]()
+
+
+
+
+
+
生产技术科:
+
+
+
![]()
+
+
+
+
+
库管班:
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+