From 3bd642ad4d805032ae43e1fd23e0c4e6b7dfa9f2 Mon Sep 17 00:00:00 2001
From: zhang_12370 <z2864490065@outlook.com>
Date: 星期六, 12 七月 2025 11:58:41 +0800
Subject: [PATCH] 1、修改采购管理的匹配逻辑 2、修改生产加工新增生产明细的总数居匹配问题 3、修改配煤计算器 4、修改设备管理领用记录的提交问题
---
src/views/salesOutbound/index.vue | 57 +++++++++++++++++++++++++++++----------------------------
1 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/src/views/salesOutbound/index.vue b/src/views/salesOutbound/index.vue
index 09430b9..b9d38ce 100644
--- a/src/views/salesOutbound/index.vue
+++ b/src/views/salesOutbound/index.vue
@@ -2,27 +2,20 @@
<div class="app-container">
<el-form :inline="true" :model="queryParams" class="search-form">
<el-form-item label="閿�鍞棩鏈�">
- <el-date-picker
- v-model="queryParams.saleDate"
- type="date"
- placeholder="璇烽�夋嫨"
- value-format="YYYY-MM-DD"
- format="YYYY-MM-DD"
- clearable
- />
- </el-form-item>
- <el-form-item label="瀹㈡埛">
- <el-input
- v-model="queryParams.customer"
- placeholder="璇疯緭鍏�"
- clearable
- :style="{ width: '100%' }"
- />
+ <el-date-picker
+ v-model="queryParams.saleDate"
+ type="date"
+ value-format="YYYY-MM-DD"
+ format="YYYY-MM-DD"
+ clearable
+ style="width: 100%"
+ placeholder="璇烽�夋嫨鏃ユ湡"
+ />
</el-form-item>
<el-form-item label="鐓ょ">
<el-input
v-model="queryParams.coal"
- placeholder="璇疯緭鍏�"
+ placeholder="璇疯緭鍏ョ叅绉�"
clearable
:style="{ width: '100%' }"
/>
@@ -44,9 +37,9 @@
</el-tabs>
<!-- 鎿嶄綔鎸夐挳鍖� -->
<el-space>
- <el-button type="primary" :icon="Plus" @click="openDia()">鏂板缓</el-button>
+ <el-button type="primary" :icon="Plus" @click="openDia(undefined, 'add')">鏂板缓</el-button>
<el-button type="danger" :icon="Delete" @click="handleDelete">鍒犻櫎</el-button>
- <el-button type="info" plain :icon="Download" @click="handleExport">瀵煎嚭</el-button>
+ <!-- <el-button type="info" plain :icon="Download" @click="handleExport">瀵煎嚭</el-button> -->
</el-space>
<!-- 琛ㄦ牸缁勪欢 -->
<div>
@@ -56,15 +49,18 @@
@selection-change="handleSelectionChange"
:show-selection="true"
:border="true"
+ :operations="operationsArr"
style="width: 100%;height: calc(100vh - 30em)"
- @edit="openDia"></ETable>
+ @edit="(row) => openDia(row, 'edit')"
+ @viewRow="(row) => openDia(row, 'view')"
+ ></ETable>
</div>
<pagination
v-if="total>0"
- :page-num="pageNum"
- :page-size="pageSize"
+ :page="pageNum"
+ :limit="pageSize"
:total="total"
- @pagination="handleQuery"
+ @pagination="handlePagination"
:layout="'total, prev, pager, next, jumper'"
/>
</el-card>
@@ -88,6 +84,7 @@
{ name: "out", label: "閿�鍞嚭搴�" },
]);
// 琛ㄦ牸鏁版嵁
+const operationsArr = ref(['edit', 'viewRow']);
const tableLoading = ref(false);
const tableData = ref([]);
const columns = ref([
@@ -114,9 +111,8 @@
const pageSize = ref(10);
// 鏌ヨ鍙傛暟
const queryParams = reactive({
- saleDate: "",
- customer: "",
- coal: "",
+ saleDate: "",
+ coal: "",
})
onMounted(() => {
handleQuery()
@@ -144,10 +140,15 @@
});
handleQuery();
};
+// 鍒嗛〉澶勭悊
+const handlePagination = (val) => {
+ pageNum.value = val.page;
+ pageSize.value = val.limit;
+ getList();
+};
// 鏂板鍑哄簱
-const openDia = (row) => {
+const openDia = (row, type) => {
console.log(row)
- const type = row === undefined ? 'add' : 'edit'
nextTick(() => {
formDia.value?.openDialog(type, row)
})
--
Gitblit v1.9.3