Merge remote-tracking branch 'origin/dev' into dev

mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/classesSelect.vue

@@ -0,0 +1,65 @@
+<template>
+  <!-- 班组选择 -->
+  <el-select
+    v-model="valueName"
+    placeholder="请输入班组"
+    :remote-method="remoteMethod"
+    remote-show-suffix
+    remote
+    clearable
+    reserve-keyword
+    filterable
+    :loading="Loading"
+    @change="onSelectChange"
+  >
+    <el-option
+      v-for="item in classesSelectList"
+      :key="item.id"
+      :label="item.name"
+      :value="item.id"
+    />
+  </el-select>
+</template>
+
+<script lang="ts" setup>
+import { ref, onMounted, toRefs } from 'vue'
+import * as ClassesApi from '@/api/heli/classes'
+const valueName: any = ref() //选中的值
+const classesList = ref<ClassesApi.ClassesVO[]>([]) // 用户列表
+const classesSelectList = ref<ClassesApi.ClassesVO[]>([])
+const Loading = ref(false)
+
+// 初始化用户列表
+onMounted(async () => {
+  const queryParams = {
+    pageNo: 1,
+    pageSize: 10,
+    code: undefined,
+    brief: undefined,
+    status: undefined
+  }
+  try {
+    const data = await ClassesApi.getClassesPage(queryParams)
+    console.log(data.list)
+    classesList.value = data.list
+    // 设置初始值，如果需要的话
+    remoteMethod('')
+  } catch (error) {
+    console.error(error)
+  }
+})
+
+const remoteMethod = (query: any) => {
+  if (query) {
+    Loading.value = true
+    setTimeout(() => {
+      Loading.value = false
+      classesSelectList.value = classesList.value
+        .filter((item) => item.name.toLowerCase().includes(query.toLowerCase()))
+        .slice(0, 10) //只显示前10个
+    }, 200)
+  } else {
+    classesSelectList.value = classesList.value.slice(0, 10)
+  }
+}
+</script>

mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/index.vue

@@ -9,10 +9,12 @@
       <el-row style="font-size: 20px; font-weight: 700;margin-bottom: 30px">
         <el-col :span="1"> 部门 </el-col>
         <el-col :span="1"> 车间 </el-col>
+        <el-col :span="1"> 班组 </el-col>
         <el-col :span="1"> 职工 </el-col>
         <el-col :span="1"> 客户</el-col>
         <el-col :span="1"> 供应商</el-col>
         <el-col :span="1"> 材质</el-col>
+        <el-col :span="1"> 物料</el-col>
       </el-row>
       <!-- 搜索工作栏 -->
       <el-form

mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/indexFrom.vue

@@ -12,6 +12,9 @@
       </el-form-item>
       <el-form-item label="车间" prop="workshopId">
         <WorkshopSelect v-model="formData.workshopId" />
+      </el-form-item>
+       <el-form-item label="班组" prop="classesId">
+        <ClassesSelect v-model="formData.classesId" />
       </el-form-item>
       <el-form-item label="职工" prop="leaderUserId">
         <UserSelect v-model="formData.leaderUserId" />
@@ -25,6 +28,9 @@
       <el-form-item label="材质" prop="compositionId">
         <CompositionSelect v-model="formData.compositionId" />
       </el-form-item>
+       <el-form-item label="物料" prop="materialId">
+        <MaterialSelect v-model="formData.materialId" />
+      </el-form-item>
     </el-form>
     <template #footer>
       <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -45,6 +51,8 @@ import ClientSelect from '../hlvuestyle/clientSelect.vue'
 import SupplierSelect from '../hlvuestyle/supplierSelect.vue'
 import CompositionSelect from '../hlvuestyle/compositionSelect.vue'
 import WorkshopSelect from '../hlvuestyle/workshopSelect.vue'
+import MaterialSelect from '../hlvuestyle/materialSelect.vue'
+import ClassesSelect from '../hlvuestyle/classesSelect.vue'
 
 defineOptions({ name: 'SystemDeptForm' })
 
@@ -63,6 +71,8 @@ const formData: any = ref({
   supplierId: undefined,
   compositionId: undefined,
   workshopId: undefined,
+  materialId: undefined,
+  classesId:undefined,
   status: CommonStatusEnum.ENABLE
 })
 const formRules = reactive<FormRules>({
@@ -118,6 +128,10 @@ const resetForm = () => {
   leaderUserId: undefined,
   clientId: undefined,
   supplierId: undefined,
+  compositionId: undefined,
+  workshopId: undefined,
+  materialId: undefined,
+  classesId:undefined,
   status: CommonStatusEnum.ENABLE
   }
   formRef.value?.resetFields()

mes-ui/mes-ui-admin-vue3/src/views/heli/hlvuestyle/materialSelect.vue

@@ -0,0 +1,61 @@
+<template>
+  <!-- 物料选择 -->
+  <el-select
+    v-model="valueName"
+    placeholder="请输入物料"
+    :remote-method="remoteMethod"
+    remote-show-suffix
+    remote
+    clearable
+    reserve-keyword
+    filterable
+    :loading="Loading"
+    @change="onSelectChange"
+  >
+    <el-option v-for="item in materialSelectList" :key="item.id" :label="item.name" :value="item.id" />
+  </el-select>
+</template>
+
+<script lang="ts" setup>
+import { ref, onMounted, toRefs } from 'vue'
+import * as MaterialApi from '@/api/heli/material'
+const valueName: any = ref() //选中的值
+const materialList = ref<MaterialApi.MaterialVO[]>([]) // 用户列表
+const materialSelectList = ref<MaterialApi.MaterialVO[]>([])
+const Loading = ref(false)
+
+// 初始化用户列表
+onMounted(async () => {
+  const queryParams = {
+    pageNo: 1,
+    pageSize: 10,
+    code: undefined,
+    brief: undefined,
+    status: undefined
+  }
+  try {
+    const data = await MaterialApi.getMaterialPage(queryParams)
+    console.log(data.list)
+    materialList.value = data.list
+    // 设置初始值，如果需要的话
+    remoteMethod('')
+  } catch (error) {
+    console.error(error)
+  }
+})
+
+const remoteMethod = (query: any) => {
+  if (query) {
+    Loading.value = true
+    setTimeout(() => {
+      Loading.value = false
+      materialSelectList.value = materialList.value
+        .filter((item) => item.name.toLowerCase().includes(query.toLowerCase()))
+        .slice(0, 10) //只显示前10个
+    }, 200)
+  } else {
+    materialSelectList.value = materialList.value.slice(0, 10)
+  }
+}
+
+</script>