From 95b6a6388e4cc4e6ed0f54cc04212a86cd8cf829 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期五, 23 五月 2025 13:37:09 +0800 Subject: [PATCH] 1、用户管理新增和编辑用户时设置工单为必填项 2、新增终端登录、首页、设备点检、故障上报、上下班打卡、停机原因维护页面(未与后端联调且客户未确定页面设计)并调整全局路由守卫相关逻辑 3、调整设备结构树设备层级和车间层级区分的判断条件 4、调整电子样板检索与部件借用弹窗列表与搜索区域样式 --- src/views/dnc/base/modules/ProductStructure/Document/NcComponentBorrowModal.vue | 31 +++++++++++++++++-------------- 1 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/views/dnc/base/modules/ProductStructure/Document/NcComponentBorrowModal.vue b/src/views/dnc/base/modules/ProductStructure/Document/NcComponentBorrowModal.vue index 95d5ab0..8dd02fc 100644 --- a/src/views/dnc/base/modules/ProductStructure/Document/NcComponentBorrowModal.vue +++ b/src/views/dnc/base/modules/ProductStructure/Document/NcComponentBorrowModal.vue @@ -12,44 +12,43 @@ <div class="table-page-search-wrapper"> <a-form layout="inline" @keyup.enter.native="searchQuery"> <a-row :gutter="24"> - <a-col :md="7" :sm="7"> + <a-col :md="5" :sm="5"> <a-form-item label="閮ㄤ欢鍚嶇О"> <a-input placeholder="璇疯緭鍏ラ儴浠跺悕绉�" v-model="queryParam.componentName" allow-clear></a-input> </a-form-item> </a-col> - <a-col :md="7" :sm="7"> + <a-col :md="5" :sm="5"> <a-form-item label="閮ㄤ欢浠e彿"> <a-input placeholder="璇疯緭鍏ラ儴浠朵唬鍙�" v-model="queryParam.componentCode" allow-clear></a-input> </a-form-item> </a-col> - <a-col :md="7" :sm="7"> + <a-col :md="5" :sm="5"> <a-form-item label="閮ㄤ欢鍨嬪彿"> <a-input placeholder="璇疯緭鍏ラ儴浠跺瀷鍙�" v-model="queryParam.componentModel" allow-clear></a-input> </a-form-item> </a-col> - <a-col :md="7" :sm="7"> + <a-col :md="4" :sm="4"> <a-form-item label="瑙勬牸"> <a-input placeholder="璇疯緭鍏ヨ鏍�" v-model="queryParam.componentScale" allow-clear></a-input> </a-form-item> </a-col> - <a-col :md="7" :sm="7"> + <a-col :md="4" :sm="4"> <a-form-item label="鏉愯川"> <a-input placeholder="璇疯緭鍏ユ潗璐�" v-model="queryParam.structureType" allow-clear></a-input> </a-form-item> </a-col> - - <a-col :md="4" :sm="4"> - <a-space> - <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button> - <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button> - </a-space> - </a-col> </a-row> </a-form> + </div> + + <!-- 鎿嶄綔鎸夐挳鍖哄煙 --> + <div class="table-operator"> + <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button> + <a-button type="primary" @click="searchReset" icon="reload">閲嶇疆</a-button> </div> <a-table :columns="columns" :data-source="dataSource" bordered :pagination="ipagination" :loading="loading" @@ -137,13 +136,13 @@ title: '鍒涘缓鏃堕棿', dataIndex: 'createTime', align: 'center', - width: 150, + width: 100, }, { title: '鍒涘缓浜�', dataIndex: 'createBy_dictText', align: 'center', - width: 100, + width: 60, } ], searchValue: '', @@ -305,6 +304,10 @@ <style scoped lang="less"> /deep/ .ant-modal { + .ant-modal-body{ + padding: 0 24px 12px; + } + .tabs-container { display: flex; justify-content: space-between; -- Gitblit v1.9.3