微调

frontend/src/views/machine/device/components/devicePopup.vue

@@ -41,7 +41,7 @@
                                     />
                                 </el-select>
                                 </el-form-item>           
-                                <el-form-item label="出厂日期" prop="createDate" >
+                                <el-form-item label="出厂日期" prop="createDate"    v-if="scene === '0'">
                                     <el-date-picker
                                         v-model="formContent.createDate" 
                                         placeholder="请选择出厂日期"
@@ -281,17 +281,21 @@ const baseRules: Record<string, Array<FormItemRule>> = {
 const rules = computed(() => {
   const dynamicRules = { ...baseRules };
 
+  if (scene.value === '0'){//只有电科院需要展示
+    dynamicRules.createDate= [{ required: true, message: '出厂日期必填！', trigger: 'blur' }];
+  }
   if (scene.value !== '0') {
     dynamicRules.name = [{ required: true, message: '设备名称必填！', trigger: 'blur' }];
     dynamicRules.hardwareVersion = [{ required: true, message: '固件版本必填！', trigger: 'blur' }];
     dynamicRules.softwareVersion = [{ required: true, message: '软件版本必填！', trigger: 'blur' }];
     dynamicRules.manufacturer = [{ required: true, message: '生产厂家必选！', trigger: 'change' }];
+   
   }
 
   if (scene.value !== '2') {
     dynamicRules.name = [{ required: true, message: '设备名称必填！', trigger: 'blur' }];
     dynamicRules.manufacturer = [{ required: true, message: '生产厂家必选！', trigger: 'change' }];
-    dynamicRules.createDate= [{ required: true, message: '出厂日期必填！', trigger: 'blur' }];
+    
   }
 
   

frontend/src/views/machine/device/index.vue

@@ -94,9 +94,10 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
     prop: 'createDate',
     label: '出厂日期',
     minWidth: 200,
-    search: {
-      span: 2,
-      render: () => {
+    isShow: appSceneStore.currentScene === '0',
+    ...(appSceneStore.currentScene === '0' ? {
+      search: { 
+        render: () => {
         return (
           <div class='flx-flex-start'>
             <TimeControl
@@ -106,7 +107,21 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
           </div>
         )
       },
-    },
+       },
+    } : {}),
+    // search: {
+    //   span: 2,
+    //   render: () => {
+    //     return (
+    //       <div class='flx-flex-start'>
+    //         <TimeControl
+    //           default={'月'}
+    //           onUpdate-dates={handleDateChange}
+    //         />
+    //       </div>
+    //     )
+    //   },
+    // },
   },
   {
     prop: 'devChns',