From 89fd9ab312c0aef9fcab89fbbaee4add5baa7c57 Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 27 十月 2026 09:43:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/business/productOrder/index.vue | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/views/business/productOrder/index.vue b/src/views/business/productOrder/index.vue
index 72952d9..49965e2 100644
--- a/src/views/business/productOrder/index.vue
+++ b/src/views/business/productOrder/index.vue
@@ -15,10 +15,10 @@
<el-input v-model="entity.sampleModel" clearable placeholder="璇疯緭鍏�" size="small"
@keyup.enter="refreshTable()"></el-input>
</el-form-item>
- <el-form-item label="涓嬪崟鏃堕棿" prop="createTime" v-if="more">
- <el-date-picker v-model="entity.createTime" clearable format="YYYY-MM-DD" placeholder="閫夋嫨鏃ユ湡" size="small"
+ <el-form-item label="閫佹牱鏃堕棿" prop="sampleDate" v-if="more">
+ <el-date-picker v-model="entity.sampleDate" clearable format="YYYY-MM-DD" placeholder="閫夋嫨鏃ユ湡" size="small"
@change="refreshTable"
- style="width:100%" type="date" value-format="YYYY-MM-DD HH:mm:ss">
+ style="width:100%" type="date" value-format="YYYY-MM-DD">
</el-date-picker>
</el-form-item>
<el-form-item label="濮旀墭浜�" prop="prepareUser" v-if="more">
@@ -298,6 +298,7 @@
entity: {
orderType: '',
state: '',
+ sampleDate: null,
},
upIndex: 0,
tableData: [],
@@ -332,7 +333,7 @@
{ label: '澶囨敞', prop: 'remark' },
{ label: '妫�楠岃繘搴�%', prop: 'insProgress' },
{ label: '绾﹀畾鏃堕棿', prop: 'appointed' },
- { label: '涓嬪崟鏃堕棿', prop: 'createTime' },
+ { label: '閫佹牱鏃堕棿', prop: 'sampleDate', minWidth: 110 },
{ label: '涓嬪彂鏃堕棿', prop: 'sendTime' },
{ label: '閫�鍥炵悊鐢�', prop: 'tell' },
{ label: '鎷掓敹鍘熷洜', prop: 'sampleRejectRemark' },
@@ -471,6 +472,7 @@
verifyDialogVisible: false,
quashDialogVisible: false,
filesDialogVisible: false, // 闄勪欢鏌ョ湅寮规
+ attachmentOrderId: null,
tableDataFile: [],
tableLoadingFile: false,
columnFile: [
@@ -652,6 +654,7 @@
},
refresh() {
this.resetForm('entity')
+ this.entity.sampleDate = null
this.refreshTable()
},
pagination(page) {
@@ -842,12 +845,15 @@
},
// 闄勪欢鏌ョ湅
handleFileLook(row) {
+ this.attachmentOrderId = row.id
+ this.pageFile.current = 1
+ this.tableDataFile = []
this.filesDialogVisible = true
- this.getFileList(row)
+ this.getFileList()
},
- getFileList(row) {
+ getFileList() {
this.tableLoadingFile = true
- getFileList({ insOrderId: row.id }).then(res => {
+ getFileList({ insOrderId: this.attachmentOrderId, current: this.pageFile.current, size: this.pageFile.size }).then(res => {
this.tableLoadingFile = false
if (res.code === 200) {
this.tableDataFile = res.data.records
@@ -858,6 +864,7 @@
})
},
paginationFile(page) {
+ this.pageFile.current = page.page
this.pageFile.size = page.limit
this.getFileList()
},
@@ -866,7 +873,7 @@
downFile({
id: row.id,
}).then(res => {
- this.$download.saveAs(res.data.fileUrl, row.fileName);
+ return this.$download.attachment(res.data, row.fileName);
}).catch(error => {
})
--
Gitblit v1.9.3