From 20364b7cf413ea69a31602f52280d8030f1face7 Mon Sep 17 00:00:00 2001
From: 周宾 <2802492122@qq.com>
Date: 星期三, 10 十二月 2025 09:30:24 +0800
Subject: [PATCH] 海川开心-修改仓储物流

---
 src/views/inventoryManagement/stockManagement/index.vue |  133 +++++++++++++++++++++++--------------------
 1 files changed, 71 insertions(+), 62 deletions(-)

diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 2fcacb3..c72b8c4 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/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">瀹㈡埛鍚嶇О锛�</span>-->
@@ -55,54 +55,54 @@
         </div>
       </el-tab-pane>
 
-<!--      <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"-->
-<!--            />-->
-<!--            <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>-->
-<!--          </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%"-->
-<!--            :row-class-name="tableRowClassName"-->
-<!--            :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="warnNum" width="130" 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>-->
-<!--              </template>-->
-<!--            </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="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"
+           />
+           <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>
+         </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%"
+           :row-class-name="tableRowClassName"
+           :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="warnNum" width="130" 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>
+             </template>
+           </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>-->
@@ -161,16 +161,25 @@
       @close="closeDia">
       <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
         <el-row :gutter="30">
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="渚涘簲鍟嗗悕绉帮細" prop="supplierName">
               <el-input disabled v-model="form.supplierName" placeholder="璇疯緭鍏�" clearable />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="浜у搧澶х被锛�" prop="productId">
               <el-select disabled v-model="form.productCategory" placeholder="璇烽�夋嫨" clearable filterable>
                 <el-option v-for="item in productList" :key="item.id" :label="item.productName"
                            :value="item.productName" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+           <el-col :span="12">
+            <el-form-item label="鍑哄簱浜猴細" prop="entryPerson">
+              <el-select v-model="form.createUser"                 filterable
+                         default-first-option
+                         :reserve-keyword="false" placeholder="璇烽�夋嫨" clearable>
+                <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" :value="item.userId" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -230,7 +239,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="30">
+        <!-- <el-row :gutter="30">
           <el-col :span="12">
             <el-form-item label="鍑哄簱浜猴細" prop="entryPerson">
               <el-select v-model="form.createUser"                 filterable
@@ -240,12 +249,12 @@
               </el-select>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="12">-->
-<!--          <el-form-item label="搴撳瓨棰勮鏁伴噺锛�" prop="warnNum">-->
-<!--            <el-input v-model="form.warnNum" placeholder="璇疯緭鍏ユ渶浣庡簱瀛�" clearable />-->
-<!--          </el-form-item>-->
-<!--        </el-col>-->
-        </el-row>
+         <el-col :span="12">
+            <el-form-item label="搴撳瓨棰勮鏁伴噺锛�" prop="warnNum">
+              <el-input v-model="form.warnNum" placeholder="璇疯緭鍏ユ渶浣庡簱瀛�" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row> -->
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -299,13 +308,13 @@
 const activeTab = ref('production')
 const data = reactive({
   searchForm: {
-    supplierName: '',
+    // supplierName: '',
     customerName: '',
     timeStr: getCurrentDate(),
   },
   form: {
     supplierId: null,
-    supplierName: '',
+    // supplierName: '',
     productId: null,
     productName: '',
     userId: userStore.userId,
@@ -326,7 +335,7 @@
     salesLedgerProductId: null,
   },
   rules: {
-    supplierName: [{ required: true, message: '璇疯緭鍏ヤ緵搴斿晢鍚嶇О', trigger: 'blur' }],
+    // supplierName: [{ required: true, message: '璇疯緭鍏ヤ緵搴斿晢鍚嶇О', trigger: 'blur' }],
     productCategory: [{ required: true, message: '璇烽�夋嫨浜у搧澶х被', trigger: 'change' }],
     specificationModel: [{ required: true, message: '璇疯緭鍏ヨ鏍煎瀷鍙�', trigger: 'blur' }],
     unit: [{ required: true, message: '璇疯緭鍏ュ崟浣�', trigger: 'blur' }],
@@ -362,7 +371,7 @@
   if (activeTab.value === 'production') {
     params.customerName = searchForm.value.customerName
   } else {
-    params.supplierName = searchForm.value.supplierName
+    // params.supplierName = searchForm.value.supplierName
   }
   return params
 }
@@ -392,7 +401,7 @@
 // 鍒囨崲 tab
 const handleTabChange = () => {
   page.current = 1
-  searchForm.value.supplierName = ''
+  // searchForm.value.supplierName = ''
   searchForm.value.customerName = ''
   searchForm.value.timeStr = ''
   selectedRows.value = []

--
Gitblit v1.9.3