|
@@ -433,16 +433,38 @@
|
|
|
>创建erp</el-button>
|
|
|
</el-tooltip>
|
|
|
</el-col>
|
|
|
- <!-- <el-col :span="1.5">
|
|
|
- <el-tooltip content="批量推送erp" placement="top">
|
|
|
- <el-tag
|
|
|
- plain
|
|
|
- size="mini"
|
|
|
- effect="plain"
|
|
|
- v-hasPermi="['his:storeOrder:createErpOrder']"
|
|
|
- >创建erp</el-tag>
|
|
|
- </el-tooltip>
|
|
|
- </el-col> -->
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ disabled
|
|
|
+ plain
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ >应付金额: {{ payPriceTotal}}</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ disabled
|
|
|
+ plain
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ >实付金额: {{payMoneyTotal}}</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ disabled
|
|
|
+ plain
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ >物流代收金额: {{payRemainTotal }}</el-button>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="1.5">
|
|
|
+ <el-button
|
|
|
+ disabled
|
|
|
+ plain
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ >订单量/金额: {{ total }}/{{payPriceTotal }}</el-button>
|
|
|
+ </el-col>
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
</el-row>
|
|
|
<el-tabs type="card" v-model="actName" @tab-click="handleClickX">
|
|
@@ -523,6 +545,9 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
+ <div>
|
|
|
+ 商品数量合计:{{ productInfo }}
|
|
|
+ </div>
|
|
|
<pagination
|
|
|
v-show="total>0"
|
|
|
:total="total"
|
|
@@ -788,6 +813,10 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ productInfo:"",
|
|
|
+ payPriceTotal:"0",
|
|
|
+ payMoneyTotal:"0",
|
|
|
+ payRemainTotal:"0",
|
|
|
// 新增排序相关数据
|
|
|
currentSort: {
|
|
|
prop: null,
|
|
@@ -1178,6 +1207,18 @@ export default {
|
|
|
listOrder(this.queryParams).then(response => {
|
|
|
this.orderList = response.rows;
|
|
|
this.total = response.total;
|
|
|
+ if(this.total>0){
|
|
|
+ this.payPriceTotal = response.payPriceTotal;
|
|
|
+ this.payMoneyTotal = response.payMoneyTotal;
|
|
|
+ this.payRemainTotal = response.payRemainTotal;
|
|
|
+ this.productInfo = response.productInfo;
|
|
|
+ } else {
|
|
|
+ this.payPriceTotal = "0"
|
|
|
+ this.payMoneyTotal = "0"
|
|
|
+ this.payRemainTotal = "0"
|
|
|
+ this.productInfo = response.productInfo;
|
|
|
+ }
|
|
|
+
|
|
|
this.loading = false;
|
|
|
|
|
|
if(response.msg == 'jnmy'){
|
|
@@ -1798,59 +1839,6 @@ export default {
|
|
|
this.storeOPtions = response.rows;
|
|
|
});
|
|
|
},
|
|
|
- /** 查询订单列表 */
|
|
|
- getList() {
|
|
|
- this.loading = true;
|
|
|
- if(this.payTypeArr.length>0){
|
|
|
- this.queryParams.payType=this.payTypeArr.toString();
|
|
|
- }
|
|
|
- else{
|
|
|
- this.queryParams.payType=null
|
|
|
- }
|
|
|
- if(this.scheduleIdArr.length>0){
|
|
|
- this.queryParams.scheduleId=this.scheduleIdArr.toString();
|
|
|
- }
|
|
|
- else{
|
|
|
- this.queryParams.scheduleId=null
|
|
|
- }
|
|
|
- if(this.buyTypeArr.length>0){
|
|
|
- this.queryParams.orderBuyType=this.buyTypeArr.toString();
|
|
|
- }
|
|
|
- else{
|
|
|
- this.queryParams.orderbuyType=null
|
|
|
- }
|
|
|
- if(this.channelArr.length>0){
|
|
|
- this.queryParams.orderChannel=this.channelArr.toString();
|
|
|
- }
|
|
|
- else{
|
|
|
- this.queryParams.orderChannel=null
|
|
|
- }
|
|
|
- if(this.qwSubjectArr.length>0){
|
|
|
- this.queryParams.qwSubject=this.qwSubjectArr.toString();
|
|
|
- }
|
|
|
- else{
|
|
|
- this.queryParams.qwSubject=null
|
|
|
- }
|
|
|
- if(this.companyIds && this.companyIds.length>1){
|
|
|
- this.queryParams.companyIds = this.companyIds
|
|
|
- this.queryParams.companyId = null;
|
|
|
- this.queryParams.deptId = null;
|
|
|
- } else {
|
|
|
- this.queryParams.companyId = this.companyId
|
|
|
- this.queryParams.companyIds = null;
|
|
|
- }
|
|
|
- listOrder(this.queryParams).then(response => {
|
|
|
- this.orderList = response.rows;
|
|
|
- this.total = response.total;
|
|
|
- this.loading = false;
|
|
|
- if(response.msg == 'jnmy'){
|
|
|
- this.SFDFopen = true;
|
|
|
- } else{
|
|
|
- this.SFDFopen = false;
|
|
|
- }
|
|
|
- });
|
|
|
-
|
|
|
- },
|
|
|
// 取消按钮
|
|
|
cancel() {
|
|
|
this.open = false;
|