From a46be80ad06cbf89f6d5bdcd09bca4f01404ab82 Mon Sep 17 00:00:00 2001
From: weitingdong <2480899115@qq.com>
Date: Fri, 19 Jul 2024 15:28:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/smart/workorder.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/views/smart/workorder.vue b/src/views/smart/workorder.vue
index 60e425d..bbfda81 100644
--- a/src/views/smart/workorder.vue
+++ b/src/views/smart/workorder.vue
@@ -8,6 +8,7 @@
                :before-open="beforeOpen"
                v-model="form"
                :search.sync="search"
+               header-cell-class-name="header-class"
                ref="crud"
                @row-update="rowUpdate"
                @row-save="rowSave"
@@ -99,6 +100,7 @@
         option: {
           searchIndex: 3,
           searchIcon: true,
+          align: 'center',
           height: 'auto',
           calcHeight: 210,
           searchShow: true,
@@ -611,8 +613,4 @@
 </script>
 
 <style>
-  .header-class{
-    background-color: #3366cc !important;
-    color: #FFFFFF !important;
-  }
 </style>

From 4267d4d008ba3a5315620e3e5d063ae22c56b317 Mon Sep 17 00:00:00 2001
From: yangzhicheng <dayu123@qq.com>
Date: Fri, 19 Jul 2024 15:33:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=9D=BF=E5=9D=97=E8=BF=BD=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/spares/material.js          | 10 +++++++++
 src/views/spares/materialDetail.vue | 32 +++++++++++++++++++++++++++--
 src/views/wel/index.vue             | 16 +++++++++++++++
 3 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/src/api/spares/material.js b/src/api/spares/material.js
index cd82f83..809a4e7 100644
--- a/src/api/spares/material.js
+++ b/src/api/spares/material.js
@@ -48,3 +48,13 @@ export const update = (row) => {
   })
 }
 
+export const getDetailByMaterialNo = (materialNo) => {
+  return request({
+    url: '/api/spares/material/detail',
+    method: 'get',
+    params: {
+      materialNo
+    }
+  })
+}
+
diff --git a/src/views/spares/materialDetail.vue b/src/views/spares/materialDetail.vue
index 315ec7b..6973122 100644
--- a/src/views/spares/materialDetail.vue
+++ b/src/views/spares/materialDetail.vue
@@ -1,6 +1,7 @@
 <template>
   <basic-container>
     <avue-tabs :option="option"
+               ref="tabs"
                @change="handleChange"></avue-tabs>
     <span v-if="type.prop==='information'">
         <avue-form :option="tab1_option"
@@ -78,7 +79,7 @@
 </template>
 
 <script>
-  import {add, getDetail} from "@/api/spares/material";
+  import {add, getDetail, getDetailByMaterialNo} from "@/api/spares/material";
   import {inbound_getListByMaterialNo, update_materialDetailIn} from "@/api/spares/inbound";
   import {outbound_getListByMaterialNo, update_materialDetailOut} from "@/api/spares/outbound";
   import {mapGetters} from "vuex";
@@ -446,7 +447,29 @@
         this.addUpdateShowButton=false;
         this.frame_class = 'frame_class';
         this.SearchDetail();
-      }else{
+      }else if(this.$route.query.frameMode == "search"){
+        const creditCodeM = this.findObject(this.tab1_option.column, "creditCodeM");
+        creditCodeM.display = false;
+        const creditCodeS = this.findObject(this.tab1_option.column, "creditCodeS");
+        creditCodeS.display = false;
+        this.option.column.push({ label: '入库详情', prop: 'inbound' },{ label: '出库详情', prop: 'outbound' });
+        if (this.$route.query.mode == "in")
+        {
+          this.$nextTick(() => {
+            this.$refs.tabs.changeTabs(1)
+          })
+        }
+        else
+        {
+          this.$nextTick(() => {
+            this.$refs.tabs.changeTabs(2)
+          })
+        }
+        this.readonlyForm=true;
+        this.addUpdateShowButton=false;
+        this.frame_class = 'frame_class';
+        this.SearchDetailByMaterialNo();
+      } else {
         const materialNo = this.findObject(this.tab1_option.column, "materialNo");
         materialNo.value = ' ';
         materialNo.disabled = true;
@@ -512,6 +535,11 @@
           this.tab1_form = res.data.data;
         });
       },
+      SearchDetailByMaterialNo() {
+        getDetailByMaterialNo(this.$route.query.materialNo).then(res => {
+          this.tab1_form = res.data.data;
+        });
+      },
       SearchClassCode() {
         getCodeList().then(res => {
           this.optionsExt = res.data.data;
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 27ede76..747e1f4 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -81,6 +81,12 @@
                   <div class="el-collapse-item" v-for="(item, index) in homePageData.supplierInfoAudit" :key="index">
                     <div class="el-collapse-item__header" @click="skip('/spares/supplierinfo', item.id)"><span class="el-collapse-span">{{item.creditCode}}号供应商待审核</span></div>
                   </div>
+                  <div class="el-collapse-item" v-for="(item, index) in homePageData.inboundAudit" :key="index">
+                    <div class="el-collapse-item__header" @click="skip2('/spares/materialDetail', item.materialNo, 'in')"><span class="el-collapse-span">{{item.inboundNo}}号入库待审核</span></div>
+                  </div>
+                  <div class="el-collapse-item" v-for="(item, index) in homePageData.outboundAudit" :key="index">
+                    <div class="el-collapse-item__header" @click="skip2('/spares/materialDetail', item.materialNo, 'out')"><span class="el-collapse-span">{{item.outboundNo}}号出库待审核</span></div>
+                  </div>
                 </div>
                 <div v-show="homePageData.workOrderAudit">
                   <div class="el-collapse-item">
@@ -141,6 +147,16 @@
             id: id
           },
         });
+      },
+      skip2(path, materialNo, mode){
+        this.$router.push({
+          path: path,
+          query: {
+            frameMode:"search",
+            materialNo: materialNo,
+            mode: mode
+          },
+        });
       }
     }
   };