From fc39f41acfcb9afb8d12f3ed3799b97352bb4178 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 09 十二月 2025 16:57:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_food' into dev_food
---
src/views/inventoryManagement/stockManagement/index.vue | 112 ++++++++++++++++++++++++-------------------------------
1 files changed, 49 insertions(+), 63 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 85602dc..2fcacb3 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -43,7 +43,7 @@
<!-- <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="鍏ュ簱浜�" 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>
@@ -55,62 +55,54 @@
</div>
</el-tab-pane>
- <el-tab-pane label="閲囪喘鍏ュ簱" name="purchase">
- <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" 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="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>
- </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>-->
@@ -153,7 +145,7 @@
<!-- <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="鍏ュ簱浜�" prop="createBy" width="80" show-overflow-tooltip /> -->
<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>
@@ -526,12 +518,6 @@
const handleDelete = () => {
let ids = []
if (selectedRows.value.length > 0) {
- // 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
- const unauthorizedData = selectedRows.value.filter(item => item.createBy !== userStore.nickName);
- if (unauthorizedData.length > 0) {
- proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
- return;
- }
ids = selectedRows.value.map(item => item.id);
} else {
proxy.$modal.msgWarning('璇烽�夋嫨鏁版嵁')
--
Gitblit v1.9.3