From c7104b6948d521b027902b612c50d6d9caec0ec2 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 13 Dec 2023 08:43:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E8=AE=B0=E5=BD=95=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/reportWork/index.vue            | 11 ++++++-----
 src/views/quality/qcIncome/selectMaterial.vue |  1 -
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index aafa55b..52d6272 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -34,7 +34,7 @@
       					@keyup.enter.native="handleQuery"
       				/>
       		</el-form-item>
-			<el-form-item label="报工时间" prop="feedbackTimeArray">
+			<el-form-item label="生产时间" prop="feedbackTimeArray">
                 <el-date-picker
 				v-model="queryParams.feedbackTimeArray"
 				format="yyyy-MM-dd"
@@ -150,6 +150,7 @@
 					>{{scope.row.workorderCode}}</el-button>
 				</template>
 			</el-table-column>
+            <el-table-column label="sap工单编码" align="center" prop="workorderCodeSap" width="130"/>
 			<el-table-column label="产品编码" align="center" prop="productCode" width="130"
 			   :formatter="productCodeFormate"
 			/>
@@ -161,7 +162,7 @@
 			<el-table-column label="累计报工数量" align="center" prop="quantityFeedback" width="100"/>
 			<el-table-column label="累计用人数" align="center" prop="useMan" width="100"/>
 			<el-table-column label="累计工时" align="center" prop="workTime" />
-			<el-table-column label="报工时间" align="center" prop="feedbackTimeStr" width="100"/><!--加时分秒生成报工单的逻辑要变切记！！-->
+			<el-table-column label="生产时间" align="center" prop="productDate" width="100"/>
 			<el-table-column label="SAP报工状态" align="center" prop="uploadStatus" width="150"/>
 			<el-table-column label="SAP报工时间" align="center" prop="uploadTime" width="150"/>
 
@@ -724,7 +725,7 @@ export default {
 			var y = dd.getFullYear();
 			var m = dd.getMonth() + 1;//获取当前月份的日期
 			var d = dd.getDate();
-            return y + "-" + m + "-" + d+" 00:00:00";
+            return y + "-" + m + "-" + d;
 			
 		},
 		/** 查询报工报表列表 */
@@ -736,8 +737,8 @@ export default {
 			}**/
 
 			if(this.queryParams.feedbackTimeArray !=null && this.queryParams.feedbackTimeArray.length>0){
-				this.queryParams.feedbackTimeStart = moment(this.queryParams.feedbackTimeArray[0]).format('YYYY-MM-DD 00:00:00');
-				this.queryParams.feedbackTimeEnd = moment(this.queryParams.feedbackTimeArray[1]).format('YYYY-MM-DD 23:59:59');
+				this.queryParams.feedbackTimeStart = moment(this.queryParams.feedbackTimeArray[0]).format('YYYY-MM-DD');
+				this.queryParams.feedbackTimeEnd = moment(this.queryParams.feedbackTimeArray[1]).format('YYYY-MM-DD');
 			}
 			this.loading = true;
 			listReportWork(this.queryParams).then(response => {
diff --git a/src/views/quality/qcIncome/selectMaterial.vue b/src/views/quality/qcIncome/selectMaterial.vue
index bf9f8db..07aab87 100644
--- a/src/views/quality/qcIncome/selectMaterial.vue
+++ b/src/views/quality/qcIncome/selectMaterial.vue
@@ -150,7 +150,6 @@ export default {
       this.selectedRows.name = this.idsName;
       this.$emit('onSelected', this.selectedRows);
       this.showFlag = false;
-      this.queryParams.itemCodeGet = "";
     }
   }
 };