zhouhao 2 سال پیش
والد
کامیت
5da8d8381d
2فایلهای تغییر یافته به همراه53 افزوده شده و 33 حذف شده
  1. 9 7
      src/views/deposit_home/refund_list.vue
  2. 44 26
      src/views/supply/engin/home_list.vue

+ 9 - 7
src/views/deposit_home/refund_list.vue

@@ -667,13 +667,7 @@ export default {
     }
   },
   created() {
-    getDepositCountList({
-      enginOrderType: this.enginOrderType
-    }).then(res=>{
-      if (res.data){
-        this.numSum = res.data
-      }
-    })
+
     this.getDataList({
       pageSize: this.pageSize,
       pageNum: this.currentPage,
@@ -915,6 +909,14 @@ export default {
       this.showSurrender = false
     },
     async getDataList(data) {
+      getDepositCountList({
+        enginOrderType: this.enginOrderType,
+        ...this.screenForm
+      }).then(res=>{
+        if (res.data){
+          this.numSum = res.data
+        }
+      })
       const res = await getDepositManageList(data)
       res.data.records.forEach(item => {
         item.totalPrice = item.itemPrice * item.itemQty

+ 44 - 26
src/views/supply/engin/home_list.vue

@@ -11,8 +11,9 @@
           <template #left_btn>
             <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">{{
-                item.label
-              }}</el-checkbox-button>
+                  item.label
+                }}
+              </el-checkbox-button>
             </el-checkbox-group>
           </template>
           <template #search>
@@ -46,7 +47,7 @@
                     <el-date-picker
                       v-model="screenForm.date"
                       type="datetimerange"
-:default-time="['00:00:00','23:59:59']"
+                      :default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -163,7 +164,7 @@
                     <el-date-picker
                       v-model="screenForm.orderTime"
                       type="datetimerange"
-:default-time="['00:00:00','23:59:59']"
+                      :default-time="['00:00:00','23:59:59']"
                       range-separator="至"
                       style="width: 100%"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -206,8 +207,8 @@
         </Collapse>
       </div>
       <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>
       <div class="mymain-container">
         <div class="btn-group clearfix">
@@ -218,7 +219,8 @@
               type="primary"
               icon="el-icon-plus"
               @click="toForm()"
-              >新增</el-button
+            >新增
+            </el-button
             >
             <el-button
               v-if="$checkBtnRole('del', $route.meta.roles)"
@@ -227,7 +229,8 @@
               icon="el-icon-minus"
               :disabled="multipleSelection.length < 1"
               @click="batchDelete()"
-              >批量删除</el-button
+            >批量删除
+            </el-button
             >
           </div>
           <div class="fr">
@@ -401,8 +404,10 @@
             >
               <template slot-scope="scope">
                 {{ scope.row.applySendQty }}
-              </template> </el-table-column
-            ><el-table-column
+              </template>
+            </el-table-column
+            >
+            <el-table-column
               align="right"
               label="退货数量"
               prop="refundProductQty"
@@ -558,7 +563,7 @@
                 >
                   退订
                 </el-button>
-                <el-button type="text" @click="toDetail(scope.row)"> 详情 </el-button>
+                <el-button type="text" @click="toDetail(scope.row)"> 详情</el-button>
                 <el-popconfirm
                   v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus !== 'OK'"
                   style="margin-left: 10px"
@@ -597,7 +602,15 @@
 </template>
 
 <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 HomeDetail from '@/views/supply/engin/components/home_detail'
 import HomeForm from '@/views/supply/engin/components/home_form'
@@ -691,9 +704,9 @@ export default {
       salesTypeList: [],
       NoRebateWalletList: [],
       typeList: [],
-      numSum:{
-        totalC:0,
-        amountC:0
+      numSum: {
+        totalC: 0,
+        amountC: 0
       }
     }
   },
@@ -745,11 +758,7 @@ export default {
     this.getSalesTypeList()
     this.getSalesmanList()
     this.getList()
-    getEnginCountList().then(res=>{
-      if (res.data){
-        this.numSum = res.data
-      }
-    })
+
   },
 
   methods: {
@@ -790,8 +799,7 @@ export default {
     getList() {
       this.listLoading = true
       const params = {
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
+
         examineStatus: this.screenForm.status.join(','),
         enginOrderNo: this.screenForm.orderNum,
         refProjectNo: this.screenForm.enginNum,
@@ -821,6 +829,13 @@ export default {
         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 => {
         res.data.records.forEach(item => {
           item.sums1 = ['qty', 'directTransferQty', 'hasSendQty']
@@ -944,7 +959,8 @@ export default {
             this.getList()
           })
         })
-        .catch(() => {})
+        .catch(() => {
+        })
     },
 
     handleSelectionChange(val) {
@@ -975,19 +991,21 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.ulStyle{
+.ulStyle {
   list-style: none;
   margin: 0;
   padding: 10px 0;
   background-color: #ffffff;
   z-index: 1;
 }
-.title{
+
+.title {
   display: inline-block;
   font-weight: 700;
   margin-right: 20px;
 }
-.num{
+
+.num {
   padding-left: 6px;
   font-weight: 400;
 }