lims-ruoyi-before.git

			@@ -49,7 +49,6 @@
			:rowClassName="rowClassName" :height="'calc(100vh - 300px)'" @pagination="pagination"
			key="tableData0">
			<div slot="action" slot-scope="scope">
			<el-button size="small" type="text" @click="handleDataLook(scope.row)">数据查看</el-button>
			<el-button type="text" size="small"
			:disabled="(scope.row.userName == null \|\| scope.row.insState == 3 \|\| scope.row.insState == 5) && checkPermi(['update:product:onPlan'])"
			@click="editInspection(scope.row)">修改检验值</el-button>
			@@ -134,22 +133,6 @@
			<el-button @click="connectVisible = false">取消</el-button>
			<el-button :loading="loading" type="primary" @click="confirmConnect">确定</el-button>
			</span>
			</el-dialog>
			<el-dialog :visible.sync="dataDialogVisible" title="数据查看" width="80%">
			<div v-if="dataDialogVisible" style="height: 74vh; overflow-y: auto">
			<div>
			<el-form :model="entity" :inline="true">
			<el-form-item label="检验项" prop="outputWorkTime">
			<el-input v-model="entity.inspectionItem" clearable size="small"></el-input>
			</el-form-item>
			<el-form-item>
			<el-button size="small" type="primary" @click="getLookList">查询</el-button>
			</el-form-item>
			</el-form>
			</div>
			<lims-table :tableData="lookTableData" :column="lookColumn" :page="lookPage" :tableLoading="lookTableLoading"
			:height="'60vh'" @pagination="lookPagination" key="tableData1" :key="upIndex"></lims-table>
			</div>
			</el-dialog>
			<el-dialog :visible.sync="bindDialogVisible" title="检验项绑定" width="600px">
			<div slot="title" style="
			@@ -241,7 +224,6 @@
			bindingProductTreeByProductId,
			delProductTreeByProductId,
			selectInsOrderPlanList,
			selectSampleAndProductByOrderId,
			} from "@/api/business/inspectionTask.js";
			import { treeDevice } from "@/api/cnas/resourceDemand/device.js";
			import { mapGetters } from "vuex";
			@@ -291,7 +273,6 @@
			],
			active: 1,
			tabIndex: 0,
			dataDialogVisible: false,
			planTotal: 0,
			insStateList: [],
			state: 0, // 0:台账页，1：检验页面,2检验页面(复核)，默认为0,3数据查看
			@@ -320,7 +301,6 @@
			retestInfo: [],
			isCopper: null,
			bindCurrentInfo: {},
			lookInfo: {},
			orderTypeList: [
			{
			value: "Customer-ordered test",
			@@ -466,88 +446,6 @@
			type: "",
			},
			],
			// 数据查看相关字段---开始
			entity: {
			inspectionItem: "",
			},
			lookTableData: [],
			lookColumn: [
			{
			label: "样品编号",
			prop: "sampleCode",
			width: "140px",
			mergeCol: true, //合并列
			},
			{ label: "样品名称", prop: "sample", width: "140px", mergeCol: true },
			{ label: "检验项分类", prop: "inspectionItemClass" },
			{ label: "检验项", prop: "inspectionItem", width: "140px" },
			{ label: "检验子项", prop: "inspectionItemSubclass" },
			{ label: "单位", prop: "unit" },
			{ label: "样品型号", prop: "model", mergeCol: true },
			{ label: "条件", prop: "radius" },
			{ label: "电缆标识", prop: "cableTag" },
			{ label: "试验要求", prop: "tell" },
			{ label: "检验结果", prop: "lastValue" },
			{
			label: "结果判定",
			prop: "insResult",
			dataType: "tag",
			formatData: (params) => {
			let obj = this.insResultList.find((m) => m.value == params)
			if (obj) {
			return this.insResultList.find((m) => m.value == params).label;
			} else {
			return null
			}
			},
			formatType: (params) => {
			let obj = this.insResultList.find((m) => m.value == params)
			if (obj) {
			return this.insResultList.find((m) => m.value == params).type;
			} else {
			return null
			}
			},
			},
			{
			dataType: "action",
			fixed: "right",
			label: "操作",
			operation: [
			{
			name: "不合格复测查看",
			type: "text",
			clickFun: (row) => {
			this.getRetestResultInfo(row);
			},
			disabled: (row) => {
			return row.insResult!=0
			},
			},
			{
			name: "检验项绑定",
			type: "text",
			clickFun: (row) => {
			this.getBinding(row);
			},
			disabled: (row) => {
			return (
			this.lookInfo.userName == null \|\|
			this.lookInfo.insState == 3 \|\|
			this.lookInfo.insState == 5
			);
			},
			},
			],
			},
			],
			lookPage: {
			total: 0,
			size: 20,
			current: 0,
			},
			lookTableLoading: false,
			// 数据查看相关字段---结束
			retestVisible: false,
			upIndex: 0,
			tabLabel: ''
			@@ -600,29 +498,6 @@
			this.page.size = limit;
			this.getList();
			},
			getLookList() {
			this.lookTableLoading = true;
			let param = { id: this.lookInfo.id, ...this.lookPage, inspectionItem: this.entity.inspectionItem };
			delete param.total;
			selectSampleAndProductByOrderId({ ...param })
			.then((res) => {
			this.lookTableLoading = false;
			if (res.code === 200) {
			this.lookTableData = res.data.records;
			this.lookPage.total = res.data.total;
			this.upIndex++
			this.dataDialogVisible = true;
			}
			})
			.catch((err) => {
			this.lookTableLoading = false;
			});
			},
			lookPagination({ page, limit }) {
			this.lookPage.current = page;
			this.lookPage.size = limit;
			this.getLookList();
			},
			// 修改检验值
			editInspection(row) {
			this.$refs.editInspectionItem.showDialog(row.id);
			@@ -630,11 +505,6 @@
			// 查看工时
			viewManHour(row) {
			this.$refs.viewManHourDia.showDialog(row.id, row.insState);
			},
			// 数据查看
			handleDataLook(row) {
			this.lookInfo = row;
			this.getLookList();
			},
			changeCheckBox(val) {
			this.queryParams.userId = val ? 0 : null;