From 6b35a453725b34422e5336b456f03b92b963f2d8 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期五, 21 三月 2025 13:35:06 +0800
Subject: [PATCH] Merge branch 'radio-frequency-cable-before' of http://114.132.189.42:9002/r/lims-ruoyi-before into radio-frequency-cable-before
---
src/views/business/reportPreparation/index.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 61584a6..117603d 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -184,8 +184,8 @@
<el-button size="small" style="height: 38px" type="primary">闄勪欢涓婁紶</el-button>
</el-upload>
</div>
- <lims-table :tableData="tableDataFile" :column="columnFile" height="500px"
- key="tableDataFile" :tableLoading="tableLoadingFile"></lims-table>
+ <lims-table :tableData="tableDataFile" :column="columnFile" height="500px" key="tableDataFile"
+ :tableLoading="tableLoadingFile"></lims-table>
</el-dialog>
</div>
</template>
@@ -205,7 +205,7 @@
import { mapGetters } from "vuex";
import { selectUserCondition } from "@/api/business/inspectionTask";
import limsTable from "@/components/Table/lims-table.vue";
-import {delFile, downFile, getFileList} from "@/api/business/rawMaterialOrder";
+import { delFile, downFile, getFileList } from "@/api/business/rawMaterialOrder";
export default {
name: 'ReportPreparation',
components: { limsTable, onlyoffice },
@@ -249,7 +249,7 @@
loadingVerify: false, // 瀹℃牳浜哄憳
typeSourceList: [
{ label: '鎴愬搧涓嬪崟', value: 0 },
- { label: '鍘熸潗鏂欎笅鍗�', value: 1 },
+ { label: '鍘熻緟鏂欎笅鍗�', value: 1 },
],
orderTypeList: [
{ label: '濮旀墭璇曢獙', value: 'Customer-ordered test' },
@@ -273,7 +273,7 @@
orderId: 0,
inspectorList: [],//妫�楠屼汉鍛樺垪琛�
InspectionKey: 1,
- typeSource: null,// 0:鎴愬搧涓嬪崟锛�1锛氬師鏉愭枡涓嬪崟
+ typeSource: null,// 0:鎴愬搧涓嬪崟锛�1锛氬師杈呮枡涓嬪崟
sonLaboratory: '', // 璇曢獙瀹�
filesDialogVisible: false,
filesLookInfo: {},
@@ -349,7 +349,7 @@
if (params == 0) {
return "鎴愬搧涓嬪崟";
} else {
- return "鍘熸潗鏂欎笅鍗�";
+ return "鍘熻緟鏂欎笅鍗�";
}
},
},
@@ -660,7 +660,7 @@
this.currentId = parseInt(row.insOrderId)
switch (row.isCopper) {
case 0:
- // 鍘熸潗鏂�
+ // 鍘熻緟鏂�
this.$router.push({
path: "/materialOrder/customsInspection", query: {
customsInspection: row,
--
Gitblit v1.9.3