From 1ea1ad2c56e95e71e1756cfca73e7183f9795ac9 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 16 四月 2025 15:23:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev_test
---
src/views/business/inspectionTask/index.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/views/business/inspectionTask/index.vue b/src/views/business/inspectionTask/index.vue
index ea4bfe9..1cdc196 100644
--- a/src/views/business/inspectionTask/index.vue
+++ b/src/views/business/inspectionTask/index.vue
@@ -19,7 +19,7 @@
</el-form-item>
</el-form>
</div>
- <div class="center">
+ <div class="center" v-loading="tableLoading">
<div class="center-options">
<div style="display: flex; align-items: center">
<span style="font-size: 14px">璇曢獙瀹ょ绫�:</span>
@@ -38,7 +38,7 @@
<span>{{ page.total }}</span>
</div>
</div>
- <lims-table :tableData="tableData" :column="column" :page="page" :tableLoading="tableLoading"
+ <lims-table :tableData="tableData" :column="column" :page="page"
:rowClassName="rowClassName" :height="'calc(100vh - 300px)'" @pagination="pagination"
key="tableData0">
<div slot="action" slot-scope="scope">
@@ -140,7 +140,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">
@@ -539,6 +539,7 @@
lookTableLoading: false,
// 鏁版嵁鏌ョ湅鐩稿叧瀛楁---缁撴潫
retestVisible: false,
+ upIndex: 0
};
},
mounted() {
@@ -555,7 +556,6 @@
},
activated() {
this.getAuthorizedPerson();
- this.queryParams.userId = this.userId;
this.currentTime = getYearAndMonthAndDays();
this.getDicts("urgency_level").then((response) => {
this.urgencyLevel = this.dictToValue(response.data);
@@ -597,6 +597,7 @@
if (res.code === 200) {
this.lookTableData = res.data.records;
this.lookPage.total = res.data.total;
+ this.upIndex++
this.dataDialogVisible = true;
}
})
@@ -735,7 +736,7 @@
case 0:
// 鍘熸潗鏂�
this.$router.push({
- path: "/materialOrder/customsInspection", query: {
+ path: "/materialOrder/customsInspectionView", query: {
customsInspection: row,
active: this.activeFace,
currentId: this.currentId,
@@ -756,7 +757,7 @@
case 1:
// 閾滄潗
this.$router.push({
- path: "/materialOrder/copperOrder", query: {
+ path: "/materialOrder/CopperView", query: {
active: this.activeFace,
currentId: this.currentId
}
--
Gitblit v1.9.3