From a00484ae729aed9a664050362fa2b8c6a4ce4fd6 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 12 六月 2025 10:29:11 +0800
Subject: [PATCH] 1.库存管理页面联调
---
src/views/warehouseManagement/index.vue | 469 ++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 306 insertions(+), 163 deletions(-)
diff --git a/src/views/warehouseManagement/index.vue b/src/views/warehouseManagement/index.vue
index dd3d5f2..8905e20 100644
--- a/src/views/warehouseManagement/index.vue
+++ b/src/views/warehouseManagement/index.vue
@@ -1,14 +1,6 @@
<template>
<div class="app-container">
<el-form :inline="true" :model="queryParams" class="search-form">
- <el-form-item label="鎼滅储">
- <el-input
- v-model="queryParams.searchText"
- placeholder="璇疯緭鍏ュ叧閿瘝"
- clearable
- :style="{ width: '100%' }"
- />
- </el-form-item>
<el-form-item label="渚涘簲鍟嗗悕绉�">
<el-input
v-model="queryParams.supplierName"
@@ -17,17 +9,9 @@
:style="{ width: '100%' }"
/>
</el-form-item>
- <el-form-item label="缁熶竴浜鸿瘑鍒彿">
+ <el-form-item label="鐓ょ">
<el-input
- v-model="queryParams.identifyNumber"
- placeholder="璇疯緭鍏�"
- clearable
- :style="{ width: '100%' }"
- />
- </el-form-item>
- <el-form-item label="缁忚惀鍦板潃">
- <el-input
- v-model="queryParams.address"
+ v-model="queryParams.coal"
placeholder="璇疯緭鍏�"
clearable
:style="{ width: '100%' }"
@@ -54,29 +38,32 @@
</el-tabs>
<!-- 鎿嶄綔鎸夐挳鍖� -->
<el-space>
- <el-button type="danger" :icon="Delete">鍒犻櫎</el-button>
+<!-- <el-button type="danger" :icon="Delete">鍒犻櫎</el-button>-->
<el-button type="info" plain :icon="Download">瀵煎嚭</el-button>
- <el-button type="success" plain :icon="Refresh" v-if="activeTab=== 'officialInventory'" @click="mergeRows">鍚堝苟</el-button>
+ <el-button type="success" plain :icon="Refresh" v-if="activeTab=== 'officialInventory'" @click="mergeRows('merge')">鍚堝苟</el-button>
</el-space>
<div>
- <el-table :data="tableData" border @selection-change="selectionChange" style="width: 100%">
+ <el-table :data="tableData" border @selection-change="selectionChange" style="width: 100%" show-summary :summary-method="summarizeChildrenTable">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="搴忓彿" type="index" width="60" align="center" />
- <el-table-column prop="name" label="渚涜揣鍟嗗悕绉�" width="180" sortable/>
- <el-table-column prop="type" label="鐓ょ" sortable/>
+ <el-table-column prop="supplierName" label="渚涜揣鍟嗗悕绉�" width="180" sortable/>
+ <el-table-column prop="coal" label="鐓ょ" sortable/>
<el-table-column prop="unit" label="鍗曚綅" width="70"/>
- <el-table-column prop="number" label="搴撳瓨鏁伴噺" sortable min-width="110"/>
- <el-table-column prop="money" label="鍗曚环锛堝惈绋庯級" sortable width="130"/>
- <el-table-column prop="money1" label="鎬讳环锛堝惈绋庯級" width="130" />
- <el-table-column prop="money2" label="鎴愭湰鍗曚环" />
+ <el-table-column prop="inventoryQuantity" label="搴撳瓨鏁伴噺" sortable min-width="110"/>
+ <el-table-column prop="priceIncludingTax" label="鍗曚环(鍚◣)" sortable width="130"/>
+ <el-table-column prop="totalPriceIncludingTax" label="鎬讳环(鍚◣)" width="130" />
+ <el-table-column prop="priceExcludingTax" label="鍗曚环(涓嶅惈绋�)" width="130" />
+ <el-table-column prop="totalPriceExcludingTax" label="鎬讳环(涓嶅惈绋�)" width="130" />
+ <el-table-column prop="pendingReplenishment" label="寰呰ˉ搴�" width="130" />
<el-table-column label="鐓よ川" align="center" v-if="activeTab=== 'officialInventory'" width="600">
<el-table-column v-for="col in columnTitle" :key="col.prop" :prop="col.prop" :label="col.label" align="center" sortable min-width="200"/>
</el-table-column>
- <el-table-column prop="createUser" label="鐧昏浜�" width="180"/>
- <el-table-column prop="createTime" label="鐧昏鏃ユ湡" width="180"/>
- <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center" v-if="activeTab !== 'officialInventory'">
+ <el-table-column prop="registrantId" label="鐧昏浜�" width="180"/>
+ <el-table-column prop="registrationDate" label="鐧昏鏃ユ湡" width="180"/>
+ <el-table-column fixed="right" label="鎿嶄綔" min-width="60" align="center">
<template #default="scope">
- <el-button link type="primary" size="small" @click="reviewDia(scope.row)">瀹℃牳</el-button>
+ <el-button link type="primary" size="small" @click="reviewDia(scope.row)" v-if="activeTab !== 'officialInventory'">瀹℃牳</el-button>
+ <el-button link type="primary" size="small" @click="mergeRows('edit', scope.row)" v-else>缂栬緫</el-button>
</template>
</el-table-column>
</el-table>
@@ -92,77 +79,74 @@
</el-card>
<!-- 瀹℃牳寰呭叆搴撳脊妗� -->
<el-dialog title="瀹℃牳鍏ュ簱" v-model="reviewVisible" width="1000px">
- <el-form :model="form" :rules="rules" ref="userRef" label-width="180px">
+ <el-form :model="form" :rules="rules" ref="formRef" label-width="180px">
<el-row>
<el-col :span="12">
- <el-form-item label="渚涜揣鍟嗗悕绉�" prop="userName">
- <el-input v-model="form.name" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="30" />
+ <el-form-item label="渚涜揣鍟嗗悕绉�" prop="supplierName">
+ <el-input v-model="form.supplierName" placeholder="璇疯緭鍏ヤ緵璐у晢鍚嶇О" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐓ょ" prop="nickName">
- <el-input v-model="form.type" placeholder="璇疯緭鍏ュ鍚�" maxlength="30" />
+ <el-form-item label="鐓ょ" prop="coal">
+ <el-input v-model="form.coal" placeholder="璇疯緭鍏ョ叅绉�" maxlength="30" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鍗曚綅" prop="userName">
- <el-input v-model="form.unit" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="30" />
+ <el-form-item label="鍗曚綅" prop="unit">
+ <el-input v-model="form.unit" placeholder="璇疯緭鍏ュ崟浣�" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="搴撳瓨鏁伴噺" prop="nickName">
- <el-input v-model="form.num" placeholder="璇疯緭鍏ュ鍚�" maxlength="30" />
+ <el-form-item label="搴撳瓨鏁伴噺" prop="inventoryQuantity">
+ <el-input v-model="form.inventoryQuantity" placeholder="璇疯緭鍏ュ簱瀛樻暟閲�" :max="inventoryQuantity" type="number"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鍗曚环(鍚◣)" prop="userName">
- <el-input v-model="form.priceOne" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="30" />
+ <el-form-item label="鍗曚环(鍚◣)" prop="priceIncludingTax">
+ <el-input v-model="form.priceIncludingTax" placeholder="璇疯緭鍏ュ崟浠�(鍚◣)" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎬讳环(鍚◣)" prop="nickName">
- <el-input v-model="form.priceAll" placeholder="璇疯緭鍏ュ鍚�" maxlength="30" />
+ <el-form-item label="鎬讳环(鍚◣)" prop="totalPriceIncludingTax">
+ <el-input v-model="form.totalPriceIncludingTax" placeholder="璇疯緭鍏ユ�讳环(鍚◣)" maxlength="30" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鎴愭湰鍗曚环" prop="userName">
- <el-input v-model="form.price" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="30" />
+ <el-form-item label="鍗曚环(涓嶅惈绋�)" prop="priceExcludingTax">
+ <el-input v-model="form.priceExcludingTax" placeholder="璇疯緭鍏ユ垚鏈崟浠�" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐓よ川" prop="userName">
- <el-input v-model="form.type2" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="30" />
+ <el-form-item label="鎬讳环(涓嶅惈绋�)" prop="totalPriceExcludingTax">
+ <el-input v-model="form.totalPriceExcludingTax" placeholder="璇疯緭鍏ユ垚鏈崟浠�" maxlength="30" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鐓よ川鏂规" prop="qualityPlan">
+ <el-select v-model="form.qualityPlan" placeholder="璇烽�夋嫨" @change="coalPlanByIdList" clearable>
+ <el-option
+ v-for="dict in qualityPlanOption"
+ :key="dict.id"
+ :label="dict.plan"
+ :value="dict.id"
+ ></el-option>
+ </el-select>
</el-form-item>
</el-col>
</el-row>
<el-divider></el-divider>
<el-row>
- <el-col :span="12">
- <el-form-item label="鍏ㄦ按鍚噺鐧惧垎姣� (%)" prop="userName">
- <el-input v-model="form.value1" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="30" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鍥哄畾纰崇櫨鍒嗘瘮 (%)" prop="nickName">
- <el-input v-model="form.value2" placeholder="璇疯緭鍏ュ鍚�" maxlength="30" />
- </el-form-item>
- </el-col>
- </el-row>
- <el-row>
- <el-col :span="12">
- <el-form-item label="浣庝綅鍙戠儹閲忥紙鍗曚綅锛氬崈鍗�/鍗冨厠锛�" prop="userName">
- <el-input v-model="form.value3" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="30" />
- </el-form-item>
- </el-col>
- <el-col :span="12">
- <el-form-item label="鐏板垎鐧惧垎姣� (%)" prop="nickName">
- <el-input v-model="form.value4" placeholder="璇疯緭鍏ュ鍚�" maxlength="30" />
+ <el-col :span="12" v-for="item in filteredList" :key="item.id">
+ <el-form-item :label="item.fieldName">
+ <el-input v-model="form[item.fields]" />
</el-form-item>
</el-col>
</el-row>
@@ -176,35 +160,60 @@
</el-dialog>
<!-- 鍚堝苟鏁版嵁寮规 -->
<el-dialog title="鍚堝苟搴撳瓨" v-model="mergeVisible" width="800px">
- <el-form :model="form" :rules="rules" ref="userRef" label-width="100px">
+ <el-form :model="mergeForm" :rules="mergeRules" ref="mergeRef" label-width="100px">
<el-row>
<el-col :span="12">
- <el-form-item label="渚涜揣鍟嗗悕绉�" prop="userName">
- <el-input v-model="form.userName" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="30" />
+ <el-form-item label="渚涜揣鍟嗗悕绉�" prop="supplierName">
+ <el-input v-model="mergeForm.supplierName" placeholder="璇疯緭鍏ヤ緵璐у晢鍚嶇О" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鐓ょ" prop="nickName">
- <el-input v-model="form.nickName" placeholder="璇疯緭鍏ュ鍚�" maxlength="30" />
+ <el-form-item label="鐓ょ" prop="coal">
+ <el-input v-model="mergeForm.coal" placeholder="璇疯緭鍏ョ叅绉�" maxlength="30" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鍗曚环(鍚◣)" prop="userName">
- <el-input v-model="form.userName" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="30" />
+ <el-form-item label="鍗曚綅" prop="unit">
+ <el-input v-model="mergeForm.unit" placeholder="璇疯緭鍏ュ崟浣�" maxlength="30" />
</el-form-item>
</el-col>
<el-col :span="12">
- <el-form-item label="鎴愭湰鍗曚环" prop="nickName">
- <el-input v-model="form.nickName" placeholder="璇疯緭鍏ュ鍚�" maxlength="30" />
+ <el-form-item label="搴撳瓨鏁伴噺" prop="inventoryQuantity">
+ <el-input v-model="mergeForm.inventoryQuantity" placeholder="璇疯緭鍏ュ簱瀛樻暟閲�" :max="inventoryQuantity" type="number"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
- <el-form-item label="鐓よ川" prop="userName">
- <el-input v-model="form.userName" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" maxlength="30" />
+ <el-form-item label="鍗曚环(鍚◣)" prop="priceIncludingTax">
+ <el-input v-model="mergeForm.priceIncludingTax" placeholder="璇疯緭鍏ュ崟浠�(鍚◣)" maxlength="30" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎬讳环(鍚◣)" prop="totalPriceIncludingTax">
+ <el-input v-model="mergeForm.totalPriceIncludingTax" placeholder="璇疯緭鍏ユ�讳环(鍚◣)" maxlength="30" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="鍗曚环(涓嶅惈绋�)" prop="priceExcludingTax">
+ <el-input v-model="mergeForm.priceExcludingTax" placeholder="璇疯緭鍏ュ崟浠�(涓嶅惈绋�)" maxlength="30" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="鎬讳环(涓嶅惈绋�)" prop="totalPriceExcludingTax">
+ <el-input v-model="mergeForm.totalPriceExcludingTax" placeholder="璇疯緭鍏ユ�讳环(涓嶅惈绋�)" maxlength="30" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-divider></el-divider>
+ <el-row>
+ <el-col :span="12" v-for="item in filteredList" :key="item.id">
+ <el-form-item :label="item.fieldName">
+ <el-input v-model="mergeForm[item.fields]" />
</el-form-item>
</el-col>
</el-row>
@@ -221,33 +230,75 @@
<script setup>
import {onMounted, ref} from "vue";
-import {Delete, Download, Plus, Refresh} from "@element-plus/icons-vue";
+import {Delete, Download, Refresh} from "@element-plus/icons-vue";
import Pagination from "@/components/Pagination/index.vue";
+import {
+ addOrEditCoalValue,
+ coalFieldList, coalPlanById,
+ coalPlanList, officialInventoryList,
+ pendingInventoryList
+} from "@/api/warehouseManagement/index.js";
+import {editOfficial, merge} from "../../api/warehouseManagement/index.js";
+
const { proxy } = getCurrentInstance()
const tableData = ref([])
const selectedRows = ref([])
-const columns = ref([])
+const qualityPlanOption = ref([])
+const filteredList = ref([])
const tableLoading = ref(false);
const total = ref(0);
const pageNum = ref(1);
const pageSize = ref(10);
+const inventoryQuantity = ref(0);
+const count = ref(0);
+const mean = ref(0);
+const totalPrice = ref(0);
// 瀹℃牳寮规
const reviewVisible = ref(false);
// 鍚堝苟寮规
const mergeVisible = ref(false)
+const operationType = ref('')
const data = reactive({
- form: {},
+ form: {
+ supplierName: '',
+ coal: '',
+ unit: '',
+ inventoryQuantity: '',
+ priceIncludingTax: '',
+ totalPriceIncludingTax: '',
+ priceExcludingTax: '',
+ totalPriceExcludingTax: '',
+ qualityPlan: '',
+ pId: '',
+ },
+ mergeForm: {
+ supplierName: '',
+ coal: '',
+ unit: '',
+ inventoryQuantity: '',
+ priceIncludingTax: '',
+ totalPriceIncludingTax: '',
+ priceExcludingTax: '',
+ totalPriceExcludingTax: '',
+ qualityPlan: '',
+ pId: '',
+ },
rules: {
- // userName: [{ required: true, message: "鐧诲綍璐﹀彿涓嶈兘涓虹┖", trigger: "blur" }],
- // nickName: [{ required: true, message: "鐢ㄦ埛濮撳悕涓嶈兘涓虹┖", trigger: "blur" }],
- // roleIds: [{ required: true, message: "瑙掕壊涓嶈兘涓虹┖", trigger: "change" }],
- // deptId: [{ required: true, message: "閮ㄩ棬涓嶈兘涓虹┖", trigger: "change" }],
- // password: [{ required: true, message: "鐢ㄦ埛瀵嗙爜涓嶈兘涓虹┖", trigger: "blur" }],
+ supplierName: [{ required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" }],
+ coal: [{ required: true, message: "璇疯緭鍏ョ叅绉�", trigger: "blur" }],
+ unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }],
+ qualityPlan: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
+ },
+ mergeRules: {
+ supplierName: [{ required: true, message: "璇疯緭鍏ヤ緵搴斿晢鍚嶇О", trigger: "blur" }],
+ coal: [{ required: true, message: "璇疯緭鍏ョ叅绉�", trigger: "blur" }],
+ unit: [{ required: true, message: "璇疯緭鍏ュ崟浣�", trigger: "blur" }],
+ qualityPlan: [{ required: true, message: "璇烽�夋嫨", trigger: "change" }],
}
})
-const { form, rules } = toRefs(data)
+const { form, rules, mergeForm, mergeRules } = toRefs(data)
// 褰撳墠鏍囩
const activeTab = ref("pendingInbound");
const tabName = ref("pendingInbound");
@@ -258,61 +309,62 @@
]);
// 鏌ヨ鍙傛暟
const queryParams = reactive({
- searchText: "",
supplierName: "",
- identifyNumber: "",
- address: "",
+ coal: "",
})
const columnTitle = ref([])
onMounted(() => {
- handleTabClick({ props: { name: "supplier" } });
+ handleTabClick({ props: { name: "pendingInbound" } });
});
// 鏍囩椤电偣鍑�
const handleTabClick = (tab) => {
- getList();
- tableLoading.value = true;
tabName.value = tab.props.name;
tableData.value = [];
getList();
- // switch (tabName.value) {
- // case "pendingInbound":
- // columns.value = pendingColumns;
- // break;
- // case "officialInventory":
- // columns.value = officialColumns;
- // break;
- // }
- setTimeout(() => {
- tableLoading.value = false;
- }, 500);
};
+const summarizeChildrenTable = (param) => {
+ return proxy.summarizeTable(param, ['inventoryQuantity', 'priceIncludingTax', 'totalPriceIncludingTax','priceExcludingTax','totalPriceExcludingTax']);
+}
// 鐐瑰嚮鏌ヨ
const handleQuery = () => {
- tableLoading.value = true;
- setTimeout(() => {
- tableLoading.value = false;
- }, 500);
+ pageNum.value = 1
+ pageSize.value = 10
+ getList()
}
const getList = () => {
tableLoading.value = true;
// 璧嬪�肩叅璐ㄨ〃澶村睍绀哄瓧娈�
- columnTitle.value = [
- {prop: 'value1', label: '鐧惧垎姣�1'},
- {prop: 'value2', label: '鐧惧垎姣�2'},
- {prop: 'value3', label: '鐧惧垎姣�3'},
- ]
- setTimeout(() => {
- // 鏆傛椂寮曞叆娴嬭瘯鏁版嵁
- tableData.value = [
- { name: "渚涘簲鍟咥", type: "鍔ㄥ姏鐓�", unit: "鍚�", number: 120, money: 500, money1: 200, money2: 200, money3: 300, money4: '楂樹綅', createUser: 'admin', createTime: '2025-06-01', value1: 12, value2: 23, value3: 14 },
- { name: "渚涘簲鍟咥", type: "鍔ㄥ姏鐓�", unit: "鍚�", number: 100, money: 600, money1: 300, money2: 300, money3: 300, money4: '浣庝綅', createUser: 'admin', createTime: '2025-06-01', value1: 14, value2: 23, value3: 14 },
- { name: "渚涘簲鍟咮", type: "鐒︾叅", unit: "鍚�", number: 300, money: 789,money1: 400, money2: 400, money3: 400, money4: '楂樹綅', createUser: 'admin', createTime: '2025-06-01', value1: 12, value2: 13, value3: 23 },
- { name: "渚涘簲鍟咮", type: "鐒︾叅", unit: "鍚�", number: 256, money: 800, money1: 420, money2: 420, money3: 420, money4: '浣庝綅', createUser: 'admin', createTime: '2025-06-01', value1: 14, value2: 23, value3: 14 },
- { name: "渚涘簲鍟咰", type: "鏃犵儫鐓�", unit: "鍚�", number: 256, money: 700, money1: 300, money2: 300, money3: 300, money4: '楂樹綅', createUser: 'admin', createTime: '2025-06-01', value1: 12, value2: 13, value3: 32 }
- ];
- total.value = tableData.value.length;
- tableLoading.value = false;
- }, 500);
+ if (tabName.value === "pendingInbound") {
+ pendingInventoryList({ ...queryParams, current: pageNum.value, size: pageSize.value }).then(res => {
+ tableLoading.value = false;
+ tableData.value = res.data.records;
+ total.value = res.data.total;
+ })
+ } else {
+ officialInventoryList({ ...queryParams, current: pageNum.value, size: pageSize.value }).then(res => {
+ tableLoading.value = false;
+ const result = flattenFields(res.data.records);
+ tableData.value = result;
+ total.value = res.data.total;
+ coalFieldListOption()
+ })
+ }
+};
+// 鎵佸钩鍖栧鐞嗗嚱鏁�
+const flattenFields = (data) => {
+ return data.map(item => {
+ const mergedFields = item.fields.reduce((acc, obj) => {
+ const key = Object.keys(obj)[0];
+ acc[key] = obj[key];
+ return acc;
+ }, {});
+
+ // 鍚堝苟涓诲璞′笌鎻愬彇鍑虹殑 fields 瀛楁
+ return {
+ ...item,
+ ...mergedFields
+ };
+ });
};
// 閲嶇疆鏌ヨ
const resetQuery = () => {
@@ -323,36 +375,6 @@
});
handleQuery();
};
-// 鍚堝苟鐩稿悓琛岀殑鏂规硶
-const mergeSameRows = ({ row, column, rowIndex, columnIndex }) => {
- const fieldsToMerge = ['number', 'money', 'money1', 'money2', 'money3', 'money4', 'type', 'unit', 'name'];
-
- if (fieldsToMerge.includes(column.property)) {
- const prevRow = tableData.value[rowIndex - 1]
- const nextRow = tableData.value[rowIndex + 1]
- // 鍒ゆ柇褰撳墠琛屽拰涓嬩竴琛屾槸鍚︾浉绛�
- if (
- (!prevRow || prevRow[column.property] !== row[column.property]) &&
- (!nextRow || nextRow[column.property] === row[column.property])
- ) {
- let count = 1
- while (
- tableData.value[rowIndex + count] &&
- tableData.value[rowIndex + count][column.property] === row[column.property]
- ) {
- count++
- }
- return { rowspan: count, colspan: 1 }
- } else if (prevRow && prevRow[column.property] === row[column.property]) {
- // 闅愯棌琚悎骞剁殑鍗曞厓鏍�
- return { rowspan: 0, colspan: 0 }
- }
- return { rowspan: 1, colspan: 1 }
- }
-
- // 鍏朵粬鍒椾笉鍚堝苟
- return { rowspan: 1, colspan: 1 }
-}
// 琛ㄦ牸閫夋嫨鏁版嵁
const selectionChange = (rows) => {
selectedRows.value = rows
@@ -360,29 +382,150 @@
// 鎵撳紑瀹℃牳寮规
const reviewDia = (row) => {
reviewVisible.value = true
+ filteredList.value = []
+ form.value = {...row}
+ form.value.pId = row.id
+ inventoryQuantity.value = row.inventoryQuantity
+ coalPlanListOptions()
+}
+// 鏌ヨ鐓よ川鏂规涓嬫媺妗�
+const coalPlanListOptions = () => {
+ coalPlanList().then(res => {
+ qualityPlanOption.value = res.data
+ })
+}
+// 鏌ヨ鐓よ川鏂规瀛楁
+const coalPlanByIdList = (id) => {
+ coalPlanById({id: id}).then(res => {
+ filteredList.value = res.data
+ if(!id) {
+ filteredList.value = []
+ }
+ })
+}
+// 鏌ヨ鐓よ川瀛楁
+const coalFieldListOption = () => {
+ coalFieldList().then(res => {
+ filteredList.value = res.data
+ columnTitle.value = res.data.map(item => {
+ return {
+ prop: item.fields,
+ label: item.fieldName // 浣跨敤 fieldName 浣滀负 label
+ };
+ });
+ })
}
// 鍚堝苟搴撳瓨鏁版嵁鏂规硶
-const mergeRows = () => {
- if (selectedRows.value.length < 2) {
- proxy.$modal.msgWarning('璇疯嚦灏戦�夋嫨涓ゆ潯鏁版嵁')
- return
+const mergeRows = (type,row) => {
+ coalFieldListOption();
+ mergeVisible.value = true;
+ operationType.value = type;
+ if (type === 'edit') {
+ mergeForm.value = {...row}
+ } else {
+ if (selectedRows.value.length < 2) {
+ proxy.$modal.msgWarning('璇疯嚦灏戦�夋嫨涓ゆ潯鏁版嵁')
+ return
+ }
+ filteredList.value.forEach(item => {
+ mergeForm.value[item.fields] = ''
+ })
+ const data = selectedRows.value
+ const selectedIds = selectedRows.value.map(row => row.id);
+ // 鍒濆鍖栧悎璁″拰鍧囧�煎彉閲�
+ let totalInventory = 0;
+ let totalPriceIncludingTax = 0;
+ let totalPriceExcludingTax = 0;
+ let priceIncludingTaxSum = 0;
+ let priceExcludingTaxSum = 0;
+ // 閬嶅巻鎵�鏈夐�変腑鏁版嵁锛岀疮鍔犺绠�
+ data.forEach(row => {
+ totalInventory += parseFloat(row.inventoryQuantity) || 0;
+ priceIncludingTaxSum += parseFloat(row.priceIncludingTax) || 0;
+ totalPriceIncludingTax += parseFloat(row.totalPriceIncludingTax) || 0;
+ priceExcludingTaxSum += parseFloat(row.priceExcludingTax) || 0;
+ totalPriceExcludingTax += parseFloat(row.totalPriceExcludingTax) || 0;
+ });
+ // 璁＄畻骞冲潎鍊煎苟淇濈暀涓や綅灏忔暟
+ const avgPriceIncludingTax = Number((priceIncludingTaxSum / data.length).toFixed(2));
+ const avgTotalPriceIncludingTax = Number((totalPriceIncludingTax / data.length).toFixed(2));
+ const avgPriceExcludingTax = Number((priceExcludingTaxSum / data.length).toFixed(2));
+ const avgTotalPriceExcludingTax = Number((totalPriceExcludingTax / data.length).toFixed(2));
+ // 璁剧疆琛ㄥ崟鏄剧ず
+ mergeForm.value.inventoryQuantity = totalInventory;
+ mergeForm.value.priceIncludingTax = avgPriceIncludingTax;
+ mergeForm.value.totalPriceIncludingTax = avgTotalPriceIncludingTax;
+ mergeForm.value.priceExcludingTax = avgPriceExcludingTax;
+ mergeForm.value.totalPriceExcludingTax = avgTotalPriceExcludingTax;
+ mergeForm.value.ids = selectedIds;
}
- mergeVisible.value = true
}
// 鎻愪氦鍚堝苟琛ㄥ崟
const submitForm = () => {
-
+ proxy.$refs.mergeRef.validate(valid => {
+ if (valid) {
+ delete mergeForm.value.createTime
+ delete mergeForm.value.updateTime
+ if (operationType.value === 'edit') {
+ mergeForm.value.fields = filteredList.value.reduce((acc, item) => {
+ const key = item.fields;
+ const value = mergeForm.value[key];
+ // 鍒ゆ柇鏄惁鏈夊�硷紙浣犲彲浠ユ牴鎹渶瑕佷慨鏀瑰垽鏂潯浠讹級
+ if (value !== null && value !== undefined && value !== '') {
+ acc.push({ [key]: value });
+ }
+ return acc;
+ }, []);
+ editOfficial(mergeForm.value).then(() => {
+ cancel()
+ proxy.$modal.msgSuccess('淇敼鎴愬姛')
+ handleQuery()
+ })
+ } else {
+ mergeForm.value.fields = filteredList.value.reduce((acc, item) => {
+ const key = item.fields;
+ const value = mergeForm.value[key];
+ // 鍒ゆ柇鏄惁鏈夊�硷紙浣犲彲浠ユ牴鎹渶瑕佷慨鏀瑰垽鏂潯浠讹級
+ if (value !== null && value !== undefined && value !== '') {
+ acc.push({ [key]: value });
+ }
+ return acc;
+ }, []);
+ merge(mergeForm.value).then(() => {
+ cancel()
+ proxy.$modal.msgSuccess('鍚堝苟鎴愬姛')
+ handleQuery()
+ })
+ }
+ }
+ })
}
// 鍏抽棴鍚堝苟琛ㄥ崟
const cancel = () => {
+ proxy.$refs.mergeRef.resetFields();
mergeVisible.value = false
}
// 鎻愪氦瀹℃牳琛ㄥ崟
const submitReviewForm = () => {
-
+ proxy.$refs.formRef.validate((valid) => {
+ if (valid) {
+ delete form.value.registrationTime
+ delete form.value.createTime
+ delete form.value.updateTime
+ form.value.fieldValue = filteredList.value.map(item => ({
+ [item.fields]: form.value[item.fields]
+ }))
+ addOrEditCoalValue(form.value).then(() => {
+ cancelReview()
+ proxy.$modal.msgSuccess('鎻愪氦鎴愬姛')
+ handleQuery()
+ })
+ }
+ })
}
// 鍏抽棴瀹℃牳寮规
const cancelReview = () => {
+ proxy.$refs.formRef.resetFields()
reviewVisible.value = false
}
</script>
--
Gitblit v1.9.3