From b80934d8bb58f356abcb00a145d0305be519de8c Mon Sep 17 00:00:00 2001
From: 周宾 <2802492122@qq.com>
Date: 星期三, 24 十二月 2025 08:47:45 +0800
Subject: [PATCH] 天津双奇点-修改仓储物流相关

---
 src/views/inventoryManagement/stockManagement/index.vue |   87 ++++++++++++++++++++-----------------------
 1 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 16a865d..8732076 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -1,12 +1,9 @@
 <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">瀹㈡埛鍚嶇О锛�</span>-->
-<!--            <el-input v-model="searchForm.customerName" style="width: 240px" placeholder="璇疯緭鍏�" @change="handleQuery"-->
-<!--              clearable prefix-icon="Search" />-->
             <span class="search_title ml10">鍏ュ簱鏃ユ湡锛�</span>
             <el-date-picker
               v-model="searchForm.timeStr"
@@ -28,7 +25,6 @@
           </div>
           <div>
             <el-button @click="handleOut">瀵煎嚭</el-button>
-<!--            <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>-->
           </div>
         </div>
         <div class="table_list">
@@ -39,7 +35,6 @@
             <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="customerName" width="240" 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 />
@@ -48,11 +43,6 @@
             <el-table-column label="鍓╀綑搴撳瓨" prop="inboundNum0" width="100" show-overflow-tooltip />
 							<el-table-column label="鍗曚环(鍏�)" prop="unitPrice" width="150"></el-table-column>
 							<el-table-column label="鎬讳环(鍏�)" prop="totalPrice" width="150"></el-table-column>
-<!--            <el-table-column label="鍚◣鍗曚环" prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip />-->
-<!--            <el-table-column label="鍚◣鎬讳环" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip />-->
-<!--            <el-table-column label="绋庣巼(%)" prop="taxRate" width="100" show-overflow-tooltip />-->
-<!--            <el-table-column label="涓嶅惈绋庢�讳环" prop="taxExclusiveTotalPrice" width="100" show-overflow-tooltip />-->
-            <!-- <el-table-column label="鍏ュ簱浜�" prop="createBy" width="80" 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('edit', scope.row);">缂栬緫</el-button>
@@ -62,9 +52,9 @@
           <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> -->
 
-     <el-tab-pane label="鍘熸枡搴撳瓨" name="purchase">
+     <el-tab-pane label="閲囪喘搴撳瓨" name="purchase">
        <div class="search_form">
          <div>
            <span class="search_title ml10">鍏ュ簱鏃ユ湡锛�</span>
@@ -88,7 +78,6 @@
          </div>
          <div>
            <el-button @click="handleOut">瀵煎嚭</el-button>
-<!--           <el-button type="danger" plain @click="handleDelete">鍒犻櫎</el-button>-->
          </div>
        </div>
        <div class="table_list">
@@ -98,22 +87,25 @@
            :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="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>
-						 <el-table-column label="鍚◣鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" width="150"></el-table-column>
+           <el-table-column label="鍏ュ簱鏃堕棿" prop="inboundDate" width="100" 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="boxNum" width="100" 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="cartonSpecifications" width="150"></el-table-column>
          </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="manual">
+      <el-tab-pane label="鎴愬搧搴撳瓨" name="manual">
         <div class="search_form">
           <div>
 <!--            <span class="search_title">渚涘簲鍟嗗悕绉帮細</span>-->
@@ -150,22 +142,23 @@
             :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="supplierName" width="240" 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>-->
-<!--							<el-table-column label="鎬讳环(鍏�)" prop="taxInclusiveTotalPrice" width="150"></el-table-column>-->
-<!--            <el-table-column label="鍚◣鍗曚环" prop="taxInclusiveUnitPrice" width="100" show-overflow-tooltip />-->
-<!--            <el-table-column label="鍚◣鎬讳环" prop="taxInclusiveTotalPrice" width="100" show-overflow-tooltip />-->
-<!--            <el-table-column label="绋庣巼(%)" prop="taxRate" width="100" show-overflow-tooltip />-->
-<!--            <el-table-column label="涓嶅惈绋庢�讳环" prop="taxExclusiveTotalPrice" width="100" show-overflow-tooltip />-->
-            <!-- <el-table-column label="鍏ュ簱浜�" prop="createBy" width="80" show-overflow-tooltip /> -->
+            <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="inboundDate" width="100" 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="boxNum" width="100" 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="cartonSpecifications" width="150"></el-table-column>
             <el-table-column fixed="right" label="鎿嶄綔" width="100" align="center">
               <template #default="scope">
                 <el-button link type="primary" size="small" @click="openForm('edit', scope.row);">缂栬緫</el-button>
@@ -274,11 +267,6 @@
 import FormDiaPurchase from './components/FormDiaPurchase.vue'
 import FormDiaManual from './components/FormDiaManual.vue'
 
-//鎵爜鐩稿叧鍙傛暟
-const barcodeDia = ref(false);
-const scanBarcodeInput = ref('');
-const barcodeDetail = ref({})
-
 const userStore = useUserStore()
 const { proxy } = getCurrentInstance()
 const tableData = ref([])
@@ -298,7 +286,7 @@
 const loading = ref(false);
 // 鐢ㄦ埛淇℃伅琛ㄥ崟寮规鏁版嵁
 const operationType = ref('')
-const activeTab = ref('production')
+const activeTab = ref('purchase')
 
 // 涓変釜鐙珛鐨勫脊妗嗘樉绀虹姸鎬�
 const productionDialogVisible = ref(false)
@@ -628,6 +616,11 @@
   const day = String(today.getDate()).padStart(2, '0');
   return `${year}-${month}-${day}`;
 }
+
+//鎵爜鐩稿叧鍙傛暟
+const barcodeDia = ref(false);
+const scanBarcodeInput = ref('');
+const barcodeDetail = ref({})
 // 鎵爜鍑芥暟
 const scanBarcode = (e) => {
   if(!e||!e.target||!e.target.tagName){
@@ -656,7 +649,7 @@
 }
 onMounted(() => {
   // 娣诲姞鎵爜鏋洃鍚簨浠�
-  document.addEventListener('keypress', scanBarcode)
+  // document.addEventListener('keypress', scanBarcode)
   getList()
   // checkStockAndCreatePurchase();
     // 姣忓皬鏃舵鏌ヤ竴娆″簱瀛�

--
Gitblit v1.9.3