From a1131357b9e38c86e734816bae42d2fafcd48222 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期一, 23 三月 2026 11:01:41 +0800
Subject: [PATCH] fix: 客户3.22提出的修改需求
---
src/pages/consumablesLogistics/dispatchLog/index.vue | 65 +++++++++++---------------------
1 files changed, 22 insertions(+), 43 deletions(-)
diff --git a/src/pages/consumablesLogistics/dispatchLog/index.vue b/src/pages/consumablesLogistics/dispatchLog/index.vue
index 132494f..98f75b5 100644
--- a/src/pages/consumablesLogistics/dispatchLog/index.vue
+++ b/src/pages/consumablesLogistics/dispatchLog/index.vue
@@ -1,17 +1,6 @@
<template>
<view class="dispatch-page">
<PageHeader title="鍑哄簱鍙拌处" @back="goBack" />
- <view class="tabs-wrap">
- <view
- v-for="tab in tabs"
- :key="tab.name"
- class="tab-item"
- :class="{ active: activeTab === tab.name }"
- @click="activeTab = tab.name"
- >
- <text>{{ tab.label }}</text>
- </view>
- </view>
<view class="search-section">
<view class="search-row">
<view class="search-input-wrap">
@@ -40,13 +29,9 @@
<view class="row"><text class="l">瑙勬牸鍨嬪彿</text><text class="r">{{ item.model }}</text></view>
<view class="row"><text class="l">鍗曚綅</text><text class="r">{{ item.unit }}</text></view>
<view class="row"><text class="l">鍑哄簱鏁伴噺</text><text class="r highlight">{{ item.stockOutNum }}</text></view>
+ <!-- <view class="row"><text class="l">閲囪喘鍛�</text><text class="r">{{ item.purchaser || '-' }}</text></view> -->
<view class="row"><text class="l">鍑哄簱浜�</text><text class="r">{{ item.createBy }}</text></view>
<view class="row" v-if="item.recordType !== undefined"><text class="l">鏉ユ簮</text><text class="r">{{ getRecordType(item.recordType) || item.recordType }}</text></view>
- <view class="row"><text class="l">姣涢噸(鍚�)</text><text class="r">{{ item.grossWeight ?? '-' }}</text></view>
- <view class="row"><text class="l">鐨噸(鍚�)</text><text class="r">{{ item.tareWeight ?? '-' }}</text></view>
- <view class="row"><text class="l">鍑�閲�(鍚�)</text><text class="r">{{ item.netWeight ?? '-' }}</text></view>
- <view class="row"><text class="l">杩囩鏃ユ湡</text><text class="r">{{ item.weighingDate || '-' }}</text></view>
- <view class="row"><text class="l">杩囩鍛�</text><text class="r">{{ item.weighingOperator || '-' }}</text></view>
</view>
</view>
<view class="card-actions">
@@ -63,26 +48,20 @@
</template>
<script setup>
-import { reactive, ref, toRefs, watch } from "vue";
+import { reactive, ref, toRefs } from "vue";
import { onReachBottom, onShow } from "@dcloudio/uni-app";
import PageHeader from "@/components/PageHeader.vue";
import { getConsumablesOutRecordPage, delConsumablesOutRecord } from "@/api/consumablesLogistics/consumablesOutRecord.js";
-import { findAllQualifiedStockOutRecordTypeOptions, findAllUnQualifiedStockOutRecordTypeOptions } from "@/api/basicData/enum.js";
+import { findAllQualifiedStockOutRecordTypeOptions } from "@/api/basicData/enum.js";
-const activeTab = ref("qualified");
const stockRecordTypeOptions = ref([]);
-const tabs = [
- { label: "鍚堟牸鍑哄簱", name: "qualified", type: "0" },
- { label: "涓嶅悎鏍煎嚭搴�", name: "unqualified", type: "1" },
-];
const tableData = ref([]);
const total = ref(0);
const loadStatus = ref("loadmore");
const page = reactive({ current: 1, size: 20 });
const data = reactive({ searchForm: { productName: "" } });
const { searchForm } = toRefs(data);
-
-const currentType = () => tabs.find((t) => t.name === activeTab.value)?.type || "0";
+const currentType = () => "0";
function getRecordType(recordType) {
if (recordType == null || recordType === "") return "";
@@ -90,11 +69,7 @@
}
function fetchRecordTypeOptions() {
- const api =
- currentType() === "1"
- ? findAllUnQualifiedStockOutRecordTypeOptions
- : findAllQualifiedStockOutRecordTypeOptions;
- api()
+ findAllQualifiedStockOutRecordTypeOptions()
.then((res) => {
const list = res.data != null ? res.data : res;
stockRecordTypeOptions.value = Array.isArray(list) ? list : [];
@@ -143,13 +118,6 @@
getList();
};
-watch(activeTab, () => {
- page.current = 1;
- loadStatus.value = "loadmore";
- stockRecordTypeOptions.value = [];
- getList();
-});
-
const handleQuery = () => {
page.current = 1;
loadStatus.value = "loadmore";
@@ -163,7 +131,7 @@
"dispatchDetailItem",
JSON.stringify({
item,
- type: currentType(),
+ type: "0",
})
);
} catch (e) {}
@@ -198,9 +166,6 @@
<style lang="scss" scoped>
.dispatch-page { min-height: 100vh; background: #f5f5f5; padding-bottom: 40rpx; }
-.tabs-wrap { display: flex; background: #fff; padding: 24rpx; gap: 24rpx; }
-.tab-item { flex: 1; text-align: center; padding: 20rpx; border-radius: 12rpx; background: #f0f0f0; font-size: 28rpx; color: #666; }
-.tab-item.active { background: #2979ff; color: #fff; }
.search-section { background: #fff; margin: 24rpx; padding: 24rpx; border-radius: 16rpx; }
.search-row { display: flex; align-items: center; }
.search-input-wrap { flex: 1; margin-right: 20rpx; min-width: 0; }
@@ -216,8 +181,22 @@
.card-body .l { color: #666; }
.card-body .r { color: #333; }
.card-body .r.highlight { color: #2979ff; font-weight: 500; }
-.card-actions { display: flex; justify-content: flex-end; margin-top: 12rpx; }
-.btn-delete { color: #f56c6c; font-size: 28rpx; }
+.card-actions {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ margin-top: 16rpx;
+ padding-top: 16rpx;
+ border-top: 1rpx solid #eee;
+}
+.btn-delete {
+ color: #f56c6c;
+ font-size: 28rpx;
+ padding: 12rpx 36rpx;
+ border-radius: 999rpx;
+ border: 1rpx solid rgba(245, 108, 108, 0.55);
+ background: rgba(245, 108, 108, 0.08);
+}
.no-data { text-align: center; padding: 60rpx 0; color: #999; font-size: 28rpx; }
.load-more-wrap { padding: 24rpx 24rpx 8rpx; }
</style>
--
Gitblit v1.9.3