rev：修改打印信息

wms/nladmin-ui/src/views/wms/basedata/groupbag/index.vue

@@ -195,6 +195,7 @@
         <el-table-column prop="status" label="状态" :formatter="formattStatus" :min-width="flexWidth('status',crud.data,'状态')" />
         <el-table-column prop="qty" label="组袋重量" :formatter="crud.formatNum3" :min-width="100" />
         <el-table-column prop="supp_code" label="供应商" :min-width="flexWidth('supp_code',crud.data,'供应商')" />
+        <el-table-column prop="validity_period" label="有效期" :min-width="flexWidth('validity_period',crud.data,'有效期')" />
         <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
         <el-table-column prop="create_name" label="组袋人" :min-width="flexWidth('create_name',crud.data,'组盘人')" />
         <el-table-column prop="create_time" label="组袋时间" :min-width="flexWidth('create_time',crud.data,'组盘时间')" />

wms/nladmin-ui/src/views/wms/basedata/material/index.vue

@@ -21,15 +21,26 @@
       </el-row>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation>
+<!--        <el-button-->
+<!--          slot="right"-->
+<!--          class="filter-item"-->
+<!--          type="success"-->
+<!--          icon="el-icon-refresh"-->
+<!--          size="mini"-->
+<!--          @click="materialSync"-->
+<!--        >-->
+<!--          物料同步-->
+<!--        </el-button>-->
         <el-button
           slot="right"
           class="filter-item"
           type="success"
-          icon="el-icon-refresh"
+          icon="el-icon-thumb"
           size="mini"
-          @click="materialSync"
+          :loading="showDtlLoading"
+          @click="down"
         >
-          物料同步
+          导出
         </el-button>
       </crudOperation>
       <!--表单组件-->
@@ -105,7 +116,9 @@
         <el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
         <el-table-column prop="quality_code" label="质量代码" width="140" />
         <el-table-column prop="supp_name" label="供应商名称" width="200" />
+        <el-table-column prop="produce_name" label="生产商" width="200" />
         <el-table-column prop="class_name" label="物料分类" width="140" />
+        <el-table-column prop="storage_conditions" label="储存条件" width="200" />
         <el-table-column prop="unit_name" label="计量单位" />
         <el-table-column label="启用" align="center" prop="is_used">
           <template slot-scope="scope">
@@ -149,6 +162,8 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
+import {download} from "@/api/data";
+import {downloadFile} from "@/utils";
 
 const defaultForm = {
   material_id: null,
@@ -206,6 +221,7 @@ export default {
       classes2: [],
       classes3: [],
       fullscreenLoading: false,
+      showDtlLoading: false,
       measure_unit: [],
       productSeries: [],
       permission: {},
@@ -274,6 +290,16 @@ export default {
           data.is_used = '0'
         }
       })
+    },
+    down() {
+      const data = this.crud.query
+      this.showDtlLoading = true
+      download('/api/Materia/download', data).then(result => {
+        downloadFile(result, '物料基础信息', 'xlsx')
+        this.showDtlLoading = false
+      }).catch(() => {
+        this.showDtlLoading = false
+      })
     }
   }
 }