From dbb84fba23bd29ca1fafdc86f8e52265b586b669 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 11 十一月 2025 13:23:22 +0800
Subject: [PATCH] 逻辑回退

---
 src/views/inventoryManagement/stockManagement/index.vue |  123 ++++++++++++++++++++++-------------------
 1 files changed, 66 insertions(+), 57 deletions(-)

diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 0954a8d..33a3a6f 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -1,56 +1,57 @@
 <template>
   <div class="app-container">
-    <div class="search_form">
-      <div>
-        <span class="search_title">渚涘簲鍟嗗悕绉帮細</span>
-        <el-input v-model="searchForm.supplierName" style="width: 240px" placeholder="璇疯緭鍏�" @change="handleQuery"
-          clearable prefix-icon="Search" />
-				<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 type="primary" @click="openForm('add')">鏂板</el-button> -->
-        <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="supplierName" width="240" show-overflow-tooltip />
-        <el-table-column label="浜у搧澶х被" prop="productCategory" width="100" show-overflow-tooltip />
-        <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="200" show-overflow-tooltip />
-        <el-table-column label="鍗曚綅" prop="unit" width="80" show-overflow-tooltip />
-        <el-table-column label="搴撳瓨鏁伴噺" prop="inboundNum0" width="100" show-overflow-tooltip />
-        <el-table-column label="搴撳瓨棰勮鏁伴噺" prop="warnNum" width="130" show-overflow-tooltip />
-        <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);" :disabled="scope.row.createUser !== userStore.id">缂栬緫</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>
+        <div class="search_form">
+          <div>
+            <span class="search_title">渚涘簲鍟嗗悕绉帮細</span>
+            <el-input v-model="searchForm.supplierName" style="width: 240px" placeholder="璇疯緭鍏�" @change="handleQuery"
+              clearable prefix-icon="Search" />
+            <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="supplierName" width="240" show-overflow-tooltip />
+            <el-table-column label="浜у搧澶х被" prop="productCategory" width="100" show-overflow-tooltip />
+            <el-table-column label="瑙勬牸鍨嬪彿" prop="specificationModel" width="200" 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="warnNum" width="130" show-overflow-tooltip />
+            <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);" :disabled="scope.row.createUser !== userStore.id">缂栬緫</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-dialog v-model="dialogFormVisible" :title="operationType === 'add' ? '鏂板搴撳瓨' : '缂栬緫搴撳瓨'" width="70%"
       @close="closeDia">
       <el-form :model="form" label-width="140px" label-position="top" :rules="rules" ref="formRef">
@@ -189,7 +190,7 @@
 const data = reactive({
   searchForm: {
     supplierName: '',
-		timeStr: '',
+    timeStr: '',
   },
   form: {
     supplierId: null,
@@ -242,14 +243,21 @@
   page.size = obj.limit;
   getList()
 }
+const buildQueryParams = () => {
+  return {
+    ...page,
+    supplierName: searchForm.value.supplierName,
+    timeStr: searchForm.value.timeStr,
+  }
+}
+
 const getList = () => {
   tableLoading.value = true
-  getStockManagePage({ ...searchForm.value, ...page }).then(res => {
+  const params = buildQueryParams()
+  getStockManagePage(params).then(res => {
     tableLoading.value = false
     tableData.value = res.data.records
     total.value = res.data.total
-    // 鏁版嵁鍔犺浇瀹屾垚鍚庢鏌ュ簱瀛�
-    // checkStockAndCreatePurchase();
   }).catch(() => {
     tableLoading.value = false
   })
@@ -357,7 +365,8 @@
     type: 'warning',
   }
   ).then(() => {
-    proxy.download("/stockin/exportCopy", {}, '搴撳瓨淇℃伅.xlsx')
+    const exportParams = buildQueryParams()
+    proxy.download("/stockin/exportCopy", exportParams, '搴撳瓨淇℃伅.xlsx')
   }).catch(() => {
     proxy.$modal.msg("宸插彇娑�")
   })
@@ -367,7 +376,7 @@
   let ids = []
   if (selectedRows.value.length > 0) {
 		// 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
-		const unauthorizedData = selectedRows.value.filter(item => item.createUser !== userStore.id);
+		const unauthorizedData = selectedRows.value.filter(item => item.createBy !== userStore.nickName);
 		if (unauthorizedData.length > 0) {
 			proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
 			return;

--
Gitblit v1.9.3