From 079a7ba0915038f265c54c6c4dc964a7c3f98250 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Sun, 18 Feb 2024 13:46:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=BB=9F=E8=AE=A1=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/productManagement/workorder2.vue    |   8 +-
 .../FQC/qualityStatistics.vue                 |  51 ++++++--
 .../FQC/qualityStatistics2.vue                | 112 ++++++++++++++++++
 3 files changed, 156 insertions(+), 15 deletions(-)
 create mode 100644 src/views/qualityManagement/FQC/qualityStatistics2.vue

diff --git a/src/views/productManagement/workorder2.vue b/src/views/productManagement/workorder2.vue
index f2535a2..4f4cc4c 100644
--- a/src/views/productManagement/workorder2.vue
+++ b/src/views/productManagement/workorder2.vue
@@ -5,11 +5,11 @@
         <el-form-item label="年">
           <el-input v-model="search.year" placeholder="输入年份"></el-input>
         </el-form-item>
-        <el-form-item label="周">
-          <el-input-number v-model="search.week" :min="1" :max="100" label="输入周"></el-input-number>
+        <el-form-item label="周次">
+          <el-input-number v-model="search.week" :min="1" :max="100" label="输入周次"></el-input-number>
         </el-form-item>
-        <el-form-item label="日">
-          <el-select v-model="search.date" placeholder="请选择日">
+        <el-form-item label="星期">
+          <el-select v-model="search.date" placeholder="请选择星期">
             <el-option label="周一" :value="1"> </el-option>
             <el-option label="周二" :value="2"> </el-option>
             <el-option label="周三" :value="3"> </el-option>
diff --git a/src/views/qualityManagement/FQC/qualityStatistics.vue b/src/views/qualityManagement/FQC/qualityStatistics.vue
index e36b1f5..b3db309 100644
--- a/src/views/qualityManagement/FQC/qualityStatistics.vue
+++ b/src/views/qualityManagement/FQC/qualityStatistics.vue
@@ -3,19 +3,25 @@
     <!-- 搜索部分 -->
     <div>
       <el-form :model="search" inline>
-        <el-form-item label="年">
-          <el-input v-model="search.year" placeholder="输入年份"></el-input>
+        <el-form-item label="开始日期">
+          <el-date-picker v-model="search.starttime" type="datetime" placeholder="选择日期时间" align="right" :picker-options="pickerOptions">
+          </el-date-picker>
         </el-form-item>
-        <el-form-item label="周">
-          <el-input v-model="search.week" placeholder="输入周"></el-input>
+        <el-form-item label="结束日期">
+          <el-date-picker v-model="search.endtime" type="datetime" placeholder="选择日期时间" align="right" :picker-options="pickerOptions">
+          </el-date-picker>
         </el-form-item>
-        <el-form-item label="日期">
-          <el-input v-model="search.date" placeholder="输入日期"></el-input>
+        <el-form-item label="班组">
+          <el-input v-model="search.team" placeholder="输入班组"></el-input>
         </el-form-item>
         <el-form-item label="工单号">
           <el-input v-model="search.workorderid" placeholder="输入工单号"></el-input>
         </el-form-item>
+        <el-form-item label="零件号">
+          <el-input v-model="search.partnumber" placeholder="输入零件号"></el-input>
+        </el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="GetQualityStatisticsTable">搜索</el-button>
+        <el-button type="warning" >EXCEL导出</el-button>
       </el-form>
     </div>
 
@@ -28,7 +34,7 @@
       :row-config="{ useKey: true }"
     >
       <vxe-column type="seq" width="60"></vxe-column>
-      <vxe-column field="id" title="id"></vxe-column>
+      <!-- <vxe-column field="id" title="id"></vxe-column> -->
       <vxe-column field="fkWorkorderId" title="工单id"></vxe-column>
       <vxe-column field="productName" title="产品名称"></vxe-column>
       <vxe-column field="color" title="颜色"></vxe-column>
@@ -122,11 +128,34 @@ export default {
   name: 'qualityStatistics',
   data() {
     return {
+      pickerOptions: {
+          shortcuts: [{
+            text: '今天',
+            onClick(picker) {
+              picker.$emit('pick', new Date());
+            }
+          }, {
+            text: '昨天',
+            onClick(picker) {
+              const date = new Date();
+              date.setTime(date.getTime() - 3600 * 1000 * 24);
+              picker.$emit('pick', date);
+            }
+          }, {
+            text: '一周前',
+            onClick(picker) {
+              const date = new Date();
+              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit('pick', date);
+            }
+          }]
+        },
       search: {
-        year: 2023,
-        week: null,
-        date: null,
-        workorderid: '',
+        starttime:null,
+        endtime:null,
+        team:null,
+        workorderid:null,
+        partnumber:null
       },
       pagination: {
         total: 0,
diff --git a/src/views/qualityManagement/FQC/qualityStatistics2.vue b/src/views/qualityManagement/FQC/qualityStatistics2.vue
new file mode 100644
index 0000000..b3c26d5
--- /dev/null
+++ b/src/views/qualityManagement/FQC/qualityStatistics2.vue
@@ -0,0 +1,112 @@
+<template>
+  <div>
+    <el-tabs v-model="activeName" type="border-card">
+      <el-tab-pane label="按零件号查询" name="first">
+        <el-form :model="search" inline>
+          <el-form-item label="开始时间">
+            <el-date-picker v-model="value2" type="datetime" placeholder="开始时间" :picker-options="pickerOptions"> </el-date-picker>
+          </el-form-item>
+          <el-form-item label="结束时间">
+            <el-date-picker v-model="value2" type="datetime" placeholder="结束时间" :picker-options="pickerOptions"> </el-date-picker>
+          </el-form-item>
+          <el-form-item label="零件号">
+            <el-input v-model="search.partNumber" placeholder="请输入零件号"></el-input>
+          </el-form-item>
+          <el-form-item label="班次">
+            <el-radio-group v-model="radio1">
+              <el-radio-button label="A班"></el-radio-button>
+              <el-radio-button label="B班"></el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
+          <el-button type="warning" size="mini" @click="download_workorder">导出EXCEL</el-button>
+        </el-form>
+        <vxe-table border resizable show-overflow ref="xTable" v-loading="loading_1" height="800" :data="tableData">
+          <vxe-colgroup title="订单信息">
+            <vxe-column type="seq" width="60"></vxe-column>
+            <vxe-column field="name" title="订单"></vxe-column>
+            <vxe-column field="name" title="物料号"></vxe-column>
+            <vxe-column field="name" title="描述"></vxe-column>
+            <vxe-column field="name" title="订单数量"></vxe-column>
+            <vxe-column field="name" title="班次"></vxe-column>
+            <vxe-column field="name" title="合格数"></vxe-column>
+            <vxe-column field="name" title="合格率"></vxe-column>
+            <vxe-column field="name" title="抛光"></vxe-column>
+            <vxe-column field="name" title="打磨"></vxe-column>
+            <vxe-column field="name" title="报废"></vxe-column>
+            <vxe-column field="name" title="开始时间"></vxe-column>
+            <vxe-column field="name" title="结束时间"></vxe-column>
+          </vxe-colgroup>
+
+
+          
+        </vxe-table>
+        <pagination
+          v-show="pagination.total > 0"
+          :total="pagination.total"
+          :page.sync="pagination.pageNum"
+          :limit.sync="pagination.pageSize"
+          @pagination="getList"
+        />
+      </el-tab-pane>
+      <el-tab-pane label="按工单查询" name="second">
+        <el-form :model="search" inline>
+          <el-form-item label="工单号">
+            <el-input v-model="search.partNumber" placeholder="请输入工单号"></el-input>
+          </el-form-item>
+          <el-form-item label="班次">
+            <el-radio-group v-model="radio1">
+              <el-radio-button label="A班"></el-radio-button>
+              <el-radio-button label="B班"></el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
+          <el-button type="warning" size="mini" @click="download_workorder">导出EXCEL</el-button>
+        </el-form>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'qualityStatistics',
+  data() {
+    return {
+      activeName: 'first',
+      search: {},
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: '今天',
+            onClick(picker) {
+              picker.$emit('pick', new Date())
+            },
+          },
+          {
+            text: '昨天',
+            onClick(picker) {
+              const date = new Date()
+              date.setTime(date.getTime() - 3600 * 1000 * 24)
+              picker.$emit('pick', date)
+            },
+          },
+          {
+            text: '一周前',
+            onClick(picker) {
+              const date = new Date()
+              date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
+              picker.$emit('pick', date)
+            },
+          },
+        ],
+      },
+      loading_1: false,
+      pagination: { total: 0, pageNum: 1, pageSize: 10 },
+    }
+  },
+  methods: {},
+}
+</script>
+
+<style lang="scss" scoped></style>