|
@@ -11,9 +11,8 @@
|
|
<template #left_btn>
|
|
<template #left_btn>
|
|
<el-checkbox-group v-model="screenForm.status" @change="getList()" size="mini">
|
|
<el-checkbox-group v-model="screenForm.status" @change="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
|
|
|
|
- }}
|
|
|
|
- </el-checkbox-button>
|
|
|
|
|
|
+ item.label
|
|
|
|
+ }}</el-checkbox-button>
|
|
</el-checkbox-group>
|
|
</el-checkbox-group>
|
|
</template>
|
|
</template>
|
|
<template #search>
|
|
<template #search>
|
|
@@ -47,7 +46,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"
|
|
@@ -164,7 +163,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"
|
|
@@ -207,8 +206,8 @@
|
|
</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">{{numSum.amountC || 0}}</span></li>
|
|
|
|
+ <li class="title">数量:<span class="num">{{numSum.totalC || 0}}</span></li>
|
|
</ul>
|
|
</ul>
|
|
<div class="mymain-container">
|
|
<div class="mymain-container">
|
|
<div class="btn-group clearfix">
|
|
<div class="btn-group clearfix">
|
|
@@ -219,8 +218,7 @@
|
|
type="primary"
|
|
type="primary"
|
|
icon="el-icon-plus"
|
|
icon="el-icon-plus"
|
|
@click="toForm()"
|
|
@click="toForm()"
|
|
- >新增
|
|
|
|
- </el-button
|
|
|
|
|
|
+ >新增</el-button
|
|
>
|
|
>
|
|
<el-button
|
|
<el-button
|
|
v-if="$checkBtnRole('del', $route.meta.roles)"
|
|
v-if="$checkBtnRole('del', $route.meta.roles)"
|
|
@@ -229,8 +227,7 @@
|
|
icon="el-icon-minus"
|
|
icon="el-icon-minus"
|
|
:disabled="multipleSelection.length < 1"
|
|
:disabled="multipleSelection.length < 1"
|
|
@click="batchDelete()"
|
|
@click="batchDelete()"
|
|
- >批量删除
|
|
|
|
- </el-button
|
|
|
|
|
|
+ >批量删除</el-button
|
|
>
|
|
>
|
|
</div>
|
|
</div>
|
|
<div class="fr">
|
|
<div class="fr">
|
|
@@ -404,10 +401,8 @@
|
|
>
|
|
>
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
{{ scope.row.applySendQty }}
|
|
{{ scope.row.applySendQty }}
|
|
- </template>
|
|
|
|
- </el-table-column
|
|
|
|
- >
|
|
|
|
- <el-table-column
|
|
|
|
|
|
+ </template> </el-table-column
|
|
|
|
+ ><el-table-column
|
|
align="right"
|
|
align="right"
|
|
label="退货数量"
|
|
label="退货数量"
|
|
prop="refundProductQty"
|
|
prop="refundProductQty"
|
|
@@ -563,7 +558,7 @@
|
|
>
|
|
>
|
|
退订
|
|
退订
|
|
</el-button>
|
|
</el-button>
|
|
- <el-button type="text" @click="toDetail(scope.row)"> 详情</el-button>
|
|
|
|
|
|
+ <el-button type="text" @click="toDetail(scope.row)"> 详情 </el-button>
|
|
<el-popconfirm
|
|
<el-popconfirm
|
|
v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'"
|
|
v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'"
|
|
style="margin-left: 10px"
|
|
style="margin-left: 10px"
|
|
@@ -602,15 +597,7 @@
|
|
</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'
|
|
@@ -704,9 +691,9 @@ export default {
|
|
salesTypeList: [],
|
|
salesTypeList: [],
|
|
NoRebateWalletList: [],
|
|
NoRebateWalletList: [],
|
|
typeList: [],
|
|
typeList: [],
|
|
- numSum: {
|
|
|
|
- totalC: 0,
|
|
|
|
- amountC: 0
|
|
|
|
|
|
+ numSum:{
|
|
|
|
+ totalC:0,
|
|
|
|
+ amountC:0
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -799,7 +786,8 @@ export default {
|
|
getList() {
|
|
getList() {
|
|
this.listLoading = true
|
|
this.listLoading = true
|
|
const params = {
|
|
const params = {
|
|
-
|
|
|
|
|
|
+ pageNum: this.currentPage,
|
|
|
|
+ pageSize: this.pageSize,
|
|
examineStatus: this.screenForm.status.join(','),
|
|
examineStatus: this.screenForm.status.join(','),
|
|
enginOrderNo: this.screenForm.orderNum,
|
|
enginOrderNo: this.screenForm.orderNum,
|
|
refProjectNo: this.screenForm.enginNum,
|
|
refProjectNo: this.screenForm.enginNum,
|
|
@@ -829,13 +817,6 @@ export default {
|
|
enginOrderType: 'HOME' // TRADE=商用 HOME=家用
|
|
enginOrderType: 'HOME' // TRADE=商用 HOME=家用
|
|
}
|
|
}
|
|
|
|
|
|
- getEnginCountList(params).then(res => {
|
|
|
|
- if (res.data) {
|
|
|
|
- this.numSum = res.data
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
- params.pageNum = this.currentPage
|
|
|
|
- params.pageSize = this.pageSize
|
|
|
|
getOrderList(params).then(res => {
|
|
getOrderList(params).then(res => {
|
|
res.data.records.forEach(item => {
|
|
res.data.records.forEach(item => {
|
|
item.sums1 = ['qty', 'directTransferQty', 'hasSendQty']
|
|
item.sums1 = ['qty', 'directTransferQty', 'hasSendQty']
|
|
@@ -846,6 +827,40 @@ export default {
|
|
this.listLoading = false
|
|
this.listLoading = false
|
|
})
|
|
})
|
|
|
|
|
|
|
|
+ getEnginCountList({
|
|
|
|
+ examineStatus: this.screenForm.status.join(','),
|
|
|
|
+ enginOrderNo: this.screenForm.orderNum,
|
|
|
|
+ refProjectNo: this.screenForm.enginNum,
|
|
|
|
+ refEnginRecordNo: this.screenForm.loginNum,
|
|
|
|
+ refTradeCategory: this.screenForm.refTradeCategory,
|
|
|
|
+ startCreateTime: this.screenForm.date ? this.screenForm.date[0] : '',
|
|
|
|
+ endCreateTime: this.screenForm.date ? this.screenForm.date[1] : '',
|
|
|
|
+ startOrderTime: this.screenForm.orderTime ? this.screenForm.orderTime[0] : '',
|
|
|
|
+ endOrderTime: this.screenForm.orderTime ? this.screenForm.orderTime[1] : '',
|
|
|
|
+ createName: this.screenForm.createMan,
|
|
|
|
+ confirmName: this.screenForm.examineMan,
|
|
|
|
+ serviceId: this.screenForm.salesMan,
|
|
|
|
+ refUseUnit: this.screenForm.refUseUnit,
|
|
|
|
+ materialOldNumber: this.screenForm.materialOldNumber,
|
|
|
|
+ specification: this.screenForm.specification,
|
|
|
|
+ customerKeyword: this.screenForm.customerKeyword,
|
|
|
|
+ refRegionWork: this.screenForm.refRegionWork,
|
|
|
|
+ remark: this.screenForm.remark,
|
|
|
|
+ geLiInerNote: this.screenForm.geLiInerNote,
|
|
|
|
+ saleTypeId: this.screenForm.saleTypeId,
|
|
|
|
+ customerWalletId: this.screenForm.customerWalletId,
|
|
|
|
+ refFactoryNo: this.screenForm.refFactoryNo,
|
|
|
|
+ refBuyUnitName: this.screenForm.refBuyUnitName,
|
|
|
|
+ isDirectTransfer: this.screenForm.isDirectTransfer,
|
|
|
|
+
|
|
|
|
+ refPromiseProvide: this.screenForm.refPromiseProvide,
|
|
|
|
+ enginOrderType: 'HOME' // TRADE=商用 HOME=家用
|
|
|
|
+ }).then(res=>{
|
|
|
|
+ if (res.data){
|
|
|
|
+ this.numSum = res.data
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+
|
|
},
|
|
},
|
|
|
|
|
|
// 提交筛选表单
|
|
// 提交筛选表单
|
|
@@ -959,8 +974,7 @@ export default {
|
|
this.getList()
|
|
this.getList()
|
|
})
|
|
})
|
|
})
|
|
})
|
|
- .catch(() => {
|
|
|
|
- })
|
|
|
|
|
|
+ .catch(() => {})
|
|
},
|
|
},
|
|
|
|
|
|
handleSelectionChange(val) {
|
|
handleSelectionChange(val) {
|
|
@@ -991,21 +1005,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;
|
|
}
|
|
}
|