diff --git a/src/views/groupManagement/GroupScheduling.vue b/src/views/groupManagement/GroupScheduling.vue
index d0cd569..c33c963 100644
--- a/src/views/groupManagement/GroupScheduling.vue
+++ b/src/views/groupManagement/GroupScheduling.vue
@@ -66,7 +66,6 @@
-
@@ -168,11 +167,23 @@
-
+
-
+
@@ -356,7 +367,7 @@ function handleAddGroup() {
function handleBindGroup() {
proxy.$refs['formRef'].validate((valid) => {
if (valid) {
- form.value.ScheduleDate = selectDate.value
+ form.value.ScheduleDate = proxy.$dayjs(selectDate.value).format('YYYY-MM-DD hh:mm:ss')
AddGroupSchedule2(form.value).then((res) => {
if (res.code === 200) {
proxy.$modal.msgSuccess('新增成功')
diff --git a/src/views/materialManagement/category/index.vue b/src/views/materialManagement/LineEdgeLibrary/category/index.vue
similarity index 100%
rename from src/views/materialManagement/category/index.vue
rename to src/views/materialManagement/LineEdgeLibrary/category/index.vue
diff --git a/src/views/materialManagement/inventory/index.vue b/src/views/materialManagement/LineEdgeLibrary/inventory/index.vue
similarity index 95%
rename from src/views/materialManagement/inventory/index.vue
rename to src/views/materialManagement/LineEdgeLibrary/inventory/index.vue
index 748b7f7..9597df5 100644
--- a/src/views/materialManagement/inventory/index.vue
+++ b/src/views/materialManagement/LineEdgeLibrary/inventory/index.vue
@@ -75,21 +75,9 @@
入库
出库
- 盘点
+ 盘点
-
-
-
-
-
-
-
-
-
-
-
-
@@ -371,11 +359,11 @@ async function submitForm() {
color: #fff;
}
.bg-red {
- background-color: red;
+ background-color: #f56c6c;
color: #fff;
}
-.bg-yellow {
- background-color: yellow;
- color: #fff;
+.bg-orange {
+ background-color: #e6a23c;
+ color: #fff !important;
}
diff --git a/src/views/materialManagement/log/inventoryChangeLog.vue b/src/views/materialManagement/LineEdgeLibrary/log/inventoryChangeLog.vue
similarity index 100%
rename from src/views/materialManagement/log/inventoryChangeLog.vue
rename to src/views/materialManagement/LineEdgeLibrary/log/inventoryChangeLog.vue
diff --git a/src/views/materialManagement/mbom/index.vue b/src/views/materialManagement/LineEdgeLibrary/mbom/index.vue
similarity index 95%
rename from src/views/materialManagement/mbom/index.vue
rename to src/views/materialManagement/LineEdgeLibrary/mbom/index.vue
index be0ad97..0df0458 100644
--- a/src/views/materialManagement/mbom/index.vue
+++ b/src/views/materialManagement/LineEdgeLibrary/mbom/index.vue
@@ -274,7 +274,24 @@ function handleDelete(row) {
})
}
+/// 物料分类
+import { listMaterialCategories } from '@/api/materialManagement/wms-category.js'
const categoryOptions = ref([])
+function getMaterialCategories() {
+ listMaterialCategories().then((res) => {
+ const { code, data } = res
+ if (code == 200) {
+ categoryOptions.value = data.result.map((item) => {
+ return {
+ value: item.categoryId,
+ label: item.categoryName
+ }
+ })
+ }
+ })
+}
+getMaterialCategories()
+
handleQuery()
diff --git a/src/views/materialManagement/supplier/index.vue b/src/views/materialManagement/LineEdgeLibrary/supplier/index.vue
similarity index 100%
rename from src/views/materialManagement/supplier/index.vue
rename to src/views/materialManagement/LineEdgeLibrary/supplier/index.vue
diff --git a/src/views/materialManagement/warehouse/index.vue b/src/views/materialManagement/LineEdgeLibrary/warehouse/index.vue
similarity index 100%
rename from src/views/materialManagement/warehouse/index.vue
rename to src/views/materialManagement/LineEdgeLibrary/warehouse/index.vue