From 133c3ad5450976bb161a9c713f2a6cf075165c55 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 03 三月 2025 16:50:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/eam/EquipmentListOfAll.vue | 95 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 68 insertions(+), 27 deletions(-)
diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index a3a3040..c69168c 100644
--- a/src/views/eam/EquipmentListOfAll.vue
+++ b/src/views/eam/EquipmentListOfAll.vue
@@ -1,7 +1,7 @@
<template>
<a-card
:bordered="false"
- title="鎵�鏈夎澶�"
+ title=""
>
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
@@ -13,35 +13,42 @@
:gutter="24"
style="margin-bottom: 1%;"
>
- <a-col :span="24">
+ <a-col :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'>
<a-form-item
label="缁熶竴缂栧彿缇�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-textarea
- placeholder="璇疯緭鍏ユ墍鏈夌粺涓�缂栫爜,椤荤敤绌烘牸闅斿紑,鍚﹀垯鍙兘鏌ヨ鍑洪敊璇俊鎭�"
+ placeholder="璇疯緭鍏ユ墍鏈夌粺涓�缂栫爜,姣忎釜缁熶竴缂栫爜鍗犵敤涓�琛�,鍚﹀垯鏌ヨ淇℃伅鍙兘浼氬嚭閿�"
v-model="queryParam.nums"
:auto-size="{ minRows: 2, maxRows:2 }"
></a-textarea>
</a-form-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="6">
+ <a-col :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'>
<a-form-item
label="璁惧鎵�灞炲垎绫�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<j-dict-select-tag
- dictCode="mom_eam_equipment_category,name,id"
+ dictCode="mom_eam_equipment_category,name,id,del_flag!='1'"
placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
v-model="queryParam.equipmentCategoryId"
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <a-col :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -53,7 +60,10 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <a-col :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'>
<a-form-item
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -65,7 +75,10 @@
></a-input>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <a-col :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'>
<a-form-item
label="鍨嬪彿"
:labelCol="labelCol"
@@ -77,9 +90,11 @@
></a-input>
</a-form-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="6">
+
+ <a-col :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'>
<a-form-item
label="宸ュ尯"
:labelCol="labelCol"
@@ -109,7 +124,10 @@
/>
</a-form-item>
</a-col> -->
- <a-col :span="6">
+ <a-col :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'>
<a-form-item
label="缁存姢閮ㄩ棬"
:labelCol="labelCol"
@@ -130,7 +148,10 @@
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <a-col :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'>
<a-form-item
label="浣跨敤閮ㄩ棬"
:labelCol="labelCol"
@@ -151,7 +172,10 @@
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <a-col :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'>
<a-form-item
label="鏄惁鐢熶骇绾胯澶�"
:labelCol="labelCol"
@@ -166,9 +190,10 @@
/>
</a-form-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="6">
+ <a-col :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'>
<a-form-item
label="ABC鏍囪瘑"
:labelCol="labelCol"
@@ -183,7 +208,10 @@
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <a-col :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'>
<a-form-item
label="鎶�鏈姸鎬�"
:labelCol="labelCol"
@@ -198,7 +226,10 @@
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <a-col :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'>
<a-form-item
label="璁惧鐘舵��"
:labelCol="labelCol"
@@ -213,7 +244,10 @@
/>
</a-form-item>
</a-col>
- <a-col :span="6">
+ <a-col :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'>
<a-form-item
label="鍏抽敭璁惧鏍囪瘑"
:labelCol="labelCol"
@@ -228,9 +262,10 @@
/>
</a-form-item>
</a-col>
- </a-row>
- <a-row :gutter="24">
- <a-col :span="6">
+ <a-col :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'>
<a-form-model-item
label="璐ㄤ繚寮�濮嬫棩鏈�"
:labelCol="labelCol"
@@ -244,7 +279,10 @@
></j-date>
</a-form-model-item>
</a-col>
- <a-col :span="6">
+ <a-col :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'>
<a-form-model-item
label="璐ㄤ繚缁撴潫鏃ユ湡"
:labelCol="labelCol"
@@ -259,7 +297,10 @@
</a-form-model-item>
</a-col>
<!-- 鎸夌淮淇彮缁勬绱� -->
- <a-col :span="6">
+ <a-col :xl='6'
+ :lg='7'
+ :md='8'
+ :sm='24'>
<a-form-item
label="缁翠慨鐝粍"
:labelCol="labelCol"
--
Gitblit v1.9.3