From fcadf16afa65a8a5ca53a33c4b8f4bf2efe2ea03 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 九月 2026 09:21:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_新疆_新聚' into dev_新疆_新聚
---
src/views/business/inspectionTask/index.vue | 89 ++++++++++++++++++++++++++------------------
1 files changed, 53 insertions(+), 36 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index c1a1a4b..37b7124 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -13,6 +13,13 @@
:value="a.value"></el-option>
</el-select>
</el-form-item>
+<!-- <el-form-item label="鐗╂枡灞炴��" prop="materialProp">-->
+<!-- <el-select clearable size="small" v-model="queryParams.materialProp" style="width: 100%">-->
+<!-- <el-option v-for="dict in dict.type.material_prop_type" :key="dict.value" :label="dict.label"-->
+<!-- :value="dict.value">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-form-item>
<el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
<el-button size="mini" @click="refresh()">閲嶇疆</el-button>
@@ -22,7 +29,7 @@
<div class="center" v-loading="tableLoading">
<div class="center-options">
<div style="display: flex; align-items: center">
- <span style="font-size: 14px">璇曢獙瀹ょ绫�:</span>
+ <span style="font-size: 14px">璇曢獙瀹�:</span>
<ul class="tab">
<li v-for="(m, i) in tabList" :key="i" :class="{ active: i == tabIndex }" @click="handleTab(m, i)">
{{ m.label.replace("璇曢獙瀹�", "") }}
@@ -61,9 +68,10 @@
)"
@click="handleConnect(scope.row)">浜ゆ帴</el-button>
<el-button type="text" size="small" @click="viewInspectInfo(scope.row)">鍘熷璁板綍</el-button>
- <el-popover placement="bottom" trigger="hover" style="margin-left: 6px">
+ <el-popover placement="bottom" trigger="hover" style="margin-left: 6px" :disabled="(scope.row.insState != 3 || scope.row.userName == null ||(scope.row.userName && !scope.row.userName.includes(nickName)))">
<template #reference>
- <el-button link type="text" size="small">鏇村</el-button>
+ <el-button link type="text" size="small" :disabled="(scope.row.insState != 3 || scope.row.userName == null ||
+ (scope.row.userName && !scope.row.userName.includes(nickName)))">鏇村</el-button>
</template>
<div>
<el-button :disabled="(scope.row.insState != 3 || scope.row.userName == null ||
@@ -140,7 +148,7 @@
</el-form>
</div>
<lims-table :tableData="lookTableData" :column="lookColumn" :page="lookPage" :tableLoading="lookTableLoading"
- :height="'60vh'" @pagination="lookPagination" key="tableData1"></lims-table>
+ :height="'60vh'" @pagination="lookPagination" key="tableData1" :key="upIndex"></lims-table>
</div>
</el-dialog>
<el-dialog :visible.sync="bindDialogVisible" title="妫�楠岄」缁戝畾" width="600px">
@@ -250,7 +258,7 @@
viewManHourDia,
UnPassRetestResult
},
- dicts: ["urgency_level", "inspection_task_state"],
+ dicts: ["urgency_level", "inspection_task_state","material_prop_type"],
computed: {
...mapGetters(["nickName", "userId"]),
},
@@ -277,8 +285,9 @@
},
claimVisible: false,
tabList: [
- { label: "濮旀墭", value: 0 },
- { label: "鍘熸潗鏂�", value: 1 },
+ { label: "濮旀墭", value: -1 },
+ // { label: "鍘熸潗鏂�", value: 1 },
+ // { label: "澶栬喘", value: 0 },
],
active: 1,
tabIndex: 0,
@@ -286,7 +295,7 @@
planTotal: 0,
insStateList: [],
state: 0, // 0:鍙拌处椤碉紝1锛氭楠岄〉闈�,2妫�楠岄〉闈�(澶嶆牳)锛岄粯璁や负0,3鏁版嵁鏌ョ湅
- typeSource: null, // 0:鎴愬搧涓嬪崟锛�1锛氬師鏉愭枡涓嬪崟
+ typeSource: -1, // 0:澶栬喘鎴愬搧涓嬪崟锛�1锛氬師鏉愭枡涓嬪崟
sonLaboratory: null, // 0:濮旀墭锛�1锛氬師鏉愭枡
activeFace: 0, // 1锛氫笅鍗曪紝2锛氭煡鐪嬶紝3锛氬鏍革紝榛樿涓�0
currentId: null,
@@ -357,36 +366,37 @@
dataType: "tag",
formatData: (params) => {
if (params == 0) {
- return "鎴愬搧涓嬪崟";
- } else {
+ return "澶栬喘涓嬪崟";
+ } else if(params==1) {
return "鍘熸潗鏂欎笅鍗�";
+ }else{
+ return "濮旀墭涓嬪崟";
}
},
},
- { label: "鏍峰搧鍨嬪彿", prop: "sampleModel", width: "120px" },
- {
- label: "绱ф�ョ▼搴�",
- prop: "type",
- dataType: "tag",
- formatData: (params) => {
- if (params == 0) {
- return '鏅��'
- } else if (params == 1) {
- return '浼樺厛'
- } else {
- return '绱ф��'
- }
- },
- formatType: (params) => {
- if (params == 0) {
- return 'success'
- } else if (params == 1) {
- return 'warning'
- } else {
- return 'danger'
- }
- }
- },
+ // {
+ // label: "绱ф�ョ▼搴�",
+ // prop: "type",
+ // dataType: "tag",
+ // formatData: (params) => {
+ // if (params == 0) {
+ // return '鏅��'
+ // } else if (params == 1) {
+ // return '浼樺厛'
+ // } else {
+ // return '绱ф��'
+ // }
+ // },
+ // formatType: (params) => {
+ // if (params == 0) {
+ // return 'success'
+ // } else if (params == 1) {
+ // return 'warning'
+ // } else {
+ // return 'danger'
+ // }
+ // }
+ // },
{
label: "妫�楠岀被鍨�",
prop: "orderType",
@@ -539,11 +549,14 @@
lookTableLoading: false,
// 鏁版嵁鏌ョ湅鐩稿叧瀛楁---缁撴潫
retestVisible: false,
+ upIndex: 0,
+ tabLabel: ''
};
},
mounted() {
this.getAuthorizedPerson();
this.queryParams.userId = this.userId;
+ this.queryParams.typeSource = this.typeSource
this.currentTime = getYearAndMonthAndDays();
this.getDicts("urgency_level").then((response) => {
this.urgencyLevel = this.dictToValue(response.data);
@@ -562,6 +575,7 @@
this.getDicts("inspection_task_state").then((response) => {
this.inspectionTaskState = this.dictToValue(response.data);
});
+ this.queryParams.typeSource = this.typeSource
this.refreshTable();
},
methods: {
@@ -596,6 +610,7 @@
if (res.code === 200) {
this.lookTableData = res.data.records;
this.lookPage.total = res.data.total;
+ this.upIndex++
this.dataDialogVisible = true;
}
})
@@ -633,7 +648,8 @@
},
refreshTable(e) {
this.page.current = 1;
- this.queryParams.typeSource = this.tabIndex;
+ this.queryParams.tabLabel = this.tabLabel;
+ this.queryParams.typeSource = this.typeSource;
this.getList();
},
// 涓嬭浇鎶ュ憡
@@ -720,6 +736,7 @@
},
handleTab(m, i) {
this.tabIndex = i;
+ this.typeSource =m.value;
this.queryParams.sonLaboratory = "";
this.refreshTable();
},
@@ -790,7 +807,7 @@
sonLaboratory: this.sonLaboratory,
state: this.state,
typeSource: this.typeSource,
- orderId: this.orderId,
+ orderId: this.orderId
},
});
},
--
Gitblit v1.9.3