Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

acs/nladmin-ui/src/components/Crud/crud.js

@@ -268,7 +268,11 @@ function CRUD(options) {
     /**
      * 取消新增/编辑
      */
-    cancelCU() {
+    cancelCU(formName) {
+      if (formName instanceof PointerEvent) {
+        formName = 'form'
+      }
+
       const addStatus = crud.status.add
       const editStatus = crud.status.edit
       const viewStatus = crud.status.view
@@ -296,18 +300,21 @@ function CRUD(options) {
         callVmHook(crud, CRUD.HOOK.afterEditCancel, crud.form)
       }
       // 清除表单验证
-      if (crud.findVM('form').$refs['form']) {
-        crud.findVM('form').$refs['form'].clearValidate()
+      if (crud.findVM('form').$refs[formName]) {
+        crud.findVM('form').$refs[formName].clearValidate()
       }
     },
     /**
      * 提交新增/编辑
      */
-    submitCU(form) {
+    submitCU(formName) {
+      if (formName instanceof PointerEvent) {
+        formName = 'form'
+      }
       if (!callVmHook(crud, CRUD.HOOK.beforeValidateCU)) {
         return
       }
-      crud.findVM('form').$refs['form'].validate(valid => {
+      crud.findVM('form').$refs[formName].validate(valid => {
         if (!valid) {
           return
         }
@@ -493,8 +500,10 @@ function CRUD(options) {
         }
       }
       // add by ghl 2020-10-04  页面重复添加信息时，下拉框的校验会存在，需要找工取消
-      if (crud.findVM('form').$refs['form']) {
-        crud.findVM('form').$refs['form'].clearValidate()
+      let form_ref = 'form'
+      if (crudFrom.form_ref) form_ref = crudFrom.form_ref
+      if (crud.findVM('form').$refs[form_ref]) {
+        crud.findVM('form').$refs[form_ref].clearValidate()
       }
     },
     /**

lms/nladmin-system/src/main/java/org/nl/wms/sch/service/impl/PointServiceImpl.java

@@ -79,7 +79,7 @@ public class PointServiceImpl implements PointService {
                     String[] types = split[j].split("-");
                     typeArr.put(types[0], types[1]);
                 }
-                object.put("point_status_name", typeArr.getString(point_type));
+                object.put("point_type_name", typeArr.getString(point_type));
             }
             res.add(object);
         }

lms/nladmin-ui/package.json

@@ -64,7 +64,6 @@
     "screenfull": "4.2.0",
     "sortablejs": "1.8.4",
     "throttle-debounce": "^5.0.0",
-    "v-fit-columns": "^0.2.0",
     "vue": "2.6.10",
     "vue-color": "^2.8.1",
     "vue-count-to": "1.0.13",

lms/nladmin-ui/src/assets/styles/eladmin.scss

@@ -167,6 +167,7 @@ input[type="number"]::-webkit-outer-spin-button {
 }
 
 //去除编辑文本框为数字时的上下箭头end
+
 //设置计数器文字居左
 .el-input-number--mini .el-input__inner {
   text-align: left;
@@ -192,10 +193,12 @@ input[type="number"]::-webkit-outer-spin-button {
       height: 35px;
       font-size: 13px;
     }
-    td{
-       color: #f8f8f9;
+
+    td {
+      color: #f8f8f9;
     }
   }
+
   .el-table__body-wrapper {
     .el-button [class*="el-icon-"] + span {
       margin-left: 1px;
@@ -203,3 +206,13 @@ input[type="number"]::-webkit-outer-spin-button {
   }
 }
 
+//表格固定列最后一行显示不全(https://mp.weixin.qq.com/s/HpoykJNtsynsW4UMHitZbQ)
+.el-table__fixed-right {
+  height: 100% !important;
+}
+
+//表头与内容错位
+.el-table--scrollable-y .el-table__body-wrapper {
+  overflow-y: overlay !important;
+}
+

lms/nladmin-ui/src/components/Crud/crud.js

@@ -268,7 +268,11 @@ function CRUD(options) {
     /**
      * 取消新增/编辑
      */
-    cancelCU() {
+    cancelCU(formName) {
+      if (formName instanceof PointerEvent) {
+        formName = 'form'
+      }
+
       const addStatus = crud.status.add
       const editStatus = crud.status.edit
       const viewStatus = crud.status.view
@@ -296,18 +300,21 @@ function CRUD(options) {
         callVmHook(crud, CRUD.HOOK.afterEditCancel, crud.form)
       }
       // 清除表单验证
-      if (crud.findVM('form').$refs['form']) {
-        crud.findVM('form').$refs['form'].clearValidate()
+      if (crud.findVM('form').$refs[formName]) {
+        crud.findVM('form').$refs[formName].clearValidate()
       }
     },
     /**
      * 提交新增/编辑
      */
-    submitCU(form) {
+    submitCU(formName) {
+      if (formName instanceof PointerEvent) {
+        formName = 'form'
+      }
       if (!callVmHook(crud, CRUD.HOOK.beforeValidateCU)) {
         return
       }
-      crud.findVM('form').$refs['form'].validate(valid => {
+      crud.findVM('form').$refs[formName].validate(valid => {
         if (!valid) {
           return
         }
@@ -493,8 +500,10 @@ function CRUD(options) {
         }
       }
       // add by ghl 2020-10-04  页面重复添加信息时，下拉框的校验会存在，需要找工取消
-      if (crud.findVM('form').$refs['form']) {
-        crud.findVM('form').$refs['form'].clearValidate()
+      let form_ref = 'form'
+      if (crudFrom.form_ref) form_ref = crudFrom.form_ref
+      if (crud.findVM('form').$refs[form_ref]) {
+        crud.findVM('form').$refs[form_ref].clearValidate()
       }
     },
     /**

lms/nladmin-ui/src/main.js

@@ -61,9 +61,6 @@ Vue.prototype.handleTree = handleTree
 Vue.prototype.getValueByCode = getValueByCode
 Vue.prototype.flexWidth = flexWidth
 
-import Plugin from 'v-fit-columns'
-Vue.use(Plugin)
-
 Vue.use(scroll)
 
 Vue.use(VueHighlightJS)