留样检验报表调整

src/api/quality/qcSampleTask.js

@@ -1,6 +1,5 @@
 import request from '@/utils/request'
 
-// 查询生产过程检验任务列表
 export function qcCheckSampleTaskList(query) {
   return request({
     url: '/quality/qc-check-sample-task/list',
@@ -8,3 +7,11 @@ export function qcCheckSampleTaskList(query) {
     params: query
   });
 }
+
+export function qcCheckSampleSignList(query) {
+  return request({
+    url: '/quality/qc-check-sample-task/signList',
+    method: 'get',
+    params: query
+  });
+}

src/views/quality/sampleCheck/index.vue

@@ -52,8 +52,6 @@
 
       <el-table-column label="样品名称" align="center" prop="materialName" width="200" :show-overflow-tooltip="true" />
       <el-table-column label="生成批号" align="center" prop="incomeBatchNo" width="200" :show-overflow-tooltip="true" />
-      <el-table-column label="订单号" align="center" prop="workOrderCodeSap" width="130"/>
-      <el-table-column label="留样人" align="center" prop="sampleUserName" />
       <el-table-column label="留样日期" align="center" prop="sampleTime" width="100" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.sampleTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>

src/views/quality/sampleSign/index.vue

@@ -0,0 +1,146 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+
+      <el-form-item label="样品名称" prop="materialName">
+        <el-input
+          v-model="queryParams.materialName"
+          placeholder="请输入样品名称"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="订单号" prop="workOrderCodeSap">
+        <el-input
+          v-model="queryParams.workOrderCodeSap"
+          placeholder="请输入订单号"
+          clearable
+        />
+      </el-form-item>
+
+
+      <el-form-item label="留样时间" prop="querySampleDate">
+        <el-date-picker
+          v-model="querySampleDate"
+          format="yyyy-MM-dd"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
+        </el-date-picker>
+      </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>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport()"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="list" >
+      <el-table-column label="id" align="center" prop="id" v-if="false"/>
+
+      <el-table-column label="样品名称" align="center" prop="materialName" />
+      <el-table-column label="生产批号" align="center" prop="incomeBatchNo" />
+      <el-table-column label="留样日期" align="center" prop="sampleTime" >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.sampleTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="留样数量" align="center" prop="sampleNum" width="200" :show-overflow-tooltip="true" />
+      <el-table-column label="取样人" align="center" prop="sampleUserName" width="200" :show-overflow-tooltip="true" />
+      <el-table-column label="取样地点" align="center" prop="gainSampleAddress" width="200" :show-overflow-tooltip="true" />
+
+
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script >
+import {parseTime} from "@/utils/ruoyi";
+import {qcCheckSampleSignList} from "@/api/quality/qcSampleTask";
+
+export default {
+  data(){
+    return{
+      showSearch:true,
+      queryParams:{
+        pageNum: 1,
+        pageSize: 10,
+        materialName:undefined,
+        workOrderCodeSap:undefined,
+        startSampleDate:parseTime(new Date(),"{y}-{m}-{d}"),
+        endSampleDate:parseTime(new Date(),"{y}-{m}-{d}")
+      },
+      loading: true,
+      list:[],
+      total:0,
+      querySampleDate:[parseTime(new Date(),"{y}-{m}-{d}"),parseTime(new Date(),"{y}-{m}-{d}")]
+    }
+  },
+  methods : {
+    parseTime,
+    getList() {
+      this.loading = true
+      qcCheckSampleSignList(this.queryParams).then(res=>{
+        this.list = res.rows;
+        this.total = res.total;
+        this.loading = false;
+      })
+    },
+    handleQuery(){
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery(){
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('quality/qc-check-sample-task/sign/export', {
+        ...this.queryParams
+      }, `留样登记表${new Date().getTime()}.xlsx`)
+    },
+  },
+  created() {
+    this.getList();
+  },
+
+  watch : {
+    querySampleDate(dateArray){
+      if (!dateArray){
+        this.queryParams.startSampleDate = null
+        this.queryParams.endSampleDate = null
+      }else {
+        this.queryParams.startSampleDate = parseTime(dateArray[0],"{y}-{m}-{d}")
+        this.queryParams.endSampleDate = parseTime(dateArray[1],"{y}-{m}-{d}")
+      }
+    }
+  }
+
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>