From 3de8b71ee1c6be3e41b77d6633c3f1a1b66c40f2 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 16 一月 2026 10:59:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津军泰伟业' into dev_天津军泰伟业

---
 src/views/inventoryManagement/dispatchLog/index.vue |  405 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 202 insertions(+), 203 deletions(-)

diff --git a/src/views/inventoryManagement/dispatchLog/index.vue b/src/views/inventoryManagement/dispatchLog/index.vue
index a58c62e..12e6fcf 100644
--- a/src/views/inventoryManagement/dispatchLog/index.vue
+++ b/src/views/inventoryManagement/dispatchLog/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="app-container">
 		<el-tabs v-model="activeTab" @tab-change="handleTabChange">
-			<!-- <el-tab-pane label="閲囪喘鍑哄簱" name="production">
+			<el-tab-pane label="鎴愬搧鍑哄簱" name="production">
 				<div class="search_form">
 					<div>
 						<span class="search_title ml10">鍑哄簱鏃ユ湡锛�</span>
@@ -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 />
@@ -62,9 +63,9 @@
 						@pagination="paginationChange"
 					/>
 				</div>
-			</el-tab-pane> -->
+			</el-tab-pane>
 
-			<el-tab-pane label="閲囪喘鍑哄簱" name="purchase">
+			<el-tab-pane label="鍘熸枡鍑哄簱" name="purchase">
 				<div class="search_form">
 					<div>
 						<span class="search_title ml10">鍑哄簱鏃ユ湡锛�</span>
@@ -107,18 +108,15 @@
 					>
 						<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="productCategory" show-overflow-tooltip />
-						<el-table-column label="浜у搧楂樺害" prop="specificationModel" width="100" show-overflow-tooltip>
-						<template #default="scope">
-							<div>{{ scope.row.specificationModel }}{{ scope.row.unit }}</div>
-						</template>
-						</el-table-column>
-						<el-table-column label="鍑哄簱鏁伴噺/浠�" prop="inboundNum" show-overflow-tooltip />
-						<el-table-column label="姣忎欢鏁伴噺/鏀�" prop="boxNum" width="100" show-overflow-tooltip />
-						<el-table-column label="鍗曚环(鍏�)/鏀�" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
-						<el-table-column label="绾哥瑙勬牸" prop="cartonSpecifications" width="150"></el-table-column>
-						<el-table-column label="鍑哄簱浜�" prop="createBy" 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 />
+						<el-table-column label="鍑哄簱鏁伴噺" prop="inboundNum" width="100" 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>
+						<el-table-column label="鍑哄簱浜�" prop="createBy" width="80" show-overflow-tooltip />
 					</el-table>
 					<pagination
 						v-show="total > 0"
@@ -131,79 +129,68 @@
 				</div>
 			</el-tab-pane>
 
-			<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"
-							style="width: 240px"
-							placeholder="璇疯緭鍏�"
-							clearable
-						/>
-						<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
-					</div>
-					<div>
-						<el-button @click="handleOut">瀵煎嚭</el-button>
-						<el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
-						<el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button>
-					</div>
-				</div>
-				<div class="table_list">
-					<el-table
-						:data="tableData"
-						border
-						v-loading="tableLoading"
-						@selection-change="handleSelectionChange"
-						: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" type="selection" width="55" />
-						<el-table-column align="center" label="搴忓彿" type="index" width="60" />
-						<el-table-column label="浜у搧鍥剧墖" width="100" align="center">
-							<template #default="scope">
-								<img class="barcode-img" :src="javaApiUrl+scope.row.url"></img>
-							</template>
-						</el-table-column>
-						<el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" width="150" show-overflow-tooltip />
-						<el-table-column label="浜у搧鍚嶇О" prop="productCategory" show-overflow-tooltip />
-						<el-table-column label="浜у搧楂樺害" prop="specificationModel" width="100" show-overflow-tooltip>
-						<template #default="scope">
-							<div>{{ scope.row.specificationModel }}{{ scope.row.unit }}</div>
-						</template>
-						</el-table-column>
-						<el-table-column label="鍑哄簱鏁伴噺/浠�" prop="inboundNum" width="150" show-overflow-tooltip />
-						<el-table-column label="姣忎欢鏁伴噺/鏀�" prop="boxNum" width="100" show-overflow-tooltip />
-						<el-table-column label="鍗曚环(缇庡厓)/浠�" prop="taxInclusiveUnitPrice" width="150"></el-table-column>
-						<el-table-column label="绾哥瑙勬牸" prop="cartonSpecifications" width="150"></el-table-column>
-						<el-table-column label="鍑哄簱浜�" prop="createBy" width="150" show-overflow-tooltip />
-					</el-table>
-					<pagination
-						v-show="total > 0"
-						:total="total"
-						layout="total, sizes, prev, pager, next, jumper"
-						:page="page.current"
-						:limit="page.size"
-						@pagination="paginationChange"
-					/>
-				</div>
-			</el-tab-pane>
+      <el-tab-pane label="鐢熶骇鍑哄簱" name="semiProduct">
+        <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"
+                style="width: 240px"
+                placeholder="璇疯緭鍏�"
+                clearable
+            />
+            <el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
+          </div>
+          <div>
+            <el-button @click="handleOut">瀵煎嚭</el-button>
+            <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>
+            <el-button type="primary" plain @click="handlePrint">鎵撳嵃</el-button>
+          </div>
+        </div>
+        <div class="table_list">
+          <el-table
+              :data="tableData"
+              border
+              v-loading="tableLoading"
+              @selection-change="handleSelectionChange"
+              :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" type="selection" width="55" />
+            <el-table-column align="center" label="搴忓彿" type="index" width="60" />
+            <el-table-column label="鍑哄簱鏃ユ湡" prop="createTime" width="220" 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="100" show-overflow-tooltip />
+            <el-table-column label="鍑哄簱鏁伴噺" prop="inboundNum" width="220" show-overflow-tooltip />
+            <el-table-column label="鍑哄簱浜�" prop="createBy" width="220" show-overflow-tooltip />
+          </el-table>
+          <pagination
+              v-show="total > 0"
+              :total="total"
+              layout="total, sizes, prev, pager, next, jumper"
+              :page="page.current"
+              :limit="page.size"
+              @pagination="paginationSemiProductChange"
+          />
+        </div>
+      </el-tab-pane>
 		</el-tabs>
-		
+
 		<!-- 鎵撳嵃棰勮寮圭獥 -->
 		<el-dialog
 			v-model="printPreviewVisible"
@@ -227,10 +214,10 @@
 					<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>
-							
+
 							<div class="info-section">
 								<div class="info-row">
 									<div>
@@ -238,9 +225,9 @@
 										<span class="value">{{ formatDate(item.createTime) }}</span>
 									</div>
 									<div>
-										
+
 										<span class="label">瀹㈡埛鍚嶇О锛�</span>
-										<span class="value">{{ item.supplierName }}</span>
+										<span class="value">{{ item.supplierName || '寮犵埍鏈�' }}</span>
 									</div>
 								</div>
 								<div class="info-row">
@@ -248,42 +235,42 @@
 									<span class="value">{{ item.code }}</span>
 								</div>
 							</div>
-							
+
 							<div class="table-section">
 								<table class="product-table">
 									<thead>
 									<tr>
 										<th>浜у搧鍚嶇О</th>
-										<th>浜у搧楂樺害</th>
-										<th>鍗曚环锛堢編鍏冿級/浠�</th>
-										<th>闆跺敭鏁伴噺/浠�</th>
-										<th>姣忎欢鏁伴噺/鏀�</th>
-										<th>绾哥瑙勬牸</th>
+										<th>瑙勬牸鍨嬪彿</th>
+										<th>鍗曚綅</th>
+										<th>鍗曚环</th>
+										<th>闆跺敭鏁伴噺</th>
+										<th>闆跺敭閲戦</th>
 									</tr>
 									</thead>
 									<tbody>
 									<tr>
-										<td>{{ item.productCategory || '' }}</td>
-										<td>{{ item.specificationModel || '' }}{{ item.unit || '' }}</td>
+										<td>{{ item.productCategory || '鐮傜伆鐮�' }}</td>
+										<td>{{ item.specificationModel || '鏍囧噯' }}</td>
+										<td>{{ item.unit || '鍧�' }}</td>
 										<td>{{ item.taxInclusiveUnitPrice || '0' }}</td>
-										<td>{{ item.inboundNum || '0' }}</td>
-										<td>{{ item.boxNum || '0' }}</td>
-										<td>{{ item.cartonSpecifications || '0' }}</td>
+										<td>{{ item.inboundNum || '2000' }}</td>
+										<td>{{ item.taxInclusiveTotalPrice || '0' }}</td>
 									</tr>
 									</tbody>
 									<tfoot>
-									<!-- <tr>
+									<tr>
 										<td class="label">鍚堣</td>
 										<td class="total-value"></td>
 										<td class="total-value"></td>
 										<td class="total-value"></td>
 										<td class="total-value">{{ item.inboundNum || '2000' }}</td>
 										<td class="total-value">{{ item.taxInclusiveTotalPrice || '0' }}</td>
-									</tr> -->
+									</tr>
 									</tfoot>
 								</table>
 							</div>
-							
+
 							<div class="footer-section">
 								<div class="footer-row">
 									<div class="footer-item">
@@ -315,8 +302,8 @@
 				</div>
 			</div>
 		</el-dialog>
-	
-	
+
+
 	</div>
 </template>
 
@@ -328,17 +315,16 @@
 import {
 	getStockOutPage,
 	delStockOut,
+  getStockOutSemiProductPage,
 } from "@/api/inventoryManagement/stockOut.js";
 import {
 	getStockInPageByProduct,
-	getStockInPageByCustom,
 } from "@/api/inventoryManagement/stockIn.js";
-const javaApiUrl = __BASE_API__;
 
 const userStore = useUserStore();
 const { proxy } = getCurrentInstance();
 const tableData = ref([]);
-const activeTab = ref('purchase');
+const activeTab = ref('production');
 const selectedRows = ref([]);
 const tableLoading = ref(false);
 const page = reactive({
@@ -357,7 +343,7 @@
 		supplierName: "",
 		customerName: "",
     	productCategory:'',
-		timeStr: getCurrentDate(),
+		timeStr: '',
 	},
 	form: {
 		supplierId: null,
@@ -392,6 +378,11 @@
 	page.size = obj.limit;
 	getList();
 };
+const paginationSemiProductChange = (obj) => {
+  page.current = obj.page;
+  page.size = obj.limit;
+  getList();
+};
 const getList = () => {
 	tableLoading.value = true;
 	const params = { ...page }
@@ -403,44 +394,52 @@
 		params.timeStr = searchForm.value.timeStr
 	}
     params.productCategory = searchForm.value.productCategory
-	
-	// 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勬帴鍙�
-	const apiCall = activeTab.value === 'production' 
-		? getStockInPageByProduct(params)
-		: activeTab.value === 'manual' 
-		? getStockInPageByCustom(params)
-		: getStockOutPage(params)
-	
-	apiCall
-		.then((res) => {
-			tableLoading.value = false;
-			tableData.value = res.data.records;
-			tableData.value.map((item) => {
-				item.children = [];
-				// 鍓嶇璁$畻鎬讳环
-				const inboundNum = Number(item.inboundNum) || 0;
-				if (activeTab.value === 'production') {
-					// 鎴愬搧鍑哄簱锛氭�讳环 = unitPrice 脳 inboundNum
-					const unitPrice = Number(item.unitPrice) || 0;
-					item.totalPrice = (unitPrice * inboundNum).toFixed(2);
-				} else {
-					// 鍘熸枡鍜屾潗鏂欏嚭搴擄細鎬讳环 = taxInclusiveUnitPrice 脳 inboundNum
-					const taxInclusiveUnitPrice = Number(item.taxInclusiveUnitPrice) || 0;
-					item.taxInclusiveTotalPrice = (taxInclusiveUnitPrice * inboundNum).toFixed(2);
-				}
-			});
-			total.value = res.data.total;
-		})
-		.catch(() => {
-			tableLoading.value = false;
-		});
+
+	// 鏍规嵁涓嶅悓鐨� tab 绫诲瀷璋冪敤涓嶅悓鐨勬帴鍙
+  if (activeTab.value === 'semiProduct') {
+    const apiCall = getStockOutSemiProductPage(params)
+    apiCall
+        .then((res) => {
+          tableLoading.value = false;
+          tableData.value = res.data.records;
+        })
+  }else {
+    const apiCall = activeTab.value === 'production'
+        ? getStockInPageByProduct(params)
+        : getStockOutPage(params)
+
+    apiCall
+        .then((res) => {
+          tableLoading.value = false;
+          tableData.value = res.data.records;
+          tableData.value.map((item) => {
+            item.children = [];
+            // 鍓嶇璁$畻鎬讳环
+            const inboundNum = Number(item.inboundNum) || 0;
+            if (activeTab.value === 'production') {
+              // 鎴愬搧鍑哄簱锛氭�讳环 = unitPrice 脳 inboundNum
+              const unitPrice = Number(item.unitPrice) || 0;
+              item.totalPrice = (unitPrice * inboundNum).toFixed(2);
+            } else {
+              // 鍘熸枡鍑哄簱锛氭�讳环 = taxInclusiveUnitPrice 脳 inboundNum
+              const taxInclusiveUnitPrice = Number(item.taxInclusiveUnitPrice) || 0;
+              item.taxInclusiveTotalPrice = (taxInclusiveUnitPrice * inboundNum).toFixed(2);
+            }
+          });
+          total.value = res.data.total;
+        })
+        .catch(() => {
+          tableLoading.value = false;
+        });
+  }
+
 };
 
 const handleTabChange = () => {
 	page.current = 1
 	searchForm.value.supplierName = ''
 	searchForm.value.customerName = ''
-	searchForm.value.timeStr = getCurrentDate() // 閲嶇疆涓哄綋鍓嶆棩鏈�
+	searchForm.value.timeStr = ''
 	selectedRows.value = []
   	searchForm.value.productCategory = ''
 	getList()
@@ -475,8 +474,6 @@
 			let exportUrl = "/stockmanagement/export"
 			if (activeTab.value === 'production') {
 				exportUrl = "/stockmanagement/exportone"
-			} else if (activeTab.value === 'manual') {
-				exportUrl = "/stockmanagement/exportTwo"
 			}
 			proxy.download(exportUrl, {}, "鍑哄簱鍙拌处.xlsx");
 		})
@@ -525,10 +522,10 @@
 const executePrint = () => {
 	console.log('寮�濮嬫墽琛屾墦鍗帮紝鏁版嵁鏉℃暟:', printData.value.length);
 	console.log('鎵撳嵃鏁版嵁:', printData.value);
-	
+
 	// 鍒涘缓涓�涓柊鐨勬墦鍗扮獥鍙�
 	const printWindow = window.open('', '_blank', 'width=800,height=600');
-	
+
 	// 鏋勫缓鎵撳嵃鍐呭
 	let printContent = `
     <!DOCTYPE html>
@@ -664,14 +661,14 @@
     </head>
     <body>
   `;
-	
+
 	// 涓烘瘡鏉℃暟鎹敓鎴愭墦鍗伴〉闈�
 	printData.value.forEach((item, index) => {
 		printContent += `
       <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>
           
@@ -683,41 +680,49 @@
               </div>
               <div>
                 <span class="label">瀹㈡埛鍚嶇О锛�</span>
-                <span class="value">${item.supplierName}</span>
+                <span class="value">${item.supplierName || '寮犵埍鏈�'}</span>
               </div>
             </div>
             <div class="info-row">
               <span class="label">鍗曞彿锛�</span>
-              <span class="value">${item.code}</span>
+              <span class="value">${item.code || ''}</span>
             </div>
           </div>
 
           <div class="table-section">
-			<table class="product-table">
-				<thead>
-				<tr>
-					<th>浜у搧鍚嶇О</th>
-					<th>浜у搧楂樺害</th>
-					<th>鍗曚环锛堢編鍏冿級/浠�</th>
-					<th>闆跺敭鏁伴噺/浠�</th>
-					<th>姣忎欢鏁伴噺/鏀�</th>
-					<th>绾哥瑙勬牸</th>
-				</tr>
-				</thead>
-				<tbody>
-				<tr>
-					<td>{{ item.productCategory || '' }}</td>
-					<td>{{ item.specificationModel || '' }}{{ item.unit || '' }}</td>
-					<td>{{ item.taxInclusiveUnitPrice || '0' }}</td>
-					<td>{{ item.inboundNum || '0' }}</td>
-					<td>{{ item.boxNum || '0' }}</td>
-					<td>{{ item.cartonSpecifications || '0' }}</td>
-				</tr>
-				</tbody>
-				<tfoot>
-				</tfoot>
-			</table>
-		</div>
+            <table class="product-table">
+              <thead>
+                <tr>
+                  <th>浜у搧鍚嶇О</th>
+                  <th>瑙勬牸鍨嬪彿</th>
+                  <th>鍗曚綅</th>
+                  <th>鍗曚环</th>
+                  <th>闆跺敭鏁伴噺</th>
+                  <th>闆跺敭閲戦</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr>
+                  <td>${item.productCategory || '鐮傜伆鐮�'}</td>
+                  <td>${item.specificationModel || '鏍囧噯'}</td>
+                  <td>${item.unit || '鍧�'}</td>
+                  <td>${item.taxInclusiveUnitPrice || '0'}</td>
+                  <td>${item.inboundNum || '2000'}</td>
+                  <td>${item.taxInclusiveTotalPrice || '0'}</td>
+                </tr>
+              </tbody>
+              <tfoot>
+                <tr>
+                  <td class="label">鍚堣</td>
+                  <td class="total-value"></td>
+                  <td class="total-value"></td>
+                  <td class="total-value"></td>
+                  <td class="total-value">${item.inboundNum || '2000'}</td>
+                  <td class="total-value">${item.taxInclusiveTotalPrice || '0'}</td>
+                </tr>
+              </tfoot>
+            </table>
+          </div>
 
           <div class="footer-section">
             <div class="footer-row">
@@ -749,16 +754,16 @@
       </div>
     `;
 	});
-	
+
 	printContent += `
     </body>
     </html>
   `;
-	
+
 	// 鍐欏叆鍐呭鍒版柊绐楀彛
 	printWindow.document.write(printContent);
 	printWindow.document.close();
-	
+
 	// 绛夊緟鍐呭鍔犺浇瀹屾垚鍚庢墦鍗�
 	printWindow.onload = () => {
 		setTimeout(() => {
@@ -818,12 +823,12 @@
 		padding: 15px;
 		border-bottom: 1px solid #e4e7ed;
 		text-align: center;
-		
+
 		.el-button {
 			margin: 0 10px;
 		}
 	}
-	
+
 	.print-preview-content {
 		padding: 20px;
 		background-color: #f5f5f5;
@@ -855,13 +860,13 @@
 .header {
 	text-align: center;
 	margin-bottom: 8px;
-	
+
 	.company-name {
 		font-size: 18px;
 		font-weight: bold;
 		margin-bottom: 4px;
 	}
-	
+
 	.document-title {
 		font-size: 16px;
 		font-weight: bold;
@@ -873,16 +878,16 @@
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
-	
+
 	.info-row {
 		line-height: 20px;
-		
+
 		.label {
 			font-weight: bold;
 			width: 60px;
 			font-size: 14px;
 		}
-		
+
 		.value {
 			margin-right: 20px;
 			min-width: 80px;
@@ -894,12 +899,12 @@
 .table-section {
 	margin-bottom: 4px;
 	flex: 1;
-	
+
 	.product-table {
 		width: 100%;
 		border-collapse: collapse;
 		border: 1px solid #000;
-		
+
 		th, td {
 			border: 1px solid #000;
 			padding: 6px;
@@ -907,16 +912,16 @@
 			font-size: 14px;
 			line-height: 1.4;
 		}
-		
+
 		th {
 			font-weight: bold;
 		}
-		
+
 		.total-label {
 			text-align: right;
 			font-weight: bold;
 		}
-		
+
 		.total-value {
 			font-weight: bold;
 		}
@@ -929,22 +934,22 @@
 		margin-bottom: 3px;
 		line-height: 20px;
 		justify-content: space-between;
-		
+
 		.footer-item {
 			display: flex;
 			margin-right: 20px;
-			
+
 			.label {
 				font-weight: bold;
 				width: 80px;
 				font-size: 14px;
 			}
-			
+
 			.value {
 				min-width: 80px;
 				font-size: 14px;
 			}
-			
+
 			&.address-item {
 				.address-value {
 					min-width: 200px;
@@ -958,7 +963,7 @@
 	.app-container {
 		display: none;
 	}
-	
+
 	.print-page {
 		box-shadow: none;
 		margin: 0;
@@ -970,12 +975,6 @@
 	.print-page:last-child {
 		page-break-after: avoid;
 	}
-}
-.barcode-img{
-  width: 80px;
-  height: 80px;
-  border-radius: 5px;
-  background-color: #F5F5F5;
 }
 </style>
 

--
Gitblit v1.9.3