From a582232206853830512bbafe8f7a4358c7a25aff Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 22 十二月 2025 13:46:01 +0800
Subject: [PATCH] 1.海川开心-发货字段和打印展示公司修改

---
 src/views/inventoryManagement/receiptManagement/index.vue      |    3 
 src/views/inventoryManagement/issueManagement/index.vue        |  106 +++++++++++++++----------
 src/views/inventoryManagement/stockManagement/index.vue        |    6 
 src/views/productionManagement/productionDispatching/index.vue |   45 ++++++++--
 src/views/salesManagement/salesLedger/index.vue                |   14 ++-
 src/views/inventoryManagement/dispatchLog/index.vue            |   13 ++-
 6 files changed, 120 insertions(+), 67 deletions(-)

diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index b56b987..5f73d91 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -44,7 +44,8 @@
 					>
 						<el-table-column align="center" type="selection" width="55" />
 						<el-table-column align="center" label="搴忓彿" type="index" width="60" />
-						<el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" min-width="120" show-overflow-tooltip />
+						<el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" width="120" show-overflow-tooltip />
+						<el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" width="180" show-overflow-tooltip />
 						<el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
 						<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
 						<el-table-column label="鍗曚綅" prop="unit" width="80" show-overflow-tooltip />
@@ -107,7 +108,8 @@
 					>
 						<el-table-column align="center" type="selection" width="55" />
 						<el-table-column align="center" label="搴忓彿" type="index" width="60" />
-						<el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" min-width="120" show-overflow-tooltip />
+						<el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" width="120" show-overflow-tooltip />
+						<el-table-column label="閲囪喘鍚堝悓鍙�" prop="purchaseContractNumber" width="180" show-overflow-tooltip />
 						<el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
 						<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
 						<el-table-column label="鍗曚綅" prop="unit" width="80" show-overflow-tooltip />
@@ -170,7 +172,8 @@
 					>
 						<el-table-column align="center" type="selection" width="55" />
 						<el-table-column align="center" label="搴忓彿" type="index" width="60" />
-						<el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" show-overflow-tooltip />
+						<el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" show-overflow-tooltip width="130"/>
+						<el-table-column label="鎵规鍙�" prop="code" width="130" show-overflow-tooltip />
 						<el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
 						<el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
 						<el-table-column label="鍗曚綅" prop="unit" show-overflow-tooltip />
@@ -215,7 +218,7 @@
 					<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="company-name">娴峰窛寮�蹇冮鍝佹湁闄愬叕鍙�</div>
 								<div class="document-title">闆跺敭鍙戣揣鍗�</div>
 							</div>
 							
@@ -658,7 +661,7 @@
       <div class="print-page">
         <div class="delivery-note">
           <div class="header">
-            <div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
+            <div class="company-name">娴峰窛寮�蹇冮鍝佹湁闄愬叕鍙�</div>
             <div class="document-title">闆跺敭鍙戣揣鍗�</div>
           </div>
           
diff --git a/src/views/inventoryManagement/issueManagement/index.vue b/src/views/inventoryManagement/issueManagement/index.vue
index 3eb1583..57ac9be 100644
--- a/src/views/inventoryManagement/issueManagement/index.vue
+++ b/src/views/inventoryManagement/issueManagement/index.vue
@@ -4,16 +4,6 @@
       <el-tab-pane label="鎴愬搧鍑哄簱" name="production">
         <div class="search_form">
           <div>
-            <span class="search_title ml10">鍏ュ簱鏃ユ湡锛�</span>
-            <el-date-picker
-              v-model="searchForm.timeStr"
-              type="date"
-              placeholder="璇烽�夋嫨鏃ユ湡"
-              value-format="YYYY-MM-DD"
-              format="YYYY-MM-DD"
-              clearable
-              @change="handleQuery"
-            />
             <span class="search_title ml10">浜у搧澶х被锛�</span>
             <el-input
               v-model="searchForm.productCategory"
@@ -32,15 +22,14 @@
             :expand-row-keys="expandedRowKeys" :row-key="row => row.id" show-summary style="width: 100%"
             :summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
             <el-table-column align="center" label="搴忓彿" type="index" width="60" />
-            <el-table-column label="鍏ュ簱鏃堕棿" prop="createTime" width="100" show-overflow-tooltip />
+            <el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" width="180" show-overflow-tooltip />
             <el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
             <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
             <el-table-column label="鍗曚綅" prop="unit" width="70" show-overflow-tooltip />
-            <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="90" show-overflow-tooltip />
             <el-table-column label="鍓╀綑搴撳瓨" prop="inboundNum0" width="90" show-overflow-tooltip />
             <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
               <template #default="scope">
-                <el-button link type="primary" size="small" @click="openForm(scope.row);">棰嗙敤</el-button>
+                <el-button link type="primary" size="small" @click="openForm(scope.row);">鍙戣揣</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -52,16 +41,6 @@
      <el-tab-pane label="鍘熸枡鍑哄簱" name="purchase">
        <div class="search_form">
          <div>
-           <span class="search_title ml10">鍏ュ簱鏃ユ湡锛�</span>
-           <el-date-picker
-             v-model="searchForm.timeStr"
-             type="date"
-             placeholder="璇烽�夋嫨鏃ユ湡"
-             value-format="YYYY-MM-DD"
-             format="YYYY-MM-DD"
-             clearable
-             @change="handleQuery"
-           />
             <span class="search_title ml10">浜у搧澶х被锛�</span>
             <el-input
               v-model="searchForm.productCategory"
@@ -81,11 +60,10 @@
            :summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
            <el-table-column align="center" type="selection" width="55" />
            <el-table-column align="center" label="搴忓彿" type="index" width="60" />
-           <el-table-column label="鍏ュ簱鏃堕棿" prop="createTime" width="100" show-overflow-tooltip />
-           <el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
+					 <el-table-column label="閲囪喘鍚堝悓鍙�" prop="purchaseContractNumber" width="180" show-overflow-tooltip />
+					 <el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
            <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
            <el-table-column label="鍗曚綅" prop="unit" width="70" show-overflow-tooltip />
-           <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="90" show-overflow-tooltip />
            <el-table-column label="鍓╀綑搴撳瓨" prop="inboundNum0" width="90" show-overflow-tooltip />
 					 <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
 					 <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" width="150"></el-table-column>
@@ -103,16 +81,6 @@
       <el-tab-pane label="鏉愭枡鍑哄簱" name="manual">
         <div class="search_form">
           <div>
-            <span class="search_title ml10">鍏ュ簱鏃ユ湡锛�</span>
-            <el-date-picker
-              v-model="searchForm.timeStr"
-              type="date"
-              placeholder="璇烽�夋嫨鏃ユ湡"
-              value-format="YYYY-MM-DD"
-              format="YYYY-MM-DD"
-              clearable
-              @change="handleQuery"
-            />
             <span class="search_title ml10">浜у搧澶х被锛�</span>
             <el-input
               v-model="searchForm.productCategory"
@@ -132,12 +100,11 @@
             :summary-method="summarizeMainTable" height="calc(100vh - 18.5em)">
             <el-table-column align="center" type="selection" width="55" />
             <el-table-column align="center" label="搴忓彿" type="index" width="60" />
-            <el-table-column label="鍏ュ簱鏃堕棿" prop="inboundDate" width="100" show-overflow-tooltip />
+            <el-table-column label="鎵规鍙�" prop="code" width="130" show-overflow-tooltip />
             <el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
             <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
             <el-table-column label="鍗曚綅" prop="unit" width="70" show-overflow-tooltip />
             <el-table-column label="鐗╁搧绫诲瀷" prop="itemType" show-overflow-tooltip />
-            <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" show-overflow-tooltip />
 						<el-table-column label="鍓╀綑搴撳瓨" prop="inboundNum0" width="90" show-overflow-tooltip />
             <el-table-column fixed="right" label="鎿嶄綔" width="100" align="center">
               <template #default="scope">
@@ -150,17 +117,17 @@
         </div>
       </el-tab-pane>
     </el-tabs>
-    <el-dialog v-model="dialogFormVisible" :title="'鏂板鍑哄簱'" width="40%" @close="closeDia">
+    <el-dialog v-model="dialogFormVisible" :title="getDialogTitle()" width="40%" @close="closeDia">
       <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
-				<div>鍙嚭搴撴暟閲�:{{currentRowNum}}</div>
-        <el-form-item label="鍑哄簱鏁伴噺锛�" prop="salesContractNo">
+			<div>{{getAvailableQuantityText()}}:{{currentRowNum}}</div>
+        <el-form-item :label="getQuantityLabel()" prop="salesContractNo">
           <el-input-number :step="0.01" :min="0" style="width: 100%" v-model="form.inboundQuantity" placeholder="璇疯緭鍏�" clearable />
         </el-form-item>
-        <el-form-item label="鍑哄簱鏃ユ湡锛�" prop="projectName">
+        <el-form-item :label="getDateLabel()" prop="projectName">
           <el-date-picker style="width: 100%" v-model="form.inboundTime" value-format="YYYY-MM-DD" format="YYYY-MM-DD"
             type="date" placeholder="璇烽�夋嫨" clearable />
         </el-form-item>
-        <el-form-item label="鍑哄簱浜猴細" prop="entryPerson">
+        <el-form-item :label="getPersonLabel()" prop="entryPerson">
           <el-select v-model="form.nickName"                 filterable
                      default-first-option
                      :reserve-keyword="false" placeholder="璇烽�夋嫨" clearable>
@@ -427,9 +394,62 @@
   const day = String(today.getDate()).padStart(2, '0');
   return `${year}-${month}-${day}`;
 }
+
+// 鏍规嵁tab绫诲瀷鑾峰彇寮规鏍囬
+const getDialogTitle = () => {
+  const titleMap = {
+    production: '鏂板鍙戣揣',
+    purchase: '鏂板棰嗙敤',
+    manual: '鏂板棰嗙敤'
+  };
+  return titleMap[activeTab.value] || '鏂板鍑哄簱';
+};
+
+// 鏍规嵁tab绫诲瀷鑾峰彇鍙嚭搴撴暟閲忔枃鏈�
+const getAvailableQuantityText = () => {
+  const textMap = {
+    production: '鍙彂璐ф暟閲�',
+    purchase: '鍙鐢ㄦ暟閲�',
+    manual: '鍙鐢ㄦ暟閲�'
+  };
+  return textMap[activeTab.value] || '鍙嚭搴撴暟閲�';
+};
+
+// 鏍规嵁tab绫诲瀷鑾峰彇鏁伴噺瀛楁鏍囩
+const getQuantityLabel = () => {
+  const labelMap = {
+    production: '鍙戣揣鏁伴噺锛�',
+    purchase: '棰嗙敤鏁伴噺锛�',
+    manual: '棰嗙敤鏁伴噺锛�'
+  };
+  return labelMap[activeTab.value] || '鍑哄簱鏁伴噺锛�';
+};
+
+// 鏍规嵁tab绫诲瀷鑾峰彇鏃ユ湡瀛楁鏍囩
+const getDateLabel = () => {
+  const labelMap = {
+    production: '鍙戣揣鏃ユ湡锛�',
+    purchase: '棰嗙敤鏃ユ湡锛�',
+    manual: '棰嗙敤鏃ユ湡锛�'
+  };
+  return labelMap[activeTab.value] || '鍑哄簱鏃ユ湡锛�';
+};
+
+// 鏍规嵁tab绫诲瀷鑾峰彇浜哄憳瀛楁鏍囩
+const getPersonLabel = () => {
+  const labelMap = {
+    production: '鍙戣揣浜猴細',
+    purchase: '棰嗙敤浜猴細',
+    manual: '棰嗙敤浜猴細'
+  };
+  return labelMap[activeTab.value] || '鍑哄簱浜猴細';
+};
+
 onMounted(() => {
   getList()
 })
 </script>
 
 <style scoped lang="scss"></style>
+
+
diff --git a/src/views/inventoryManagement/receiptManagement/index.vue b/src/views/inventoryManagement/receiptManagement/index.vue
index dc95be5..68b1b77 100644
--- a/src/views/inventoryManagement/receiptManagement/index.vue
+++ b/src/views/inventoryManagement/receiptManagement/index.vue
@@ -35,6 +35,7 @@
             <el-table-column align="center" type="selection" width="55" />
             <el-table-column align="center" label="搴忓彿" type="index" width="60" />
             <el-table-column label="鍏ュ簱鏃堕棿" prop="createTime" show-overflow-tooltip />
+						<el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" width="180" show-overflow-tooltip />
             <el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
             <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
             <el-table-column label="鍗曚綅" prop="unit" width="70" show-overflow-tooltip />
@@ -87,6 +88,7 @@
            <el-table-column align="center" type="selection" width="55" />
            <el-table-column align="center" label="搴忓彿" type="index" width="60" />
            <el-table-column label="鍏ュ簱鏃堕棿" prop="createTime" width="100" show-overflow-tooltip />
+					 <el-table-column label="閲囪喘鍚堝悓鍙�" prop="purchaseContractNumber" width="180" show-overflow-tooltip />
 <el-table-column label="渚涘簲鍟嗗悕绉�" prop="supplierName" width="240" show-overflow-tooltip />
            <el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
            <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
@@ -141,6 +143,7 @@
             <el-table-column align="center" type="selection" width="55" />
             <el-table-column align="center" label="搴忓彿" type="index" width="60" />
             <el-table-column label="鍏ュ簱鏃堕棿" prop="inboundDate" width="100" show-overflow-tooltip />
+						<el-table-column label="鎵规鍙�" prop="code" width="130" show-overflow-tooltip />
             <el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
             <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
             <el-table-column label="鍗曚綅" prop="unit" width="70" show-overflow-tooltip />
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index d723dfc..00c037c 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -36,10 +36,10 @@
             <el-table-column align="center" type="selection" width="55" />
             <el-table-column align="center" label="搴忓彿" type="index" width="60" />
             <el-table-column label="鍏ュ簱鏃ユ湡" prop="createTime" width="100" show-overflow-tooltip />
+						<el-table-column label="閿�鍞悎鍚屽彿" prop="salesContractNo" width="180" show-overflow-tooltip />
             <el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
             <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
             <el-table-column label="鍗曚綅" prop="unit" width="80" show-overflow-tooltip />
-            <el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="100" show-overflow-tooltip />
             <el-table-column label="宸插嚭搴撴暟閲�" prop="totalInboundNum" width="100" show-overflow-tooltip />
             <el-table-column label="鍓╀綑搴撳瓨" prop="inboundNum0" width="100" show-overflow-tooltip />
 							<el-table-column label="鍗曚环(鍏�)" prop="unitPrice" width="150"></el-table-column>
@@ -90,10 +90,10 @@
            <el-table-column align="center" type="selection" width="55" />
            <el-table-column align="center" label="搴忓彿" type="index" width="60" />
            <el-table-column label="鍏ュ簱鏃ユ湡" prop="createTime" width="100" show-overflow-tooltip />
+					 <el-table-column label="閲囪喘鍚堝悓鍙�" prop="purchaseContractNumber" width="180" show-overflow-tooltip />
            <el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
            <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
            <el-table-column label="鍗曚綅" prop="unit" width="80" show-overflow-tooltip />
-							<el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="100" show-overflow-tooltip />
 							<el-table-column label="宸插嚭搴撴暟閲�" prop="totalInboundNum" show-overflow-tooltip />
 							<el-table-column label="鍓╀綑搴撳瓨" prop="inboundNum0" show-overflow-tooltip />
 						 <el-table-column label="鍚◣鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
@@ -139,11 +139,11 @@
             <el-table-column align="center" type="selection" width="55" />
             <el-table-column align="center" label="搴忓彿" type="index" width="60" />
             <el-table-column label="鍏ュ簱鏃ユ湡" prop="inboundDate" width="100" show-overflow-tooltip />
+						<el-table-column label="鎵规鍙�" prop="code" width="130" show-overflow-tooltip />
             <el-table-column label="浜у搧澶х被" prop="productCategory" show-overflow-tooltip />
             <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" show-overflow-tooltip />
             <el-table-column label="鍗曚綅" prop="unit" width="80" show-overflow-tooltip />
             <el-table-column label="鐗╁搧绫诲瀷" prop="itemType" width="120" show-overflow-tooltip />
-							<el-table-column label="鍏ュ簱鏁伴噺" prop="inboundNum" width="100" show-overflow-tooltip />
 							<el-table-column label="宸插嚭搴撴暟閲�" prop="totalInboundNum" width="100" show-overflow-tooltip />
 							<el-table-column label="鍓╀綑搴撳瓨" prop="inboundNum0" width="100" show-overflow-tooltip />
 							<el-table-column label="鍗曚环(鍏�)" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
diff --git a/src/views/productionManagement/productionDispatching/index.vue b/src/views/productionManagement/productionDispatching/index.vue
index d00d23b..2d39890 100644
--- a/src/views/productionManagement/productionDispatching/index.vue
+++ b/src/views/productionManagement/productionDispatching/index.vue
@@ -117,21 +117,11 @@
 		prop: "salesContractNo",
 		width: 220,
 	},
-	// {
-	// 	label: "瀹㈡埛鍚堝悓鍙�",
-	// 	prop: "customerContractNo",
-	// 	width: 250,
-	// },
 	{
 		label: "瀹㈡埛鍚嶇О",
 		prop: "customerName",
 		width: 250,
 	},
-	// {
-	// 	label: "椤圭洰鍚嶇О",
-	// 	prop: "projectName",
-	// 	width:300
-	// },
 	{
 		label: "浜у搧澶х被",
 		prop: "productCategory",
@@ -145,7 +135,7 @@
 	{
 		label: "缁戝畾鏈哄櫒",
 		prop: "speculativeTradingName",
-		width: 220,
+		width: 160,
 	},
 	{
 		label: "鍗曚綅",
@@ -156,6 +146,32 @@
 		label: "褰曞叆鏃ユ湡",
 		prop: "entryDate",
 		width: 120,
+	},
+	{
+		label: "鐘舵��",
+		prop: "status",
+		dataType: "tag",
+		formatType: (params) => {
+			if (params == '鐢熶骇涓�') {
+				return "warning";
+			} else if (params == '鏈紑濮�') {
+				return "danger";
+			} else {
+				return "success";
+			}
+		},
+	},
+	{
+		label: "鐢熶骇杩涘害",
+		prop: "progress",
+		formatData: (cellValue) => {
+			// 濡傛灉鍊间负绌烘垨undefined锛屾樉绀虹┖瀛楃涓�
+			if (cellValue === null || cellValue === undefined || cellValue === '') {
+				return '';
+			}
+			// 鐩存帴鍦ㄦ暟瀛楀悗闈㈡坊鍔犵櫨鍒嗗彿
+			return `${cellValue}%`;
+		}
 	},
 	{
 		label: "鏁伴噺",
@@ -605,3 +621,10 @@
 	white-space: nowrap;
 }
 </style>
+
+
+
+
+
+
+
diff --git a/src/views/salesManagement/salesLedger/index.vue b/src/views/salesManagement/salesLedger/index.vue
index dd28234..d599868 100644
--- a/src/views/salesManagement/salesLedger/index.vue
+++ b/src/views/salesManagement/salesLedger/index.vue
@@ -65,6 +65,7 @@
             </div>
           </template>
         </el-table-column>
+        <el-table-column label="鍙戣揣鏃ユ湡" prop="shippingDate" width="120" show-overflow-tooltip />
         <el-table-column label="褰曞叆鏃ユ湡" prop="entryDate" width="120" show-overflow-tooltip />
         <el-table-column label="绛捐鏃ユ湡" prop="executionDate" width="120" show-overflow-tooltip />
         <el-table-column fixed="right" label="鎿嶄綔" min-width="200" align="center">
@@ -308,7 +309,7 @@
 					<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="company-name">娴峰窛寮�蹇冮鍝佹湁闄愬叕鍙�</div>
 								<div class="document-title">闆跺敭鍙戣揣鍗�</div>
 							</div>
 							
@@ -319,12 +320,15 @@
 										<span class="value">{{ formatDate(item.createTime) }}</span>
 									</div>
 									<div>
-										
-										<span class="label">瀹㈡埛鍚嶇О锛�</span>
-										<span class="value">{{ item.customerName || '寮犵埍鏈�' }}</span>
+										<span class="label">鍙戣揣杞︾墝鍙凤細</span>
+										<span class="value">{{ item.shippingCarNumber }}</span>
 									</div>
 								</div>
 								<div class="info-row">
+									<div>
+										<span class="label">瀹㈡埛鍚嶇О锛�</span>
+										<span class="value">{{ item.customerName || '寮犵埍鏈�' }}</span>
+									</div>
 									<span class="label">鍗曞彿锛�</span>
 									<span class="value">{{ item.salesContractNo }}</span>
 								</div>
@@ -1167,7 +1171,7 @@
       <div class="print-page">
         <div class="delivery-note">
           <div class="header">
-            <div class="company-name">榧庤瘹鐟炲疄涓氭湁闄愯矗浠诲叕鍙�</div>
+            <div class="company-name">娴峰窛寮�蹇冮鍝佹湁闄愬叕鍙�</div>
             <div class="document-title">闆跺敭鍙戣揣鍗�</div>
           </div>
           

--
Gitblit v1.9.3