From dab59f7624a2fb8d4114bb67b554ff09d91f810c Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 10 四月 2025 13:07:36 +0800
Subject: [PATCH] Merge branch 'radio-frequency-cable' of http://114.132.189.42:9002/r/lims-ruoyi-before into radio-frequency-cable
---
src/views/business/inspectionTask/index.vue | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index 20dc59a..9c622a9 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -46,17 +46,17 @@
:disabled="(scope.row.userName == null || scope.row.insState == 3 || scope.row.insState == 5) && checkPermi(['update:product:onPlan'])"
@click="editInspection(scope.row)">淇敼妫�楠屽��</el-button>
<el-button type="text" size="small" :disabled="(
- scope.row.userName == null ||
- scope.row.insState == 3 ||
- scope.row.insState == 5 ||
- (scope.row.userName && !scope.row.userName.includes(nickName))
- )" @click="handleInspection(scope.row)">妫�楠�</el-button>
+ scope.row.userName == null ||
+ scope.row.insState == 3 ||
+ scope.row.insState == 5 ||
+ (scope.row.userName && !scope.row.userName.includes(nickName))
+ )" @click="handleInspection(scope.row)">妫�楠�</el-button>
<el-button type="text" size="small" :disabled="(
- scope.row.userName == null ||
- scope.row.insState == 5 ||
- scope.row.insState == 3 ||
- (scope.row.userName && !scope.row.userName.includes(nickName))
- )" @click="handleConnect(scope.row)">浜ゆ帴</el-button>
+ scope.row.userName == null ||
+ scope.row.insState == 5 ||
+ scope.row.insState == 3 ||
+ (scope.row.userName && !scope.row.userName.includes(nickName))
+ )" @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,21 +64,21 @@
</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"
+ (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"
+ (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"
+ (scope.row.userName && !scope.row.userName.includes(nickName)))" type="text" size="small"
@click="handleRestore(scope.row)">杩樺師</el-button>
<el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null ||
- (scope.row.userName && !scope.row.userName.includes(nickName)))" type="text" size="small"
+ (scope.row.userName && !scope.row.userName.includes(nickName)))" type="text" size="small"
@click="handleIssued(scope.row)">鏌ョ湅鎶ュ憡</el-button>
</div>
</el-popover>
@@ -88,8 +88,8 @@
</div>
<el-dialog :visible.sync="claimVisible" title="鎻愮ず" width="400px">
鏄惁璁ら濮旀墭缂栧彿<span style="color: #33c130">{{
- sampleUserForm.entrustCode
- }}</span>鐨勪换鍔�
+ sampleUserForm.entrustCode
+ }}</span>鐨勪换鍔�
<span slot="footer" class="dialog-footer">
<el-button @click="claimVisible = false">鍙� 娑�</el-button>
<el-button :loading="loading" type="primary" @click="confirmClaim">纭� 瀹�</el-button>
@@ -253,6 +253,7 @@
},
data() {
return {
+ workShopId: null,
issuedVisible: false,
fullscreen: false,
lookDialogVisible: false,
@@ -275,7 +276,7 @@
claimVisible: false,
tabList: [
{ label: "濮旀墭", value: 0 },
- { label: "鍘熻緟鏂�", value: 1 },
+ { label: "鍘熸潗鏂�", value: 1 },
],
active: 1,
tabIndex: 0,
@@ -283,8 +284,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 +301,7 @@
sonLaboratoryList: [],
typeSourceList: [
{ label: "鎴愬搧涓嬪崟", value: 0 },
- { label: "鍘熻緟鏂欎笅鍗�", value: 1 },
+ { label: "鍘熸潗鏂欎笅鍗�", value: 1 },
],
customsInspection: {},
showInfoDialog: false, // 浜т笟閾句俊鎭煡鐪�
@@ -330,7 +331,7 @@
},
{
value: "Quarterly inspection",
- label: "瀛ｅ害妫�楠�",
+ label: "鍙潬鎬ф楠�",
type: "warning",
effect: "plain",
},
@@ -356,7 +357,7 @@
if (params == 0) {
return "鎴愬搧涓嬪崟";
} else {
- return "鍘熻緟鏂欎笅鍗�";
+ return "鍘熸潗鏂欎笅鍗�";
}
},
},
@@ -496,6 +497,7 @@
}
},
},
+ { label: "妫�楠屼汉", prop: "checkUserName" },
{
dataType: "action",
fixed: "right",
@@ -730,7 +732,7 @@
this.currentId = parseInt(row.id);
switch (row.isCopper) {
case 0:
- // 鍘熻緟鏂�
+ // 鍘熸潗鏂�
this.$router.push({
path: "/materialOrder/customsInspection", query: {
customsInspection: row,
@@ -778,6 +780,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 +792,7 @@
state: this.state,
typeSource: this.typeSource,
orderId: this.orderId,
+ workShopId: row.workShopId
},
});
},
--
Gitblit v1.9.3