From 61282c106068d9a792e1b084746e2d6b9a997b99 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 15 九月 2026 15:29:52 +0800
Subject: [PATCH] 新疆——新聚lims 1.不需要判定要求、检测方法、检验结果、结论 2.设备不需要绑定每个检验子项，只需要绑定当前的的检验委托单 3.判定结果检测的时候不要出现，复核的时候才判断选择最终结果是否合格
---
src/views/business/inspectionTask/inspection.vue | 63 +++++++++----------------------
1 files changed, 19 insertions(+), 44 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 0f21557..e806089 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -92,7 +92,6 @@
<el-descriptions-item label="闆朵欢鍙�">{{insOrder.partNo}}</el-descriptions-item>
<el-descriptions-item label="闆朵欢鍚嶇О">{{insOrder.partDetail}}</el-descriptions-item>
<el-descriptions-item label="鎵规鍙�">{{ insOrder.lotBatchNo }}</el-descriptions-item>
- <el-descriptions-item label="鏍峰搧鍨嬪彿" >{{currentSample.model}}</el-descriptions-item>
<el-descriptions-item label="鎶芥鏁伴噺">{{insOrder.testQuantity}}</el-descriptions-item>
<el-descriptions-item label="鍘傚瀵嗗害">{{supplierDensity}}</el-descriptions-item>
<template v-if="insOrder.ifsOrderType && insOrder.ifsOrderType==='02wg'">
@@ -109,8 +108,7 @@
<el-descriptions-item label="濮旀墭缂栧彿">{{ insOrder.entrustCode }}</el-descriptions-item>
<el-descriptions-item label="鏍峰搧缂栧彿">{{ currentSample.sampleCode }}</el-descriptions-item>
<el-descriptions-item label="鏍峰搧鍚嶇О">{{ currentSample.sample }}</el-descriptions-item>
- <el-descriptions-item label="鏍峰搧鏁伴噺">{{ sampleProduct.length }}</el-descriptions-item>
- <el-descriptions-item label="鏍峰搧鍨嬪彿">{{ currentSample.model }}</el-descriptions-item>
+ <el-descriptions-item label="鏍峰搧鏁伴噺">{{ insOrder.testQuantity }}</el-descriptions-item>
<el-descriptions-item label="涓嬪彂鏃堕棿">{{ insOrder.sendTime }}</el-descriptions-item>
<el-descriptions-item label="绱ф�ョ▼搴�">{{ insOrder.typeName }}</el-descriptions-item>
<el-descriptions-item label="绾﹀畾鏃堕棿">{{ insOrder.appointed }}</el-descriptions-item>
@@ -125,6 +123,12 @@
:disabled="state != 1" @change="saveOverviewDevices">
<el-option v-for="device in orderDeviceOptions" :key="device.id" :label="device.label" :value="device.id" />
</el-select>
+ </el-descriptions-item>
+ <el-descriptions-item label="妫�楠岀粨璁�">
+ <el-radio-group v-model="reviewInsResult" :disabled="state != 2">
+ <el-radio :label="1">鍚堟牸</el-radio>
+ <el-radio :label="0">涓嶅悎鏍�</el-radio>
+ </el-radio-group>
</el-descriptions-item>
</el-descriptions>
</div>
@@ -388,17 +392,6 @@
<el-select v-model="verifyUser" clearable filterable placeholder="璇烽�夋嫨" size="small" style="width: 100%">
<el-option v-for="(item, i) in personList" :key="i" :label="item.label" :value="item.value">
</el-option>
- </el-select>
- </div>
- </div>
- <div class="body" style="display: flex; padding: 10px; align-items: center">
- <div class="search_label" style="width: 150px">
- <span class="required-span">*</span>鎶ュ憡绫诲瀷
- </div>
- <div class="search_input" style="width: 100%">
- <el-select v-model="reportType" clearable placeholder="璇烽�夋嫨" size="small" style="width: 100%">
- <el-option label="妫�娴嬫姤鍛�" :value="0"></el-option>
- <el-option label="妫�楠屾姤鍛�" :value="1"></el-option>
</el-select>
</div>
</div>
@@ -675,13 +668,13 @@
reviewLoading: false,
reviewDia: false,
noReason: "",
+ reviewInsResult: null,
tableWidth: 1000,
currentTable: null,
tableLists: [],
widthList: [],
addVerifyDia: false,
verifyUser: null,
- reportType: null,
personList: [],
enumList: [],
tableLoading: false,
@@ -840,7 +833,6 @@
},
tableLoading0: false,
// 浠诲姟鍒囨崲鍒楄〃--缁撴潫
- isSplit: 0, // 鏄惁鏄媶鍗曡繃鏉ョ殑
};
},
// 鐢ㄤ簬涓婁紶鏂囦欢鐨勪俊鎭�
@@ -852,7 +844,7 @@
},
created() {
this.saveQueue = Promise.resolve();
- let { sonLaboratory, orderId, state, inspectorList, typeSource,isSplit } =
+ let { sonLaboratory, orderId, state, inspectorList, typeSource } =
this.$route.query;
this.sonLaboratory = sonLaboratory;
this.orderId = orderId;
@@ -860,7 +852,6 @@
this.state = state;
this.inspectorList = inspectorList;
this.typeSource = typeSource;
- this.isSplit = isSplit;
},
mounted() {
this.getTypeDicts(); // 鑾峰彇绱ф�ョ▼搴︿笅鎷夋閫夐」
@@ -1090,6 +1081,7 @@
laboratory: this.sonLaboratory,
}).then(async (res) => {
this.insOrder = res.data.insOrder;
+ this.reviewInsResult = this.insOrder.insResult;
if(res.data.insOrder.ifsOrderType==='02wg'){
//鏌ヨ闆朵欢灞炴��
this.getPartProps(res.data.insOrder.ifsInventoryId)
@@ -2187,6 +2179,10 @@
upInsReview(e) {
if (e == 1) {
// 閫氳繃
+ if (this.reviewInsResult !== 0 && this.reviewInsResult !== 1) {
+ this.$message.error("璇烽�夋嫨妫�楠岀粨璁�");
+ return;
+ }
this.reviewLoading = true;
verifyPlan({
orderId: this.orderId,
@@ -2194,6 +2190,7 @@
laboratory: this.sonLaboratory,
tell: null,
userId: this.checkUser,
+ insResult: this.reviewInsResult,
}).then((res) => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛");
@@ -2239,17 +2236,15 @@
this.$refs.viewManHourDia.showDialog(this.id, 99);
},
openAddVerifyDia() {
- this.reportType = null;
this.addVerifyDia = true;
},
- confirmSubmit(registerInsResults){
+ confirmSubmit(){
submitPlan({
orderId: this.orderId,
laboratory: this.sonLaboratory,
verifyUser: this.verifyUser,
entrustCode: this.insOrder.entrustCode,
- registerInsResults: this.reportType === 1 && registerInsResults,
- reportType: this.reportType
+ registerInsResults: false,
}).then((res) => {
if (res.code === 200) {
this.$message.success("鎿嶄綔鎴愬姛");
@@ -2266,10 +2261,6 @@
async submit() {
if (this.verifyUser === null || this.verifyUser === "") {
this.$message.error("璇锋寚瀹氬鏍镐汉鍛�");
- return;
- }
- if (this.reportType === null || this.reportType === "") {
- this.$message.error("璇烽�夋嫨鎶ュ憡绫诲瀷");
return;
}
if (!this.otherForm.humidity && this.insOrder.ifsOrderType!=='02wg') {
@@ -2289,27 +2280,11 @@
checkSubmitPlan({
orderId: this.orderId,
laboratory: this.sonLaboratory,
- reportType: this.reportType,
}).then((res) => {
if (res.code === 200) {
if (!res.data || res.data.errorMsg.length == 0) {
this.submitLoading = true;
- //妫�楠岀被鍨嬩负鍘熸潗鏂�
- if(this.reportType === 1 && this.typeSource==1 && res.data.unInsOrderCount==0 && this.isSplit==1){
- const htmlStr = "鏄惁鐧昏IFS閲囪喘妫�楠岀粨鏋滃苟绉诲簱锛熻鎿嶄綔浼氱櫥璁�<span style='color:#ff4949'>鍚屼竴闆朵欢鍚屼竴璁㈠崟鐨勬墍鏈夋媶鍒嗘壒娆�</span>锛岃璋ㄦ厧閫夋嫨銆�"
- this.$confirm(htmlStr, '鎻愮ず', {
- confirmButtonText: '鏄�',
- cancelButtonText: '鍚�',
- type: 'warning',
- dangerouslyUseHTMLString: true
- }).then(() => {
- this.confirmSubmit(true)
- }).catch(() => {
- this.confirmSubmit(false)
- });
- }else{
- this.confirmSubmit(true)
- }
+ this.confirmSubmit();
} else {
let newData = [];
const h = this.$createElement;
@@ -2345,7 +2320,7 @@
})
.then(() => {
this.submitLoading = true;
- this.confirmSubmit(false)
+ this.confirmSubmit()
// submitPlan({
// orderId: this.orderId,
// laboratory: this.sonLaboratory,
--
Gitblit v1.9.3