From 27ed93ef587217ebb9482f9d97225de676b96758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Tue, 18 Mar 2025 17:58:22 +0800
Subject: [PATCH] 1

---
 src/views/groupManagement/GroupScheduling.vue | 19 ++++++++++++----
 .../{ => LineEdgeLibrary}/category/index.vue  |  0
 .../{ => LineEdgeLibrary}/inventory/index.vue | 22 +++++--------------
 .../log/inventoryChangeLog.vue                |  0
 .../{ => LineEdgeLibrary}/mbom/index.vue      | 17 ++++++++++++++
 .../{ => LineEdgeLibrary}/supplier/index.vue  |  0
 .../{ => LineEdgeLibrary}/warehouse/index.vue |  0
 7 files changed, 37 insertions(+), 21 deletions(-)
 rename src/views/materialManagement/{ => LineEdgeLibrary}/category/index.vue (100%)
 rename src/views/materialManagement/{ => LineEdgeLibrary}/inventory/index.vue (95%)
 rename src/views/materialManagement/{ => LineEdgeLibrary}/log/inventoryChangeLog.vue (100%)
 rename src/views/materialManagement/{ => LineEdgeLibrary}/mbom/index.vue (95%)
 rename src/views/materialManagement/{ => LineEdgeLibrary}/supplier/index.vue (100%)
 rename src/views/materialManagement/{ => LineEdgeLibrary}/warehouse/index.vue (100%)

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 @@
         <el-dialog title="添加班组" :lock-scroll="false" v-model="addShow" :close-on-click-modal="false" append-to-body draggable>
             <el-form ref="formRef" :model="form" :rules="rules" label-width="100px">
                 <el-row :gutter="20">
-
                     <el-col :lg="12">
                         <el-form-item label="选择班组" prop="groupCode">
                             <el-select v-model="form.groupCode" filterable placeholder="请选择班组" value-key="id">
@@ -168,11 +167,23 @@
                         </template>
                     </el-table-column>
                 </el-table>
-                <pagination :total="persionNotBindTotal" v-model:page="queryNotBindPersionParams.pageNum" v-model:limit="queryNotBindPersionParams.pageSize" @pagination="getNotBindPersionList" />
+                <pagination
+                    :total="persionNotBindTotal"
+                    v-model:page="queryNotBindPersionParams.pageNum"
+                    v-model:limit="queryNotBindPersionParams.pageSize"
+                    @pagination="getNotBindPersionList" />
             </div>
         </el-dialog>
         <!-- 人员技能矩阵图 -->
-        <ZrDialog title="人员技能矩阵" width="70%" @opened="skillOpened" :lock-scroll="false" v-model="skillShow" :close-on-click-modal="false" append-to-body draggable>
+        <ZrDialog
+            title="人员技能矩阵"
+            width="70%"
+            @opened="skillOpened"
+            :lock-scroll="false"
+            v-model="skillShow"
+            :close-on-click-modal="false"
+            append-to-body
+            draggable>
             <div>
                 <BasePersonSkillMatrix ref="BasePersonSkillMatrixRef" :PersonList="personIds" :RouteId="routeId"></BasePersonSkillMatrix>
             </div>
@@ -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 @@
                         <el-form-item label="操作类别">
                             <div v-if="actionType == 1" class="tag-box bg-blue">入库</div>
                             <div v-if="actionType == 2" class="tag-box bg-red">出库</div>
-                            <div v-if="actionType == 3" class="tag-box bg-yellow">盘点</div>
+                            <div v-if="actionType == 3" class="tag-box bg-orange">盘点</div>
                         </el-form-item>
                     </el-col>
-                    <el-col :lg="24" v-if="actionType == 1">
-                        <el-form-item label="入库单号" prop="id">
-                            <el-input v-model="form.id" placeholder="请输入库单号" />
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :lg="24" v-if="actionType == 2">
-                        <el-form-item label="领料单号" prop="id">
-                            <el-input v-model="form.id" placeholder="请输入领料单号" />
-                        </el-form-item>
-                    </el-col>
-
                     <el-col :lg="24">
                         <el-form-item label="库位" prop="location">
                             <el-select :disabled="isUpdate" filterable v-model="form.location" placeholder="请选择库位">
@@ -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;
 }
 </style>
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()
 </script>
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