From 849435a97556c61661c1c64d9cda3429dc706009 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 16 Oct 2025 09:34:05 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-16=20=E9=94=80=E5=94=AE=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E8=A3=85=E7=AE=B1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boxManage/com_saleBoxManage_boxing.vue        | 15 ++++++++-------
 src/views/modules/boxManage/saleBoxManage.vue     |  5 +++--
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/boxManage/com_saleBoxManage_boxing.vue b/src/views/modules/boxManage/com_saleBoxManage_boxing.vue
index 76a45db..6976b17 100644
--- a/src/views/modules/boxManage/com_saleBoxManage_boxing.vue
+++ b/src/views/modules/boxManage/com_saleBoxManage_boxing.vue
@@ -3,7 +3,7 @@
     <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
         <el-form-item >
           <el-button type="primary" @click="searchTable()">查询</el-button>
-          <el-button type="primary" @click="newBox()">新增箱</el-button>
+          <el-button v-if="searchData.orderStatus === '待包装'" type="primary" @click="newBox()">新增箱</el-button>
         </el-form-item>
     </el-form>
     <el-table
@@ -19,10 +19,12 @@
         label="操作">
         <template slot-scope="scope">
           <a type="text" size="small" v-if="scope.row.status!=='未封箱'" @click="boxModelOpen(scope.row)">查看</a>
-          <a type="text" size="small" v-if="scope.row.status!=='已封箱'"@click="boxModelOpen(scope.row)">装箱</a>
-          <a type="text" size="small" v-if="scope.row.status==='未封箱'" @click="fengxiang(scope.row)">封箱</a>
-          <a type="text" size="small" v-if="scope.row.status==='已封箱'" @click="chaixiang(scope.row)">拆箱</a>
-          <a type="text" size="small" v-if="scope.row.status!=='已封箱'" @click="deleteBox(scope.row)">删除</a>
+          <template v-if="searchData.orderStatus === '待包装'">
+            <a type="text" size="small" v-if="scope.row.status!=='已封箱'"@click="boxModelOpen(scope.row)">装箱</a>
+            <a type="text" size="small" v-if="scope.row.status==='未封箱'" @click="fengxiang(scope.row)">封箱</a>
+            <a type="text" size="small" v-if="scope.row.status==='已封箱'" @click="chaixiang(scope.row)">拆箱</a>
+            <a type="text" size="small" v-if="scope.row.status!=='已封箱'" @click="deleteBox(scope.row)">删除</a>
+          </template>
         </template>
       </el-table-column>
       <el-table-column
@@ -154,6 +156,7 @@ export default {
         buNo: '',
         orderNo: '',
         boxType: '',
+        orderStatus: '',
         height:'300',
         page: 1,
         limit: 1000
@@ -311,14 +314,12 @@ export default {
       this.searchData = JSON.parse(JSON.stringify(inData));
       //刷新表格
       this.searchTable();
-
     },
     searchTable(){
       searchSoReceiveBoxesData(this.searchData).then(({data}) => {
         //区分请求成功和失败的状况
         if (data && data.code == 0) {
           this.dataList = data.rows
-          console.log(this.dataList)
         } else {
           this.dataList = [];
         }
diff --git a/src/views/modules/boxManage/saleBoxManage.vue b/src/views/modules/boxManage/saleBoxManage.vue
index d37bff2..3365cd9 100644
--- a/src/views/modules/boxManage/saleBoxManage.vue
+++ b/src/views/modules/boxManage/saleBoxManage.vue
@@ -80,7 +80,7 @@
 
     <el-tabs v-model="activeName" style="margin-top: 0px; width: 99%;" @tab-click="tabClick" class="customer-tab" type="border-card">
       <el-tab-pane label="盒清单" name="cases">
-        <el-form label-position="top" style="margin-left: 2px;">
+        <el-form v-if="currentRow.orderStatus === '待包装'" label-position="top" style="margin-left: 2px;">
           <el-button type="primary" size="small" @click="openCaseDialog">新增</el-button>
           <el-button type="danger" size="small" @click="deleteCaseRecord">删除</el-button>
         </el-form>
@@ -773,7 +773,8 @@ export default {
         buNo: this.currentRow.buNo,
         orderNo: this.currentRow.orderNo,
         boxType: this.currentRow.orderType,
-        height:Number(this.height)-25
+        height:Number(this.height)-25,
+        orderStatus: this.currentRow.orderStatus
       }
       this.$refs.boxing.init(inData)
     },