From 304aaa5134f783cd6d35a21a3d968faf8492fd9c Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 08 十二月 2025 18:01:43 +0800
Subject: [PATCH] 数采调整2
---
src/views/business/outsourcingFinishProduct/index.vue | 3 ++-
src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue | 5 +++--
src/views/business/unpass/index-manage.vue | 6 +++---
src/views/business/materialOrder/index.vue | 1 +
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
index b6500ce..2abdc50 100644
--- a/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
+++ b/src/views/CNAS/resourceDemand/device/component/acquisitionConfig.vue
@@ -268,8 +268,9 @@
{ label: "db", value: ".db" },
{ label: "mdb", value: ".mdb" },
{ label: "word", value: ".docx" },
- { label: "excelxlsx", value: ".xlsx" },
- { label: "excelxls", value: ".xls" },
+ { label: "excel(xlsx)", value: ".xlsx" },
+ { label: "excel(xls)", value: ".xls" },
+ { label: "pngInExcel", value: ".pngInExcel" },
{ label: "txt", value: ".txt" },
{ label: "mysql", value: ".mysql" },
{ label: "mqtt", value: ".mqtt" },
diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index 5b5c439..8c4152a 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -1368,6 +1368,7 @@
} else {
params = {...this.entity}
}
+ params.orderType = "01raw";
rawAllExport(params).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
diff --git a/src/views/business/outsourcingFinishProduct/index.vue b/src/views/business/outsourcingFinishProduct/index.vue
index 175af48..89be8bc 100644
--- a/src/views/business/outsourcingFinishProduct/index.vue
+++ b/src/views/business/outsourcingFinishProduct/index.vue
@@ -1184,10 +1184,11 @@
} else {
params = {...this.entity}
}
+ params.orderType = "02wg";
rawAllExport(params).then(res => {
this.outLoading = false
const blob = new Blob([res], { type: 'application/octet-stream' });
- this.$download.saveAs(blob, '鍘熸潗鏂欐娴嬩俊鎭鍑�.xlsx');
+ this.$download.saveAs(blob, '澶栬喘鎴愬搧妫�娴嬩俊鎭鍑�.xlsx');
})
},
// 鎻愪氦淇敼濮旀墭缂栧彿淇℃伅
diff --git a/src/views/business/unpass/index-manage.vue b/src/views/business/unpass/index-manage.vue
index fc5ac30..27a53f3 100644
--- a/src/views/business/unpass/index-manage.vue
+++ b/src/views/business/unpass/index-manage.vue
@@ -12,8 +12,8 @@
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.no"
@keyup.enter.native="refreshTable()"></el-input>
</el-form-item>
- <el-form-item label="瑙勬牸鍨嬪彿" prop="model">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.model"
+ <el-form-item label="瑙勬牸鍨嬪彿" prop="specsModels">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.specsModels"
@keyup.enter.native="refreshTable()"></el-input>
</el-form-item>
<el-form-item label="鏍峰搧鍚嶇О" prop="sample">
@@ -86,7 +86,7 @@
handlerId: null,
entity: {
sample: null,
- model: null,
+ specsModels: null,
},
tableData: [],
tableLoading: false,
--
Gitblit v1.9.3