From c970ffdfef53a038fdb7b75bfaa93a044be58d2d Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 8 Nov 2023 16:39:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/produceReport.js              | 10 +++---
 src/views/quality/incomeReport/index.vue      | 28 ++++++++++------
 src/views/quality/produceReport/index.vue     | 31 +++++++++++-------
 src/views/quality/productReport/index.vue     | 32 ++++++++++++-------
 src/views/quality/qcProduce/index.vue         | 16 +++++-----
 .../quality/qcProduce/selectWorkCenter.vue    | 16 +++++-----
 src/views/quality/qcWarehousing/index.vue     | 16 +++++-----
 7 files changed, 87 insertions(+), 62 deletions(-)

diff --git a/src/api/quality/produceReport.js b/src/api/quality/produceReport.js
index 58b8bd6..d8b4e8f 100644
--- a/src/api/quality/produceReport.js
+++ b/src/api/quality/produceReport.js
@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-// 查询来料报告列表
+// 查询生产过程报告列表
 export function listProduce(query) {
 	return request({
 		url: '/quality/qcProduceReport/list',
@@ -9,7 +9,7 @@ export function listProduce(query) {
 	});
 }
 
-// 查询来料报告详细
+// 查询生产过程报告详细
 export function getProduce(recordId) {
 	return request({
 		url: '/quality/qcProduceReport/' + recordId,
@@ -17,7 +17,7 @@ export function getProduce(recordId) {
 		});
 }
 
-// 新增来料报告
+// 新增生产过程报告
 export function addProduce(data) {
 	return request({
 		url: '/quality/qcProduceReport',
@@ -26,7 +26,7 @@ export function addProduce(data) {
 	});
 }
 
-// 修改来料报告
+// 修改生产过程报告
 export function updateProduce(data) {
 	return request({
 		url: '/quality/qcProduceReport',
@@ -35,7 +35,7 @@ export function updateProduce(data) {
 	});
 }
 
-// 删除来料报告
+// 删除生产过程报告
 export function delProduce(recordId) {
 	return request({
 		url: '/quality/qcProduceReport/' + recordId,
diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue
index 6c82201..e596450 100644
--- a/src/views/quality/incomeReport/index.vue
+++ b/src/views/quality/incomeReport/index.vue
@@ -93,7 +93,11 @@
 					<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="检验结果" align="center" prop="checkResult" />
+			<el-table-column label="检验结果" align="center" prop="checkResult">
+			    <template slot-scope="scope">
+					<dict-tag :options="dict.type.check_result" :value="scope.row.checkResult"/>
+				</template>
+            </el-table-column>
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
 					<el-button
@@ -121,7 +125,7 @@
 				<el-col :span="20">
 					<el-button 
 						    class="print-btn"
-							size="midle"
+							size="mini"
 							type="primary"
 							icon="el-icon-edit"
 							@click="handlePrint(form)"
@@ -228,7 +232,11 @@
 								<el-table-column label="下差值" align="center" prop="downDiff" />
 								<el-table-column label="单位" align="center" prop="unitCode" />
 								<el-table-column label="检验值" align="center" prop="actualValue" />
-								<el-table-column label="结果" align="center" prop="status" />
+								<el-table-column label="结果" align="center" prop="status" >
+								    <template slot-scope="scope">
+										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
+									</template>
+								</el-table-column>	
 							</el-table>
 						</el-col>
 					</el-row>	
@@ -329,7 +337,7 @@ export default {
 		};
 	},
 	created() {
-		//this.getDate();
+		this.getDate();
 		this.getList();
 		this.getCheckTypes();
 	},
@@ -341,12 +349,12 @@ export default {
 			});
 		},
         /**获取默认查询时间段**/
-		//getDate() {
-			//let start = this.Fungetdate (0)
-			//let end = this.Fungetdate (1)
+		getDate() {
+			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();
 			dd.setDate(dd.getDate() + num);
@@ -500,7 +508,7 @@ export default {
 				type: params.type || 'html',
 				maxWidth: 1500, // 最大宽度
 				font_size: "",// 设置字体大小
-				header: params.header, // '表单',
+				header: "来料检验结果报告",//params.header, // '表单',
 				targetStyles: ['*'],
 				style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
 				ignoreElements: params.ignore || [], // ['no-print']
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 8e4abcb..581c702 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -93,7 +93,11 @@
 					<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="检验结果" align="center" prop="checkResult" />
+			<el-table-column label="检验结果" align="center" prop="checkResult">
+			    <template slot-scope="scope">
+					<dict-tag :options="dict.type.check_result" :value="scope.row.checkResult"/>
+				</template>
+            </el-table-column>
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
 					<el-button
@@ -121,7 +125,7 @@
 				<el-col :span="20">
 					<el-button 
 						    class="print-btn"
-							size="midle"
+							size="mini"
 							type="primary"
 							icon="el-icon-edit"
 							@click="handlePrint(form)"
@@ -228,7 +232,11 @@
 								<el-table-column label="下差值" align="center" prop="downDiff" />
 								<el-table-column label="单位" align="center" prop="unitCode" />
 								<el-table-column label="检验值" align="center" prop="actualValue" />
-								<el-table-column label="结果" align="center" prop="status" />
+								<el-table-column label="结果" align="center" prop="status" >
+								    <template slot-scope="scope">
+										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
+									</template>
+								</el-table-column>	
 							</el-table>
 						</el-col>
 					</el-row>	
@@ -293,6 +301,7 @@ export default {
 			// 查询参数
 			queryParams: {
 				checkTimeArray: [],
+				incomeTimeArray: [],
 				pageNum: 1,
 				pageSize: 10,
 				checkNo: null,
@@ -330,7 +339,7 @@ export default {
 		};
 	},
 	created() {
-		//this.getDate();
+		this.getDate();
 		this.getList();
 		this.getCheckTypes();
 	},
@@ -342,12 +351,12 @@ export default {
 			});
 		},
         /**获取默认查询时间段**/
-		//getDate() {
-			//let start = this.Fungetdate (0)
-			//let end = this.Fungetdate (1)
-			//this.queryParams.incomeTimeArray.push(start,end)
-			//this.queryParams.checkTimeArray.push(start,end)
-		//},
+		getDate() {
+			let start = this.Fungetdate (0)
+			let end = this.Fungetdate (1)
+			this.queryParams.incomeTimeArray.push(start,end)
+			this.queryParams.checkTimeArray.push(start,end)
+		},
 		Fungetdate (num) {
 			var dd = new Date();
 			dd.setDate(dd.getDate() + num);
@@ -501,7 +510,7 @@ export default {
 				type: params.type || 'html',
 				maxWidth: 1500, // 最大宽度
 				font_size: "",// 设置字体大小
-				header: params.header, // '表单',
+				header: "生产过程检验结果报告",//params.header, // '表单',
 				targetStyles: ['*'],
 				style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
 				ignoreElements: params.ignore || [], // ['no-print']
diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue
index cee65aa..91b80c9 100644
--- a/src/views/quality/productReport/index.vue
+++ b/src/views/quality/productReport/index.vue
@@ -93,7 +93,11 @@
 					<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
 				</template>
 			</el-table-column>
-			<el-table-column label="检验结果" align="center" prop="checkResult" />
+			<el-table-column label="检验结果" align="center" prop="checkResult">
+			    <template slot-scope="scope">
+					<dict-tag :options="dict.type.check_result" :value="scope.row.checkResult"/>
+				</template>
+            </el-table-column>
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
 					<el-button
@@ -121,7 +125,7 @@
 				<el-col :span="20">
 					<el-button 
 						    class="print-btn"
-							size="midle"
+							size="mini"
 							type="primary"
 							icon="el-icon-edit"
 							@click="handlePrint(form)"
@@ -228,7 +232,11 @@
 								<el-table-column label="下差值" align="center" prop="downDiff" />
 								<el-table-column label="单位" align="center" prop="unitCode" />
 								<el-table-column label="检验值" align="center" prop="actualValue" />
-								<el-table-column label="结果" align="center" prop="status" />
+								<el-table-column label="结果" align="center" prop="status" >
+									<template slot-scope="scope">
+										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
+									</template>
+								</el-table-column>	
 							</el-table>
 						</el-col>
 					</el-row>	
@@ -330,7 +338,7 @@ export default {
 		};
 	},
 	created() {
-		//this.getDate();
+		this.getDate();
 		this.getList();
 		this.getCheckTypes();
 	},
@@ -342,12 +350,12 @@ export default {
 			});
 		},
         /**获取默认查询时间段**/
-		//getDate() {
-			//let start = this.Fungetdate (0)
-			//let end = this.Fungetdate (1)
-			//this.queryParams.incomeTimeArray.push(start,end)
-			//this.queryParams.checkTimeArray.push(start,end)
-		//},
+		getDate() {
+			let start = this.Fungetdate (0)
+			let end = this.Fungetdate (1)
+			this.queryParams.incomeTimeArray.push(start,end)
+			this.queryParams.checkTimeArray.push(start,end)
+		},
 		Fungetdate (num) {
 			var dd = new Date();
 			dd.setDate(dd.getDate() + num);
@@ -444,7 +452,7 @@ export default {
 				this.form.printable = 'printFrom'; //打印时需要
 				this.form.ignore = ['no-print'];//打印时需要
 				this.open = true;
-				this.title = "查看来料报告";
+				this.title = "查看成品入库报告";
 			});
 			this.getCheckedProjectList();
 		},
@@ -501,7 +509,7 @@ export default {
 				type: params.type || 'html',
 				maxWidth: 1500, // 最大宽度
 				font_size: "",// 设置字体大小
-				header: params.header, // '表单',
+				header: "成品入库检验结果报告",//params.header, // '表单',
 				targetStyles: ['*'],
 				style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
 				ignoreElements: params.ignore || [], // ['no-print']
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index a9f8521..ba739cc 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -9,9 +9,9 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="批次号" prop="batchNo">
+			<el-form-item label="批次号" prop="incomeBatchNo">
 				<el-input
-					v-model="queryParams.batchNo"
+					v-model="queryParams.incomeBatchNo"
 					placeholder="请输入批次号"
 					clearable
 					@keyup.enter.native="handleQuery"
@@ -161,7 +161,7 @@
 			<el-table-column label="id" align="center" prop="recordId" v-if="false"/>
 			<el-table-column label="checkType" align="center" prop="checkType" v-if="false"/>
 			<el-table-column label="任务编号" align="center" prop="checkNo" width="120"/>
-			<el-table-column label="批次号" align="center" prop="batchNo" width="120"/>
+			<el-table-column label="批次号" align="center" prop="incomeBatchNo" width="120"/>
 			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
 			<el-table-column label="物料号" align="center" prop="materialCode" width="170"/>
 			<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
@@ -240,8 +240,8 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">
-						<el-form-item label="批次号" prop="batchNo">
-							<el-input v-model="form.batchNo" placeholder="请输入批次号" />
+						<el-form-item label="批次号" prop="incomeBatchNo">
+							<el-input v-model="form.incomeBatchNo" placeholder="请输入批次号" />
 						</el-form-item>
 					</el-col>
                     <el-col :span="8">
@@ -406,7 +406,7 @@ export default {
 				pageNum: 1,
 				pageSize: 10,
 				checkNo: null,
-				batchNo: null,
+				incomeBatchNo: null,
 				orderNo: null,
 				materialCode: null,
 				materialName: null,
@@ -435,7 +435,7 @@ export default {
 
 			// 表单校验
 			rules: {
-				batchNo: [
+				incomeBatchNo: [
 					{ required: true, message: "批次号不能为空", trigger: "blur" }
 				],
 				orderNo: [
@@ -526,7 +526,7 @@ export default {
 			this.form = {
 				recordId: null,
 				checkNo: null,
-				batchNo: null,
+				incomeBatchNo: null,
 				orderNo: null,
 				materialCode: null,
 				materialName: null,
diff --git a/src/views/quality/qcProduce/selectWorkCenter.vue b/src/views/quality/qcProduce/selectWorkCenter.vue
index 01e23e0..55cabc0 100644
--- a/src/views/quality/qcProduce/selectWorkCenter.vue
+++ b/src/views/quality/qcProduce/selectWorkCenter.vue
@@ -11,7 +11,7 @@
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="center">
           <el-form-item label="车间编码">
             <el-input
-              v-model="queryParams.carCode"
+              v-model="queryParams.supplierCode"
               placeholder="车间编码"
               clearable
               style="width: 240px"
@@ -20,7 +20,7 @@
           </el-form-item>
           <el-form-item label="车间名称">
             <el-input
-              v-model="queryParams.carName"
+              v-model="queryParams.supplierName"
               placeholder="车间名称"
               clearable
               style="width: 240px"
@@ -36,8 +36,8 @@
           <el-table-column width="50" align="center" type="selection">
           </el-table-column>
           <!-- 序号 -->
-          <el-table-column label="车间编码"  align="left" key="carCode" prop="carCode" :show-overflow-tooltip="true" />
-          <el-table-column label="车间名称"  align="left" key="carName" prop="carName" :show-overflow-tooltip="true" />
+          <el-table-column label="车间编码"  align="left" key="supplierCode" prop="supplierCode" :show-overflow-tooltip="true" />
+          <el-table-column label="车间名称"  align="left" key="supplierName" prop="supplierName" :show-overflow-tooltip="true" />
         </el-table>
 
         <pagination
@@ -86,8 +86,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        carCode: '',
-        carName : ''
+        supplierCode: '',
+        supplierName : ''
       }
     };
   },
@@ -128,8 +128,8 @@ export default {
         this.$modal.msgSuccess("只能选一个");
       }
 
-			this.ids = selection[0].carCode;
-      this.idsName = selection[0].carName;
+			this.ids = selection[0].supplierCode;
+      this.idsName = selection[0].supplierName;
 		},
 
 
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index 7a7153e..f512092 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -9,9 +9,9 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="批次号" prop="batchNo">
+			<el-form-item label="批次号" prop="incomeBatchNo">
 				<el-input
-					v-model="queryParams.batchNo"
+					v-model="queryParams.incomeBatchNo"
 					placeholder="请输入批次号"
 					clearable
 					@keyup.enter.native="handleQuery"
@@ -157,7 +157,7 @@
 			<el-table-column label="id" align="center" prop="recordId" v-if="false"/>
 			<el-table-column label="checkType" align="center" prop="checkType" v-if="false"/>
 			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
-			<el-table-column label="批次号" align="center" prop="batchNo" width="120"/>
+			<el-table-column label="批次号" align="center" prop="incomeBatchNo" width="120"/>
 			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
 			<el-table-column label="物料号" align="center" prop="materialCode" width="170"/>
 			<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
@@ -236,8 +236,8 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="8">	
-						<el-form-item label="入库批次号" prop="batchNo">
-							<el-input v-model="form.batchNo" placeholder="请输入入库批次号" />
+						<el-form-item label="入库批次号" prop="incomeBatchNo">
+							<el-input v-model="form.incomeBatchNo" placeholder="请输入入库批次号" />
 						</el-form-item>
 					</el-col>
                     <el-col :span="8">
@@ -403,7 +403,7 @@ export default {
 				pageNum: 1,
 				pageSize: 10,
 				checkNo: null,
-				batchNo: null,
+				incomeBatchNo: null,
 				orderNo: null,
 				materialCode: null,
 				materialName: null,
@@ -429,7 +429,7 @@ export default {
 			form: {},
 			// 表单校验
 			rules: {
-				batchNo: [
+				incomeBatchNo: [
 					{ required: true, message: "批次号不能为空", trigger: "blur" }
 				],
 				orderNo: [
@@ -519,7 +519,7 @@ export default {
 			this.form = {
 				recordId: null,
 				checkNo: null,
-				batchNo: null,
+				incomeBatchNo: null,
 				orderNo: null,
 				materialCode: null,
 				materialName: null,