From b8cfc2a0df4ff31685446ddb1d62e819cee1fd9f Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 14 Aug 2023 16:12:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task_template/edit.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/task_template/edit.vue b/src/views/task_template/edit.vue
index 1d85fc9..4159889 100644
--- a/src/views/task_template/edit.vue
+++ b/src/views/task_template/edit.vue
@@ -47,7 +47,7 @@
                 </el-form-item>
                 <el-form-item label="二阶比例">
                     <el-input
-                        v-model="formData.mediumint_two"
+                        v-model="formData.proportion_two"
                         clearable
                         placeholder="请输入比例"
                         type="number"
@@ -115,7 +115,7 @@ const formData = reactive({
     stage_day_one: 0,
     proportion_one: 0,
     stage_day_two: 9999,
-    mediumint_two: 0
+    proportion_two: 0
 })
 //任务类型接口
 dictDataLists({ type_id: 10 }).then((res) => {

From 6d52c2d2db01d789068eb4c59bc20774391b1e8b Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 14 Aug 2023 16:17:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/task/editTow.vue | 325 ++++++++++++++++++-------------------
 1 file changed, 161 insertions(+), 164 deletions(-)

diff --git a/src/views/task/editTow.vue b/src/views/task/editTow.vue
index f8b903e..c8309b5 100644
--- a/src/views/task/editTow.vue
+++ b/src/views/task/editTow.vue
@@ -1,207 +1,204 @@
 <template>
-  <div class="edit-popup">
-    <popup
-      ref="popupRef"
-      :title="title"
-      :async="true"
-      width="800px"
-      @confirm="handleSubmit"
-      @close="handleClose"
-      :clickModalClose="mode == 'show'"
-      :button="mode != 'show'"
-    >
-      <el-form
-        ref="formRef"
-        :rules="rules"
-        class="formdata"
-        :model="formData"
-        label-width="120px"
-      >
-        <el-form-item v-if="formData.id" required label="任务ID" prop="id">
-          <el-input
-            :disabled="true"
-            v-model="formData.id"
-            clearable
-            placeholder="请输入任务模板"
-          />
-        </el-form-item>
-        <el-form-item required label="任务日期" prop="datetime">
-          <el-date-picker
-            :disabled="isDisabled"
-            v-model="formData.datetime"
-            name="datetime"
-            type="daterange"
-            range-separator="至"
-            start-placeholder="开始时间"
-            end-placeholder="结束时间"
-            @change="changeDateTime"
-          />
-        </el-form-item>
-        <el-form-item required label="任务模板" prop="template_id">
-          <el-input
-            :disabled="isDisabled"
-            v-model="formData.template_name"
-            @click="isShow = true"
-            name="template_id"
-            clearable
-            placeholder="请输入任务模板"
-          />
-        </el-form-item>
-        <el-form-item v-if="mode == 'show'" label="">
-          <el-button type="primary" @click="clickUpdate"> 修改 </el-button>
-          <el-button type="danger" @click="clickDelete"> 删除 </el-button>
-        </el-form-item>
-      </el-form>
-    </popup>
-    <el-dialog v-model="isShow" title="选择任务" width="60%">
-      <DialogIndex @customEvent="customEvent" />
-    </el-dialog>
-  </div>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            :title="title"
+            :async="true"
+            width="800px"
+            @confirm="handleSubmit"
+            @close="handleClose"
+            :clickModalClose="mode == 'show'"
+            :button="mode != 'show'"
+        >
+            <el-form
+                ref="formRef"
+                :rules="rules"
+                class="formdata"
+                :model="formData"
+                label-width="120px"
+            >
+                <el-form-item v-if="formData.id" required label="任务ID" prop="id">
+                    <el-input
+                        :disabled="true"
+                        v-model="formData.id"
+                        clearable
+                        placeholder="请输入任务模板"
+                    />
+                </el-form-item>
+                <el-form-item required label="任务日期" prop="datetime">
+                    <el-date-picker
+                        :disabled="isDisabled"
+                        v-model="formData.datetime"
+                        name="datetime"
+                        type="daterange"
+                        range-separator="至"
+                        start-placeholder="开始时间"
+                        end-placeholder="结束时间"
+                        @change="changeDateTime"
+                    />
+                </el-form-item>
+                <el-form-item required label="任务模板" prop="template_id">
+                    <el-input
+                        :disabled="isDisabled"
+                        v-model="formData.template_name"
+                        @click="isShow = true"
+                        name="template_id"
+                        clearable
+                        placeholder="请输入任务模板"
+                    />
+                </el-form-item>
+                <el-form-item v-if="mode == 'show'" label="">
+                    <el-button type="primary" @click="clickUpdate"> 修改 </el-button>
+                    <el-button type="danger" @click="clickDelete"> 删除 </el-button>
+                </el-form-item>
+            </el-form>
+        </popup>
+        <el-dialog v-model="isShow" title="选择任务" width="60%">
+            <DialogIndex @customEvent="customEvent" />
+        </el-dialog>
+    </div>
 </template>
 
 <script lang="ts" setup name="taskEidt">
-import type { FormInstance, FormRules } from "element-plus";
-import Popup from "@/components/popup/index.vue";
-import { apiTaskAdd, apiTaskEdit, apiTaskDelete } from "@/api/task";
-import { reactive, onUpdated, type PropType } from "vue";
-import DialogIndex from "@/views/task_template/list_two.vue";
-import { timeFormat } from "@/utils/util";
-import feedback from "@/utils/feedback";
-const route = useRoute();
+import type { FormInstance, FormRules } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiTaskAdd, apiTaskEdit, apiTaskDelete } from '@/api/task'
+import { reactive, onUpdated, type PropType } from 'vue'
+import DialogIndex from '@/views/task_template/list_two.vue'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+const route = useRoute()
 
-const emit = defineEmits(["success", "close"]);
-const popupRef = shallowRef<InstanceType<typeof Popup>>();
-const mode = ref("add");
-const detailsdt = ref({});
-const isShow = ref(false);
-const title = ref("创建日程安排");
+const emit = defineEmits(['success', 'close'])
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+const detailsdt = ref({})
+const isShow = ref(false)
+const title = ref('创建日程安排')
 
 const changeDateTime = (e: any) => {
-  formData.start_time = timeFormat(e[0]);
-  formData.end_time = timeFormat(e[1]);
-};
+    formData.start_time = timeFormat(e[0])
+    formData.end_time = timeFormat(e[1])
+}
 
 // 表单数据
 const formData = reactive({
-  id: "",
-  create_user_id: "",
-  status: "",
-  template_id: "",
-  scheduling_id: "",
-  template_name: "",
-  start_time: "",
-  end_time: "",
-  datetime: "",
-});
+    id: '',
+    create_user_id: '',
+    status: '',
+    template_id: '',
+    scheduling_id: '',
+    template_name: '',
+    start_time: '',
+    end_time: '',
+    datetime: ''
+})
 
 interface RuleForm {
-  datetime: Date | String;
-  template_id: String;
+    datetime: Date | string
+    template_id: string
 }
 
 const rules = reactive<FormRules<RuleForm>>({
-  datetime: { required: true, message: "请选择时间范围", trigger: "blur" },
-  template_id: {
-    required: true,
-    message: "请选择任务模板",
-    trigger: "change",
-  },
-});
+    datetime: { required: true, message: '请选择时间范围', trigger: 'blur' },
+    template_id: {
+        required: true,
+        message: '请选择任务模板',
+        trigger: 'change'
+    }
+})
 
 function customEvent(data: any) {
-  isShow.value = false;
-  formData.template_id = data.id;
-  formData.template_name = data.title;
-}
-if (route.query.id) {
-  formData.scheduling_id = route.query.id.toString();
+    isShow.value = false
+    formData.template_id = data.id
+    formData.template_name = data.title
 }
 
-const formRef = ref(null);
+const formRef = ref(null)
 
 const props = defineProps({
-  task: {
-    type: Object,
-    defualt: () => {
-      null;
-    },
-  },
-});
-const isDisabled = ref(false);
+    task: {
+        type: Object,
+        defualt: () => {
+            null
+        }
+    }
+})
+const isDisabled = ref(false)
 
 const updatedForm = async () => {
-  if (mode.value == "show") {
-    title.value = "查看日程安排";
-    isDisabled.value = true;
-    Object.keys(formData).forEach((key: any) => {
-      if (props.task[key] != null && props.task[key] != undefined)
-        formData[key] = props.task[key];
-    });
-    formData.datetime = [
-      formData.start_time.split(" ")[0],
-      formData.end_time.split(" ")[0],
-    ];
-  } else {
-    isDisabled.value = false;
-    Object.keys(formData).forEach((key: any) => {
-      formData[key] = "";
-    });
-  }
-  await nextTick();
-  formRef.value.resetFields();
-};
+    if (mode.value == 'show') {
+        title.value = '查看日程安排'
+        isDisabled.value = true
+        Object.keys(formData).forEach((key: any) => {
+            if (props.task[key] != null && props.task[key] != undefined)
+                formData[key] = props.task[key]
+        })
+        formData.datetime = [formData.start_time.split(' ')[0], formData.end_time.split(' ')[0]]
+    } else {
+        isDisabled.value = false
+        Object.keys(formData).forEach((key: any) => {
+            formData[key] = ''
+        })
+    }
+    await nextTick()
+    formRef.value.resetFields()
+}
 
 const clickUpdate = () => {
-  mode.value = "edit";
-  isDisabled.value = false;
-};
+    mode.value = 'edit'
+    isDisabled.value = false
+}
 
 // 删除
 const clickDelete = () => {
-  feedback.confirm("确定要删除吗?").then(async (e) => {
-    if (e == "confirm") {
-      await apiTaskDelete({ id: formData.id });
-      popupRef.value?.close();
-      emit("success");
-    }
-  });
-};
+    feedback.confirm('确定要删除吗?').then(async (e) => {
+        if (e == 'confirm') {
+            await apiTaskDelete({ id: formData.id })
+            popupRef.value?.close()
+            emit('success')
+        }
+    })
+}
 
 // 提交按钮
 const handleSubmit = () => {
-  if (mode.value == "show") return popupRef.value?.close();
-  else
-    formRef.value.validate(async (e: Boolean) => {
-      if (e) {
-        const data = { ...formData };
-        mode.value == "edit" ? await apiTaskEdit(data) : await apiTaskAdd(data);
-        popupRef.value?.close();
-        emit("success");
-      }
-    });
-};
+    if (mode.value == 'show') return popupRef.value?.close()
+    else
+        formRef.value.validate(async (e: boolean) => {
+            if (e) {
+                const data = { ...formData }
+                if (route.query.id) {
+                    data.scheduling_id = route.query.id.toString()
+                }
+                mode.value == 'edit' ? await apiTaskEdit(data) : await apiTaskAdd(data)
+                popupRef.value?.close()
+                emit('success')
+            }
+        })
+}
 //打开弹窗
-const open = (type = "add") => {
-  mode.value = type;
-  popupRef.value?.open();
-};
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
 
 // 关闭回调
 const handleClose = () => {
-  emit("close");
-};
+    emit('close')
+}
 
 defineExpose({
-  open,
-  updatedForm,
-});
+    open,
+    updatedForm
+})
 </script>
 <style lang="scss" scoped>
 .formdata {
-  .el-form-item {
-    .el-date-picker {
-      width: 100%;
+    .el-form-item {
+        .el-date-picker {
+            width: 100%;
+        }
     }
-  }
 }
 </style>