生产过程检验

src/api/quality/qcProduce.js

@@ -51,3 +51,12 @@ export function getQcListWorkCenter(query) {
 	  params: query
 	});
   }
+
+// 查询工作中心列表
+export function getCheckTypes() {
+	return request({
+	  url: '/quality/qcProduce/getCheckTypes',
+	  method: 'get'
+	});
+  }  
+  

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');
 			}

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"
+									:key="dict.id"
-									:label="dict.label"
+									:label="dict.checkName"
-									:value="dict.value"
+									: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');
 			}