|
@@ -9,7 +9,14 @@
|
|
<el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
|
|
<el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
|
|
</template>
|
|
</template>
|
|
<template #left_btn>
|
|
<template #left_btn>
|
|
- <el-checkbox-group v-model="screenForm.status" @change="currentPage = 1;getList()" size="mini">
|
|
|
|
|
|
+ <el-checkbox-group
|
|
|
|
+ v-model="screenForm.status"
|
|
|
|
+ @change="
|
|
|
|
+ currentPage = 1
|
|
|
|
+ getList()
|
|
|
|
+ "
|
|
|
|
+ size="mini"
|
|
|
|
+ >
|
|
<el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
|
|
<el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
|
|
item.label
|
|
item.label
|
|
}}</el-checkbox-button>
|
|
}}</el-checkbox-button>
|
|
@@ -46,7 +53,7 @@
|
|
<el-date-picker
|
|
<el-date-picker
|
|
v-model="screenForm.date"
|
|
v-model="screenForm.date"
|
|
type="datetimerange"
|
|
type="datetimerange"
|
|
-:default-time="['00:00:00','23:59:59']"
|
|
|
|
|
|
+ :default-time="['00:00:00', '23:59:59']"
|
|
range-separator="至"
|
|
range-separator="至"
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
@@ -163,7 +170,7 @@
|
|
<el-date-picker
|
|
<el-date-picker
|
|
v-model="screenForm.orderTime"
|
|
v-model="screenForm.orderTime"
|
|
type="datetimerange"
|
|
type="datetimerange"
|
|
-:default-time="['00:00:00','23:59:59']"
|
|
|
|
|
|
+ :default-time="['00:00:00', '23:59:59']"
|
|
range-separator="至"
|
|
range-separator="至"
|
|
style="width: 100%"
|
|
style="width: 100%"
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
@@ -206,8 +213,12 @@
|
|
</Collapse>
|
|
</Collapse>
|
|
</div>
|
|
</div>
|
|
<ul class="ulStyle">
|
|
<ul class="ulStyle">
|
|
- <li class="title">金额:<span class="num">{{numSum.amountC || 0}}</span></li>
|
|
|
|
- <li class="title">数量:<span class="num">{{numSum.totalC || 0}}</span></li>
|
|
|
|
|
|
+ <li class="title">
|
|
|
|
+ 金额:<span class="num">{{ (Number(numSum.amountC) || 0) | numToFixed }}</span>
|
|
|
|
+ </li>
|
|
|
|
+ <li class="title">
|
|
|
|
+ 数量:<span class="num">{{ Number(numSum.totalC) || 0 | numToFixed }}</span>
|
|
|
|
+ </li>
|
|
</ul>
|
|
</ul>
|
|
<div class="mymain-container">
|
|
<div class="mymain-container">
|
|
<div class="btn-group clearfix">
|
|
<div class="btn-group clearfix">
|
|
@@ -376,7 +387,7 @@
|
|
{{ scope.row.isDirectTransfer ? '是' : '否' }}
|
|
{{ scope.row.isDirectTransfer ? '是' : '否' }}
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
- <el-table-column
|
|
|
|
|
|
+ <el-table-column
|
|
align="right"
|
|
align="right"
|
|
label="出库数量"
|
|
label="出库数量"
|
|
prop="hasSendQty"
|
|
prop="hasSendQty"
|
|
@@ -601,7 +612,15 @@
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
-import { getOrderList, applyHome, withdrawHome, deleteHome, editDateHome, abandonHome,getEnginCountList } from '@/api/supply/engin'
|
|
|
|
|
|
+import {
|
|
|
|
+ getOrderList,
|
|
|
|
+ applyHome,
|
|
|
|
+ withdrawHome,
|
|
|
|
+ deleteHome,
|
|
|
|
+ editDateHome,
|
|
|
|
+ abandonHome,
|
|
|
|
+ getEnginCountList
|
|
|
|
+} from '@/api/supply/engin'
|
|
import { getSalesmanList, getTypeList } from '@/api/common'
|
|
import { getSalesmanList, getTypeList } from '@/api/common'
|
|
import HomeDetail from '@/views/supply/engin/components/home_detail'
|
|
import HomeDetail from '@/views/supply/engin/components/home_detail'
|
|
import HomeForm from '@/views/supply/engin/components/home_form'
|
|
import HomeForm from '@/views/supply/engin/components/home_form'
|
|
@@ -695,9 +714,9 @@ export default {
|
|
salesTypeList: [],
|
|
salesTypeList: [],
|
|
NoRebateWalletList: [],
|
|
NoRebateWalletList: [],
|
|
typeList: [],
|
|
typeList: [],
|
|
- numSum:{
|
|
|
|
- totalC:0,
|
|
|
|
- amountC:0
|
|
|
|
|
|
+ numSum: {
|
|
|
|
+ totalC: 0,
|
|
|
|
+ amountC: 0
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -749,7 +768,6 @@ export default {
|
|
this.getSalesTypeList()
|
|
this.getSalesTypeList()
|
|
this.getSalesmanList()
|
|
this.getSalesmanList()
|
|
this.getList()
|
|
this.getList()
|
|
-
|
|
|
|
},
|
|
},
|
|
|
|
|
|
methods: {
|
|
methods: {
|
|
@@ -859,12 +877,11 @@ export default {
|
|
|
|
|
|
refPromiseProvide: this.screenForm.refPromiseProvide,
|
|
refPromiseProvide: this.screenForm.refPromiseProvide,
|
|
enginOrderType: 'HOME' // TRADE=商用 HOME=家用
|
|
enginOrderType: 'HOME' // TRADE=商用 HOME=家用
|
|
- }).then(res=>{
|
|
|
|
- if (res.data){
|
|
|
|
|
|
+ }).then(res => {
|
|
|
|
+ if (res.data) {
|
|
this.numSum = res.data
|
|
this.numSum = res.data
|
|
}
|
|
}
|
|
})
|
|
})
|
|
-
|
|
|
|
},
|
|
},
|
|
|
|
|
|
// 提交筛选表单
|
|
// 提交筛选表单
|
|
@@ -875,7 +892,7 @@ export default {
|
|
|
|
|
|
// 重置筛选表单
|
|
// 重置筛选表单
|
|
resetScreenForm() {
|
|
resetScreenForm() {
|
|
- this.$refs.screenForm.resetFields()
|
|
|
|
|
|
+ this.$refs.screenForm.resetFields()
|
|
this.currentPage = 1
|
|
this.currentPage = 1
|
|
this.getList()
|
|
this.getList()
|
|
},
|
|
},
|
|
@@ -1009,19 +1026,19 @@ export default {
|
|
</script>
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
<style lang="scss" scoped>
|
|
-.ulStyle{
|
|
|
|
|
|
+.ulStyle {
|
|
list-style: none;
|
|
list-style: none;
|
|
margin: 0;
|
|
margin: 0;
|
|
padding: 10px 0;
|
|
padding: 10px 0;
|
|
background-color: #ffffff;
|
|
background-color: #ffffff;
|
|
z-index: 1;
|
|
z-index: 1;
|
|
}
|
|
}
|
|
-.title{
|
|
|
|
|
|
+.title {
|
|
display: inline-block;
|
|
display: inline-block;
|
|
font-weight: 700;
|
|
font-weight: 700;
|
|
margin-right: 20px;
|
|
margin-right: 20px;
|
|
}
|
|
}
|
|
-.num{
|
|
|
|
|
|
+.num {
|
|
padding-left: 6px;
|
|
padding-left: 6px;
|
|
font-weight: 400;
|
|
font-weight: 400;
|
|
}
|
|
}
|