rev：任务号重复、包衣下料卡控、导出PDF

wms/nladmin-ui/src/views/monitor/log/errorLog.vue

@@ -12,7 +12,7 @@
           :loading="showDtlLoading"
           @click="down"
         >
-          导出
+          导出PDF
         </el-button>
       </crudOperation>
     </div>
@@ -177,7 +177,7 @@ export default {
         data.log_type = 'ERROR'
         this.showDtlLoading = true
         download('/api/logs/download', data).then(result => {
-          downloadFile(result, '日志查询', 'xlsx')
+          downloadFile(result, '异常日志查询', 'pdf')
           this.showDtlLoading = false
         }).catch(() => {
           this.showDtlLoading = false

wms/nladmin-ui/src/views/wms/statement/review/index.vue

@@ -56,7 +56,19 @@
         </el-form>
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
-      <crudOperation :permission="permission"/>
+      <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="success"
+          icon="el-icon-thumb"
+          size="mini"
+          :loading="showDtlLoading"
+          @click="downdtl"
+        >
+          导出PDF
+        </el-button>
+      </crudOperation>
       <!--表格渲染-->
       <el-table
         ref="table"
@@ -75,11 +87,12 @@
         <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
 <!--        <el-table-column prop="supp_code" label="供应商编码" :min-width="flexWidth('supp_code',crud.data,'供应商编码')" />-->
 <!--        <el-table-column prop="supp_name" label="供应商名称" :min-width="flexWidth('supp_name',crud.data,'供应商名称')" />-->
-        <el-table-column prop="create_time" label="时间" :min-width="flexWidth('create_time',crud.data,'时间')" />
         <el-table-column prop="create_code" label="操作人编码" :min-width="flexWidth('create_code',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,'时间')" />
         <el-table-column prop="review_code" label="复核人编码" :min-width="flexWidth('review_code',crud.data,'复核人编码')" />
         <el-table-column prop="review_name" label="复核人名称" :min-width="flexWidth('review_name',crud.data,'复核人名称')" />
+        <el-table-column prop="create_time" label="复核时间" :min-width="flexWidth('create_time',crud.data,'复核时间')" />
         <el-table-column prop="action" label="动作" :min-width="flexWidth('action',crud.data,'动作')" />
       </el-table>
       <!--分页组件-->
@@ -162,9 +175,14 @@ export default {
     },
     downdtl() {
       if (this.currentRow !== null) {
+        const data = this.crud.query
+        if (this.crud.query.createTime !== undefined) {
+          data.begin_time = this.crud.query.createTime[0]
+          data.end_time = this.crud.query.createTime[1]
+        }
         this.showDtlLoading = true
-        download('/api/review/download', this.crud.query).then(result => {
-          downloadFile(result, '复核记录', 'xlsx')
+        download('/api/review/download', data).then(result => {
+          downloadFile(result, '复核记录', 'pdf')
           this.showDtlLoading = false
         }).catch(() => {
           this.showDtlLoading = false