From 9508c11a63737b4b9e80e1223792f07d3151c2e8 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 11 四月 2025 14:26:01 +0800
Subject: [PATCH] 条件改成 试验条件 电缆配置修改
---
src/views/business/inspectionTask/index.vue | 29 ++++++++++++++++-------------
1 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 20dc59a..96a4352 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -56,7 +56,7 @@
scope.row.insState == 5 ||
scope.row.insState == 3 ||
(scope.row.userName && !scope.row.userName.includes(nickName))
- )" @click="handleConnect(scope.row)">浜ゆ帴</el-button>
+ )" @click="handleConnect(scope.row)" v-if="tabIndex != 0">浜ゆ帴</el-button>
<el-button type="text" size="small" @click="viewInspectInfo(scope.row)">鍘熷璁板綍</el-button>
<el-popover placement="bottom" trigger="hover" style="margin-left: 6px">
<template #reference>
@@ -64,15 +64,14 @@
</template>
<div>
<el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null ||
- (scope.row.userName && !scope.row.userName.includes(nickName)))" style="margin-left: 10px"
- type="text" size="small" @click="download(scope.row)">涓嬭浇鎶ュ憡</el-button>
+ (scope.row.userName && !scope.row.userName.includes(nickName)))" style="margin-left: 10px" type="text"
+ size="small" @click="download(scope.row)">涓嬭浇鎶ュ憡</el-button>
<el-upload ref='upload' :action="javaApi + '/insReport/inReport'" :before-upload="beforeUpload"
:data="{ id: scope.row.insReportId }" :headers="uploadHeader" :on-error="onError"
:on-success="handleSuccessUp" :show-file-list="false" style="display: inline;margin: 0 6px"
accept='.jpg,.jpeg,.png,.gif,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.zip,.rar'>
<el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null ||
- (scope.row.userName && !scope.row.userName.includes(nickName)))" size="small"
- type="text">涓婁紶</el-button>
+ (scope.row.userName && !scope.row.userName.includes(nickName)))" size="small" type="text">涓婁紶</el-button>
</el-upload>
<el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null ||
(scope.row.userName && !scope.row.userName.includes(nickName)))" type="text" size="small"
@@ -253,6 +252,7 @@
},
data() {
return {
+ workShopId: null,
issuedVisible: false,
fullscreen: false,
lookDialogVisible: false,
@@ -275,7 +275,7 @@
claimVisible: false,
tabList: [
{ label: "濮旀墭", value: 0 },
- { label: "鍘熻緟鏂�", value: 1 },
+ { label: "鍘熸潗鏂�", value: 1 },
],
active: 1,
tabIndex: 0,
@@ -283,8 +283,8 @@
planTotal: 0,
insStateList: [],
state: 0, // 0:鍙拌处椤碉紝1锛氭楠岄〉闈�,2妫�楠岄〉闈�(澶嶆牳)锛岄粯璁や负0,3鏁版嵁鏌ョ湅
- typeSource: null, // 0:鎴愬搧涓嬪崟锛�1锛氬師杈呮枡涓嬪崟
- sonLaboratory: null, // 0:濮旀墭锛�1锛氬師杈呮枡
+ typeSource: null, // 0:鎴愬搧涓嬪崟锛�1锛氬師鏉愭枡涓嬪崟
+ sonLaboratory: null, // 0:濮旀墭锛�1锛氬師鏉愭枡
activeFace: 0, // 1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍革紝榛樿涓�0
currentId: null,
entityCopy: {},
@@ -300,7 +300,7 @@
sonLaboratoryList: [],
typeSourceList: [
{ label: "鎴愬搧涓嬪崟", value: 0 },
- { label: "鍘熻緟鏂欎笅鍗�", value: 1 },
+ { label: "鍘熸潗鏂欎笅鍗�", value: 1 },
],
customsInspection: {},
showInfoDialog: false, // 浜т笟閾句俊鎭煡鐪�
@@ -330,7 +330,7 @@
},
{
value: "Quarterly inspection",
- label: "瀛ｅ害妫�楠�",
+ label: "鍙潬鎬ф楠�",
type: "warning",
effect: "plain",
},
@@ -356,7 +356,7 @@
if (params == 0) {
return "鎴愬搧涓嬪崟";
} else {
- return "鍘熻緟鏂欎笅鍗�";
+ return "鍘熸潗鏂欎笅鍗�";
}
},
},
@@ -471,7 +471,7 @@
{ label: "妫�楠屽瓙椤�", prop: "inspectionItemSubclass" },
{ label: "鍗曚綅", prop: "unit" },
{ label: "鏍峰搧鍨嬪彿", prop: "model", mergeCol: true },
- { label: "鏉′欢", prop: "radius" },
+ { label: "璇曢獙鏉′欢", prop: "radius" },
{ label: "鐢电紗鏍囪瘑", prop: "cableTag" },
{ label: "璇曢獙瑕佹眰", prop: "tell" },
{ label: "妫�楠岀粨鏋�", prop: "lastValue" },
@@ -496,6 +496,7 @@
}
},
},
+ { label: "妫�楠屼汉", prop: "checkUserName" },
{
dataType: "action",
fixed: "right",
@@ -730,7 +731,7 @@
this.currentId = parseInt(row.id);
switch (row.isCopper) {
case 0:
- // 鍘熻緟鏂�
+ // 鍘熸潗鏂�
this.$router.push({
path: "/materialOrder/customsInspection", query: {
customsInspection: row,
@@ -778,6 +779,7 @@
}
this.inspectorList = inspectorList;
this.sonLaboratory = row.sonLaboratory;
+ this.workShopId = row.workShopId;
this.state = 1;
this.typeSource = row.typeSource;
this.orderId = row.id;
@@ -789,6 +791,7 @@
state: this.state,
typeSource: this.typeSource,
orderId: this.orderId,
+ workShopId: row.workShopId
},
});
},
--
Gitblit v1.9.3