From 1d9f871bd6d29e5b9eaeac739f92fcb74ea76abd Mon Sep 17 00:00:00 2001
From: ZN <zhang_12370@163.com>
Date: 星期五, 20 三月 2026 09:50:33 +0800
Subject: [PATCH] 员工台账列表中加上部门、入职日期、合同结束日期这些字段 销售台账发货后的产品状态

---
 src/views/salesManagement/salesLedger/index.vue |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index 1833bc1..5297a2e 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">
@@ -481,7 +483,6 @@
 					<div v-for="(item, index) in printData" :key="index" class="print-page">
 						<div class="delivery-note">
 							<div class="header">
-								<div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
 								<div class="document-title">闆跺敭鍙戣揣鍗�</div>
 							</div>
 							
@@ -499,7 +500,7 @@
 								<div class="info-row">
 									<div>
 										<span class="label">瀹㈡埛鍚嶇О锛�</span>
-										<span class="value">{{ item.customerName || '寮犵埍鏈�' }}</span>
+										<span class="value">{{ item.customerName }}</span>
 									</div>
 									<span class="label">鍗曞彿锛�</span>
 									<span class="value">{{ item.salesContractNo }}</span>
@@ -1670,7 +1671,6 @@
       <div class="print-page">
         <div class="delivery-note">
           <div class="header">
-            <div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
             <div class="document-title">闆跺敭鍙戣揣鍗�</div>
           </div>
           
@@ -1682,7 +1682,7 @@
               </div>
               <div>
                 <span class="label">瀹㈡埛鍚嶇О锛�</span>
-                <span class="value">${item.customerName || '寮犵埍鏈�'}</span>
+                <span class="value">${item.customerName}</span>
               </div>
             </div>
             <div class="info-row">

--
Gitblit v1.9.3