|
@@ -28,8 +28,8 @@
|
|
|
</template>
|
|
|
<template slot="storageIdSearch">
|
|
|
<search-query :datalist="storageData" :selectValue="query.storageId" :clearable="true" :buttonIf="false"
|
|
|
- :forParameter="{ key: 'id', label: 'cname', value: 'id' }" placeholder="请选择品牌" @corpFocus="storageIdfun"
|
|
|
- @corpChange="corpChange($event, 'storageId')">
|
|
|
+ :forParameter="{ key: 'id', label: 'cname', value: 'id' }" placeholder="请选择品牌"
|
|
|
+ @corpFocus="storageIdfun" @corpChange="corpChange($event, 'storageId')">
|
|
|
</search-query>
|
|
|
</template>
|
|
|
<!--<template slot="goodsNameSearch">-->
|
|
@@ -53,10 +53,10 @@
|
|
|
</search-query>
|
|
|
</template>
|
|
|
<template slot="actualPaymentStatusSearch">
|
|
|
- <search-query :datalist="actualPaymentStatusData" :selectValue="query.actualPaymentStatus" :clearable="true"
|
|
|
- :buttonIf="false" :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }"
|
|
|
- placeholder="请选择结算方式" @corpFocus="actualPaymentWorkDictsfun"
|
|
|
- @corpChange="corpChange($event, 'actualPaymentStatus')">
|
|
|
+ <search-query :datalist="actualPaymentStatusData" :selectValue="query.actualPaymentStatus"
|
|
|
+ :clearable="true" :buttonIf="false"
|
|
|
+ :forParameter="{ key: 'dictKey', label: 'dictValue', value: 'dictKey' }" placeholder="请选择结算方式"
|
|
|
+ @corpFocus="actualPaymentWorkDictsfun" @corpChange="corpChange($event, 'actualPaymentStatus')">
|
|
|
</search-query>
|
|
|
</template>
|
|
|
<template slot="bsTypeSearch">
|
|
@@ -149,6 +149,7 @@ export default {
|
|
|
label: '供应商名称',
|
|
|
prop: 'customerName',
|
|
|
overHidden: true,
|
|
|
+ width: 100,
|
|
|
search: true,
|
|
|
searchslot: true,
|
|
|
searchOrder: 3
|
|
@@ -218,21 +219,60 @@ export default {
|
|
|
label: '花纹',
|
|
|
prop: 'pattern',
|
|
|
overHidden: true,
|
|
|
- }, {
|
|
|
- label: '数量',
|
|
|
- prop: 'goodsNum',
|
|
|
- overHidden: true,
|
|
|
- }, {
|
|
|
+ },
|
|
|
+ // {
|
|
|
+ // label: '数量',
|
|
|
+ // prop: 'goodsNum',
|
|
|
+ // overHidden: true,
|
|
|
+ // },
|
|
|
+ {
|
|
|
label: '价格',
|
|
|
prop: 'price',
|
|
|
overHidden: true,
|
|
|
- }, {
|
|
|
- label: '金额',
|
|
|
+ },
|
|
|
+ // {
|
|
|
+ // label: '金额',
|
|
|
+ // prop: 'subTotalMoney',
|
|
|
+ // overHidden: true,
|
|
|
+ // },
|
|
|
+ {
|
|
|
+ label: '采购数量',
|
|
|
+ prop: 'primaryGoodsTotalNum',
|
|
|
+ overHidden: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '采购金额',
|
|
|
+ prop: 'primaryGoodsTotalMoney',
|
|
|
+ overHidden: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '入库数量',
|
|
|
+ prop: 'goodsNum',
|
|
|
+ overHidden: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '入库金额',
|
|
|
prop: 'subTotalMoney',
|
|
|
overHidden: true,
|
|
|
- }, {
|
|
|
- label: '余额',
|
|
|
- prop: 'balanceAmount',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '卖出数量',
|
|
|
+ prop: 'outGoodsTotalShipNum',
|
|
|
+ overHidden: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '卖出金额',
|
|
|
+ prop: 'outGoodsTotalShipAmount',
|
|
|
+ overHidden: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '剩余数量',
|
|
|
+ prop: 'surplusNum',
|
|
|
+ overHidden: true,
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '剩余金额',
|
|
|
+ prop: 'surplusAmount',
|
|
|
overHidden: true,
|
|
|
},
|
|
|
// {
|
|
@@ -327,12 +367,12 @@ export default {
|
|
|
commodityLabel: [{
|
|
|
id: 1,
|
|
|
label: '采购数量',
|
|
|
- prop: 'goodsSum'
|
|
|
+ prop: 'primaryGoodsTotalNum'
|
|
|
},
|
|
|
{
|
|
|
id: 2,
|
|
|
label: '采购金额',
|
|
|
- prop: 'amount'
|
|
|
+ prop: 'primaryGoodsTotalMoney'
|
|
|
},
|
|
|
// {
|
|
|
// id: 3,
|
|
@@ -354,6 +394,30 @@ export default {
|
|
|
label: '已取消金额',
|
|
|
prop: 'amountCancellation'
|
|
|
},
|
|
|
+ {
|
|
|
+ label: '入库数量',
|
|
|
+ prop: 'goodsSum',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '入库金额',
|
|
|
+ prop: 'amount',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '卖出数量',
|
|
|
+ prop: 'outGoodsTotalShipNum',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '卖出金额',
|
|
|
+ prop: 'outGoodsTotalShipAmount',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '剩余数量',
|
|
|
+ prop: 'surplusNum',
|
|
|
+ },
|
|
|
+ {
|
|
|
+ label: '剩余金额',
|
|
|
+ prop: 'surplusAmount',
|
|
|
+ },
|
|
|
// {
|
|
|
// id: 7,
|
|
|
// label: '已取消成本',
|
|
@@ -390,7 +454,12 @@ export default {
|
|
|
},
|
|
|
methods: {
|
|
|
resetChange() {
|
|
|
- this.query = this.$options.data().query
|
|
|
+ this.query = {
|
|
|
+ businesDateStart: defaultDate3()[0],
|
|
|
+ businesDateEnd: defaultDate3()[1],
|
|
|
+ isContain: 1,
|
|
|
+ bsType: 'CG,TKCG,RZCG',
|
|
|
+ }
|
|
|
},
|
|
|
cellStyle({ row, rowIndex }) {
|
|
|
if (row.status == '已取消') {
|