From 8e9bc97e709f7e49586dffb9cc3d2dac4cfef4ca Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 26 三月 2026 10:13:02 +0800
Subject: [PATCH] 进销存升级 1.语法修改

---
 src/views/salesManagement/salesLedger/index.vue |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 2ec1fab..16fde49 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -51,10 +51,12 @@
 															 width="100px"
 															 align="center">
                 <template #default="scope">
-									<el-tag v-if="scope.row.approveStatus === 1"
+
+									<el-tag v-if="scope.row.approveStatus === 1 && (!scope.row.shippingDate || !scope.row.shippingCarNumber)"
 													type="success">鍏呰冻</el-tag>
-									<el-tag v-else
-													type="danger">涓嶈冻</el-tag>
+									<el-tag v-else-if="scope.row.approveStatus === 0 && (scope.row.shippingDate || scope.row.shippingCarNumber)"
+													type="success">宸插嚭搴�</el-tag>
+									<el-tag v-else type="danger">涓嶈冻</el-tag>
                 </template>
               </el-table-column>
 							<el-table-column label="鍙戣揣鐘舵��" width="140" align="center">
@@ -95,8 +97,7 @@
                 <template #default="scope">
                   <el-button 
                     link 
-                    type="primary" 
-                    size="small"
+                    type="primary"
                     :disabled="!canShip(scope.row)"
                     @click="openDeliveryForm(scope.row)">
                     鍙戣揣
@@ -119,12 +120,10 @@
         <el-table-column label="绛捐鏃ユ湡" prop="executionDate" width="120" show-overflow-tooltip />
         <el-table-column label="浜や粯鏃ユ湡" prop="deliveryDate" width="120" show-overflow-tooltip />
         <el-table-column label="澶囨敞" prop="remarks" width="200" show-overflow-tooltip />
-        <el-table-column fixed="right" label="鎿嶄綔" min-width="100" align="center">
+        <el-table-column fixed="right" label="鎿嶄綔" width="130" align="center">
           <template #default="scope">
-            <el-button link type="primary" size="small" @click="openForm('edit', scope.row)" :disabled="!scope.row.isEdit">缂栬緫</el-button>
-<!--            <el-button link type="primary" size="small" @click="openForm('view', scope.row)">璇︽儏</el-button>-->
-            <el-button link type="primary" size="small" @click="downLoadFile(scope.row)">闄勪欢</el-button>
-<!--            <el-button link type="primary" size="small" @click="openDeliveryForm(scope.row)">鍙戣揣</el-button>-->
+            <el-button link type="primary" @click="openForm('edit', scope.row)" :disabled="!scope.row.isEdit">缂栬緫</el-button>
+            <el-button link type="primary" @click="downLoadFile(scope.row)">闄勪欢</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -631,7 +630,6 @@
                   <div>
                     <el-button
                       type="danger"
-                      size="small"
                       @click="removeApproverNode(index)"
                       v-if="approverNodes.length > 1"
                     >鍒犻櫎</el-button>
@@ -2194,19 +2192,19 @@
 	margin-left: 10px;
 }
 
-::v-deep .yellow {
+:deep(.yellow) {
   background-color: #FAF0DE;
 }
 
-::v-deep .pink {
+:deep(.pink) {
   background-color: #FAE1DE;
 }
 
-::v-deep .red {
+:deep(.red) {
   background-color: #FAE1DE;
 }
 
-::v-deep .purple{
+:deep(.purple){
   background-color: #F4DEFA;
 }
 

--
Gitblit v1.9.3