git fix orgWorker

src/views/mes/organization/WorkerIndex.vue

@@ -265,7 +265,7 @@ const getCurrentDate = () =>{
   if(month<10){month = '0'+month}
   let day = now.getDate();
   if(day<10)day = '0'+day;
-  return year + "-" + month + "-" + day +" 00:00:01";
+  return year + "-" + month + "-" + day +" 00:00:00";
 }
 /** 初始化 **/
 onMounted(async () => {

src/views/mes/organization/components/WorkerRight.vue

@@ -1,14 +1,14 @@
 <template>
   <!-- 列表 -->
   <ContentWrap>
-    <el-button
+<!--    <el-button-->
-      type="success"
+<!--      type="success"-->
-      plain
+<!--      plain-->
-      @click="handleExport"
+<!--      @click="handleExport"-->
-      :loading="exportLoading"
+<!--      :loading="exportLoading"-->
-    >
+<!--    >-->
-      <Icon icon="ep:download" class="mr-5px" /> 导出
+<!--      <Icon icon="ep:download" class="mr-5px" /> 导出-->
-    </el-button>
+<!--    </el-button>-->
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
       <el-tab-pane label="所有" name="" />
       <el-tab-pane label="白班" name="1" />

src/views/mes/orgworker/OrgWorkerForm.vue

@@ -7,15 +7,15 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="工位id" prop="orgId">
+      <el-form-item label="工位" prop="orgId">
-        <el-input v-model="formData.orgId" placeholder="请输入工位id" />
+        <el-tree-select
-      </el-form-item>
+          v-model="formData.orgId"
-      <el-form-item label="工作日期" prop="workDate">
+          :data="organizationTree"
-        <el-date-picker
+          :props="defaultProps"
-          v-model="formData.workDate"
+          check-strictly
-          type="date"
+          default-expand-all
-          value-format="x"
+          @change="checkValid"
-          placeholder="选择工作日期"
+          placeholder="请选择工位"
         />
       </el-form-item>
       <el-form-item label="班别" prop="groupType">
@@ -29,11 +29,17 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="工人id" prop="workerId">
+      <el-form-item label="工作日期" prop="planDates">
-        <el-input v-model="formData.workerId" placeholder="请输入工人id" />
+        <el-date-picker
+          v-model="formData.planDates"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="dates"
+          placeholder="请选择工作日期"
+          class="!w-300px"
+        />
       </el-form-item>
-      <el-form-item label="报工单id" prop="reportId">
+      <el-form-item label="工人" prop="workerId">
-        <el-input v-model="formData.reportId" placeholder="请输入报工单id" />
+        <el-input disabled="disabled" v-model="formData.workerId" placeholder="请输入工人" />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -45,30 +51,36 @@
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { OrgWorkerApi, OrgWorkerVO } from '@/api/mes/orgworker'
+import {defaultProps, handleTree} from "@/utils/tree";
+import {OrganizationApi} from "@/api/mes/organization";
 
 /** 工位安排 表单 */
 defineOptions({ name: 'OrgWorkerForm' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
-
+const organizationTree = ref() // 树形结构
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
+
+disabled
+
 const formData = ref({
   id: undefined,
   orgId: undefined,
   workDate: undefined,
   groupType: undefined,
   workerId: undefined,
-  reportId: undefined
+  reportId: undefined,
+  planDates:[]
 })
 const formRules = reactive({
-  orgId: [{ required: true, message: '工位id不能为空', trigger: 'blur' }],
+  orgId: [{ required: true, message: '工位不能为空', trigger: 'blur' }],
   workDate: [{ required: true, message: '工作日期不能为空', trigger: 'blur' }],
   groupType: [{ required: true, message: '班别不能为空', trigger: 'blur' }],
-  workerId: [{ required: true, message: '工人id不能为空', trigger: 'blur' }]
+  workerId: [{ required: true, message: '工人不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -87,6 +99,7 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
+  await getOrganizationTree()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -126,4 +139,12 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
+/** 获得产线工位树 */
+const getOrganizationTree = async () => {
+  organizationTree.value = []
+  const data = await OrganizationApi.getOrganizationList()
+  const root: Tree = { id: 0, name: 'ALL', children: [] }
+  root.children = handleTree(data, 'id', 'parentId')
+  organizationTree.value.push(root)
+}
 </script>