From 0b08d373869c91dda58dd0e33b13fe59688234f9 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期三, 29 十一月 2023 17:03:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue
index 30e0824..1b75940 100644
--- a/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue
+++ b/web/src/views/modules/configItemWarehouse/ConfigItemWarehouse.vue
@@ -1,7 +1,6 @@
<template>
- <el-card shadow="never" class="aui-card--fill">
- <div class="mod-configItemWarehouse-configItemWarehouse}">
- <zt-table-wraper query-url="/configItemWarehouse/ConfigItemWarehouse/page" delete-url="/configItemWarehouse/ConfigItemWarehouse" v-slot="{ table }">
+ <div class="fa-card-a">
+ <zt-table-wraper query-url="/configItemWarehouse/ConfigItemWarehouse/page" delete-url="/configItemWarehouse/ConfigItemWarehouse/deleteConfigItem" v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
<el-form-item>
<el-input v-model="dataForm.code" placeholder="璇疯緭鍏ラ厤缃」鍏ュ簱缂栧彿" clearable></el-input>
@@ -10,7 +9,7 @@
<el-input v-model="dataForm.projectCode" placeholder="璇疯緭鍏ラ」鐩紪鍙�" clearable></el-input>
</el-form-item>
<el-form-item>
- <el-input v-model="dataForm.projectName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable></el-input>
+ <el-input v-model="dataForm.softwareName" placeholder="璇疯緭鍏ラ」鐩悕绉�" clearable></el-input>
</el-form-item>
<el-form-item>
<zt-dict v-model="dataForm.libraryType" dict="library_type" clearable></zt-dict>
@@ -22,10 +21,10 @@
</el-form-item>
</el-form>
<el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}" border @selection-change="table.selectionChangeHandle">
- <el-table-column type="selection" width="40"/>
+ <el-table-column align="center" type="selection" width="40"/>
<el-table-column prop="code" label="閰嶇疆椤瑰叆搴撶紪鍙�"/>
<el-table-column prop="projectCode" label="椤圭洰缂栧彿"/>
- <el-table-column prop="projectName" label="椤圭洰鍚嶇О"/>
+ <el-table-column prop="softwareName" label="椤圭洰鍚嶇О"/>
<zt-table-column-dict prop="libraryType" label="搴撶被鍨�" dict="library_type"/>
<zt-table-column-handle :table="table" edit-perm="configItemWarehouse:update" delete-perm="configItemWarehouse::delete"/>
</el-table>
@@ -36,8 +35,7 @@
@setProjectInfo="openAddWin">
</ProjectSelect>
</zt-table-wraper>
- </div>
- </el-card>
+ </div>
</template>
<script>
@@ -49,8 +47,8 @@
dataForm: {
code: '',
projectCode: '',
- projectName: '',
- libraryType: '',
+ softwareName: '',
+ libraryType: ''
}
}
},
--
Gitblit v1.9.1