校验报修时间，回显小区

杨泽宇
1 parent b0ac8d7c
Showing 3 changed files with 48 additions and 26 deletions
src/views/event/edit.vue
src/views/event/handwork.vue
src/views/repair/edit.vue
 <script setup lang="ts">
 import { reactive, ref, getCurrentInstance, onMounted } from "vue";
-import { eventCategory, handworkEdit } from '@/api/event';
+import { eventCategory, handworkEdit } from "@/api/event";
 import { useRoute } from "vue-router";
 import { back } from "@/utils/tool";
 import type { ElForm } from "element-plus";
@@ -97,16 +97,19 @@ const submitForm = (
   if (!formEl) return;
   formEl.validate(async (valid) => {
     if (valid) {
-      handworkEdit(form.data).then(res => {
-        if(res) {
-          instance?.proxy?.$message.success("操作成功");
-          back()
-        }
-      }).catch(error => {
-        console.log(error)
-      }).finally (() => {
-        form.loading = false
-      })
+      handworkEdit(form.data)
+        .then((res) => {
+          if (res) {
+            instance?.proxy?.$message.success("操作成功");
+            back();
+          }
+        })
+        .catch((error) => {
+          console.log(error);
+        })
+        .finally(() => {
+          form.loading = false;
+        });
     } else {
       instance?.proxy?.$message.error("请检查表单格式");
       form.loading = false;
@@ -159,18 +162,14 @@ onMounted(() =&gt; {
           </el-date-picker>
         </el-form-item>
         <el-form-item label="活动时长" prop="duration" style="width: 50%">
-          <el-input
-            v-model.trim="form.data.duration"
-            placeholder="请填写活动时长"
-            maxlength="15"
-          />
+          <el-input v-model.trim="form.data.duration" placeholder="请填写活动时长">
+            <template #append>小时</template>
+          </el-input>
         </el-form-item>
         <el-form-item label="活动单价" prop="unitPrice" style="width: 50%">
-          <el-input
-            v-model.trim="form.data.unitPrice"
-            placeholder="请填写活动单价"
-            maxlength="15"
-          />
+          <el-input v-model.trim="form.data.unitPrice" placeholder="请填写活动单价">
+            <template #append>元</template>
+          </el-input>
         </el-form-item>
         <el-form-item label="活动地址" prop="location" style="width: 100%">
           <el-input
@@ -49,8 +49,8 @@ const getList = async () =&gt; {
   data.loading = true;
   try {
     const res = await handworkList(data.params.query);
-    data.list = res?.data?.data?.list;
-    data.params.total = res?.data?.data?.total;
+    data.list = res?.data?.data;
+    // data.params.total = res?.data?.data?.total;
   } catch (e) {
     console.log(e);
   } finally {
@@ -143,7 +143,11 @@ onMounted(() =&gt; {
         prop="startTime"
         label="开始时间"
         align="center"
-      ></el-table-column>
+      >
+        <template #default="scope">
+          {{ parseTime(new Date(scope.row.startTime).getTime()) }}
+        </template>
+      </el-table-column>
       <el-table-column
         prop="duration"
         label="活动时长/小时"
@@ -177,7 +181,14 @@ onMounted(() =&gt; {
           {{statusData.find(u => u.value === scope.row.status)['publish']}}
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center"></el-table-column>
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button type="text">编辑</el-button>
+          <el-button type="text">删除</el-button>
+          <el-button type="text">查看人员</el-button>
+          <el-button type="text">编辑/查看/发布活动总结</el-button>
+        </template>
+      </el-table-column>
     </el-table>
     <Pagination
       :total="data.params.total"
@@ -27,6 +27,16 @@ let form = reactive({
 });
 const ruleFormRef = ref<InstanceType<typeof ElForm>>();
 /**
+ * 结束时间要在开始时间之后
+ */
+const checkTime = (rules, value, callback) => {
+  if(new Date(value).getTime() >= new Date(form.data.intentBeginTime).getTime()) {
+    callback()
+  } else {
+    callback(new Error('结束时间要在开始时间之后'))
+  }
+}
+/**
  * 表单验证规则
  */
 const rules = reactive({
@@ -75,8 +85,9 @@ const rules = reactive({
   intentEndTime: [
     {
       required: true,
-      message: "请选择意向上门结束时间",
+      message: "请选择晚于开始时间的意向上门结束时间",
       trigger: "blur",
+      validator: checkTime
     },
   ],
 });
@@ -143,6 +154,7 @@ onMounted(() =&gt; {
     form.dataType = "add";
   } else {
     form.dataType = "edit";
+    form.data.neighboorHoodId = ~~useRoute().query.neighboorHoodId;
     form.checkList = form.data.repairProject
       ? form.data.repairProject?.split(",").map((v) => v / 1)
       : [];