样式修改

wms/hd/nladmin-system/src/main/java/org/nl/modules/quartz/utils/ExecutionJob.java

@@ -112,8 +112,9 @@ public class ExecutionJob extends QuartzJobBean {
                 EmailVo emailVo = taskAlarm(quartzJob, ThrowableUtil.getStackTrace(e));
                 emailService.send(emailVo, emailService.find());
             }
-        } finally {
             quartzLogRepository.save(log);
+        } finally {
+
         }
     }
 

wms/qd/src/assets/styles/eladmin.scss

@@ -1,14 +1,17 @@
 .head-container {
   padding-bottom: 10px;
+
   .filter-item {
     display: inline-block;
     vertical-align: middle;
     margin: 0 3px 10px 0;
+
     input {
       height: 30.5px;
       line-height: 30.5px;
     }
   }
+
   .el-form-item-label {
     margin: 0 3px 9px 0;
     display: inline-block;
@@ -19,12 +22,15 @@
     line-height: 30.5px;
     padding: 0 7px 0 7px;
   }
+
   .el-button + .el-button {
     margin-left: 0 !important;
   }
+
   .el-select__caret.el-input__icon.el-icon-arrow-up {
     line-height: 30.5px;
   }
+
   .date-item {
     display: inline-block;
     vertical-align: middle;
@@ -33,6 +39,7 @@
     width: 230px !important;
   }
 }
+
 .el-avatar {
   display: inline-block;
   text-align: center;
@@ -51,6 +58,7 @@
 .logo-con {
   height: 60px;
   padding: 13px 0 0;
+
   img {
     height: 32px;
     width: 135px;
@@ -87,6 +95,7 @@
   z-index: 99;
   width: 100%;
 }
+
 .eladmin-upload {
   border: 1px dashed #c0ccda;
   border-radius: 5px;
@@ -94,6 +103,7 @@
   line-height: 45px;
   width: 368px;
 }
+
 .my-blockquote {
   margin: 0 0 10px;
   padding: 15px;
@@ -102,6 +112,7 @@
   border-radius: 0 2px 2px 0;
   background-color: #f2f2f2;
 }
+
 .my-code {
   position: relative;
   padding: 15px;
@@ -115,3 +126,80 @@
 .el-tabs {
   margin-bottom: 25px;
 }
+
+
+//修改侧边栏菜单颜色和高度
+.el-menu-item, .el-submenu__title {
+  height: 40px !important;
+  //background-color: #776020 !important;
+}
+
+#app .sidebar-container .el-submenu .el-menu-item {
+}
+
+#app .sidebar-container .nest-menu .el-submenu > .el-submenu__title, #app .sidebar-container .el-submenu .el-menu-item {
+}
+
+#app .sidebar-container {
+  //background-color: #544b32 !important;
+}
+
+.el-form-item--small.el-form-item {
+  margin-bottom: 12px !important;
+}
+
+.el-form-item--mini.el-form-item {
+  margin-bottom: 10px !important;
+}
+
+//去除编辑文本框为数字时的上下箭头start
+.el-form--inline .el-form-item__content {
+  width: auto !important;
+}
+
+input[type="number"] {
+  -moz-appearance: textfield;
+}
+
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+}
+
+//去除编辑文本框为数字时的上下箭头end
+//设置计数器文字居左
+.el-input-number--mini .el-input__inner {
+  text-align: left;
+}
+
+.el-table:not(.el-table–scrollable-x) .el-table__fixed-right {
+  height: 100% !important;
+}
+
+// 修改弹出框距离
+.el-dialog__body {
+  padding-top: 0px !important;
+}
+
+//表格标题样式
+.el-table {
+  .el-table__header-wrapper,
+  .el-table__fixed-header-wrapper {
+    th {
+      word-break: break-word;
+      background-color: #f8f8f9;
+      color: #515a6e;
+      height: 35px;
+      font-size: 13px;
+    }
+    td{
+      color: #f8f8f9;
+    }
+  }
+  .el-table__body-wrapper {
+    .el-button [class*="el-icon-"] + span {
+      margin-left: 1px;
+    }
+  }
+}
+

wms/qd/src/assets/styles/element-ui.scss

@@ -17,7 +17,7 @@
 
 .cell {
   .el-tag {
-    margin-right: 0;
+    margin-right: 0px;
   }
 }
 
@@ -41,7 +41,7 @@
     text-align: center;
 
     .el-tag {
-      margin-right: 0;
+      margin-right: 0px;
     }
   }
 }
@@ -69,7 +69,7 @@
 // dropdown
 .el-dropdown-menu {
   a {
-    display: block
+    display: block;
   }
 }
 
@@ -77,3 +77,46 @@
 .el-range-editor.el-input__inner {
   display: inline-flex !important;
 }
+
+// to fix el-date-picker css style
+.el-range-separator {
+  box-sizing: content-box;
+}
+
+.el-menu--collapse
+> div
+> .el-submenu
+> .el-submenu__title
+.el-submenu__icon-arrow {
+  display: none;
+}
+
+.el-form-search {
+  float: right;
+  .el-form-search-item {
+    margin-bottom: 0px;
+    .el-input__inner {
+      width: 140px;
+    }
+  }
+}
+
+el-table .el-table__cell {
+  padding: 8px 0;
+}
+
+.el-table--medium .el-table__cell {
+  padding: 6px 0;
+}
+
+.el-table--small .el-table__cell {
+  padding: 3px 0;
+}
+
+.el-table--mini .el-table__cell {
+  padding: 1px 0;
+}
+
+.el-dialog__body {
+  padding: 20px 20px;
+}

wms/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>

wms/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>

wms/qd/src/components/Crud/crud.js

@@ -52,7 +52,7 @@ function CRUD(options) {
       add: true,
       edit: true,
       del: true,
-      download: true,
+      download: false,
       reset: true
     },
     // 自定义一些扩展属性

wms/qd/src/main.js

@@ -53,8 +53,11 @@ 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 }
+Element.TableColumn.props.align = { type: String, default: 'center' }
 Vue.use(Element, {
-  size: Cookies.get('size') || 'small' // set element-ui default size
+  size: 'mini' // set element-ui default size
 })
 
 Vue.config.productionTip = false

wms/qd/src/views/wms/sch/point/index.vue

@@ -231,7 +231,7 @@
         <el-table-column v-if="false" prop="area_type" label="所属区域" width="180" />
         <el-table-column prop="area_type_name" label="所属区域" width="180" />
         <el-table-column prop="vehicle_code" label="载具编码" />
-        <el-table-column prop="remark" label="备注" />
+        <el-table-column prop="remark" label="备注" show-overflow-tooltip />
         <el-table-column v-if="false" prop="source_uuid" label="来源标识" />
         <!--
                 <el-table-column prop="remark" label="备注"/>

wms/qd/src/views/wms/st/core/emptyVehicle/index.vue

@@ -99,11 +99,11 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="record_uuid" label="记录标识" />
-        <el-table-column prop="bill_code" label="单据编码" />
+        <el-table-column prop="bill_code" label="单据编码" min-width="120" show-overflow-tooltip />
         <el-table-column prop="io_type_name" label="单据类型" :formatter="formatTypeName" />
         <el-table-column prop="bill_status_name" label="单据状态" :formatter="formatStatusName" />
-        <el-table-column prop="start_point_code" label="起始点位" />
+        <el-table-column prop="start_point_code" label="起始点位" min-width="100" show-overflow-tooltip />
-        <el-table-column prop="next_point_code" label="下一点位" />
+        <el-table-column prop="next_point_code" label="下一点位" min-width="100" show-overflow-tooltip />
         <el-table-column prop="vehicle_code" label="载具编码" />
         <el-table-column prop="remark" label="备注" />
         <el-table-column prop="update_by" label="修改者" />

wms/qd/src/views/wms/st/quality/index.vue

@@ -55,21 +55,21 @@
         <el-table-column prop="bill_code" label="单据编码" width="115" />
         <el-table-column prop="bill_date" label="业务日期" width="85" />
         <el-table-column prop="bill_status" label="单据状态" :formatter="formatBillStatusName" width="100" />
-        <el-table-column prop="struct_code" label="仓位编码" />
+        <el-table-column prop="struct_code" label="仓位编码" min-width="100" show-overflow-tooltip />
         <el-table-column prop="struct_name" label="仓位名称" width="120" />
         <el-table-column prop="vehicle_code" label="载具号" />
         <el-table-column prop="material_code" label="物料编码" />
         <el-table-column prop="material_name" label="物料名称" />
         <el-table-column v-if="false" prop="outtask_uuid" label="出库任务标识" />
         <el-table-column v-if="false" prop="intask_uuid" label="入库任务标识" />
-        <el-table-column prop="remark" label="备注" />
+        <el-table-column prop="remark" label="备注" show-overflow-tooltip />
         <el-table-column prop="update_by" label="修改者" />
         <el-table-column prop="update_time" label="修改时间" width="135" />
         <el-table-column
           v-permission="['admin','instruction:edit','instruction:del']"
           fixed="left"
           label="操作"
-          width="80px"
+          width="50px"
           align="center"
         >
           <template slot-scope="scope">

wms/qd/src/views/wms/st/struct/index.vue

@@ -90,14 +90,14 @@
       >
         <el-table-column type="selection" width="55" />
         <el-table-column v-if="false" prop="struct_uuid" label="仓位标识" />
-        <el-table-column prop="struct_code" label="仓位编码" />
+        <el-table-column prop="struct_code" label="仓位编码" min-width="100" show-overflow-tooltip />
         <el-table-column prop="struct_name" label="仓位名称" width="120" />
         <!--
         <el-table-column prop="simple_name" label="仓位简称" width="120"/>
 -->
         <el-table-column prop="order_seq" label="顺序号" />
-        <el-table-column prop="store_name" label="所属仓库" />
+        <el-table-column prop="store_name" label="所属仓库" min-width="120" show-overflow-tooltip />
-        <el-table-column prop="sect_name" label="所属库区" />
+        <el-table-column prop="sect_name" label="所属库区" min-width="120" show-overflow-tooltip />
         <el-table-column label="是否启用" align="center" prop="is_active">
           <template slot-scope="scope">
             <el-switch

wms/qd/src/views/wms/st/structIvt/index.vue

@@ -79,7 +79,7 @@
         @selection-change="crud.selectionChangeHandler"
       >
         <el-table-column type="selection" width="55" />
-        <el-table-column prop="label_code" label="标签码" />
+        <el-table-column prop="label_code" label="标签码" min-width="160" show-overflow-tooltip />
         <el-table-column prop="formula" label="配方" />
         <el-table-column prop="pcsn" label="批次" />
         <el-table-column prop="material_code" label="物料编码" />