From a17f09e572d644b04d1a40aa889ee1fd38a2b643 Mon Sep 17 00:00:00 2001
From: lixiangyu <lixiangyu@xalxzn.com>
Date: 星期五, 12 九月 2025 17:56:13 +0800
Subject: [PATCH] feat(cms): 添加刀具归还功能并优化 CuttingReceiveList组件
---
src/views/base/ShiftGroupManager.vue | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/views/base/ShiftGroupManager.vue b/src/views/base/ShiftGroupManager.vue
index 1e4f5c1..81d39ba 100644
--- a/src/views/base/ShiftGroupManager.vue
+++ b/src/views/base/ShiftGroupManager.vue
@@ -7,7 +7,13 @@
<!-- 鎼滅储鍖哄煙 -->
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
- <a-col :md="6" :sm="8">
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
+ <a-form-item label="浜х嚎">
+ <j-dict-select-tag placeholder="璇烽�夋嫨浜х嚎" v-model="queryParam.factoryId"
+ dictCode="base_factory,factory_name,id,del_flag=0 and factory_category='3'"></j-dict-select-tag>
+ </a-form-item>
+ </a-col>
+ <a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="鐝粍鍚嶇О" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
<a-input placeholder="" v-model="queryParam.groupName"></a-input>
</a-form-item>
@@ -89,7 +95,7 @@
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
<a-col :md="9" :sm="24">
<a-button type="primary" @click="searchQuery2" icon="search" style="margin-left: 21px">鏌ヨ</a-button>
- <a-button type="primary" @click="searchReset2" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+ <a-button type="info" @click="searchReset2" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
</a-col>
</span>
@@ -170,7 +176,7 @@
queryParam2: {},
dataSource1: [],
dataSource2: [],
- ipagination1: {
+ ipagination: {
current: 1,
pageSize: 10,
pageSizeOptions: ['10', '20', '30'],
@@ -192,9 +198,9 @@
showSizeChanger: true,
total: 0
},
- isorter1: {
- column: 'createTime',
- order: 'desc'
+ isorter: {
+ column: 'groupCode',
+ order: 'asc'
},
isorter2: {
column: 'createTime',
--
Gitblit v1.9.3