Ver código fonte

feature/bug修复

dengrui 10 meses atrás
pai
commit
135812f523

+ 1 - 1
src/views/base/craftManagement/route/components/processComponent.vue

@@ -124,7 +124,7 @@ const save = async () => {
     dtos: selectProComs.value,
   };
   let res = await saveCompoents(p);
-  // Elmessage.success("保存成功");
+  ElMessage.success("保存成功");
   loadTopList();
 };
 

+ 50 - 7
src/views/plan/schedule/index.vue

@@ -1,12 +1,31 @@
 <template>
   <div class="mainContentBox">
-    <avue-crud ref="crudRef" v-model:search="search" v-model="form" :data="data" :option="option" v-model:page="page"
-      @row-save="createRow" @row-update="updateRow" @row-del="deleteRow" @search-change="searchChange"
-      @search-reset="resetChange" @size-change="dataList" @current-change="dataList"
-      @selection-change="selectionChange">
+    <avue-crud
+      ref="crudRef"
+      v-model:search="search"
+      v-model="form"
+      :data="data"
+      :option="option"
+      v-model:page="page"
+      @row-save="createRow"
+      @row-update="updateRow"
+      @row-del="deleteRow"
+      @search-change="searchChange"
+      @search-reset="resetChange"
+      @size-change="dataList"
+      @current-change="dataList"
+      @selection-change="selectionChange"
+    >
       <template #menu="{ size, row, index }">
-        <el-button icon="el-icon-edit" text v-if="row.state === '-1' || row.state === '0'"
-          @click="handleEdit(row, index)" type="primary" :size="size">编辑</el-button>
+        <el-button
+          icon="el-icon-edit"
+          text
+          v-if="row.state === '-1' || row.state === '0'"
+          @click="handleEdit(row, index)"
+          type="primary"
+          :size="size"
+          >编辑</el-button
+        >
       </template>
       <template #menu-left>
         <div id="charts"></div>
@@ -82,7 +101,23 @@ onMounted(() => {
     });
   });
 });
-
+const validatePass1 = (rule, value, callback) => {
+  if (form.value.planStartWhen != "" && form.value.planStartWhen != null) {
+    if (getTime(form.value.planStartWhen) > getTime(form.value.planStartEnd)) {
+      callback(new Error("开始时间不能大于结束时间"));
+    } else {
+      callback();
+    }
+  } else {
+    callback();
+  }
+};
+const getTime = (str) => {
+  const isoDateString = str.replace(" ", "T");
+  const date = new Date(isoDateString);
+  const timestamp = Math.floor(date.getTime());
+  return timestamp;
+};
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {
   selection: true,
@@ -188,6 +223,14 @@ option.value = Object.assign(option.value, {
       prop: "planStartWhen",
       type: "datetime",
       valueFormat: "YYYY-MM-DD HH:mm:ss",
+      rules: [
+        {
+          required: true,
+          message: "开始时间不能大于结束时间",
+          trigger: "blur",
+          validator: validatePass1,
+        },
+      ],
     },
     {
       label: "结束时间",