From 4a476243e0928236472f0a916467630cb5706ee5 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 17 五月 2024 11:40:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
web/src/views/modules/basicInfo/TyProductModel.vue | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/web/src/views/modules/basicInfo/TyProductModel.vue b/web/src/views/modules/basicInfo/TyProductModel.vue
index 3438ece..bfb3068 100644
--- a/web/src/views/modules/basicInfo/TyProductModel.vue
+++ b/web/src/views/modules/basicInfo/TyProductModel.vue
@@ -1,11 +1,9 @@
<template>
-
- <el-card shadow="never" class="aui-card--fill">
- <div class="mod-tyProductModel-tyProductModel}">
+ <div class="mod-tyProductModel-tyProductModel} fa-card-a">
<zt-table-wraper query-url="/basicInfo/TyProductModel/tree" delete-url="/basicInfo/TyProductModel/" v-bind:paging='false'
v-slot="{ table }">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="table.query()">
- <el-form-item>
+ <!--<el-form-item>
<zt-dict v-model="dataForm.nodeType" dict="product" placeholder="璇烽�夋嫨鑺傜偣绫诲瀷" clearable></zt-dict>
</el-form-item>
<el-form-item>
@@ -13,15 +11,15 @@
</el-form-item>
<el-form-item>
<zt-dict v-model="dataForm.repairDistrib" dict="RepairDistribType" placeholder="璇烽�夋嫨缁翠慨鍒嗗竷绫诲瀷" clearable></zt-dict>
- </el-form-item>
+ </el-form-item>-->
<el-form-item>
- <zt-button type="query" @click="table.query()"/>
+ <!--<zt-button type="query" @click="table.query()"/>-->
<zt-button type="add" @click="table.editHandle()"/>
<zt-button type="delete" @click="table.deleteHandle()"/>
</el-form-item>
</el-form>
- <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:70}"
- border row-key="id"
+ <el-table v-loading="table.dataLoading" :data="table.dataList" height="100px" v-adaptive="{bottomOffset:30}"
+ row-key="id"
@selection-change="table.selectionChangeHandle"
:cell-style="cellStyle"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
@@ -37,13 +35,12 @@
</template>
</el-table-column>
<el-table-column prop="sort" label="鎺掑簭"/>
- <zt-table-column-handle :table="table"/>
+ <zt-table-column-handle :table="table" width="150" />
</el-table>
<!-- 寮圭獥, 鏂板 / 淇敼 -->
<add-or-update @refreshDataList="table.query"/>
</zt-table-wraper>
</div>
- </el-card>
</template>
<script>
--
Gitblit v1.9.1