From ce8c5400bd053e0dc4a6a6149d242c5d65868e7c Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 18 Apr 2024 14:55:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/reportWork/index.vue      | 20 ++++++++------------
 src/views/quality/unqualified/index.vue |  3 ++-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index b6bbf4d..aa75b32 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -21,6 +21,7 @@
 			</el-form-item>
 			<el-form-item label="生产时间" prop="feedbackTimeArray">
 				<el-date-picker v-model="queryParams.feedbackTimeArray" format="yyyy-MM-dd" type="datetimerange"
+        clearable
 					range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期">
 				</el-date-picker>
 			</el-form-item>
@@ -879,23 +880,17 @@ export default {
     },
     /** 查询报工报表列表 */
     getList() {
-      /**
-			if(this.queryParams.createTimeArray !=null && this.queryParams.createTimeArray.length>0){
-				this.queryParams.createTimeStart = moment(this.queryParams.createTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
-				this.queryParams.createTimeEnd = moment(this.queryParams.createTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
-			}
-
-      if (
-        this.queryParams.feedbackTimeArray != null &&
-        this.queryParams.feedbackTimeArray.length > 0
-      ) {
+      if (this.queryParams.feedbackTimeArray != null &&this.queryParams.feedbackTimeArray.length > 0) {
         this.queryParams.feedbackTimeStart = moment(
           this.queryParams.feedbackTimeArray[0]
         ).format("YYYY-MM-DD");
         this.queryParams.feedbackTimeEnd = moment(
           this.queryParams.feedbackTimeArray[1]
         ).format("YYYY-MM-DD");
-      }**/
+      }else{
+        this.queryParams.feedbackTimeStart = null;
+        this.queryParams.feedbackTimeEnd = null;
+      }
       this.loading = true;
       listReportWork(this.queryParams).then((response) => {
         this.reportWorkList = response.rows;
@@ -916,6 +911,7 @@ export default {
     },
     // 取消按钮
     cancel() {
+      window.location.reload();
       this.open = false;
       this.openReport = false;
       this.openReportSAP = false;
@@ -991,7 +987,7 @@ export default {
         createTime: null,
         updateTime: null,
         updateBy: null,
-        endReport: "0",
+        endReport: "0"
       };
       this.resetForm("form");
       this.libTabs = [];
diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue
index db0bac7..a5c6ae8 100644
--- a/src/views/quality/unqualified/index.vue
+++ b/src/views/quality/unqualified/index.vue
@@ -85,6 +85,7 @@
 		</el-form>
 
 		<el-row :gutter="10" class="mb8">
+		<!--
 			<el-col :span="1.5">
 				<el-button
 					type="success"
@@ -95,7 +96,7 @@
 					@click="handleUpdate"
 					v-hasPermi="['quality:unqualified:edit']"
 				>发起OA流程</el-button>
-			</el-col>
+			</el-col>-->
 			<el-col :span="1.5">
 				<el-button
 					type="primary"