From 31e47cebb043a65c838a23c517848f1afdab778c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 13 三月 2025 09:45:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/business/rawMaterialInspection/index.vue | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index 266c6cd..d0f8df2 100644
--- a/src/views/business/rawMaterialInspection/index.vue
+++ b/src/views/business/rawMaterialInspection/index.vue
@@ -54,8 +54,10 @@
<div class="table-tab">
<div>
<ul class="tab">
- <li v-for="m in tabList" :key="m.value" :class="{ active: m.value === tabIndex }" @click="handleTab(m)">
- {{ m.label }}</li>
+ <li :class="{ active: tabIndex === 0 }" @click="handleTab(0)">寰呮姤妫�</li>
+ <li :class="{ active: tabIndex === 1 }" @click="handleTab(1)">寰呬笅鍗�</li>
+ <li :class="{ active: tabIndex === 3 }" @click="handleTab(3)">宸插畬鎴�</li>
+ <li :class="{ active: tabIndex === 4 }" v-if="checkPermi(['get:Ifs:ByAll'])" @click="handleTab(4)">鍏ㄩ儴</li>
</ul>
</div>
<div>
@@ -92,7 +94,7 @@
</el-dialog>
<!-- 纭鎶ユ -->
<el-dialog :close-on-click-modal="false" :title="declareType === 'add' ? '鏂板鎶ユ淇℃伅' : '鍘熸潗鏂欐姤妫�'"
- :visible.sync="declareDialogVisible" width="800px" @close="resetForm">
+ :visible.sync="declareDialogVisible" width="800px" @close="resetFormData">
<el-form ref="declareObj" :inline="true" :model="declareObj" :rules="declareObjRules" label-width="130px"
label-position="right">
<el-form-item class="declareObj-form-item" label="璁㈠崟鍙�:" prop="orderNo">
@@ -444,7 +446,7 @@
partNo: null,
partDesc: null,
supplierName: null,
- date: '',
+ date: null,
entrustCode: '',
inspectStatus: '',
},
@@ -525,7 +527,7 @@
methods: {
// 鍒囨崲tab琛ㄦ牸
handleTab(m) {
- this.tabIndex = m.value;
+ this.tabIndex = m;
this.refreshTable()
},
// 鏌ヨ鍥炶皟
@@ -558,6 +560,13 @@
// 宸插畬鎴愰儴鏌ヨ
getIfsByFinishList() {
this.tableLoading1 = true
+ if(null != this.componentData.date){
+ this.componentData.beginDeclareDate = this.componentData.date[0]
+ this.componentData.endDeclareDate = this.componentData.date[1]
+ } else {
+ this.componentData.beginDeclareDate = ''
+ this.componentData.endDeclareDate = ''
+ }
getIfsByFinish({ ...this.componentData, ...this.page1 }).then(res => {
this.tableLoading1 = false
if (res.code === 200) {
@@ -571,6 +580,13 @@
// 鍏ㄩ儴鏌ヨ
getIfsByAllList() {
this.tableLoading1 = true
+ if(null != this.componentData.date){
+ this.componentData.beginDeclareDate = this.componentData.date[0]
+ this.componentData.endDeclareDate = this.componentData.date[1]
+ } else {
+ this.componentData.beginDeclareDate = ''
+ this.componentData.endDeclareDate = ''
+ }
getIfsByAll({ ...this.componentData, ...this.page1 }).then(res => {
this.tableLoading1 = false
if (res.code === 200) {
@@ -746,7 +762,7 @@
});
}
},
- resetForm() {
+ resetFormData() {
this.$refs['declareObj'].resetFields();
this.declareDialogVisible = false
},
@@ -792,8 +808,8 @@
entity: entity
}).then(res => {
this.outLoading = false
- let url = this.javaApi + '/word/' + res.data
- this.$download.saveAs(url, "鍘熸潗鏂欐娴嬩俊鎭鍑�.xlsx");
+ const blob = new Blob([res], { type: 'application/octet-stream' });
+ this.$download.saveAs(blob, "鍘熸潗鏂欐娴嬩俊鎭鍑�.xlsx");
})
},
clear() {
--
Gitblit v1.9.3