meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
liushuai
2019-01-03 19:05:42 +08:00
parent 115de385bc
commit 63cca644bb
12 changed files with 96 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils/request.js
View File

@@ -19,7 +19,7 @@ const service = axios.create({
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.1.199:8411/submit/MESCommonBase.ashx`,
baseURL: `http://192.168.0.2:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间

59
src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue
View File

@@ -203,8 +203,10 @@
icon=""
style="margin-top:10px"
@click="calculateContractSum">计算合同总额</el-button>
<span>合同总额:</span>
<span>合同总额(未税):</span>
<el-input v-model="contractSum" size="small"/>
<span>合同总额(含税):</span>
<el-input v-model="contractSum2" size="small"/>
</el-card>
<el-card>
<el-input :rows="20" v-model="textArea" type="textarea" style="width:calc(99% - 250px);float:right;margin-bottom: 20px" resize="none"/>
@@ -364,6 +366,7 @@ export default {
paramRow: '', // 参数row
contractSum: 0,
contractSum1: 0,
contractSum2: 0,
deliveryDay: [],
deliveryDay1: [],
contractNumValue: '',
@@ -515,6 +518,7 @@ export default {
this.tableData4.push(this.groupNum2[i])
}
this.contractSum = (this.contractSum + this.contractSum1).toFixed(2)
this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100
this.costAccount = this.contractSum
if (parseInt(this.costAccount) === 0) {
this.$message.error('成本核算不可为0')
@@ -681,59 +685,6 @@ export default {
})
}
},
// payMethodChange() { // 付款方式改变
// for (let i = 0; i < this.payMethod.length; i++) {
// if (this.payMethod[i].value === this.payMethodValue) {
// this.payMethodName = this.payMethod[i].label
// }
// }
// const payTimeNum = this.payMethodName.split(':')
// switch (payTimeNum.length) {
// case 1:
// this.disable2 = true
// this.disable3 = true
// this.disable4 = true
// this.disable5 = true
// this.disable6 = true
// break
// case 2:
// this.disable2 = false
// this.disable3 = true
// this.disable4 = true
// this.disable5 = true
// this.disable6 = true
// break
// case 3:
// this.disable2 = false
// this.disable3 = false
// this.disable4 = true
// this.disable5 = true
// this.disable6 = true
// break
// case 4:
// this.disable2 = false
// this.disable3 = false
// this.disable4 = false
// this.disable5 = true
// this.disable6 = true
// break
// case 5:
// this.disable2 = false
// this.disable3 = false
// this.disable4 = false
// this.disable5 = false
// this.disable6 = true
// break
// case 6:
// this.disable2 = false
// this.disable3 = false
// this.disable4 = false
// this.disable5 = false
// this.disable6 = false
// break
// }
// this.fetchData()
// },
exportExcel() {}
}
}

8
src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue
View File

@@ -75,7 +75,7 @@
</el-table-column>
<el-table-column label="总金额" width="70" align="center">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="预付款" width="80" align="center">
@@ -207,7 +207,7 @@
</el-table-column>
<el-table-column label="总金额" min-width="80" align="center">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="预付款" min-width="80" align="center">
@@ -314,6 +314,8 @@ export default {
}
}
})
response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100
response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100
}
this.tableData1 = response.data.rows
this.total1 = response.data.total
@@ -381,6 +383,8 @@ export default {
}
searchRequestTable(this.checkRequest, this.startRequestDate, this.endRequestDate).then(response => {
for (let j = 0; j < response.data.length; j++) {
response.data[j].含税总金额 = parseInt(response.data[j].含税总金额 * 100) / 100
response.data[j].欠款金额 = parseInt(response.data[j].欠款金额 * 100) / 100
if (response.data[j].请款时间 !== null) {
response.data[j].请款时间 = response.data[j].请款时间.substring(0, response.data[j].请款时间.indexOf(' '))
}

6
src/views/WorkshopProcurement/FundApproval2/index.vue
View File

@@ -35,7 +35,7 @@
</el-table-column>
<el-table-column label="总金额" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="欠款金额" align="center" min-width="70">
@@ -108,6 +108,10 @@ export default {
},
searchTable() {
initApproval1(this.pageCurrent, this.pageSize, 2).then(response => {
for (let j = 0; j < response.data.rows.length; j++) {
response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100
response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100
}
this.tableData = response.data.rows
this.total = response.data.total
})

6
src/views/WorkshopProcurement/FundApproval3/index.vue
View File

@@ -35,7 +35,7 @@
</el-table-column>
<el-table-column label="总金额" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="欠款金额" align="center" min-width="70">
@@ -108,6 +108,10 @@ export default {
},
searchTable() {
initApproval1(this.pageCurrent, this.pageSize, 3).then(response => {
for (let j = 0; j < response.data.rows.length; j++) {
response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100
response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100
}
this.tableData = response.data.rows
this.total = response.data.total
})

4
src/views/WorkshopProcurement/InvoiceStateSearch/index.vue
View File

@@ -182,7 +182,9 @@ export default {
this.contractNum ? this.check1 = 1 : this.check1 = 0
this.supplierName ? this.check2 = 1 : this.check2 = 0
searchContractInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.contractNum, this.check2, this.supplierName).then(response => {
console.log(response.data.rows)
for (let j = 0; j < response.data.rows.length; j++) {
response.data.rows[j].合同总金额 = parseInt(response.data.rows[j].合同总金额 * 100) / 100
}
this.tableData1 = response.data.rows
this.total1 = response.data.total
})

10
src/views/WorkshopProcurement/PayStateSearch/index.vue
View File

@@ -56,7 +56,7 @@
</el-table-column>
<el-table-column label="总金额" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="欠款金额" align="center" min-width="70">
@@ -66,7 +66,7 @@
</el-table-column>
<el-table-column label="已付金额" align="center" min-width="70">
<template slot-scope="scope">
{{ scope.row.总金额 - scope.row.欠款金额 }}
{{ scope.row.含税总金额 - scope.row.欠款金额 }}
</template>
</el-table-column>
<el-table-column label="付款情况" align="center" min-width="150">
@@ -74,7 +74,7 @@
<el-progress
:text-inside="true"
:stroke-width="18"
:percentage="(parseInt(10000*(scope.row.总金额 - scope.row.欠款金额)/scope.row.总金额)) / 100"
:percentage="(parseInt(10000*(scope.row.含税总金额 - scope.row.欠款金额)/scope.row.含税总金额)) / 100"
status="success"/>
</template>
</el-table-column>
@@ -141,6 +141,10 @@ export default {
this.contractNumValue ? this.check1 = 1 : this.check1 = 0
this.supplierName ? this.check2 = 1 : this.check2 = 0
searchPayState(this.pageCurrent1, this.pageSize1, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => {
for (let j = 0; j < response.data.rows.length; j++) {
response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100
response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100
}
this.tableData1 = response.data.rows
this.total1 = response.data.total
})

2
src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
View File

@@ -61,7 +61,7 @@
</el-table-column>
<el-table-column label="总金额" align="center">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="预付款" align="center">

2
src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
View File

@@ -70,7 +70,7 @@
</el-table-column>
<el-table-column label="总金额" align="center">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="预付款" align="center">

60
src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
View File

@@ -17,7 +17,7 @@
@click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
</el-card>
<el-card>
<el-table v-loading="" :data="tableData2" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
<el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
<el-table-column label="项目名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -56,7 +56,7 @@
</el-table>
</el-card>
<el-card>
<el-table v-loading="" :data="tableData" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
<el-table v-loading="" :data="tableData" :summary-method="getSummaries" show-summary border style="width: 100%;max-height: 500px;" height="300px" size="mini">
<el-table-column label="项目名称" align="center" min-width="100">
<template slot-scope="scope">
{{ scope.row.项目名称 }}
@@ -144,6 +144,62 @@ export default {
} else {
this.$message.error('请选择项目')
}
},
getSummaries(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 4) {
sums[index] = '合计'
return
} else if (index === 5) {
const values = data.map(item => Number(item['金额']))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return Number(prev) + Number(curr)
} else {
return Number(prev)
}
}, 0)
sums[index] += ' 元(未税)'
} else {
sums[index] = 'N/A'
}
} else if (index === 6) {
sums[index] = parseInt(parseInt(sums[5]) * 1.16 * 100) / 100 + ' 元(含税)'
}
})
return sums
},
getSummaries1(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 4) {
sums[index] = '合计'
return
} else if (index === 5) {
const values = data.map(item => Number(item['金额']))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return Number(prev) + Number(curr)
} else {
return Number(prev)
}
}, 0)
sums[index] += ' 元(未税)'
} else {
sums[index] = 'N/A'
}
} else if (index === 6) {
sums[index] = parseInt(parseInt(sums[5]) * 1.16 * 100) / 100 + ' 元(含税)'
}
})
return sums
}
}
}

4
src/views/WorkshopProcurement/PurchaseContractChange/index.vue
View File

@@ -49,7 +49,7 @@
</el-table-column>
<el-table-column label="总金额" align="center">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="预付款" align="center">
@@ -257,7 +257,7 @@
</el-table-column>
<el-table-column label="总金额" align="center">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column label="预付款" align="center">

3
src/views/WorkshopProcurement/ReceiptConnectionSheet/index.vue
View File

@@ -80,7 +80,7 @@
</el-table-column>
<el-table-column align="center" label="总金额" min-width="100px">
<template slot-scope="scope">
{{ scope.row.总金额 }}
{{ scope.row.含税总金额 }}
</template>
</el-table-column>
<el-table-column align="center" label="扣除金额" min-width="100px">
@@ -284,6 +284,7 @@ export default {
this.contractNum ? this.check5 = 1 : this.check5 = 0
searchInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.invoiceNum, this.check2, this.invoiceTime, this.check3, this.transmitValue, this.check4, this.recipientValue, this.check5, this.contractNum).then(response => {
for (let j = 0; j < response.data.rows.length; j++) {
response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100
if (response.data.rows[j].开票时间 !== null) {
response.data.rows[j].开票时间 = response.data.rows[j].开票时间.substring(0, response.data.rows[j].开票时间.indexOf(' '))
}