From bf0270f60b61d7df28e26636be30810feb252a8d Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Tue, 14 Mar 2023 14:12:48 +0800
Subject: [PATCH] =?UTF-8?q?0412=20=E6=96=B0=E7=9C=8B=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/Abnormal/AbnormalFeedBack.vue     | 109 ++++++++++++++++--
 .../modules/board/SeqNoForLiuHuaJiChu.vue     |  25 ++--
 .../modules/production/scheduleForSOTask.vue  |   8 +-
 3 files changed, 116 insertions(+), 26 deletions(-)

diff --git a/src/views/modules/Abnormal/AbnormalFeedBack.vue b/src/views/modules/Abnormal/AbnormalFeedBack.vue
index 406b457..a6512f2 100644
--- a/src/views/modules/Abnormal/AbnormalFeedBack.vue
+++ b/src/views/modules/Abnormal/AbnormalFeedBack.vue
@@ -48,6 +48,21 @@
       <el-form-item label=" " >
       <el-button @click="search()" style="margin-left: 0px;margin-top: 0px" type="primary">查询</el-button>
         <el-button @click="addAbnormal()" style="margin-left: 0px;margin-top: 0px" type="primary">新增</el-button>
+        <download-excel
+          :fields="exportDataStandard"
+          :data="tableData"
+          type="xlsx"
+          :name="exportName"
+          :header="exportHeader"
+          :footer="exportFooter"
+          :defaultValue="exportDefaultValue"
+          :fetch="createExportData"
+          :before-generate="startDownload"
+          :before-finish="finishDownload"
+          worksheet="导出信息"
+          class="el-button el-button--primary el-button--medium">
+          {{'导出'}}
+        </download-excel>
       </el-form-item>
     </el-form>
     <el-table
@@ -76,6 +91,20 @@
         width="60"
         label="派工单号">
       </el-table-column>
+      <el-table-column
+        prop="operatorDesc"
+        header-align="center"
+        align="left"
+        width="60"
+        label="操作员">
+      </el-table-column>
+      <el-table-column
+        prop="productionLineDesc"
+        header-align="center"
+        align="left"
+        width="60"
+        label="生产线">
+      </el-table-column>
       <el-table-column
         prop="feedbackDate"
         header-align="center"
@@ -242,6 +271,56 @@
     name: 'AbnormalFeedBack',
     data () {
       return {
+
+        searchData:{
+          userId:this.$store.state.user.name,
+          startDate:'',
+          endDate:'',
+          abnormalCode:'',
+          site:'',
+          active:'',
+        },
+        // 导出 start
+        exportData: [],
+        exportDataStandard: {
+          "工厂编号": "site",
+          "生产订单": "orderNo",
+          "派工单号": "seqNo",
+          "操作员": "operatorDesc",
+          "生产线": "productionLineDesc",
+          "反馈时间": "feedbackDate",
+          "反馈人": "feedbackBy",
+          "状态": "status",
+          "异常原因": "abnormalDesc",
+          "异常描述": "abnormalRemark",
+          "紧急处理方式": "treatmentTemporary",
+          "温度": "temperatureTemporary",
+          "压力": "pressureTemporary",
+          "时间": "timeTemporary",
+          "投料量": "feedingTemporary",
+          "机台": "resourceTemporary",
+          "功率": "efficiencyTemporary",
+          "速度": "speedTemporary",
+          "材料": "materialTemporary",
+          "模具": "mouldTemporary",
+          "工装": "workClothesTemporary",
+          "长久处理方式": "treatment",
+          "温度 ": "temperature",
+          "压力 ": "pressure",
+          "时间 ": "time",
+          "投料量 ": "feeding",
+          "机台 ": "resource",
+          "功率 ": "efficiency",
+          "速度 ": "speed",
+          "材料 ": "material",
+          "模具 ": "mould",
+          "工装 ": "workClothes",
+        },
+        exportName: "异常反馈清单"+this.getStrDate(),
+        exportHeader: ["异常反馈清单"],
+        exportFooter: [],
+        exportDefaultValue: "",
+        // 导出 end
         dataListLoading:false,
         // 导出 end
         height:200,
@@ -257,14 +336,6 @@
           abnormalRemark:'',
         },
 
-        searchData:{
-          userId:this.$store.state.user.name,
-          startDate:'',
-          endDate:'',
-          abnormalCode:'',
-          site:'',
-          active:'',
-        },
         addModalFlag:false,
         modalFlag:false,
         disableFlag4:false,
@@ -476,6 +547,28 @@
         }).catch(() => {
         })
       },
+      createExportData() {
+
+        return this.tableData;
+      },
+      startDownload() {
+        //  this.exportData = this.dataList
+
+      },
+      finishDownload() {
+
+      },
+      getStrDate() {
+        let dd = new Date();
+        let Y = dd.getFullYear();
+        let M = (dd.getMonth() + 1) < 10 ? "0" + (dd.getMonth() + 1) : (dd.getMonth() + 1);//获取当前月份的日期，不足10补0
+        let D = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();//获取当前几号，不足10补0
+        let H = dd.getHours() < 10 ? "0" + dd.getHours() : dd.getHours();
+        let MM = dd.getMinutes() < 10 ? "0" + dd.getMinutes() : dd.getMinutes();
+        let S = dd.getSeconds() < 10 ? "0" + dd.getSeconds() : dd.getSeconds();
+        return Y + M + D + H + MM + S;
+
+      },
     },
     created() {
       this.getAllAbnormalItem();
diff --git a/src/views/modules/board/SeqNoForLiuHuaJiChu.vue b/src/views/modules/board/SeqNoForLiuHuaJiChu.vue
index c8cb883..2d857e0 100644
--- a/src/views/modules/board/SeqNoForLiuHuaJiChu.vue
+++ b/src/views/modules/board/SeqNoForLiuHuaJiChu.vue
@@ -18,7 +18,7 @@
           prop="site"
           header-align="center"
           align="left"
-          min-width="20"
+          min-width="17"
           style="font-size: 20px"
           label="工厂">
         </el-table-column>
@@ -63,35 +63,35 @@
           prop="num1"
           header-align="center"
           align="right"
-          min-width="20"
+          min-width="22"
           label="温度1">
         </el-table-column>
         <el-table-column
           prop="num2"
           header-align="center"
           align="right"
-          min-width="20"
+          min-width="22"
           label="温度2">
         </el-table-column>
         <el-table-column
           prop="num3"
           header-align="center"
           align="right"
-          min-width="20"
+          min-width="22"
           label="温度3">
         </el-table-column>
         <el-table-column
           prop="num4"
           header-align="center"
           align="right"
-          min-width="20"
+          min-width="22"
           label="温度4">
         </el-table-column>
         <el-table-column
           prop="num5"
           header-align="center"
           align="right"
-          min-width="20"
+          min-width="22"
           label="温度5">
         </el-table-column>
         <el-table-column
@@ -115,18 +115,11 @@
           min-width="20"
           label="钢速">
         </el-table-column>
-        <el-table-column
-          prop="num9"
-          header-align="center"
-          align="right"
-          min-width="25"
-          label="挤功">
-        </el-table-column>
         <el-table-column
           prop="planStartTime"
           header-align="center"
           align="left"
-          min-width="40"
+          min-width="45"
           label="生产日期">
 <!--          <template slot-scope="scope">-->
 <!--            {{dayjs(scope.row.planStartTime).format('YYYYMMDD')}}-->
@@ -136,7 +129,7 @@
           prop="operatorDesc"
           header-align="center"
           align="left"
-          min-width="25"
+          min-width="30"
           label="操作员">
         </el-table-column>
         <el-table-column
@@ -150,7 +143,7 @@
           prop="resourceId"
           header-align="center"
           align="left"
-          min-width="45"
+          min-width="50"
           label="机台">
         </el-table-column>
       </el-table>
diff --git a/src/views/modules/production/scheduleForSOTask.vue b/src/views/modules/production/scheduleForSOTask.vue
index 7b72ade..ad0742d 100644
--- a/src/views/modules/production/scheduleForSOTask.vue
+++ b/src/views/modules/production/scheduleForSOTask.vue
@@ -860,6 +860,10 @@
   }
 </script>
 
-<style scoped>
-
+<style >
+  .rq .el-table .cell {
+    line-height: 20px;
+    font-size: 12px;
+    height: 20px;
+  }
 </style>