Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/api/wms/employeeChange.js

@@ -0,0 +1,64 @@
+import request from '@/utils/request'
+
+// 查询员工异动（入职/离职）列表
+export function listEmployeeChange(query) {
+  return request({
+    url: '/wms/employeeChange/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询员工异动（入职/离职）详细
+export function getEmployeeChange(changeId) {
+  return request({
+    url: '/wms/employeeChange/' + changeId,
+    method: 'get'
+  })
+}
+
+// 新增员工异动（入职/离职）
+export function addEmployeeChange(data) {
+  return request({
+    url: '/wms/employeeChange',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改员工异动（入职/离职）
+export function updateEmployeeChange(data) {
+  return request({
+    url: '/wms/employeeChange',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除员工异动（入职/离职）
+export function delEmployeeChange(changeId) {
+  return request({
+    url: '/wms/employeeChange/' + changeId,
+    method: 'delete'
+  })
+}
+
+// 员工入职
+export function employeeEntry(data) {
+  return request({
+    url: '/wms/employeeChange/entry',
+    method: 'post',
+    data: data
+  })
+}
+
+/**
+ * 员工离职
+ */
+export function employeeLeave(data) {
+  return request({
+    url: '/wms/employeeChange/leave',
+    method: 'post',
+    data: data
+  })
+}

klp-ui/src/api/wms/pendingAction.js

@@ -85,6 +85,10 @@ export function updatePendingAction(data) {
   if (payload.completeTime) {
     payload.completeTime = parseDate(payload.completeTime)
   }
+  if (payload.scanTime) {
+    // 扫码日期格式化为yyyy-MM-dd'T'HH:mm:ss.SSSX
+    payload.scanTime = parseDate(payload.scanTime).replace(' ', 'T') + '.000Z'
+  }
   return request({
     url: '/wms/coilPendingAction',
     method: 'put',