代码更新

mes/qd/src/components/Crud/RR.operation.vue

@@ -1,8 +1,16 @@
 <!--搜索与重置-->
 <template>
   <span>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="crud.toQuery">搜索</el-button>
+    <!-- <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="crud.toQuery">搜索</el-button>
     <el-button v-if="crud.optShow.reset" class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="crud.resetQuery()">重置</el-button>
+    -->
+    <el-dropdown split-button type="primary" class="filter-item" @click="crud.toQuery">
+      <i class="el-icon-search el-icon--left" />查询
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item icon="el-icon-zoom-out" @click.native="crud.resetQuery()">重置</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+
   </span>
 </template>
 <script>

mes/qd/src/components/Crud/UD.operation.vue

@@ -1,14 +1,15 @@
 <template>
   <div>
-    <el-button v-if="isVisiableEdit" v-permission="permission.edit" :loading="crud.status.cu === 2" :disabled="disabledEdit" size="mini" type="primary" icon="el-icon-edit" @click="crud.toEdit(data)" />
+    <el-button v-if="isVisiableEdit" v-permission="permission.edit" type="text" :loading="crud.status.cu === 2" :disabled="disabledEdit" size="mini" icon="el-icon-edit" @click="crud.toEdit(data)">修改</el-button>
     <el-popover v-model="pop" v-permission="permission.del" placement="top" width="180" trigger="manual" @show="onPopoverShow" @hide="onPopoverHide">
       <p>{{ msg }}</p>
       <div style="text-align: right; margin: 0">
         <el-button size="mini" type="text" @click="doCancel">取消</el-button>
         <el-button :loading="crud.dataStatus[crud.getDataId(data)].delete === 2" type="primary" size="mini" @click="crud.doDelete(data)">确定</el-button>
       </div>
-      <el-button v-if="isVisiableDel" slot="reference" :disabled="disabledDle" type="danger" icon="el-icon-delete" size="mini" @click="toDelete" />
+      <el-button v-if="isVisiableDel" slot="reference" type="text" :disabled="disabledDle" icon="el-icon-delete" size="mini" @click="toDelete">删除</el-button>
     </el-popover>
+
   </div>
 </template>
 <script>

mes/qd/src/main.js

@@ -8,11 +8,6 @@ import Element from 'element-ui'
 // 列自适应宽度:https://github.com/legendJaden/AFTableColumn
 import AFTableColumn from 'af-table-column'
 
-// 可编辑grid插件
-import 'xe-utils'
-import VXETable from 'vxe-table'
-import 'vxe-table/lib/style.css'
-
 import 'font-awesome/css/font-awesome.css'
 
 // vue中markdown编辑器
@@ -46,15 +41,16 @@ import 'jquery'
 Vue.use(scroll)
 
 Vue.use(AFTableColumn)
-Vue.use(VXETable)
-Vue.prototype.$XModal = VXETable.modal
 
 Vue.use(VueHighlightJS)
 Vue.use(mavonEditor)
 Vue.use(permission)
 Vue.use(dict)
+
+// 全局设置控件样式https://codeantenna.com/a/0IN5FMJk5h
+Element.Table.props.border = { type: Boolean, default: true }
 Vue.use(Element, {
-  size: Cookies.get('size') || 'small' // set element-ui default size
+  size: Cookies.get('size') || 'mini' // set element-ui default size
 })
 
 Vue.config.productionTip = false

mes/qd/src/views/system/param/index.vue

@@ -48,9 +48,9 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="id" label="id" />
-        <el-table-column prop="code" label="编码" />
-        <el-table-column prop="name" label="名称" />
-        <el-table-column prop="value" label="值" width="270" />
+        <el-table-column prop="code" label="编码" min-width="150" show-overflow-tooltip />
+        <el-table-column prop="name" label="名称" min-width="123" show-overflow-tooltip />
+        <el-table-column prop="value" label="值" min-width="150" show-overflow-tooltip />
         <el-table-column prop="remark" label="备注" />
         <el-table-column prop="is_active" label="启用" width="75px">
           <template slot-scope="scope">