From e4e75a7312f5195144b105d59ac90f26e174d4ba Mon Sep 17 00:00:00 2001
From: lixiangyu <lixiangyu@xalxzn.com>
Date: 星期五, 05 九月 2025 18:02:54 +0800
Subject: [PATCH] feat(cms): 优化刀具入库和库存列表功能
---
src/views/cms/CuttingInventoryList.vue | 85 ++++++++++++++++++++++++++----------------
1 files changed, 52 insertions(+), 33 deletions(-)
diff --git a/src/views/cms/CuttingInventoryList.vue b/src/views/cms/CuttingInventoryList.vue
index a21fc71..ae89f6a 100644
--- a/src/views/cms/CuttingInventoryList.vue
+++ b/src/views/cms/CuttingInventoryList.vue
@@ -2,41 +2,41 @@
<a-card :bordered="false">
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
-<!-- <a-form layout="inline" @keyup.enter.native="searchQuery">-->
-<!-- <a-row :gutter="24">-->
+ <a-form layout="inline" @keyup.enter.native="searchQuery">
+ <a-row :gutter="24">
<!-- <a-col :md="6" :sm="8">-->
<!-- <a-form-item label="鍒�鍏风紪鐮�">-->
<!-- <a-input placeholder="璇疯緭鍏ュ垁鍏风紪鐮�" v-model="queryParam.cuttingId" />-->
<!-- </a-form-item>-->
<!-- </a-col>-->
-<!-- <a-col :md="6" :sm="8">-->
-<!-- <a-form-item label="鍒�鍏锋潯鐮�">-->
-<!-- <a-input placeholder="璇疯緭鍏ュ垁鍏锋潯鐮�" v-model="queryParam.cuttingBarcode" />-->
-<!-- </a-form-item>-->
-<!-- </a-col>-->
-<!-- <a-col-->
-<!-- :md="6"-->
-<!-- :sm="8"-->
-<!-- >-->
-<!-- <span-->
-<!-- style="float: left;overflow: hidden;"-->
-<!-- class="table-page-search-submitButtons"-->
-<!-- >-->
-<!-- <a-button-->
-<!-- type="primary"-->
-<!-- @click="searchQuery"-->
-<!-- icon="search"-->
-<!-- >鏌ヨ</a-button>-->
-<!-- <a-button-->
-<!-- type="primary"-->
-<!-- @click="searchReset"-->
-<!-- icon="reload"-->
-<!-- style="margin-left: 8px"-->
-<!-- >閲嶇疆</a-button>-->
-<!-- </span>-->
-<!-- </a-col>-->
-<!-- </a-row>-->
-<!-- </a-form>-->
+ <a-col :md="6" :sm="8">
+ <a-form-item label="鍒�鍏锋潯鐮�">
+ <a-input placeholder="璇疯緭鍏ュ垁鍏锋潯鐮�" v-model="queryParam.cuttingBarcode" />
+ </a-form-item>
+ </a-col>
+ <a-col
+ :md="6"
+ :sm="8"
+ >
+ <span
+ style="float: left;overflow: hidden;"
+ class="table-page-search-submitButtons"
+ >
+ <a-button
+ type="primary"
+ @click="searchQuery"
+ icon="search"
+ >鏌ヨ</a-button>
+ <a-button
+ type="primary"
+ @click="searchReset"
+ icon="reload"
+ style="margin-left: 8px"
+ >閲嶇疆</a-button>
+ </span>
+ </a-col>
+ </a-row>
+ </a-form>
</div>
<!-- 鏌ヨ鍖哄煙-END -->
@@ -220,9 +220,27 @@
align: "center",
},
{
- title: '鏁伴噺',
+ title: '鎬绘暟',
dataIndex: 'cuttingIdNumber',
- align: "center"
+ align: "center",
+ customRender: (text, record, index) => {
+ const obj = {
+ children: text,
+ attrs: {}
+ };
+ // 鍙湪绗竴琛屾樉绀烘�绘暟閲忥紝鍏朵粬琛屾樉绀虹┖
+ if (record.rowSpan !== undefined && record.rowSpan > 0) {
+ obj.children = text;
+ obj.attrs.rowSpan = record.rowSpan;
+ } else if (record.rowSpan === 0) {
+ obj.children = '';
+ obj.attrs.rowSpan = 0;
+ } else {
+ obj.children = text;
+ obj.attrs.rowSpan = 1;
+ }
+ return obj;
+ }
}
],
url: {
@@ -475,7 +493,8 @@
}
return result;
- }
+ },
+
}
}
</script>
--
Gitblit v1.9.3