From b3c0980cfc10eca8725f005eb569a46f282a72cf Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Wed, 17 Jan 2024 10:22:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=A3=80=E9=AA=8C=EF=BC=8C?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=8A=A5=E5=91=8A=EF=BC=8C=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E7=BB=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/inventoryReport.js            |  93 +++
 .../checkTypeProject/MaterialGroupAdd.vue     |   2 -
 src/views/quality/inventoryReport/index.vue   | 570 ++++++++++++++++++
 .../quality/qcInventory/checkProjectType.vue  | 258 --------
 src/views/quality/qcInventory/index.vue       |  95 +--
 .../quality/qcInventory/selectLLWorkOrder.vue |   6 +-
 src/views/quality/qcInventory/selectUser.vue  | 150 -----
 7 files changed, 696 insertions(+), 478 deletions(-)
 create mode 100644 src/api/quality/inventoryReport.js
 create mode 100644 src/views/quality/inventoryReport/index.vue
 delete mode 100644 src/views/quality/qcInventory/checkProjectType.vue
 delete mode 100644 src/views/quality/qcInventory/selectUser.vue

diff --git a/src/api/quality/inventoryReport.js b/src/api/quality/inventoryReport.js
new file mode 100644
index 0000000..f34d835
--- /dev/null
+++ b/src/api/quality/inventoryReport.js
@@ -0,0 +1,93 @@
+import request from '@/utils/request'
+
+// 查询来料报告列表
+export function listIncome(query) {
+	return request({
+		url: '/quality/qcInventoryReport/list',
+		method: 'get',
+		params: query
+	});
+}
+
+// 查询来料报告详细
+export function getIncome(recordId) {
+	return request({
+		url: '/quality/qcInventoryReport/' + recordId,
+		method: 'get'
+		});
+}
+
+// 新增来料报告
+export function addIncome(data) {
+	return request({
+		url: '/quality/qcInventoryReport',
+		method: 'post',
+		data: data
+	});
+}
+
+// 修改来料报告
+export function updateIncome(data) {
+	return request({
+		url: '/quality/qcInventoryReport',
+		method: 'put',
+		data: data
+	});
+}
+
+// 删除来料报告
+export function delIncome(recordId) {
+	return request({
+		url: '/quality/qcInventoryReport/' + recordId,
+		method: 'delete'
+	});
+}
+
+// 查询BOM物料管理列表
+export function getQcListBom(query) {
+	return request({
+	  url: '/quality/qcInventoryReport/getQcListBom',
+	  method: 'get',
+	  params: query
+	});
+  }
+
+// 查询供应商管理列表
+export function getQcListSupplier(query) {
+	return request({
+	  url: '/quality/qcInventoryReport/getQcListSupplier',
+	  method: 'get',
+	  params: query
+	});
+  }
+
+// 查询人员列表
+export function getQcListUser(query) {
+	return request({
+	  url: '/quality/qcInventoryReport/getQcListUser',
+	  method: 'get',
+	  params: query
+	});
+  }
+
+//状态修改
+export function changeIncomeStatus(recordId, status) {
+	const data = {
+		recordId,
+	    status
+	}
+	return request({
+	  url: '/quality/qcInventoryReport/changeIncomeStatus',
+	  method: 'put',
+	  data: data
+	})
+  }
+
+// 查询检测项列表
+export function getCkeckProjectList(query) {
+	return request({
+	  url: '/quality/qcInventoryReport/getCkeckProjectList',
+	  method: 'get',
+	  params: query
+	});
+  }
diff --git a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
index 4e5364d..2bf8489 100644
--- a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
+++ b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
@@ -127,8 +127,6 @@ export default {
       },
       // 查询参数
       queryParams: {
-        pageNum: 1,
-        pageSize: 10,
         groupName: null,
         attr1: null,
         factoryCode: null,
diff --git a/src/views/quality/inventoryReport/index.vue b/src/views/quality/inventoryReport/index.vue
new file mode 100644
index 0000000..1fbadd0
--- /dev/null
+++ b/src/views/quality/inventoryReport/index.vue
@@ -0,0 +1,570 @@
+<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:incomeReport: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="150"/>
+			<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">
+			    <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
+						size="mini"
+						type="text"
+						icon="el-icon-edit"
+						@click="handleLook(scope.row)"
+						v-hasPermi="['quality:incomeReport: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="1000px" append-to-body>
+			<el-row>
+				<el-col :span="20">
+					<el-button 
+						    class="print-btn"
+							size="mini"
+							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="80px">
+					<el-row>
+						<el-col :span="7">
+							<img src="@/assets/logo/lanjv.png" class="report-logo"/>
+						</el-col>
+						<el-col :span="10" class="center-text">
+							<h1>中山榄菊日化实业有限公司</h1>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :offset="8" :span="8" class="center-text">
+							<h2>库存检验报告</h2>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="8">
+							<el-form-item label="库存类别" prop="factoryCode">
+								<el-input v-model="form.factoryCode" disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="生产批号" prop="incomeBatchNo">
+								<el-input v-model="form.incomeBatchNo" disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="报告编号" prop="checkNo">
+								<el-input v-model="form.checkNo" disabled />
+							 </el-form-item>
+						 </el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="16">
+							<el-form-item label="物料名称" prop="materialName">
+								<el-input v-model="form.materialName" disabled />
+							 </el-form-item>
+						 </el-col>
+						 <el-col :span="8">
+							<el-form-item label="物料编码" prop="materialCode">
+								<el-input v-model="form.materialCode" disabled />
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="16">
+							<el-form-item label="供应单位" prop="supplierName">
+								<el-input v-model="form.supplierName" disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">	
+							<el-form-item label="供应编码" prop="supplierCode">
+								<el-input v-model="form.supplierCode" 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" disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="单位" prop="unit" >
+								<el-input v-model="form.unit" disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="物料来源" prop="checkType" >
+								<el-input v-model="form.checkType" disabled/>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="8">
+							<el-form-item label="抽检数量" prop="sampleQuality">
+								<el-input v-model="form.sampleQuality" disabled />
+							</el-form-item>
+						</el-col>
+						
+						 <el-col :span="8">
+							<el-form-item label="报检日期" prop="createTime">
+								<el-input v-model="form.createTime" 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="checkTime">
+								<el-input v-model="form.checkTime" disabled>
+									{{ parseTime(form.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+								</el-input>
+							</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="50"/>
+								<el-table-column label="检验项目" align="center" prop="ruleName" />
+								<el-table-column label="标准要求" align="center" prop="checkStandard" width="200"/>
+								<el-table-column label="抽检数" align="center" prop="sampleNum" />
+								<el-table-column label="单位" align="center" prop="unitCode" />
+								<el-table-column label="实测结果" align="center" prop="actualValue" width="300"/>
+								<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>
+					<el-row>
+						<el-col>
+							<el-form-item label="综合检验结论" prop="checkManName" label-width="100px">
+								<el-col offset="6" span="6">
+									<el-checkbox disabled>合格</el-checkbox>
+								</el-col>
+								<el-col offset="3" span="6">
+									<el-checkbox disabled>不合格</el-checkbox>
+								</el-col>
+							</el-form-item>
+						</el-col>
+					</el-row>
+					<el-row>
+						<el-col :span="8">
+							<el-form-item label="品管经理/主任：" label-width="120px">
+								<el-input disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="品质主管：" label-width="100px">
+								<el-input disabled/>
+							</el-form-item>
+						</el-col>
+						<el-col :span="8">
+							<el-form-item label="品管员：" prop="checkManName">
+								<el-input v-model="form.checkManName" disabled/>
+							</el-form-item>
+						</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} from "@/api/quality/inventoryReport";
+import { getCheckTypes } from "@/api/quality/qcProduce";
+import moment from 'moment';
+export default {
+	name: "InventoryReport",
+	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('inventory').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/qcInventory/export', {
+				...this.queryParams
+			}, `inventory_${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: 1600, // 最大宽度
+				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;
+}
+.center-text {  
+	text-align: center;
+}
+.report-logo {
+	margin-top: 15px;
+	margin-left: 15px;
+    height: 38px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/quality/qcInventory/checkProjectType.vue b/src/views/quality/qcInventory/checkProjectType.vue
deleted file mode 100644
index a93c201..0000000
--- a/src/views/quality/qcInventory/checkProjectType.vue
+++ /dev/null
@@ -1,258 +0,0 @@
-<template>
-  <div>
-  <el-dialog title="检验项目"
-    v-if="showFlag"
-    :visible.sync="showFlag"
-    :modal= false
-    width="1000px"
-  >
-    <el-row :gutter="20">
-
-      <el-col :span="24" :xs="24">
-        <el-table v-loading="loading" :data="itemList" ref="myTable" >
-          <el-table-column width="50" align="center" type="selection">
-          </el-table-column>
-          <!-- 序号 -->
-          <el-table-column label="检测规则Id"  align="left" prop="recordId" :show-overflow-tooltip="true" v-if="false"/>
-          <el-table-column label="检测规则编码"  align="left" prop="projectNo" :show-overflow-tooltip="true" width="120"/>
-          <el-table-column label="检验规则名称"  align="left" prop="ruleName" :show-overflow-tooltip="true" width="120"/>
-          <el-table-column label="检验规则属性"  align="left" prop="propertyCode" :show-overflow-tooltip="true" width="120">
-            <template slot-scope="scope">
-            <dict-tag
-              :options="dict.type.qc_rule_prop"
-              :value="scope.row.propertyCode"
-            />
-          </template>
-        </el-table-column>
-          <el-table-column label="检验方式"  align="left" prop="checkMode" :show-overflow-tooltip="true" /> 
-          <el-table-column label="检验工具"  align="left" prop="checkTool" :show-overflow-tooltip="true" /> 
-          <el-table-column label="检验标准"  align="left" prop="checkStandard" :show-overflow-tooltip="true" /> 
-          <el-table-column label="上差值"  align="left" prop="upperDiff" :show-overflow-tooltip="true" /> 
-          <el-table-column label="下差值"  align="left" prop="downDiff" :show-overflow-tooltip="true" /> 
-          <el-table-column label="单位"  align="left"  prop="unitCode" :show-overflow-tooltip="true" width="80"/>
-          <el-table-column label="检测结果" key="status" align="center" prop="status" width="90">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.status"
-                active-value="Y"
-                inactive-value="N"
-                @change="handleStatusChange(scope.row)"
-              ></el-switch>
-            </template>
-          </el-table-column>
-          <el-table-column label="测量值"  align="left"  prop="actualValue" :show-overflow-tooltip="true" width="120"/>
-          <el-table-column label="不良项目"  align="left"  prop="defectCode" :show-overflow-tooltip="true" width="120">
-            <template scope="scope">
-              <el-select v-model="scope.row.defectCode">
-                <el-option v-for="item in defectList" :key="item.defectCode" :label="item.defectSubclass" :value="item.defectCode">
-                </el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-           <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="handleShowValue(scope.row)"
-                v-hasPermi="['quality:qcIncome: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-col>
-    </el-row>
-    <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitBomForm">确 定</el-button>
-              <el-button @click="showFlag=false">取 消</el-button>
-       </div>
-  </el-dialog>
-  <!--测量值弹窗-->
-	<el-dialog title="测量值" :visible.sync="valueOpen" width="600px" append-to-body>
-      <el-form :model="dynamicValidateForm" ref="dynamicValidateForm" label-width="100px" class="demo-dynamic">
-          <el-form-item
-            v-for="(domain, index) in dynamicValidateForm.domains"
-            :label="'测量值' + index"
-            :key="domain.key"
-            :prop="'domains.' + index + '.value'"
-            :rules="{
-              required: true, message: '测量值不能为空', trigger: 'blur'
-            }"
-          >
-            <el-input v-model="domain.value" style="width: 70%;"></el-input>
-            <el-button @click.prevent="removeDomain(domain)" style="margin-left:30px">删除</el-button>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" @click="submitForm('dynamicValidateForm')">提交</el-button>
-            <el-button @click="addDomain">新增测量值</el-button>
-            <el-button @click="resetForm('dynamicValidateForm')">重置</el-button>
-          </el-form-item>
-        </el-form>
-		</el-dialog>	
-    </div>
-</template>
-<script>
-
-import { getCkeckProjectList,changeCheckDetailStatus,commitActualValue,commitCheckResult,getDefectList } from "@/api/quality/income";
-export default {
-  name: "itemSelectUser",
-  dicts: ["check_result","qc_rule_prop"],
-  data() {
-    return {
-      showFlag:false,
-      // 选中数组
-      selectedRows: {},
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // BOM产品表格数据
-      itemList: null,
-
-      //树名称
-      bomCode: undefined,
-      defaultProps: {
-        id: "id",
-        label: "label"
-      },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        belongTo:''
-        //,userCode: '',
-        //userName : ''
-      },
-      data:{},
-      dynamicValidateForm: {
-          domains: [{
-            value: ''
-          }]
-      },
-      // 是否显示弹出层
-			valueOpen: false, 
-      //检测详情的id
-      recordId:'',
-      typeCode:'',//检测类型
-      defectList:[]//不良名称
-    };
-  },
-  created() {
-    this.getDefect();
-  },
-
-  methods: {
-
-    getDefect(){
-      getDefectList('defect_in').then(response => {
-          this.defectList = response;
-      });
-    },
-
-    init(rowdata,typeCode){
-      this.data=rowdata;
-      this.queryParams.belongTo = this.data.recordId;
-      this.typeCode = typeCode;
-      this.checkType = this.data.checkType;
-      this.orderNo = this.data.orderNo;
-      this.getList();
-    },
-
-    /** 查询表格列表*/
-    getList() {
-      this.loading = true;
-      getCkeckProjectList(this.queryParams).then(response => {
-          this.itemList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
-
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-
-    //提交整体检测结果
-    submitBomForm() {
-      commitCheckResult(this.queryParams.belongTo,this.typeCode,this.checkType,this.orderNo).then(response => {
-          this.$modal.msgSuccess("检测完成");
-          this.$emit('saveCheck');
-          this.showFlag = false;
-      });
-    },
-
-    // 数据状态修改/Y合格N不合格
-		handleStatusChange(row) {
-			let text = row.status === "N" ? "不合格" : "合格";
-			this.$modal.confirm('确认' + '"' + row.projectNo + '"'+text+'吗？').then(function() {
-				return changeCheckDetailStatus(row.recordId, row.status, row.defectCode);
-			}).then(() => {
-				this.$modal.msgSuccess(text + "操作成功");
-			}).catch(function() {
-				row.status = row.status === "N" ? "Y" : "N";
-			});
-		},
-
-    //动态测量值
-    /** 检测结果钮操作 */
-		handleShowValue(row) {
-			this.valueOpen = true;
-      this.recordId = row.recordId;
-		},
-    submitForm(formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          let values = this.dynamicValidateForm.domains;
-          var actualValues = values.map(item => item.value);
-          commitActualValue(this.recordId, actualValues).then(response => {
-              this.dynamicValidateForm.domains = [{ value: ''}];
-							this.$modal.msgSuccess("提交成功");
-							this.valueOpen = false;
-              this.getList();
-						});
-        } else {
-          console.log('error submit!!');
-          return false;
-        }
-      });
-    },
-    resetForm(formName) {
-      this.$refs[formName].resetFields();
-    },
-    removeDomain(item) {
-      var index = this.dynamicValidateForm.domains.indexOf(item)
-      if (index !== -1) {
-        this.dynamicValidateForm.domains.splice(index, 1)
-      }
-    },
-    addDomain() {
-      this.dynamicValidateForm.domains.push({
-        value: '',
-        key: Date.now()
-      });
-    }
-  }
-};
-</script>
diff --git a/src/views/quality/qcInventory/index.vue b/src/views/quality/qcInventory/index.vue
index b5b7864..fd67e60 100644
--- a/src/views/quality/qcInventory/index.vue
+++ b/src/views/quality/qcInventory/index.vue
@@ -12,7 +12,7 @@
 			<el-form-item label="批次号" prop="incomeBatchNo">
 				<el-input
 					v-model="queryParams.incomeBatchNo"
-					placeholder="请输入来料批次号"
+					placeholder="请输入库存批次号"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
@@ -47,7 +47,7 @@
 				/>
 				</el-select>
 			</el-form-item>
-			<el-form-item label="来料时间" prop="incomeTimeArray">
+			<el-form-item label="入库时间" prop="incomeTimeArray">
                 <el-date-picker
 				v-model="queryParams.incomeTimeArray"
 				format="yyyy-MM-dd HH:mm:ss"
@@ -89,7 +89,7 @@
 					icon="el-icon-plus"
 					size="mini"
 					@click="handleAdd"
-					v-hasPermi="['quality:qcIncome:add']"
+					v-hasPermi="['quality:qcInventory:add']"
 				>新增</el-button>
 			</el-col>
 			<el-col :span="1.5">
@@ -100,7 +100,7 @@
 					size="mini"
 					:disabled="single"
 					@click="handleUpdate"
-					v-hasPermi="['quality:qcIncome:edit']"
+					v-hasPermi="['quality:qcInventory:edit']"
 				>修改</el-button>
 			</el-col>
 			<!--
@@ -122,7 +122,7 @@
 					icon="el-icon-download"
 					size="mini"
 					@click="handleExport"
-					v-hasPermi="['quality:qcIncome:export']"
+					v-hasPermi="['quality:qcInventory:export']"
 				>导出</el-button>
 			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -133,16 +133,14 @@
 			<el-table-column label="recordId" 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="incomeBatchNo" width="120"/>
-			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
+			<el-table-column label="库存批次号" align="center" prop="incomeBatchNo" width="120"/>
 			<el-table-column label="物料号" align="center" prop="materialCode" width="170"/>
 			<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="noOkQuality" width="120"/>
 			<el-table-column label="单位" align="center" prop="unit" />
 			<el-table-column label="供应商编码" align="center" prop="supplierCode" width="120"/>
 			<el-table-column label="供应商名称" align="center" prop="supplierName" width="240"/>
-			<el-table-column label="来料时间" align="center" prop="incomeTime" width="180">
+			<el-table-column label="库存时间" align="center" prop="incomeTime" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
 				</template>
@@ -205,15 +203,15 @@
 			@pagination="getList"
 		/>
 
-		<!-- 添加或修改来料检验对话框 -->
+		<!-- 添加或修改库存检验对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="100px">
 				<el-row>
-				   <el-col :span="8">
+				   	<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>
 					<el-col :span="8">
 						<el-form-item label="检验类型" prop="checkType" >
 							<el-select v-model="form.checkType" placeholder="请选择检验类型" style="width: 100%;">
@@ -226,10 +224,10 @@
 							</el-select>
 						</el-form-item>
 					</el-col>
-                    <el-col :span="8">
-						<el-form-item label="订单号" prop="orderNo">
-							<el-input v-model="form.orderNo" placeholder="请输入订单号">
-									<el-button slot="append" @click="handleSelectWorkOrder" icon="el-icon-search"></el-button>
+					<el-col :span="8">
+						<el-form-item label="来料批次号" prop="incomeBatchNo">
+							<el-input v-model="form.incomeBatchNo" placeholder="请输入库存批次号">
+								<el-button slot="append" @click="handleSelectWorkOrder" icon="el-icon-search"></el-button>
 							</el-input>
 						</el-form-item>
 					</el-col>
@@ -240,24 +238,18 @@
 							<el-input v-model="form.materialName" placeholder="请选择物料名称"/>
 						</el-form-item>
 					</el-col>
-
 					<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="8">	
-						<el-form-item label="来料批次号" prop="incomeBatchNo">
-							<el-input v-model="form.incomeBatchNo" placeholder="请输入来料批次号" />
+						<el-form-item label="检测地点" prop="checkLoc">
+							<el-input v-model="form.checkLoc" placeholder="请输入检测地点" />
 						</el-form-item>
 					</el-col>
 				</el-row>	
 				<el-row>
-					<el-col :span="6">	
-						<el-form-item label="收货数量" prop="quality">
-							<el-input type="number" v-model="form.quality" placeholder="请输入收货数量" />
-						</el-form-item>
-					</el-col>
 					<el-col :span="6">	
 						<el-form-item label="抽样数量" prop="sampleQuality">
 							<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" />
@@ -268,43 +260,21 @@
 							<el-input type="number" v-model="form.noOkQuality" placeholder="请输入不合格数量" />
 						</el-form-item>
 					</el-col>
-					<el-col :span="6">
-						<el-form-item label="单位" prop="unit" >
-							<el-select v-model="form.unit" placeholder="请选择单位" style="width: 100%;">
-								<el-option
-									v-for="dict in dict.type.unit"
-									:key="dict.value"
-									:label="dict.label"
-									:value="dict.value"
-								></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
 				</el-row>
 				<el-row>
 					<el-col :span="8">
-						<el-form-item label="供应商名称" prop="supplierName">
+						<el-form-item label="仓库名称" prop="supplierName">
 							<el-input v-model="form.supplierName" placeholder="请选择供应商名称">
 							<el-button slot="append" @click="handleSelectSupplier" icon="el-icon-search"></el-button>
 							</el-input>
 						</el-form-item>
 					</el-col>
 				   <el-col :span="8">	
-						<el-form-item label="供应商编码" prop="supplierCode">
+						<el-form-item label="仓库编码" prop="supplierCode">
 							<el-input v-model="form.supplierCode" placeholder="请输入供应商编码" disabled/>
 						</el-form-item>
-					</el-col>	
-					<el-col :span="8">
-						<el-form-item label="来料时间" prop="incomeTime">
-							<el-date-picker clearable
-								v-model="form.incomeTime"
-								type="datetime"
-								value-format="yyyy-MM-dd HH:mm:ss"
-								placeholder="请选择来料时间">
-							</el-date-picker>
-						</el-form-item>
 					</el-col>
-				</el-row>	
+				</el-row>
 				<el-row>
 					<el-col :span="8">
 						<el-form-item label="检测人姓名" prop="checkManName">
@@ -318,12 +288,7 @@
 							<el-input v-model="form.checkManCode" placeholder="请输入检测人工号" disabled/>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8">	
-						<el-form-item label="检测地点" prop="checkLoc">
-							<el-input v-model="form.checkLoc" placeholder="请输入检测地点" />
-						</el-form-item>
-					</el-col>
-				</el-row>	
+				</el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -358,11 +323,11 @@ import { listQcInventory, getQcInventory, addQcInventory, updateQcInventory, del
 import { getCheckTypes } from "@/api/quality/qcProduce";
 import ItemSelectWorkOrder from "./selectLLWorkOrder.vue";
 import ItemSelectSupplier from "./selectSupplier.vue";
-import ItemSelectUser from "./selectUser.vue";
-import ItemSelectProject from "./checkProjectType.vue";
+import ItemSelectUser from "../qcIncome/selectUser.vue";
+import ItemSelectProject from "../qcIncome/checkProjectType.vue";
 import moment from 'moment';
 export default {
-	name: "Income",
+	name: "Inventory",
 	components: { ItemSelectWorkOrder,ItemSelectSupplier,ItemSelectUser,ItemSelectProject},
 	dicts: ["unit","check_status","check_result"],
 	data() {
@@ -379,7 +344,7 @@ export default {
 			showSearch: true,
 			// 总条数
 			total: 0,
-			// 来料检验表格数据
+			// 库存检验表格数据
 			incomeList: [],
 			// 弹出层标题
 			title: "",
@@ -460,7 +425,7 @@ export default {
 	methods: {
 		/****/
 		getCheckTypes() {
-           	getCheckTypes('material').then(response => {
+           	getCheckTypes('inventory').then(response => {
 				this.checkTypes = response;
 			});
 		},
@@ -480,7 +445,7 @@ export default {
 			return y + "-" + m + "-" + d+" 00:00:00";
 		},
 
-		/** 查询来料检验列表 */
+		/** 查询库存检验列表 */
 		getList() {
 			this.loading = true;
 
@@ -559,7 +524,7 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			this.title = "添加来料检验";
+			this.title = "添加库存检验";
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -568,7 +533,7 @@ export default {
 			getQcInventory(recordId).then(response => {
 				this.form = response.data;
 				this.open = true;
-				this.title = "修改来料检验";
+				this.title = "修改库存检验";
 			});
 		},
 		/** 提交按钮 */
@@ -593,7 +558,7 @@ export default {
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const recordIds = row.recordId || this.ids;
-			this.$modal.confirm('是否确认删除来料检验编号为"' + recordIds + '"的数据项？').then(function() {
+			this.$modal.confirm('是否确认删除库存检验编号为"' + recordIds + '"的数据项？').then(function() {
 				return delQcInventory(recordIds);
 			}).then(() => {
 				this.getList();
@@ -664,7 +629,7 @@ export default {
 			}
 
 			this.$refs.itemSelectProject.showFlag = true;
-			this.$refs.itemSelectProject.init(row,'material');
+			this.$refs.itemSelectProject.init(row,'inventory');
 		},
 		//提交检测结果
 		saveCheck(){
diff --git a/src/views/quality/qcInventory/selectLLWorkOrder.vue b/src/views/quality/qcInventory/selectLLWorkOrder.vue
index cf11382..2d87cf1 100644
--- a/src/views/quality/qcInventory/selectLLWorkOrder.vue
+++ b/src/views/quality/qcInventory/selectLLWorkOrder.vue
@@ -9,10 +9,10 @@
 
       <el-col :span="24" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="105px" align="left">
-          <el-form-item label="入库单号">
+          <el-form-item label="来料单号">
             <el-input
               v-model="queryParams.orderNo"
-              placeholder="入库单号"
+              placeholder="来料单号"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
@@ -26,7 +26,7 @@
         <el-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
           <el-table-column width="50" align="center" type="selection"/>
           <el-table-column label="id"  align="left"  prop="recordId" width="100" v-if="false"/>
-          <el-table-column label="入库单号"  align="left"  prop="orderNo" width="180"/>
+          <el-table-column label="来料单号"  align="left"  prop="orderNo" width="180"/>
           <el-table-column label="质检状态"  align="left"  prop="qualityStatus" width="100"/>
           <el-table-column label="批次号"  align="left" prop="incomeBatchNo" width="120"/>
           <el-table-column label="产品编码"  align="left" prop="materialCode" width="180" />
diff --git a/src/views/quality/qcInventory/selectUser.vue b/src/views/quality/qcInventory/selectUser.vue
deleted file mode 100644
index a7e9c5e..0000000
--- a/src/views/quality/qcInventory/selectUser.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-<template>
-  <el-dialog title="人员选择"
-    v-if="showFlag"
-    :visible.sync="showFlag"
-    :modal= false
-    width="1000px"
-  >
-    <el-row :gutter="20">
-
-      <el-col :span="24" :xs="24">
-        <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.userCode"
-              placeholder="员工工号"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="员工姓名">
-            <el-input
-              v-model="queryParams.userName"
-              placeholder="员工姓名"
-              clearable
-              style="width: 240px"
-              @keyup.enter.native="handleQuery"
-            />
-          </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-table v-loading="loading" :data="itemList" @selection-change="handleBomSelectionChange" ref="myTable" >
-          <el-table-column width="50" align="center" type="selection">
-          </el-table-column>
-          <!-- 序号 -->
-          <el-table-column label="员工ID"  align="left" key="userId" prop="userId" :show-overflow-tooltip="true" />
-          <el-table-column label="员工工号"  align="left" key="userCode" prop="userCode" :show-overflow-tooltip="true" />
-          <el-table-column label="员工姓名"  align="left" key="userName" prop="userName" :show-overflow-tooltip="true" />
-          <el-table-column label="手机号"  align="left" key="phonenumber" prop="phonenumber" :show-overflow-tooltip="true" />     
-        </el-table>
-
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
-      </el-col>
-    </el-row>
-    <div slot="footer" class="dialog-footer">
-              <el-button type="primary" @click="submitBomForm">确 定</el-button>
-              <el-button @click="showFlag=false">取 消</el-button>
-       </div>
-  </el-dialog>
-</template>
-<script>
-
-import { getQcListUser } from "@/api/quality/income";
-export default {
-  name: "itemSelectUser",
-  data() {
-    return {
-      showFlag:false,
-      // 选中数组
-      selectedRows: {},
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // BOM产品表格数据
-      itemList: null,
-
-      //树名称
-      bomCode: undefined,
-      defaultProps: {
-        id: "id",
-        label: "label"
-      },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        userCode: '',
-        userName : ''
-      }
-    };
-  },
-  created() {
-    this.getList();
-  },
-
-  methods: {
-
-    /** 查询表格列表*/
-    getList() {
-      this.loading = true;
-      getQcListUser(this.queryParams).then(response => {
-          this.itemList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        }
-      );
-    },
-
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1;
-      this.getList();
-    },
-
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-
-    
-    // 多选框选中数据
-		handleBomSelectionChange(selection) {
-
-      /* if(selection.length>1){
-        this.$modal.msgSuccess("只能选一个");
-      } */
-      
-
-			/* this.ids = selection[0].userCode;
-      this.idsName = selection[0].userName; */
-      this.ids = selection.map(item => item.userCode).join(',');
-      this.idsName = selection.map(item => item.userName).join(',');
-		},
-
-
-    submitBomForm() {
-      this.selectedRows.code = this.ids;
-      this.selectedRows.name = this.idsName;
-      this.$emit('onSelected', this.selectedRows);
-      this.showFlag = false;
-      this.queryParams.itemCodeGet = "";
-    }
-  }
-};
-</script>