计划调整

src/locales/en.ts

@@ -984,6 +984,7 @@ export default {
     selectInspectionItems:'SelectInspectionItems',
     unitHolder:'Please select unit',
     cycle:'Cycle',
+    beginCreateTime:'firstExecuteTime',
     SelectInspectionDevice:'SelectInspectionDevice',
     InspectionRoute:'InspectionRoute',
     planTitle:'PlanTitle',

src/locales/zh-CN.ts

@@ -979,6 +979,7 @@ export default {
     selectInspectionItems:'选择巡检项',
     unitHolder:'请选择单位',
     cycle:'周期',
+    beginCreateTime:'首次执行时间',
     SelectInspectionDevice:'选择巡检设备',
     InspectionRoute:'巡检路线',
     planTitle:'计划标题',

src/views/pms/inspect/plan/IotInspectPlan.vue

@@ -34,11 +34,6 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="t('route.cycle')" prop="planCycle">
-<!--                <el-input-->
-<!--                  type="number"-->
-<!--                  v-model="formData.planCycle"-->
-<!--                  :disabled="formType === 'update'"-->
-<!--                />-->
                 <el-input-number
                   style="width: 100%"
                   v-model="formData.planCycle"
@@ -48,24 +43,16 @@
                 />
               </el-form-item>
             </el-col>
-            <!--            <el-col :span="12">-->
-            <!--              <el-form-item label="负责人" prop="charges">-->
-            <!--                <el-select-->
-            <!--                  clearable-->
-            <!--                  filterable-->
-            <!--                  v-model="formData.charges"-->
-            <!--                  multiple-->
-            <!--                  style="width: 100%"-->
-            <!--                >-->
-            <!--                  <el-option-->
-            <!--                    v-for="item in deptUsers"-->
-            <!--                    :key="item.id"-->
-            <!--                    :label="item.nickname"-->
-            <!--                    :value="item.id"-->
-            <!--                  />-->
-            <!--                </el-select>-->
-            <!--              </el-form-item>-->
-            <!--            </el-col>-->
+            <el-col :span="12">
+              <el-form-item :label="t('route.beginCreateTime')" prop="beginCreateTime">
+                <el-date-picker
+                  style="width: 150%"
+                  v-model="formData.beginCreateTime"
+                  type="datetime"
+                  value-format="x"
+                />
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item :label="t('form.remark')" prop="remark">
                 <el-input type="textarea" v-model="formData.remark" />
@@ -190,6 +177,7 @@ const formData = ref({
   planTitle: undefined,
   planCode: undefined,
   planCycle: undefined,
+  beginCreateTime: undefined,
   planUnit: undefined,
   charge: undefined,
   charges: [],
@@ -201,6 +189,7 @@ const formRules = reactive({
   planTitle: [{ required: true, message: '巡检计划标题不能为空', trigger: 'blur' }],
   planCode: [{ required: true, message: '巡检计划编号不能为空', trigger: 'blur' }],
   planCycle: [{ required: true, message: '周期不能为空', trigger: 'blur' }],
+  beginCreateTime: [{ required: true, message: '首次执行时间不能为空', trigger: 'blur' }],
   planUnit: [{ required: true, message: '单位不能为空', trigger: 'blur' }]
   // charges: [{ required: true, message: '负责人不能为空', trigger: 'blur' }]
 })

src/views/pms/inspect/plan/index.vue

@@ -76,15 +76,15 @@
               {{ scope.$index + 1 }}
             </template>
           </el-table-column>
-          <el-table-column :label="t('route.planTitle')" align="center" prop="planTitle" />
-          <el-table-column :label="t('route.planNumber')" align="center" prop="planCode" />
+          <el-table-column :label="t('route.planTitle')" align="center" prop="planTitle" width="160" />
+          <el-table-column :label="t('route.planNumber')" align="center" prop="planCode" width="170" />
           <el-table-column :label="t('route.cycle')" align="center" prop="planCycle" />
           <el-table-column :label="t('workOrderMaterial.unit')" align="center" prop="planUnit" >
             <template #default="scope">
               <dict-tag :type="DICT_TYPE.PMS_INSPECT_UNIT" :value="scope.row.planUnit" />
             </template>
           </el-table-column>
-          <el-table-column :label="t('iotMaintain.PersonInCharge')" align="center" prop="chargeName" />
+<!--          <el-table-column :label="t('iotMaintain.PersonInCharge')" align="center" prop="chargeName" />-->
           <!--      <el-table-column label="设备" align="center" prop="deviceIds" />-->
           <el-table-column :label="t('bomList.status')" key="status">
             <template #default="scope">
@@ -96,7 +96,14 @@
               />
             </template>
           </el-table-column>
-          <el-table-column :label="t('form.remark')" align="center" prop="remark" />
+<!--          <el-table-column :label="t('form.remark')" align="center" prop="remark" />-->
+          <el-table-column
+            :label="t('route.beginCreateTime')"
+            align="center"
+            prop="beginCreateTime"
+            :formatter="dateFormatter"
+            width="180px"
+          />
           <el-table-column
             :label="t('table.createTime')"
             align="center"