Merge remote-tracking branch 'origin/master'

src/api/dms/dmsBaseMaintStation/types.ts

@@ -34,6 +34,11 @@ export interface DmsBaseMaintStationVO {
    */
   remark: string;
 
+  /**
+   * 保养项目ID数组
+   */
+  maintProjectIds: (string | number)[] | null;
+
 }
 
 export interface DmsBaseMaintStationForm extends BaseEntity {
@@ -72,6 +77,11 @@ export interface DmsBaseMaintStationForm extends BaseEntity {
    */
   remark?: string;
 
+  /**
+   * 保养项目ID数组
+   */
+  maintProjectIds?: (string | number)[] | null;
+
 }
 
 export interface DmsBaseMaintStationQuery extends PageQuery {
@@ -110,6 +120,11 @@ export interface DmsBaseMaintStationQuery extends PageQuery {
      * 日期范围参数
      */
     params?: any;
+
+  /**
+   * 保养项目ID数组
+   */
+  maintProjectIds?: (string | number)[] | null;
 }
 
 

src/views/dms/dmsBaseLubeStation/index.vue

@@ -212,9 +212,6 @@ const data = reactive<PageData<DmsBaseLubeStationForm, DmsBaseLubeStationQuery>>
     activeFlag: [
       { required: true, message: "激活标识不能为空", trigger: "change" }
     ],
-    deviceTypeId: [
-      { required: true, message: "设备类型不能为空", trigger: "change" }
-    ],
   }
 });
 

src/views/dms/dmsBaseMaintStation/index.vue

@@ -87,12 +87,20 @@
           <el-input v-model="form.maintStationId" placeholder="请输入主键标识" />
         </el-form-item>-->
         <el-form-item label="设备类型" prop="deviceTypeId">
-          <el-input v-model="form.deviceTypeId" placeholder="请输入设备类型" />
+<!--          <el-input v-model="form.deviceTypeId" placeholder="请输入设备类型" />-->
+          <el-select v-model="form.deviceTypeId"  placeholder="请选择设备类型" >
+            <el-option
+              v-for="item in dviceTypeOptions"
+              :key="item.deviceTypeId"
+              :label="item.deviceTypeName"
+              :value="item.deviceTypeId"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="保养标准" prop="maintStandardId">
 <!--          <el-input v-model="form.maintStandardId" placeholder="请输入保养标准ID" />-->
           <el-select v-model="form.maintStandardId" placeholder="请选择保养标准" >
-            <el-option v-for="item in maintStandardOptions" :key="item.maintStandardId" :label="item.maintStandardCode" :value="item.maintStandardId" />
+            <el-option v-for="item in maintStandardOption" :key="item.maintStandardId" :label="item.maintStandardCode" :value="item.maintStandardId" />
           </el-select>
         </el-form-item>
         <el-form-item label="部位编号" prop="maintStationCode">
@@ -101,6 +109,19 @@
         <el-form-item label="部位名称" prop="maintStationName">
           <el-input v-model="form.maintStationName" placeholder="请输入部位名称" />
         </el-form-item>
+
+        <!-- 新增保养项目多选组件 -->
+        <el-form-item label="保养项目" prop="maintProjectIds">
+          <el-select v-model="form.maintProjectIds" multiple placeholder="可选择多个保养项目" style="width: 100%">
+            <el-option
+              v-for="item in maintProjectOptions"
+              :key="item.maintProjectId"
+              :label="item.maintProjectName"
+              :value="item.maintProjectId"
+            />
+          </el-select>
+        </el-form-item>
+
         <el-form-item label="激活标识" prop="activeFlag">
           <el-radio-group v-model="form.activeFlag">
             <el-radio
@@ -129,6 +150,8 @@ import { listDmsBaseMaintStation, getDmsBaseMaintStation, delDmsBaseMaintStation
 import { DmsBaseMaintStationVO, DmsBaseMaintStationQuery, DmsBaseMaintStationForm } from '@/api/dms/dmsBaseMaintStation/types';
 import {getDmsBaseMaintStandardList} from "@/api/dms/dmsBaseMaintStandard";
 import {getBaseDeviceTypeListInDMS} from "@/api/dms/baseDeviceType";
+import { getDmsBaseMaintProjectList } from '@/api/dms/dmsBaseMaintProject';
+
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { active_flag } = toRefs<any>(proxy?.useDict('active_flag'));
@@ -173,8 +196,9 @@ const initFormData: DmsBaseMaintStationForm = {
   maintStandardId: undefined,
   maintStationCode: undefined,
   maintStationName: undefined,
-  activeFlag: undefined,
+  activeFlag: '1',
   remark: undefined,
+  maintProjectIds: []
 }
 const data = reactive<PageData<DmsBaseMaintStationForm, DmsBaseMaintStationQuery>>({
   form: {...initFormData},
@@ -298,9 +322,6 @@ const handleExport = () => {
   }, `dmsBaseMaintStation_${new Date().getTime()}.xlsx`)
 }
 
-
-
-
 // 保养标准
 let maintStandardOption = ref([]);
 const getMaintStandardOtions = async () => {
@@ -315,9 +336,17 @@ const getDviceTypeOption = async () => {
   dviceTypeOptions.value = res.data;
 }
 
+// 保养项目选项
+const maintProjectOptions = ref([]);
+const getMaintProjectOptions = async () => {
+  const res = await getDmsBaseMaintProjectList(null);
+  maintProjectOptions.value = res.data;
+}
+
 onMounted(() => {
   getMaintStandardOtions();
   getDviceTypeOption();
+  getMaintProjectOptions();
   getList();
 });
 </script>