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

---
 src/views/business/materialOrder/index.vue |   46 +++++++++++++++++++++++++++++++++++-----------
 1 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/src/views/business/materialOrder/index.vue b/src/views/business/materialOrder/index.vue
index d5e4a46..bba1f96 100644
--- a/src/views/business/materialOrder/index.vue
+++ b/src/views/business/materialOrder/index.vue
@@ -59,9 +59,11 @@
         <div class="table-tab">
           <div>
             <ul class="tab">
-              <li v-for="(m, i) 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 === 2 }" @click="handleTab(2)">宸叉楠�</li>
+              <li :class="{ active: tabIndex === 4 }" @click="handleTab(4)">瀛ｅ害妫�楠�</li>
+              <li :class="{ active: tabIndex === 3 }" v-if="checkPermi(['get:Ifs:ByAll'])" @click="handleTab(3)">鍏ㄩ儴</li>
             </ul>
           </div>
           <div>
@@ -193,6 +195,7 @@
   concessionRelease,
   getIfsByAll,
   getIfsByOver,
+  getIfsByQuarter,
   getIfsByStateOne,
   rawAllExport,
   rawOrderRelease,
@@ -205,7 +208,7 @@
 // import Inspection from "../do/b1-inspect-order-plan/Inspection.vue";
 
 export default {
-  name: "b1-material-inspection-order",
+  name: "MaterialOrder",
   // import 寮曞叆鐨勭粍浠堕渶瑕佹敞鍏ュ埌瀵硅薄涓墠鑳戒娇鐢�
   components: { limsTable, DownFileDialog, FilesLookVisible, DataLookVisible, ShowInfo, PrintDialog },
   data() {
@@ -847,7 +850,7 @@
     // 寰呬笅鍗曟煡璇�
     getPurchaseOrderList() {
       this.tableLoading = true
-      const params = { ...this.entity, isInspect: 1, state: 0 }
+      const params = { ...this.entity, isInspect: 1, state: 0, ...this.page }
       getWarehouseSubmit(params).then(res => {
         this.tableLoading = false
         if (res.code === 200) {
@@ -861,7 +864,7 @@
     // 妫�楠屼腑鏌ヨ
     getIfsByStateOneList() {
       this.tableLoading1 = true
-      const params = { ...this.entity, orderState: 1, state: 1 }
+      const params = { ...this.entity, orderState: 1, state: 1, ...this.page1 }
       getIfsByStateOne(params).then(res => {
         this.tableLoading1 = false
         if (res.code === 200) {
@@ -875,7 +878,14 @@
     // 宸叉楠屾煡璇�
     getIfsByOverList() {
       this.tableLoading2 = true
-      const params = { ...this.entity, orderState: 4, state: 2 }
+      if(null != this.entity.date){
+        this.entity.beginDeclareDate = this.entity.date[0]
+        this.entity.endDeclareDate = this.entity.date[1]
+      } else {
+        this.entity.beginDeclareDate = ''
+        this.entity.endDeclareDate = ''
+      }
+      const params = { ...this.entity, orderState: 4, state: 2, ...this.page2 }
       getIfsByOver(params).then(res => {
         this.tableLoading2 = false
         if (res.code === 200) {
@@ -889,8 +899,15 @@
     // 鏌ヨ瀛ｅ害妫�楠�
     getIfsByQuarterList() {
       this.tableLoading4 = true
-      const params = { ...this.entity }
-      getIfsByOver(params).then(res => {
+      if(null != this.entity.date){
+        this.entity.beginDeclareDate = this.entity.date[0]
+        this.entity.endDeclareDate = this.entity.date[1]
+      } else {
+        this.entity.beginDeclareDate = ''
+        this.entity.endDeclareDate = ''
+      }
+      const params = { ...this.entity, ...this.page4 }
+      getIfsByQuarter(params).then(res => {
         this.tableLoading4 = false
         if (res.code === 200) {
           this.tableData4 = res.data.records
@@ -903,7 +920,14 @@
     // 鍏ㄩ儴
     getIfsByAllList() {
       this.tableLoading3 = true
-      const params = { ...this.entity, isInspect: 1 }
+      if(null != this.entity.date){
+        this.entity.beginDeclareDate = this.entity.date[0]
+        this.entity.endDeclareDate = this.entity.date[1]
+      } else {
+        this.entity.beginDeclareDate = ''
+        this.entity.endDeclareDate = ''
+      }
+      const params = { ...this.entity, isInspect: 1, ...this.page3 }
       getIfsByAll(params).then(res => {
         this.tableLoading3 = false
         if (res.code === 200) {
@@ -1228,7 +1252,7 @@
     },
     // 鍒囨崲涓嬪崟tab琛ㄦ牸
     handleTab(m) {
-      this.tabIndex = m.value;
+      this.tabIndex = m;
       this.refreshTable()
     },
     // 琛ㄦ牸閫夋嫨鏂规硶

--
Gitblit v1.9.3