From 13a60da2424da8cd50e52e35e0126e23e34ea6f3 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期日, 16 三月 2025 15:58:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 src/views/business/rawMaterialInspection/index.vue |   35 ++++++++++++++++++++++++++---------
 1 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/src/views/business/rawMaterialInspection/index.vue b/src/views/business/rawMaterialInspection/index.vue
index 266c6cd..d3fa7e4 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">
@@ -142,7 +144,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-row>
-          <el-button @click="resetForm">鍙� 娑�</el-button>
+          <el-button @click="resetFormData">鍙� 娑�</el-button>
           <el-button :loading="submitDeclareLoading" type="primary" @click="submitDeclare">纭� 瀹�</el-button>
         </el-row>
       </span>
@@ -189,6 +191,7 @@
 import limsTable from "@/components/Table/lims-table.vue";
 
 export default {
+  name: 'RawMaterialInspection',
   // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
   components: { limsTable, DataLookVisible },
   data() {
@@ -444,7 +447,7 @@
         partNo: null,
         partDesc: null,
         supplierName: null,
-        date: '',
+        date: null,
         entrustCode: '',
         inspectStatus: '',
       },
@@ -525,7 +528,7 @@
   methods: {
     // 鍒囨崲tab琛ㄦ牸
     handleTab(m) {
-      this.tabIndex = m.value;
+      this.tabIndex = m;
       this.refreshTable()
     },
     // 鏌ヨ鍥炶皟
@@ -558,6 +561,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 +581,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 +763,7 @@
         });
       }
     },
-    resetForm() {
+    resetFormData() {
       this.$refs['declareObj'].resetFields();
       this.declareDialogVisible = false
     },
@@ -792,8 +809,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