Merge branch 'dev_web' of http://dev.ccwin-in.com:3000/BoXu.Zheng/WZC2 into dev_web

fe/PC/src/components/currenDescriptions/index.vue

@@ -66,7 +66,7 @@
 </template>
 <script>
 import { parseTime } from "@/utils/index"
-import { formatDateTime } from "@/utils/formatTime"
+import { formatTimeStrToStr } from "@/utils/formatTime"
 import { fileStorage } from "@/api/wms-api"
 
 let that
@@ -84,7 +84,10 @@ export default {
   },
   filters: {
     formatDate (time) {
-      return formatDateTime(time)
+      if (time == null) {
+        return '-'
+      }
+      return formatTimeStrToStr(time)
     },
     formatOnlyDate (time) {
       var date = new Date(time);

fe/PC/src/components/currenTable/index.vue

@@ -307,7 +307,7 @@
 </template>
 <script>
 import Sortable from "sortablejs";
-import { formatDateTime } from "@/utils/formatTime";
+import { formatTimeStrToStr } from "@/utils/formatTime";
 import { getMatchRegConformValue } from "@/utils/index"
 import _ from "lodash";
 export default {
@@ -317,7 +317,7 @@ export default {
       if (time == null) {
         return '-'
       }
-      return formatDateTime(time)
+      return formatTimeStrToStr(time)
     },
   },
   props: {

fe/PC/src/components/umyTable/index.vue

@@ -320,14 +320,17 @@
   </u-table>
 </template>
 <script>
-import { formatDateTime } from "@/utils/formatTime";
+import { formatTimeStrToStr } from "@/utils/formatTime";
 import _ from "lodash";
 import { getMatchRegConformValue } from "@/utils/index"
 export default {
   name: "currenTable",
   filters: {
     formatDate(time) {
-      return formatDateTime(time)
+      if (time == null) {
+        return '-'
+      }
+      return formatTimeStrToStr(time)
     },
   },
   props: {

fe/PC/src/views/basicData/WarehouseManage/Location.vue

@@ -326,6 +326,8 @@ export default {
           workGroupCode: [{ required: true, trigger: "change", message: "不可为空" }],
           code: [{ required: true, trigger: "change", message: "不可为空" }],
           erpLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
+          rowCode:[{required: true, trigger: "change", message: "不可为空"}],
+          columnCode:[{required: true, trigger: "change", message: "不可为空"}],
         },
         editRule: {
           // warehouseCode: [{ required: true, trigger: "change", message: "不可为空" },],
@@ -333,6 +335,8 @@ export default {
           locationGroupCode: [{ required: true, trigger: "change", message: "不可为空" }],
           workGroupCode: [{ required: true, trigger: "change", message: "不可为空" }],
           erpLocationCode: [{ required: true, trigger: "change", message: "不可为空" }],
+          rowCode:[{required: true, trigger: "change", message: "不可为空"}],
+          columnCode:[{required: true, trigger: "change", message: "不可为空"}],
         }
       },
       // 自定义详情明细汇总等table页