物料领取导出功能修改

src/api/material/material.js

@@ -46,11 +46,11 @@ export function delMaterial(materialId) {
 }
 
 //导出数据
-export function exportMaterial() {
+export function exportMaterial(data) {
   return exportExcel({
     url: '/material/material/export',
     method: 'get',
-    responseType: 'blob'
-    // params: { id: params }
+    responseType: 'blob',
+    params: data
   })
 }

src/views/material/receive.vue

@@ -10,21 +10,33 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="厂商" pro="factory">
-        <el-input
-          v-model="queryParams.factory"
-          placeholder="请输入厂商名称"
-          clearable
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="月/周数据" prop="monthOrWeek">
         <el-radio-group v-model="queryParams.monthOrWeek">
           <el-radio-button label="1">月</el-radio-button>
           <el-radio-button label="2">周</el-radio-button>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="周期" prop="recordDate">
+        <div v-if="queryParams.monthOrWeek==='1'">
+          <el-date-picker
+            v-model="queryParams.recordDate"
+            type="month"
+            value-format="yyyy-MM"
+            placeholder="选择月份"
+            clearable>
+          </el-date-picker>
+        </div>
+        <div v-if="queryParams.monthOrWeek==='2'">
+          <el-date-picker
+            v-model="queryParams.recordDate"
+            type="week"
+            format="yyyy 第 WW 周"
+            placeholder="选择周"
+            clearable>
+          </el-date-picker>
+        </div>
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -209,7 +221,8 @@ export default {
         pageSize: 10,
         materialName: undefined,
         factory: undefined,
-        monthOrWeek: undefined
+        monthOrWeek: undefined,
+        recordDate: undefined
       },
       // 表单参数
       form: {},
@@ -288,7 +301,6 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      console.log(this.$refs);
       this.$refs.queryForm.resetFields();
       this.handleQuery();
     },
@@ -308,7 +320,7 @@ export default {
       this.open = true;
     },
     handleExport() {
-      exportMaterial()
+      exportMaterial(this.queryParams)
     },
     /** 周数据填报操作 */
     handleSplit(row) {
@@ -317,7 +329,7 @@ export default {
       this.form.id = undefined;
       this.form.num = undefined;
       this.form.monthOrWeek = '2'
-      this.form.recordDate=DateUtil.day()
+      this.form.recordDate = DateUtil.day()
       this.title = "添加周物料计划";
       this.open = true;
     },