From 6ec4ab163cff16c7ce0f4822efc224abe8e85410 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 24 三月 2025 09:51:00 +0800
Subject: [PATCH] 合并
---
src/views/business/reportPreparation/index.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 7e161aa..1f324fb 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -22,11 +22,13 @@
</el-select>
</el-form-item>
<el-form-item>
- <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
<el-button size="mini" type="primary" @click="refreshTable()">鏌ヨ</el-button>
- <el-button :loading="outLoading" size="mini" type="primary" @click="handleDowns">鎵归噺涓嬭浇</el-button>
+ <el-button size="mini" @click="refresh()">閲嶇疆</el-button>
</el-form-item>
</el-form>
+ </div>
+ <div style="text-align: right;margin-bottom: 10px">
+ <el-button :loading="outLoading" size="mini" type="primary" @click="handleDowns">鎵归噺涓嬭浇</el-button>
</div>
<div>
<lims-table :tableData="valueTableData" :column="column" :page="page" :tableLoading="tableLoading"
@@ -249,7 +251,7 @@
loadingVerify: false, // 瀹℃牳浜哄憳
typeSourceList: [
{ label: '鎴愬搧涓嬪崟', value: 0 },
- { label: '鍘熸潗鏂欎笅鍗�', value: 1 },
+ { label: '鍘熻緟鏂欎笅鍗�', value: 1 },
],
orderTypeList: [
{ label: '濮旀墭璇曢獙', value: 'Customer-ordered test' },
@@ -273,7 +275,7 @@
orderId: 0,
inspectorList: [],//妫�楠屼汉鍛樺垪琛�
InspectionKey: 1,
- typeSource: null,// 0:鎴愬搧涓嬪崟锛�1锛氬師鏉愭枡涓嬪崟
+ typeSource: null,// 0:鎴愬搧涓嬪崟锛�1锛氬師杈呮枡涓嬪崟
sonLaboratory: '', // 璇曢獙瀹�
filesDialogVisible: false,
filesLookInfo: {},
@@ -349,7 +351,7 @@
if (params == 0) {
return "鎴愬搧涓嬪崟";
} else {
- return "鍘熸潗鏂欎笅鍗�";
+ return "鍘熻緟鏂欎笅鍗�";
}
},
},
@@ -660,7 +662,7 @@
this.currentId = parseInt(row.insOrderId)
switch (row.isCopper) {
case 0:
- // 鍘熸潗鏂�
+ // 鍘熻緟鏂�
this.$router.push({
path: "/materialOrder/customsInspection", query: {
customsInspection: row,
@@ -815,7 +817,7 @@
},
// 鑾峰彇浜哄憳鍒楄〃
getAuthorizedPerson() {
- selectUserCondition({ type: 0 }).then((res) => {
+ selectUserCondition({ type: 1 }).then((res) => {
let data = [];
res.data.forEach((a) => {
data.push({
--
Gitblit v1.9.3