|
@@ -113,7 +113,9 @@
|
|
|
:append-to-body="true"
|
|
|
>
|
|
|
<el-form :model="form">
|
|
|
- <div style=" margin-left: 30%;"><h4>合计发票金额{{}}元,确定提交?</h4></div>
|
|
|
+ <div style=" margin-left: 30%;">
|
|
|
+ <h4>合计发票金额{{}}元,确定提交?</h4>
|
|
|
+ </div>
|
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
<el-button @click="dialogFormVisible3 = false">取 消</el-button>
|
|
@@ -139,7 +141,7 @@
|
|
|
<el-button @click="dialogFormVisible3 = false">取 消</el-button>
|
|
|
<el-button type="primary" @click="dialogFormVisible3 = false">提 交</el-button>
|
|
|
</div>
|
|
|
- </el-dialog> -->
|
|
|
+ </el-dialog>-->
|
|
|
<ws-button type="primary" @click="dialogFormVisible4=true">付款</ws-button>
|
|
|
|
|
|
<el-dialog
|
|
@@ -258,10 +260,11 @@
|
|
|
<el-table
|
|
|
class="wenzi"
|
|
|
:data="warehouseList.records"
|
|
|
- style="width: 100%; margin-top: 20px"
|
|
|
- height="780"
|
|
|
+ style="width: 100%; margin-top: 20px; height: 780;"
|
|
|
+ ref="warehouseList"
|
|
|
+ border
|
|
|
+ :summary-method="getSummaries"
|
|
|
show-summary
|
|
|
-
|
|
|
>
|
|
|
<el-table-column type="selection" width="55"></el-table-column>
|
|
|
<el-table-column type="index" label="序号" width="50"></el-table-column>
|
|
@@ -410,38 +413,45 @@ export default {
|
|
|
accessoryTFs: false
|
|
|
}
|
|
|
},
|
|
|
+
|
|
|
activated() {
|
|
|
// this.loaddata()
|
|
|
this.getList()
|
|
|
this.showType = this.isShow
|
|
|
},
|
|
|
methods: {
|
|
|
-// getSummaries (param) {
|
|
|
-// const { columns, data } = param
|
|
|
-// const sums = []
|
|
|
-// columns.forEach((column, index) => {
|
|
|
-// if (index === 0) {
|
|
|
-// sums[index] = '总计'
|
|
|
-// } else if (index === 5 || index === 6) {
|
|
|
-// const values = data.map(item => Number(item[column.property]))
|
|
|
-// if (!values.every(value => isNaN(value))) {
|
|
|
-// sums[index] = values.reduce((prev, curr) => {
|
|
|
-// const value = Number(curr)
|
|
|
-// if (!isNaN(value)) {
|
|
|
-// return prev + curr
|
|
|
-// } else {
|
|
|
-// return prev
|
|
|
-// }
|
|
|
-// }, 0)
|
|
|
-// } else {
|
|
|
-// sums[index] = 'N/A'
|
|
|
-// }
|
|
|
-// } else {
|
|
|
-// sums[index] = '--'
|
|
|
-// }
|
|
|
-// })
|
|
|
-// return sums
|
|
|
-// },
|
|
|
+ updated() {
|
|
|
+ this.$nextTick(() => {
|
|
|
+ this.$refs.warehouseList.doLayout()
|
|
|
+ })
|
|
|
+ },
|
|
|
+ //合计
|
|
|
+ getSummaries(param) {
|
|
|
+ const { columns, data } = param
|
|
|
+ const sums = []
|
|
|
+ columns.forEach((column, index) => {
|
|
|
+ if (index === 0) {
|
|
|
+ sums[index] = '合计'
|
|
|
+ } else if (index === 5 || index === 7 || index === 8 || index === 9) {
|
|
|
+ const values = data.map(item => Number(item[column.property]))
|
|
|
+ if (!values.every(value => isNaN(value))) {
|
|
|
+ sums[index] = values.reduce((prev, curr) => {
|
|
|
+ const value = Number(curr)
|
|
|
+ if (!isNaN(value)) {
|
|
|
+ return prev + curr
|
|
|
+ } else {
|
|
|
+ return prev
|
|
|
+ }
|
|
|
+ }, 0)
|
|
|
+ } else {
|
|
|
+ sums[index] = '元'
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ sums[index] = '--'
|
|
|
+ }
|
|
|
+ })
|
|
|
+ return sums
|
|
|
+ },
|
|
|
//成交
|
|
|
submit() {
|
|
|
if (!this.warehouseList.transactionPrice) {
|
|
@@ -727,7 +737,6 @@ export default {
|
|
|
.el-button--primary {
|
|
|
background-color: #5878e8;
|
|
|
border-color: #5878e8;
|
|
|
-
|
|
|
}
|
|
|
.el-button--default {
|
|
|
color: #8890b1;
|
|
@@ -944,6 +953,19 @@ hr {
|
|
|
.el-input-number--small {
|
|
|
width: 123% !important;
|
|
|
}
|
|
|
+.wemzi {
|
|
|
+ height: 780;
|
|
|
+}
|
|
|
+/deep/.el-table td,
|
|
|
+.el-table th.is-leaf {
|
|
|
+ border-right: 1px solid #e9ecf7;
|
|
|
+ text-align: center;
|
|
|
+ height: 40px;
|
|
|
+}
|
|
|
+// .el-table { overflow: visible !important; }
|
|
|
+// .el-table__footer-wrapper {
|
|
|
+// margin-top: -23%;
|
|
|
+// }
|
|
|
// .danjia{
|
|
|
// width: 9px;
|
|
|
// height: 9px;
|