|
@@ -121,10 +121,15 @@
|
|
<!-- 操作按钮 -->
|
|
<!-- 操作按钮 -->
|
|
<div class="table-operator" style="display:flex;align-items:center;justify-content: space-between;">
|
|
<div class="table-operator" style="display:flex;align-items:center;justify-content: space-between;">
|
|
<div class="alert-message">
|
|
<div class="alert-message">
|
|
- 销售单数合计:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
|
|
|
|
- 销售款数合计:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
|
|
|
|
- 销售数量合计:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
|
|
|
|
- 销售金额合计:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
|
|
|
|
|
|
+ 合计:
|
|
|
|
+ 总单数:<strong>{{ totalData&&(totalData.totalRecord || totalData.totalRecord==0) ? totalData.totalRecord : '--' }}</strong>;
|
|
|
|
+ 总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '--' }}</strong>;
|
|
|
|
+ 总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
|
|
|
|
+ 总售价:<strong>{{ totalData&&(totalData.totalAmount || totalData.totalAmount==0) ? toThousands(totalData.totalAmount) : '--' }}</strong>;
|
|
|
|
+ <span v-if="showDiscount">
|
|
|
|
+ 折扣金额:<strong>{{ totalData&&(totalData.totalDiscountAmount || totalData.totalDiscountAmount==0) ? toThousands(totalData.totalDiscountAmount) : '--' }}</strong>;
|
|
|
|
+ 折后总售价:<strong>{{ totalData&&(totalData.totalDiscountedAmount || totalData.totalDiscountedAmount==0) ? toThousands(totalData.totalDiscountedAmount) : '--' }}</strong>;
|
|
|
|
+ </span>
|
|
</div>
|
|
</div>
|
|
<div class="action-buttons">
|
|
<div class="action-buttons">
|
|
<a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(0)"><a-icon type="plus" /> 新增(零售)</a-button>
|
|
<a-button type="primary" class="button-error" v-if="$hasPermissions('B_salesNews')" @click="handleAdd(0)"><a-icon type="plus" /> 新增(零售)</a-button>
|
|
@@ -258,7 +263,6 @@ export default {
|
|
components: { STable, VSelect, chooseCustomModal, rangeDate, auditModal, custList, stateIcon },
|
|
components: { STable, VSelect, chooseCustomModal, rangeDate, auditModal, custList, stateIcon },
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
data () {
|
|
data () {
|
|
- const _this = this
|
|
|
|
return {
|
|
return {
|
|
spinning: false,
|
|
spinning: false,
|
|
tableHeight: 0,
|
|
tableHeight: 0,
|
|
@@ -319,7 +323,6 @@ export default {
|
|
}
|
|
}
|
|
this.disabled = false
|
|
this.disabled = false
|
|
}
|
|
}
|
|
- console.log(res, 'res')
|
|
|
|
this.spinning = false
|
|
this.spinning = false
|
|
return data
|
|
return data
|
|
})
|
|
})
|
|
@@ -336,8 +339,8 @@ export default {
|
|
const arr = [
|
|
const arr = [
|
|
{ title: '序号', dataIndex: 'no', align: 'center', width: '4%' },
|
|
{ title: '序号', dataIndex: 'no', align: 'center', width: '4%' },
|
|
{ title: '来源', dataIndex: 'sourceTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
{ title: '来源', dataIndex: 'sourceTypeDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
- { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: '9%', align: 'center' },
|
|
|
|
- { title: '客户名称', dataIndex: 'buyerNameCurrent', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },
|
|
|
|
|
|
+ { title: '销售单号', scopedSlots: { customRender: 'salesBillNo' }, width: this.showDiscount ? '6%' : '9%', align: 'center' },
|
|
|
|
+ { title: '客户名称', dataIndex: 'buyerNameCurrent', align: 'center', width: this.showDiscount ? '12%' : '15%', customRender: function (text) { return text || '--' } },
|
|
{ title: '总款数', dataIndex: 'totalCategory', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '总款数', dataIndex: 'totalCategory', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '总数量', dataIndex: 'totalQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '总数量', dataIndex: 'totalQty', align: 'center', width: '5%', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
{ title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
{ title: '总售价', dataIndex: 'totalAmount', align: 'right', width: '5%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
|
|
@@ -599,7 +602,6 @@ export default {
|
|
this.$refs.table.refresh()
|
|
this.$refs.table.refresh()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
}
|
|
}
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|