From 00d9d8d47463c1ecc7d2218593a6efb313d084a2 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期二, 22 四月 2025 21:59:13 +0800
Subject: [PATCH] 样品出来导出调整
---
src/views/CNAS/process/disposal/sampleReceipt/index.vue | 57 +++++++++++++++++++---------
src/views/CNAS/process/disposal/sampleDisposal/index.vue | 16 +++-----
src/api/cnas/process/sampleDisposal.js | 9 ++++
3 files changed, 53 insertions(+), 29 deletions(-)
diff --git a/src/api/cnas/process/sampleDisposal.js b/src/api/cnas/process/sampleDisposal.js
index 82501ac..68c22a8 100644
--- a/src/api/cnas/process/sampleDisposal.js
+++ b/src/api/cnas/process/sampleDisposal.js
@@ -81,6 +81,15 @@
});
}
+//鏍峰搧澶勭悊瀵煎嚭
+export function exportProcessTotaldeal(query) {
+ return request({
+ url: "/processTotaldeal/exportProcessTotaldeal",
+ method: "get",
+ responseType: "blob",
+ params: query,
+ });
+}
// 鏍峰搧鎺ユ敹-鍒嗛〉鏌ヨ
export function pageProcessSample(query) {
diff --git a/src/views/CNAS/process/disposal/sampleDisposal/index.vue b/src/views/CNAS/process/disposal/sampleDisposal/index.vue
index f966024..1cbcb06 100644
--- a/src/views/CNAS/process/disposal/sampleDisposal/index.vue
+++ b/src/views/CNAS/process/disposal/sampleDisposal/index.vue
@@ -115,11 +115,11 @@
doProcessDeal,
addProcessDeal,
submitProcessTotaldeal,
- pageProcessDeal,
checkProcessTotaldeal,
ratifyProcessTotaldeal,
delProcessDeal,
pageProcessTotaldeal, getProcessDeal, addProcessTotaldeal,
+ exportProcessTotaldeal
} from "@/api/cnas/process/sampleDisposal";
export default {
name: 'SampleDisposal',
@@ -273,9 +273,6 @@
type: "text",
clickFun: (row) => {
this.handleDown0(row);
- },
- disabled: (row) => {
- return !row.url
}
},
{
@@ -538,12 +535,11 @@
},
// 瀵煎嚭璇︽儏
handleDown0(row) {
- if (!row.url) {
- this.$message.warning('鏆傛棤鏂囦欢')
- return
- }
- // 鍚庣涓嬭浇
- this.$download.saveAs(row.url, row.month + ' 鏍峰搧澶勭悊鐢宠琛�');
+ exportProcessTotaldeal({ id: row.id }).then(res => {
+ this.outLoading = false
+ const blob = new Blob([res], { type: 'application/msword' });
+ this.$download.saveAs(blob, '鏍峰搧澶勭悊' + '.docx');
+ })
},
handleDelete(row) {
this.$confirm("鏄惁鍒犻櫎璇ユ潯鏁版嵁?", "鎻愮ず", {
diff --git a/src/views/CNAS/process/disposal/sampleReceipt/index.vue b/src/views/CNAS/process/disposal/sampleReceipt/index.vue
index 8ea9309..46ada41 100644
--- a/src/views/CNAS/process/disposal/sampleReceipt/index.vue
+++ b/src/views/CNAS/process/disposal/sampleReceipt/index.vue
@@ -32,6 +32,16 @@
<el-row>
<el-col :span="24" style="margin-bottom: 16px;">
<div class="search_thing">
+ <div class="search_label">鏀舵牱鏃ユ湡锛�</div>
+ <div class="search_input">
+ <el-date-picker v-model="addInfo.receiveDate" type="date" size="small" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd" style="width: 100%;">
+ </el-date-picker>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="24" style="margin-bottom: 16px;">
+ <div class="search_thing">
<div class="search_label">鏍峰搧鍚嶇О锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
v-model="addInfo.sampleName"></el-input></div>
@@ -46,7 +56,15 @@
</el-col>
<el-col :span="24" style="margin-bottom: 16px;">
<div class="search_thing">
- <div class="search_label">渚涙牱鍗曚綅锛�</div>
+ <div class="search_label">鏁伴噺锛�</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="addInfo.num"></el-input>
+ </div>
+ </div>
+ </el-col>
+ <el-col :span="24" style="margin-bottom: 16px;">
+ <div class="search_thing">
+ <div class="search_label">鏉ユ牱鍗曚綅锛�</div>
<div class="search_input">
<el-select v-model="addInfo.sampleSupplier" size="small">
<el-option :label="item.company" :value="item.company" v-for="(item, index) in customPageList"
@@ -57,29 +75,31 @@
</el-col>
<el-col :span="24" style="margin-bottom: 16px;">
<div class="search_thing">
- <div class="search_label">鏁伴噺锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="addInfo.num"></el-input>
- </div>
- </div>
- </el-col>
- <el-col :span="24" style="margin-bottom: 16px;">
- <div class="search_thing">
- <div class="search_label">澶勭悊鏂瑰紡锛�</div>
- <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
- v-model="addInfo.dealMethod"></el-input></div>
- </div>
- </el-col>
- <el-col :span="24" style="margin-bottom: 16px;">
- <div class="search_thing">
- <div class="search_label">鏃堕棿锛�</div>
+ <div class="search_label">鐣欐牱鏃ユ湡锛�</div>
<div class="search_input">
- <el-date-picker v-model="addInfo.dealTime" type="date" size="small" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd"
+ <el-date-picker v-model="addInfo.leaveDate" type="date" size="small" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd"
value-format="yyyy-MM-dd" style="width: 100%;">
</el-date-picker>
</div>
</div>
</el-col>
+ <el-col :span="24" style="margin-bottom: 16px;">
+ <div class="search_thing">
+ <div class="search_label">鏍峰搧鐘舵�侊細</div>
+ <div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable
+ v-model="addInfo.sampleState"></el-input></div>
+ </div>
+ </el-col>
+ <el-col :span="24" style="margin-bottom: 16px;">
+ <div class="search_thing">
+ <div class="search_label">澶勭悊鏃ユ湡锛�</div>
+ <div class="search_input">
+ <el-date-picker v-model="addInfo.dealTime" type="date" size="small" placeholder="閫夋嫨鏃ユ湡" format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd" style="width: 100%;">
+ </el-date-picker>
+ </div>
+ </div>
+ </el-col>
</el-row>
<span slot="footer" class="dialog-footer">
<el-button @click="addDialogVisible = false">鍙� 娑�</el-button>
@@ -109,7 +129,6 @@
addProcessSample,
exportProcessSample
} from "@/api/cnas/process/sampleDisposal";
-import {exportInconsistentDistribution} from "@/api/cnas/process/nonconformingWork";
export default {
name: 'SampleReceipt',
components: {
--
Gitblit v1.9.3