From 1ed8764edaaa6ac9dde6707922b29a9366058847 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 26 Oct 2023 09:06:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=BF=87=E7=A8=8B=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/qcProduce.js          | 11 ++++++++++-
 src/views/quality/qcIncome/index.vue  |  6 +++---
 src/views/quality/qcProduce/index.vue | 20 +++++++++++---------
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/src/api/quality/qcProduce.js b/src/api/quality/qcProduce.js
index bf7b4ad..82e98d5 100644
--- a/src/api/quality/qcProduce.js
+++ b/src/api/quality/qcProduce.js
@@ -50,4 +50,13 @@ export function getQcListWorkCenter(query) {
 	  method: 'get',
 	  params: query
 	});
-  }
\ No newline at end of file
+  }
+
+// 查询工作中心列表
+export function getCheckTypes() {
+	return request({
+	  url: '/quality/qcProduce/getCheckTypes',
+	  method: 'get'
+	});
+  }  
+  
diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue
index c74023f..1ccddc9 100644
--- a/src/views/quality/qcIncome/index.vue
+++ b/src/views/quality/qcIncome/index.vue
@@ -434,7 +434,7 @@ export default {
 			let start = this.Fungetdate (0)
 			let end = this.Fungetdate (1)
 			this.queryParams.incomeTimeArray.push(start,end)
-			this.queryParams.checkTimeArray.push(start,end)
+			//this.queryParams.checkTimeArray.push(start,end)
 		},
 		Fungetdate (num) {
 			var dd = new Date();
@@ -449,12 +449,12 @@ export default {
 		getList() {
 			this.loading = true;
 
-			if(this.queryParams.incomeTimeArray!=null){
+			if(this.queryParams.incomeTimeArray.length>0){
 				this.queryParams.incomeTimeStart = moment(this.queryParams.incomeTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.incomeTimeEnd = moment(this.queryParams.incomeTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
 			}
 
-			if(this.queryParams.checkTimeArray!=null){
+			if(this.queryParams.checkTimeArray.length>0){
 				this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
 			}
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index d928bd6..d1c077b 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -270,9 +270,9 @@
 							<el-select v-model="form.typeCode" placeholder="请选择检验类型" style="width: 100%;">
 								<el-option
 									v-for="dict in checkTypes"
-									:key="dict.value"
-									:label="dict.label"
-									:value="dict.value"
+									:key="dict.id"
+									:label="dict.checkName"
+									:value="dict.id"
 								></el-option>
 							</el-select>
 						</el-form-item>
@@ -368,7 +368,7 @@
 </template>
 
 <script>
-import { listQcProduce, getQcProduce, delQcProduce, addQcProduce, updateQcProduce } from "@/api/quality/qcProduce";
+import { listQcProduce, getQcProduce, delQcProduce, addQcProduce, updateQcProduce,getCheckTypes } from "@/api/quality/qcProduce";
 import moment from 'moment';
 import ItemSelectMaterial from "../qcIncome/selectMaterial.vue";
 import ItemSelectWorkCenter from "./selectWorkCenter.vue";
@@ -471,15 +471,17 @@ export default {
 	},
 	methods: {
         /****/
-		getList() {
-
+		getCheckTypes() {
+           	getCheckTypes().then(response => {
+				this.checkTypes = response;
+			});
 		},
         /**获取默认查询时间段**/
 		getDate() {
 			let start = this.Fungetdate (0)
 			let end = this.Fungetdate (1)
 			this.queryParams.produceDateArray.push(start,end)
-			this.queryParams.checkTimeArray.push(start,end)
+			//this.queryParams.checkTimeArray.push(start,end)
 		},
 		Fungetdate (num) {
 			var dd = new Date();
@@ -494,12 +496,12 @@ export default {
 		getList() {
 			this.loading = true;
 
-			if(this.queryParams.produceDateArray!=null){
+			if(this.queryParams.produceDateArray.length>0){
 				this.queryParams.produceDateStart = moment(this.queryParams.produceDateArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.produceDateEnd = moment(this.queryParams.produceDateArray[1]).format('YYYY-MM-DD HH:mm:ss');
 			}
 
-			if(this.queryParams.checkTimeArray!=null){
+			if(this.queryParams.checkTimeArray.length>0){
 				this.queryParams.checkTimeStart = moment(this.queryParams.checkTimeArray[0]).format('YYYY-MM-DD HH:mm:ss');
 				this.queryParams.checkTimeEnd = moment(this.queryParams.checkTimeArray[1]).format('YYYY-MM-DD HH:mm:ss');
 			}