From cf6960149683cae19d60961ea68b6e6fc19b2f45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Sat, 22 Feb 2025 16:23:54 +0800
Subject: [PATCH] =?UTF-8?q?GP12=E8=A7=A6=E6=91=B8=E5=B1=8F=E6=94=B9?=
 =?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.js                                   |  6 +++-
 src/utils/request.js                          |  2 +-
 .../gp12/report/QualityReport.vue             | 32 +++++++++++++------
 .../workorder/components/WorkOrderCard.vue    |  6 ++--
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/src/main.js b/src/main.js
index 42584d5..98cf4ec 100644
--- a/src/main.js
+++ b/src/main.js
@@ -62,8 +62,12 @@ import AFTableColumn from 'af-table-column'
 import dayjs from 'dayjs'
 import 'dayjs/locale/zh-cn' // 引入中文语言包
 import relativeTime from 'dayjs/plugin/relativeTime'
+import utc from 'dayjs/plugin/utc'
+import timezone from 'dayjs/plugin/timezone'
+dayjs.extend(utc)
+dayjs.extend(timezone)
 dayjs.extend(relativeTime)
-
+dayjs.tz.setDefault('Asia/Shanghai')
 // mdicon
 import '@mdi/font/css/materialdesignicons.css'
 
diff --git a/src/utils/request.js b/src/utils/request.js
index 8252a2c..3397919 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -68,7 +68,7 @@ service.interceptors.response.use(
         type: 'error',
       })
       return Promise.reject(res.data)
-    }  else {
+    } else {
       //返回标准 code/msg/data字段
       return res.data
     }
diff --git a/src/views/qualityManagement/gp12/report/QualityReport.vue b/src/views/qualityManagement/gp12/report/QualityReport.vue
index 4e21808..50c3b08 100644
--- a/src/views/qualityManagement/gp12/report/QualityReport.vue
+++ b/src/views/qualityManagement/gp12/report/QualityReport.vue
@@ -4,11 +4,11 @@
         <el-form :model="queryParams" size="small" label-position="right" inline ref="queryForm"
             :label-width="labelWidth" @submit.native.prevent>
             <el-form-item label="开始日期" prop="startTime">
-                <el-date-picker v-model="queryParams.startTime" @change="selectChange" :clearable="false" type="date"
-                    placeholder="选择日期时间"></el-date-picker>
+                <el-date-picker v-model="queryParams.startTime" @change="selectChange" :clearable="false"
+                    type="datetime" placeholder="选择日期时间"></el-date-picker>
             </el-form-item>
             <el-form-item label="结束日期" prop="endTime">
-                <el-date-picker v-model="queryParams.endTime" @change="selectChange" :clearable="false" type="date"
+                <el-date-picker v-model="queryParams.endTime" @change="selectChange" :clearable="false" type="datetime"
                     placeholder="选择日期时间"></el-date-picker>
             </el-form-item>
             <el-form-item label="工单号" prop="workOrder">
@@ -80,22 +80,22 @@
                 <vxe-column field="baofeiNumber" title="报废数" align="center" />
                 <vxe-column field="isOnetime" title="是否一次合格" align="center">
                     <template #default="{ row }">
-                        {{ row.isOnetime == 1 ? '是' : '' }}
+                        {{ row.isOnetime == 1 ? '是' : '否' }}
                     </template>
                 </vxe-column>
                 <vxe-column field="isBack" title="是否返工件" align="center">
                     <template #default="{ row }">
-                        {{ row.isBack == 1 ? '是' : '' }}
+                        {{ row.isBack == 1 ? '是' : '否' }}
                     </template>
                 </vxe-column>
                 <vxe-column field="isPolish" title="是否抛光件" align="center">
                     <template #default="{ row }">
-                        {{ row.isPolish == 1 ? '是' : '' }}
+                        {{ row.isPolish == 1 ? '是' : '否' }}
                     </template>
                 </vxe-column>
                 <vxe-column field="isOut" title="是否其他" align="center">
                     <template #default="{ row }">
-                        {{ row.isOut == 1 ? '是' : '' }}
+                        {{ row.isOut == 1 ? '是' : '否' }}
                     </template>
                 </vxe-column>
                 <vxe-column field="startTime" title="开始时间" align="center" width="100px" />
@@ -280,6 +280,11 @@ export default {
         // 查询数据
         getList() {
             this.loading = true;
+            const params = { ...this.queryParams }
+            params.startTime = this.$dayjs(this.queryParams.startTime).format()
+            params.endTime = this.$dayjs(this.queryParams.endTime).format()
+            console.log(params);
+
             GetReviseList(this.queryParams).then(res => {
                 if (res.code == 200) {
                     this.dataList = res.data.list;
@@ -364,6 +369,8 @@ export default {
         resetQuery() {
             this.timeRange = [];
             this.resetForm("queryForm");
+            this.queryParams.startTime = this.$dayjs().startOf('day')
+            this.queryParams.endTime = this.$dayjs().endOf('day')
             this.handleQuery();
         },
         // 多选框选中数据
@@ -409,10 +416,17 @@ export default {
         handleExport() {
             const $table = this.$refs.xTable
             if ($table) {
-                $table.exportData()
+                $table.openExport({
+                    type: 'xlsx',
+                    isMerge: true,
+                    isColgroup: true,
+                    useStyle: true
+                })
+                // $table.exportData()
                 // 设置导出类型为 xlsx
+
                 // $table.exportData({
-                //     type: 'xlsx', 
+                //     type: 'xlsx',
                 // }).then(() => {
                 //     console.log('导出成功');
                 // }).catch(error => {
diff --git a/src/views/qualityManagement/gp12/touchScreen/workorder/components/WorkOrderCard.vue b/src/views/qualityManagement/gp12/touchScreen/workorder/components/WorkOrderCard.vue
index a772f38..7ebdd93 100644
--- a/src/views/qualityManagement/gp12/touchScreen/workorder/components/WorkOrderCard.vue
+++ b/src/views/qualityManagement/gp12/touchScreen/workorder/components/WorkOrderCard.vue
@@ -284,7 +284,7 @@ export default {
         doBtnStartWorkOrder() {
             const data = {
                 team: this.team,
-                siteNo: this.siteNo,
+                siteNo: this.site,
             }
             this.$refs.StartWorkOrderDialogRef.open(data);
         },
@@ -292,7 +292,7 @@ export default {
             const data = {
                 formData: this.formData,
                 team: this.team,
-                siteNo: this.siteNo,
+                siteNo: this.site,
             }
             this.$refs.EndWorkOrderDialogRef.open(data);
         },
@@ -300,7 +300,7 @@ export default {
             const data = {
                 formData: this.formData,
                 team: this.team,
-                siteNo: this.siteNo,
+                siteNo: this.site,
             }
             this.$refs.GenerateLabelDialogRef.open(data);
         }