Browse Source

no message

linwenxin 4 tháng trước cách đây
mục cha
commit
a40f989558

+ 16 - 6
src/views/auxiliaryFittings/statement/purchase-category-sum/index.vue

@@ -9,12 +9,11 @@
           >
           >
         </div>
         </div>
       </div>
       </div>
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
+      <el-form ref="screenForm" :model="screenForm" label-width="110px" size="mini" label-position="left">
         <el-row :gutter="20">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="网点" prop="websitId">
             <el-form-item label="网点" prop="websitId">
-              <el-select v-model="screenForm.websitId" filterable placeholder="网点" size="small">
-                <el-option label="全部" value="" />
+              <el-select v-model="screenForm.websitId" filterable placeholder="网点" size="small" clearable>
                 <el-option v-for="(item, index) in shopList" :key="index" :label="item.name" :value="item.websitId" />
                 <el-option v-for="(item, index) in shopList" :key="index" :label="item.name" :value="item.websitId" />
               </el-select>
               </el-select>
             </el-form-item>
             </el-form-item>
@@ -28,6 +27,14 @@
               <el-date-picker v-model="screenForm.yearMonth" type="month" placeholder="选择月" value-format="yyyy-MM" />
               <el-date-picker v-model="screenForm.yearMonth" type="month" placeholder="选择月" value-format="yyyy-MM" />
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
+          <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="统计时间选择" prop="isConfirm">
+              <el-select v-model="screenForm.isConfirm" filterable placeholder="网点" size="small" clearable>
+                <el-option label="按收货时间" :value="true" />
+                <el-option label="按采购时间" :value="false" />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="24" class="tr">
           <el-col :span="24" class="tr">
             <el-form-item label="">
             <el-form-item label="">
               <el-button size="mini" type="primary" @click="submitScreenForm">查询</el-button>
               <el-button size="mini" type="primary" @click="submitScreenForm">查询</el-button>
@@ -191,7 +198,8 @@ export default {
       screenForm: {
       screenForm: {
         // 筛选表单数据
         // 筛选表单数据
         websitId: '', // 门店编号
         websitId: '', // 门店编号
-        yearMonth: '' // 年月
+        yearMonth: '', // 年月
+        isConfirm: ''
       }
       }
     }
     }
   },
   },
@@ -211,7 +219,8 @@ export default {
           this.listLoading = true
           this.listLoading = true
           const params = {
           const params = {
             websitId: this.screenForm.websitId, // 门店编号
             websitId: this.screenForm.websitId, // 门店编号
-            month: this.screenForm.yearMonth // 年月
+            month: this.screenForm.yearMonth, // 年月
+            isConfirm: this.screenForm.isConfirm
           }
           }
           getPurchaseCategorySum(params).then(res => {
           getPurchaseCategorySum(params).then(res => {
             if (res.data) {
             if (res.data) {
@@ -236,7 +245,8 @@ export default {
         if (valid) {
         if (valid) {
           const screenData = {
           const screenData = {
             websitId: this.screenForm.websitId, // 门店编号
             websitId: this.screenForm.websitId, // 门店编号
-            month: this.screenForm.yearMonth // 年月
+            month: this.screenForm.yearMonth, // 年月
+            isConfirm: this.screenForm.isConfirm
           }
           }
           downloadFiles('websit/report/export/purchase-category-sum', screenData)
           downloadFiles('websit/report/export/purchase-category-sum', screenData)
         }
         }