Merge remote-tracking branch 'origin/master'

src/api/mes/reportWork.js

@@ -154,4 +154,13 @@ export function getMesListBom(query) {
 	  method: 'get',
 	  params: query
 	});
-  }
+  }
+
+  // 查询物料管理列表
+// export function getTeamList() {
+// 	return request({
+// 		url: '/mes/reportWorkConsume/getTeamList',
+// 		method: 'get'
+// 	});
+// }
+  

src/api/quality/incomeReport.js

@@ -0,0 +1,93 @@
+import request from '@/utils/request'
+
+// 查询来料报告列表
+export function listIncome(query) {
+	return request({
+		url: '/quality/qcIncomeReport/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询来料报告详细
+export function getIncome(recordId) {
+	return request({
+		url: '/quality/qcIncomeReport/' + recordId,
+		method: 'get'
+		});
+}
+
+// 新增来料报告
+export function addIncome(data) {
+	return request({
+		url: '/quality/qcIncomeReport',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改来料报告
+export function updateIncome(data) {
+	return request({
+		url: '/quality/qcIncomeReport',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除来料报告
+export function delIncome(recordId) {
+	return request({
+		url: '/quality/qcIncomeReport/' + recordId,
+		method: 'delete'
+	});
+}
+
+// 查询BOM物料管理列表
+export function getQcListBom(query) {
+	return request({
+	  url: '/quality/qcIncomeReport/getQcListBom',
+	  method: 'get',
+	  params: query
+	});
+  }
+
+// 查询供应商管理列表
+export function getQcListSupplier(query) {
+	return request({
+	  url: '/quality/qcIncomeReport/getQcListSupplier',
+	  method: 'get',
+	  params: query
+	});
+  }
+
+// 查询人员列表
+export function getQcListUser(query) {
+	return request({
+	  url: '/quality/qcIncomeReport/getQcListUser',
+	  method: 'get',
+	  params: query
+	});
+  }
+
+//状态修改
+export function changeIncomeStatus(recordId, status) {
+	const data = {
+		recordId,
+	    status
+	}
+	return request({
+	  url: '/quality/qcIncomeReport/changeIncomeStatus',
+	  method: 'put',
+	  data: data
+	})
+  }
+
+// 查询检测项列表
+export function getCkeckProjectList(query) {
+	return request({
+	  url: '/quality/qcIncomeReport/getCkeckProjectList',
+	  method: 'get',
+	  params: query
+	});
+  }

src/views/mes/reportWork/index.vue

@@ -309,11 +309,18 @@
 							/>
 							</el-form-item>
 					</el-col>
+					<!--
                     <el-col :span="6">
 						<el-form-item label="班组编码" prop="teamCode">
-							<el-input v-model="form.teamCode" placeholder="请输入班组编码" />
+							<el-select v-model="form.teamCode" class="selectItem" placeholder="请选择班组">
+								<el-option v-for="(item,index) in teamList"
+											:key="index"
+											:label="item.teamDesc"
+											:value="item.teamCode">
+								</el-option>
+							</el-select>
 						</el-form-item>
-					</el-col>
+					</el-col>-->
 				</el-row>
 				<el-row>
 					<el-col :span="24">
@@ -434,6 +441,7 @@ export default {
 				{"dictLabel":"报工成功","dictValue":"1"},
 				{"dictLabel":"报工失败","dictValue":"2"}
 			],
+			teamList:[],
 			// 表单校验
 			rules: {
 				workorderCode:[
@@ -447,16 +455,17 @@ export default {
 				],
 				machineName: [
 					{ required: true, message: "本次报工线体不能为空", trigger: "blur" }
-				],
-				teamCode: [
-					{ required: true, message: "本次报工班组不能为空", trigger: "blur" }
-				],
+				]
+				//,teamCode: [
+				//	{ required: true, message: "本次报工班组不能为空", trigger: "blur" }
+				//],
 			}
 		};
 	},
 	created() {
 		this.getList();
 		this.getDate();
+		//this.getTeamList();
 	},
 	methods: {
 		//产品编码格式化
@@ -464,6 +473,13 @@ export default {
 			return cellValue.slice(7,18);  //返回值
 		},
 
+		//获取班组下拉列表
+		//getTeamList(){
+		//	getTeamList().then(response => {
+		//		this.teamList = response;
+		//	});
+		//},
+
 		/**获取默认查询时间段**/
 		getDate() {
 			let start = this.Fungetdate (0)

src/views/quality/incomeReport/index.vue

@@ -0,0 +1,518 @@
+<template>
+	<div class="app-container">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+		    <el-form-item label="任务编号" prop="checkNo">
+				<el-input
+					v-model="queryParams.checkNo"
+					placeholder="请输入检验任务编号"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="物料名称" prop="materialName">
+				<el-input
+					v-model="queryParams.materialName"
+					placeholder="请输入物料名称"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="检验结果" prop="checkResult">
+				<el-select
+				v-model="queryParams.checkResult"
+				placeholder="检验结果"
+				clearable
+				>
+				<el-option
+					v-for="dict in dict.type.check_result"
+					:key="dict.value"
+					:label="dict.label"
+					:value="dict.value"
+				/>
+				</el-select>
+			</el-form-item>
+			<el-form-item label="检测地点" prop="checkLoc">
+				<el-input
+					v-model="queryParams.checkLoc"
+					placeholder="请输入检测地点"
+					clearable
+					@keyup.enter.native="handleQuery"
+				/>
+			</el-form-item>
+			<el-form-item label="检验时间" prop="checkTimeArray">
+                <el-date-picker
+				v-model="queryParams.checkTimeArray"
+				format="yyyy-MM-dd HH:mm:ss"
+				type="datetimerange"
+				range-separator="至"
+				start-placeholder="开始日期"
+				end-placeholder="结束日期">
+				</el-date-picker>
+			</el-form-item>
+			<el-form-item>
+				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+			</el-form-item>
+		</el-form>
+
+		<el-row :gutter="10" class="mb8">
+			<!-- <el-col :span="1.5">
+				<el-button
+					type="primary"
+					plain
+					icon="el-icon-plus"
+					size="mini"
+					@click="handleAdd"
+					v-hasPermi="['quality:qcIncome:add']"
+				>新增</el-button>
+			</el-col> -->
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-download"
+					size="mini"
+					@click="handleExport"
+					v-hasPermi="['quality:qcIncomeReport:export']"
+				>导出</el-button>
+			</el-col>
+			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+		</el-row>
+
+		<el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange">
+			<el-table-column type="selection" width="55" align="center" />
+			<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
+			<el-table-column label="检验任务编号" align="center" prop="checkNo" width="120"/>
+			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
+			<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
+			<el-table-column label="收货数量" align="center" prop="quality" />
+			<el-table-column label="单位" align="center" prop="unit" />
+			<el-table-column label="供应商名称" align="center" prop="supplierName" width="240"/>
+			<el-table-column label="检验时间" align="center" prop="checkTime" width="180">
+				<template slot-scope="scope">
+					<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" class-name="small-padding fixed-width">
+				<template slot-scope="scope">
+					<el-button
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleLook(scope.row)"
+						v-hasPermi="['quality:qcIncomeReport:edit']"
+					>查看</el-button>
+				</template>
+			</el-table-column>
+		</el-table>
+		
+		<pagination
+			v-show="total>0"
+			:total="total"
+			:page.sync="queryParams.pageNum"
+			:limit.sync="queryParams.pageSize"
+			@pagination="getList"
+		/>
+
+		<!-- 添加或修改来料检验对话框 -->
+		<el-dialog :title="title" :visible.sync="open" width="1200px" append-to-body>
+			<el-row>
+				<el-col :span="20">
+					<el-button 
+						    class="print-btn"
+							size="midle"
+							type="primary"
+							icon="el-icon-edit"
+							@click="handlePrint(form)"
+						>打印</el-button>
+				</el-col>
+			</el-row>
+			<!-- 打印整个printFrom区域 -->
+			<div id="printFrom">
+				<el-form ref="form" :model="form" :rules="rules" label-width="100px">
+					<el-row>
+						<el-col :span="8">
+							<el-form-item label="OEM厂名" prop="supplierName">
+								<el-input v-model="form.supplierName" placeholder="请输入OEM厂名" disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="来料类别" prop="factoryCode">
+								<el-input v-model="form.factoryCode" placeholder="请输入检验任务编号" disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="来料批号" prop="incomeBatchNo">
+								<el-input v-model="form.incomeBatchNo" placeholder="请输入来料批号" disabled/>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="8">
+							   <el-form-item label="物料编码" prop="materialCode">
+								<el-input v-model="form.materialCode" placeholder="请选择物料编码" disabled />
+							</el-form-item>
+						</el-col>
+						<el-col :span="16">
+							<el-form-item label="物料名称" prop="materialName">
+								<el-input v-model="form.materialName" placeholder="请选择物料名称" disabled />
+							 </el-form-item>
+						 </el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="8">	
+							<el-form-item label="供应商编码" prop="supplierCode">
+								<el-input v-model="form.supplierCode" placeholder="请输入供应商编码" disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="16">
+							<el-form-item label="供应商名称" prop="supplierName">
+								<el-input v-model="form.supplierName" placeholder="请选择供应商名称" disabled/>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="8">	
+							<el-form-item label="物料数量" prop="quality">
+								<el-input type="number" v-model="form.quality" placeholder="请输入物料数量" disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="单位" prop="unit" >
+								<el-input v-model="form.unit" placeholder="请输入单位" disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="物料来源" prop="checkType" >
+								<el-input v-model="form.checkType" placeholder="物料来源" disabled/>
+								<!-- <el-select v-model="form.checkType" placeholder="请选择检验类型" style="width: 100%;">
+									<el-option
+										v-for="dict in checkTypes"
+										:key="dict.id"
+										:label="dict.checkName"
+										:value="dict.id"
+									></el-option>
+								</el-select> -->
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="8">
+							<el-form-item label="检验日期" prop="checkTime">
+								<el-input v-model="form.checkTime" placeholder="请输入检验日期" disabled>
+									{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+								</el-input>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="检验编号" prop="checkNo">
+								<el-input v-model="form.checkNo" placeholder="请输入检验编号" disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="产品提报人" prop="checkManName">
+								<el-input v-model="form.checkManName" placeholder="请输入OEM产品提报人" disabled/>
+							</el-form-item>
+						</el-col>
+					</el-row>	
+					<el-row>
+						<el-col :span="24">	
+							<!-- 检验项目明细 -->
+							<el-table v-loading="loading" :data="checkProjectList" >
+								<el-table-column type="selection" width="55" align="center" />
+								<el-table-column label="检验规则编号" align="center" type="index" width="100"/>
+								<el-table-column label="检验规则名称" align="center" prop="ruleName" />
+								<el-table-column label="标准值" align="center" prop="checkStandard" />
+								<el-table-column label="上差值" align="center" prop="upperDiff" />
+								<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>
+						</el-col>
+					</el-row>	
+				</el-form>
+			</div>
+			
+			<div slot="footer" class="dialog-footer">
+				<el-button type="primary" @click="cancel">确 定</el-button>
+				<el-button @click="cancel">取 消</el-button>
+			</div>
+		</el-dialog>
+		
+	</div>
+</template>
+
+<script>
+import { listIncome, getIncome, delIncome, addIncome, updateIncome,getCkeckProjectList,getWorkOrders} from "@/api/quality/incomeReport";
+import { getCheckTypes } from "@/api/quality/qcProduce";
+import moment from 'moment';
+export default {
+	name: "Income",
+	dicts: ["unit","check_status","check_result"],
+	data() {
+		return {
+			// 遮罩层
+			loading: true,
+			// 选中数组
+			ids: [],
+			// 非单个禁用
+			single: true,
+			// 非多个禁用
+			multiple: true,
+			// 显示搜索条件
+			showSearch: true,
+			// 总条数
+			total: 0,
+			//打印
+			formRef: 'form',
+			validateRules: [],
+			printData: {
+				printable: 'printFrom',
+				ignore: ['no-print'],
+				workCenter: "暂无数据",
+				SAPNo: null,
+				manufacture: null,
+				auditor: null,
+				printDate: null,
+				factory: null,
+				productDate: null,
+				workTable: [],
+			},
+			printDialogVisible: false,
+			// 来料检验表格数据
+			incomeList: [],
+			// 检验项目列表
+			checkProjectList: [],
+			// 弹出层标题
+			title: "",
+			// 是否显示弹出层
+			open: false,
+			// 查询参数
+			queryParams: {
+				checkTimeArray: [],
+				pageNum: 1,
+				pageSize: 10,
+				checkNo: null,
+				incomeBatchNo: null,
+				orderNo: null,
+				materialCode: null,
+				materialName: null,
+				quality: null,
+				unit: null,
+				supplierCode: null,
+				supplierName: null,
+				incomeTime: null,
+				checkLoc: null,
+				checkStatus: null,
+				checkManCode: null,
+				checkManName: null,
+				checkTime: null,
+				checkResult: null,
+				status: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				attr4: null,
+				factoryCode: null,
+			},
+			// 表单参数
+			form: {},
+			checkTypes:[],
+			// 表单校验
+			rules: {
+				/* incomeBatchNo: [
+					{ required: true, message: "来料批次号不能为空", trigger: "blur" }
+				], */
+			}
+		};
+	},
+	created() {
+		//this.getDate();
+		this.getList();
+		this.getCheckTypes();
+	},
+	methods: {
+		/****/
+		getCheckTypes() {
+           	getCheckTypes('material').then(response => {
+				this.checkTypes = response;
+			});
+		},
+        /**获取默认查询时间段**/
+		//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);
+			var y = dd.getFullYear();
+			var m = dd.getMonth() + 1;//获取当前月份的日期
+			var d = dd.getDate();
+			return y + "-" + m + "-" + d+" 00:00:00";
+		},
+
+		/** 查询来料检验列表 */
+		getList() {
+			this.loading = true;
+
+			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');
+			}
+
+			listIncome(this.queryParams).then(response => {
+				this.incomeList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 取消按钮
+		cancel() {
+			this.open = false;
+			this.reset();
+		},
+		// 表单重置
+		reset() {
+			this.form = {
+				recordId: null,
+				checkNo: null,
+				incomeBatchNo: null,
+				orderNo: null,
+				materialCode: null,
+				materialName: null,
+				quality: null,
+				unit: null,
+				supplierCode: null,
+				supplierName: null,
+				incomeTime: null,
+				checkLoc: null,
+				checkStatus: null,
+				checkManCode: null,
+				checkManName: null,
+				checkTime: null,
+				checkResult: null,
+				status: null,
+				attr1: null,
+				attr2: null,
+				attr3: null,
+				attr4: null,
+				createBy: null,
+				createTime: null,
+				updateBy: null,
+				updateTime: null,
+				factoryCode: null,
+				delFlag: null,
+				
+			};
+			this.resetForm("form");
+		},
+		/** 搜索按钮操作 */
+		handleQuery() {
+			this.queryParams.pageNum = 1;
+			this.getList();
+		},
+		/** 重置按钮操作 */
+		resetQuery() {
+			this.resetForm("queryForm");
+			this.handleQuery();
+		},
+		// 多选框选中数据
+		handleSelectionChange(selection) {
+			this.ids = selection.map(item => item.recordId)
+			this.single = selection.length!==1
+			this.multiple = !selection.length
+		},
+		/** 新增按钮操作 */
+		handleAdd() {
+			this.reset();
+			this.open = true;
+			this.title = "添加来料检验";
+		},
+		/** 查看按钮操作 */
+		handleLook(row) {
+			this.reset();
+			const recordId = row.recordId || this.ids
+			this.queryParams.recordId = recordId;
+			getIncome(recordId).then(response => {
+				this.form = response.data;
+				this.form.printable = 'printFrom'; //打印时需要
+				this.form.ignore = ['no-print'];//打印时需要
+				this.open = true;
+				this.title = "查看来料报告";
+			});
+			this.getCheckedProjectList();
+		},
+		/** 提交按钮 */
+		submitForm() {
+			this.$refs["form"].validate(valid => {
+				if (valid) {
+					if (this.form.recordId != null) {
+						updateIncome(this.form).then(response => {
+							this.$modal.msgSuccess("修改成功");
+							this.open = false;
+							this.getList();
+						});
+					} else {
+						addIncome(this.form).then(response => {
+							this.$modal.msgSuccess("新增成功");
+							this.open = false;
+							this.getList();
+						});
+					}
+				}
+			});
+		},
+		/** 删除按钮操作 */
+		handleDelete(row) {
+			const recordIds = row.recordId || this.ids;
+			this.$modal.confirm('是否确认删除来料检验编号为"' + recordIds + '"的数据项？').then(function() {
+				return delIncome(recordIds);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("删除成功");
+			}).catch(() => {});
+		},
+		/** 导出按钮操作 */
+		handleExport() {
+			this.download('quality/qcIncome/export', {
+				...this.queryParams
+			}, `income_${new Date().getTime()}.xlsx`)
+		},
+		/**获取检验项目列表 */
+		getCheckedProjectList(){
+			this.loading = true;
+			getCkeckProjectList(this.queryParams).then((response) => {
+				this.checkProjectList = response.rows;
+				this.total = response.total;
+				this.loading = false;
+			});
+		},
+		// 打印预览-浏览器打印
+		handlePrint(params) {
+			console.log(this.form);
+			printJS({
+				printable: params.printable, // 'printFrom', // 标签元素id
+				type: params.type || 'html',
+				maxWidth: 1500, // 最大宽度
+				font_size: "",// 设置字体大小
+				header: params.header, // '表单',
+				targetStyles: ['*'],
+				style: '@page {margin:0 10mm};', // 可选-打印时去掉眉页眉尾
+				ignoreElements: params.ignore || [], // ['no-print']
+				properties: params.properties || null
+			})
+		},
+	}
+};
+</script>
+<style scoped>
+.print-btn{
+	margin-bottom: 15px;
+	margin-left: 10px;
+}
+</style>