From 9ab680e396120ccd9437919c19f8ef01c4e51db5 Mon Sep 17 00:00:00 2001
From: xuesinan <1404152492@qq.com>
Date: Tue, 7 Dec 2021 17:42:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=BB=BA=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |   3 +-
 package.json                                  |   3 +-
 .../TimeLine/component/TimeStatus.vue         | 107 +++-
 src/components/Title/Title.vue                |   1 -
 .../Title/components/CreateTask copy.vue      | 466 ++++++++++++++++++
 .../Title/components/CreateTask.vue           | 287 +++++++----
 tsconfig.json                                 |   1 +
 7 files changed, 766 insertions(+), 102 deletions(-)
 create mode 100644 src/components/Title/components/CreateTask copy.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4fe18f..dbd47a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# 0.1.0 (2021-11-18)
+# 0.1.0 (2021-12-07)
 
 ### 🌟 新功能
 范围|描述|commitId
@@ -226,6 +226,7 @@
 范围|描述|commitId
 --|--|--
  - | 1.时间轴筛选相同的时间替换数据 2.整理代码 | e082ccb
+ - | 本地缓存 | c615924
  - | 测试接口 | 215e074
  - | 插件查询及展示 | 4dba770
  - | 角色栏文字颜色修改 | 215c6b3
diff --git a/package.json b/package.json
index fca8b3c..102ee37 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,7 @@
     "@dcloudio/uni-h5": "^2.0.0-31920210709003",
     "@dcloudio/uni-helper-json": "*",
     "@dcloudio/uni-i18n": "^2.0.0-31920210709003",
+    "@dcloudio/uni-cli-i18n": "^2.0.0-31920210709003",
     "@dcloudio/uni-mp-vue": "^2.0.0-31920210709003",
     "@dcloudio/uni-mp-weixin": "^2.0.0-31920210709003",
     "@dcloudio/uni-quickapp-native": "^2.0.0-31920210709003",
@@ -42,7 +43,7 @@
     "regenerator-runtime": "^0.12.1",
     "uview-ui": "^1.8.4",
     "vue": "^2.6.11",
-    "vue-clipboard2": "^0.3.1",
+    "vue-clipboard2": "^0.3.3",
     "vuex": "^3.2.0"
   },
   "devDependencies": {
diff --git a/src/components/TimeLine/component/TimeStatus.vue b/src/components/TimeLine/component/TimeStatus.vue
index 7055166..536e533 100644
--- a/src/components/TimeLine/component/TimeStatus.vue
+++ b/src/components/TimeLine/component/TimeStatus.vue
@@ -36,14 +36,33 @@
         </view>
       </view>
     </view>
+
+    <!-- 遮罩 -->
+    <view class="mask" v-if="maskShow" @click="closeMask"></view>
+    <!-- 新建任务弹窗 -->
+    <CreateTask
+      :startTime="startTime"
+      :endTime="endTime"
+      :task="task"
+      :source="'timeStatus'"
+      @showTime="showTime"
+      @closeMask="closeMask"
+      class="thirdPopup flex transition-transform"
+      v-if="createTaskShow"
+    />
+
+    <u-picker title="开始时间" mode="time" v-model="showStart" :params="params" @confirm="confirmStartTime"></u-picker>
+    <u-picker title="结束时间" mode="time" v-model="showEnd" :params="params" @confirm="confirmEndTime"></u-picker>
   </view>
 </template>
 
 <script>
 import { mapState, mapMutations } from 'vuex';
+import CreateTask from '../../Title/components/CreateTask.vue';
 
 export default {
   name: 'TimeStatus',
+  components: { CreateTask },
   props: { task: { type: Object, default: () => {} } },
 
   data() {
@@ -55,6 +74,20 @@ export default {
       again: [{ text: '重新开始任务', color: 'blue' }],
       timer: null,
       durationText: 0,
+      maskShow: false, //遮罩显示
+      createTaskShow: false, //新建项目显示
+      startTime: '', // 新建任务的开始时间
+      endTime: '', // 新建任务的截止时间
+      showStart: false,
+      showEnd: false,
+      params: {
+        year: true,
+        month: true,
+        day: true,
+        hour: true,
+        minute: true,
+        second: true,
+      },
     };
   },
 
@@ -150,7 +183,38 @@ export default {
 
     // 新建任务
     addTask() {
-      this.$t.ui.showToast('新建任务');
+      // this.$t.ui.showToast('新建任务');
+      // 打开遮罩
+      this.maskShow = true;
+      // 打开新建项目弹窗
+      this.createTaskShow = true;
+    },
+
+    //点击遮罩，关闭弹窗
+    closeMask() {
+      // 关闭遮罩
+      this.maskShow = false;
+      // 关闭新建项目弹窗
+      this.createTaskShow = false;
+    },
+
+    showTime(data) {
+      if (data === 1) {
+        this.showStart = !this.showStart;
+      } else {
+        this.showEnd = !this.showEnd;
+      }
+    },
+
+    // 选择开始时间
+    confirmStartTime(e) {
+      this.startTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
+      // this.showEnd = true;
+    },
+
+    // 选择结束时间
+    confirmEndTime(e) {
+      this.endTime = `${e.year}-${e.month}-${e.day} ${e.hour}:${e.minute}:${e.second}`;
     },
 
     // 计算圆环的弧度百分比
@@ -228,4 +292,45 @@ export default {
   height: 25px;
   border: 2px solid #60a5fa;
 }
+
+.mask {
+  width: 100%;
+  height: 100vh;
+  z-index: 21;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: rgba(0, 0, 0, 0.3);
+}
+
+.thirdPopup {
+  background: #ffffff;
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 33;
+  border-radius: 5px;
+  width: 90%;
+}
+
+::v-deep .u-dropdown__content {
+  min-height: 120px !important;
+  height: auto !important;
+  overflow-y: auto;
+  background: #fff !important;
+  transition: none !important;
+  box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);
+}
+::v-deep .u-dropdown__menu__item .u-flex {
+  justify-content: space-between;
+  width: 100%;
+  height: 100%;
+  flex-wrap: nowrap;
+  border: 1px solid #afbed1;
+  padding: 0 8px;
+}
+::v-deep .u-dropdown__content__mask {
+  display: none;
+}
 </style>
diff --git a/src/components/Title/Title.vue b/src/components/Title/Title.vue
index a74f8e9..326737e 100644
--- a/src/components/Title/Title.vue
+++ b/src/components/Title/Title.vue
@@ -120,7 +120,6 @@ export default {
     },
     // 回到首页
     openIndex() {
-      console.log(111);
       uni.webView.reLaunch({ url: `/pages/index/index?u=${this.userId}` });
     },
 
diff --git a/src/components/Title/components/CreateTask copy.vue b/src/components/Title/components/CreateTask copy.vue
new file mode 100644
index 0000000..fb32b18
--- /dev/null
+++ b/src/components/Title/components/CreateTask copy.vue	
@@ -0,0 +1,466 @@
+<template>
+  <div class="new-projects-box">
+    <div class="form">
+      <!-- 项目名称 -->
+      <view class="mb-3 font-bold text-base flex justify-center text-black">新建任务</view>
+      <div class="flex items-center mb-2">
+        <div>名称<span class="text-red-500">*</span>：</div>
+        <u-input max-length="5" v-model="name" :type="type" :border="border" />
+      </div>
+      <!-- 起止时间 -->
+      <div class="mb-2">
+        <div>起止时间：</div>
+        <u-input placeholder="请选择起止时间" v-model="timeValue" :type="type" :border="border" @click="$emit('showTime')" />
+      </div>
+      <!-- 多选框 -->
+      <div class="flex justify-between items-center">
+        <div>负责人<span class="text-red-500">*</span>：</div>
+        <div class="flex-1" v-if="hasRole">{{ roleName }}</div>
+        <div label="负责人" class="flex-1" v-else>
+          <u-dropdown disabled ref="uDropdown" placeholder="请选择负责人">
+            <u-dropdown-item :title="roleList">
+              <view class="slot-content bg-white">
+                <div
+                  class="flex flex-row justify-between mb-1 drop-item"
+                  v-for="(role, roleIndex) in roleOptions"
+                  :key="roleIndex"
+                  @click="change(roleIndex)"
+                >
+                  <view v-model="role.id">{{ role.name }}</view>
+                  <u-icon v-if="role.dropdownShow" name="checkbox-mark" color="#2979ff" size="28"></u-icon>
+                </div>
+              </view>
+            </u-dropdown-item>
+          </u-dropdown>
+        </div>
+      </div>
+      <!-- 下拉图标 -->
+      <div class="flex justify-center my-6">
+        <u-icon v-if="arrow" name="arrow-down" size="28" @click="openDropdown"></u-icon>
+        <u-icon v-else name="arrow-up" size="28" @click="closeSecondDropdown"></u-icon>
+      </div>
+      <!-- 下拉框的内容 -->
+      <div v-if="show" class="mb-6">
+        <!-- 描述 -->
+        <div class="flex items-center mb-2">
+          <div>描述：</div>
+          <u-input v-model="description" max-length="48" type="textarea" height="36" auto-height :border="border" />
+        </div>
+        <!-- 所属项目 -->
+        <div class="w flex items-center mb-2">
+          <div>所属项目<span class="text-red-500">*</span>：</div>
+          <div>{{ project.name }}</div>
+        </div>
+        <!-- 所属任务 -->
+        <div class="w flex items-center mb-2" v-if="task && task.id">
+          <div>所属任务：</div>
+          <div>{{ task.name }}</div>
+        </div>
+        <!-- 上道工序 -->
+        <div class="flex items-center mb-2">
+          <div>上道工序：</div>
+          <InputSearch
+            @searchPrevTask="searchPrevTask"
+            :dataSource="allTasks"
+            @select="handleChange"
+            @clearAllTasks="clearAllTasks"
+            placeholder="请输入上道工序"
+          />
+        </div>
+        <!-- 检查人多选框 -->
+        <div class="flex justify-between items-center">
+          <div>检查人<span class="text-red-500">*</span>：</div>
+          <div label="检查人" class="flex-1">
+            <u-dropdown ref="dropdown">
+              <u-dropdown-item :title="checkerList">
+                <view class="slot-content bg-white">
+                  <div
+                    class="flex flex-row justify-between mb-1 drop-item"
+                    v-for="(checkoutOption, Index) in checkoutOptions"
+                    :key="Index"
+                    @click="choose(Index)"
+                  >
+                    <view v-model="checkoutOption.value">{{ checkoutOption.name }}</view>
+                    <u-icon v-if="checkoutOption.dropdownShow" name="checkbox-mark" color="#2979ff" size="28"></u-icon>
+                  </div>
+                </view>
+              </u-dropdown-item>
+            </u-dropdown>
+          </div>
+        </div>
+        <!-- 是否是日常任务 -->
+        <div class="flex justify-between items-center mt-6">
+          是否是日常任务：
+          <u-switch v-model="isGlobal" size="28"></u-switch>
+        </div>
+        <div class="mt-6">
+          <div>交付物：</div>
+          <div v-for="(sort, sortIndex) in deliverSort" :key="sortIndex">
+            <u-input
+              @blur="addDeliverInput"
+              v-model="sort.name"
+              :placeholder="`交付物名称${sortIndex + 1}`"
+              :type="type"
+              :border="border"
+            />
+          </div>
+        </div>
+      </div>
+      <div class="flex items-center mb-6">
+        <u-button type="primary" size="medium" @click="setParameters">提交</u-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState, mapGetters, mapMutations, mapActions } from 'vuex';
+
+export default {
+  props: {
+    startTime: {
+      type: String,
+      default: '',
+    },
+    endTime: {
+      type: String,
+      default: '',
+    },
+    task: {
+      type: Object,
+      default: null,
+    },
+  },
+  data() {
+    return {
+      arrow: true,
+      show: false,
+      isGlobal: false, //是否日常任务
+      name: '', //名称
+      showChooseTime: false,
+      timeValue: '', //起止时间
+      description: '', //描述
+      projectShow: false, //所属项目模糊搜索展示
+      processTaskId: '', //上道工序
+      type: 'text',
+      border: true,
+      roleList: undefined, //负责人默认多选
+      checkerList: undefined, //检查人默认多选
+      roleOptions: [], // 负责人下拉多选列表
+      checkoutOptions: [], // 检查人下拉多选列表
+      roleIdList: [], // 选中的负责人id
+      checkerIdList: [], // 选中的检查人id
+      deliverables: [], // 交付物
+      deliverSort: [{ name: '' }], // 交付物排序
+      allTasks: [],
+      roleName: '', // 负责人名字
+      hasRole: false, // 有没有负责人
+    };
+  },
+
+  computed: {
+    ...mapState('role', ['visibleRoles', 'roleId']),
+    ...mapState('project', ['project']),
+    ...mapState('task', ['tasks']),
+    ...mapGetters('project', ['projectId']),
+  },
+
+  watch: {
+    endTime(val) {
+      if (val) {
+        this.timeValue = this.startTime + ' 至 ' + val;
+      }
+    },
+  },
+
+  mounted() {
+    // 获取负责人和检查人列表
+    if (this.visibleRoles.length) {
+      this.visibleRoles.forEach(role => {
+        role.dropdownShow = false;
+        role.status = false;
+      });
+    }
+    this.roleOptions = this.$u.deepClone(this.visibleRoles);
+    this.checkoutOptions = this.$u.deepClone(this.visibleRoles);
+
+    // 判断有没有负责人 是不是添加子任务
+    if (this.roleId) {
+      const item = this.visibleRoles.find(r => r.id === this.roleId);
+      if (item) {
+        this.roleName = item.name;
+        this.hasRole = true;
+      }
+    }
+  },
+
+  methods: {
+    ...mapMutations('task', ['updateTasks']),
+    ...mapActions('task', ['getPermanent']),
+
+    // 负责人下拉多选选中
+    change(index) {
+      let arr = [...this.roleOptions];
+      // 选择多选项图标的展示
+      arr[index].dropdownShow = !arr[index].dropdownShow;
+      // 多选展示的改变
+      this.roleList = arr[index].name;
+      let shows = '';
+      // 遍历arr，如果选中，添加到多选展示框上
+      arr.map(val => {
+        if (val.dropdownShow === true) {
+          shows += val.name + ',';
+          this.roleIdList.push(val.id);
+        }
+      });
+      this.roleOptions = [...arr];
+      // 删除最后的','
+      this.roleList = shows.slice(0, shows.length - 1);
+    },
+
+    // 检查人下拉多选选中
+    choose(index) {
+      let arr = [...this.checkoutOptions];
+      // 选择多选项图标的展示
+      arr[index].dropdownShow = !arr[index].dropdownShow;
+      // 多选展示的改变
+      this.checkerList = arr[index].name;
+      let shows = '';
+      // 遍历arr，如果选中，添加到多选展示框上
+      arr.map(val => {
+        if (val.dropdownShow === true) {
+          shows += val.name + ',';
+          this.checkerIdList.push(val.id);
+        }
+      });
+      this.checkoutOptions = [...arr];
+      // 删除最后的','
+      this.checkerList = shows.slice(0, shows.length - 1);
+      // this.roleList = arr[value - 1].name;
+    },
+
+    // 打开下拉框
+    openDropdown() {
+      this.arrow = !this.arrow;
+      this.show = true;
+    },
+
+    // 关闭下拉框
+    closeSecondDropdown() {
+      this.arrow = !this.arrow;
+      this.show = false;
+    },
+
+    /**
+     * 模糊查询 查找项目下的任务
+     * @param name 任务名
+     * @param projectId 项目id
+     */
+    async searchPrevTask(val) {
+      try {
+        const params = { name: val, projectId: this.projectId };
+        const data = await this.$u.api.queryTaskOfProject(params);
+        this.allTasks = data;
+        return data;
+      } catch (error) {
+        console.error('error: ', error);
+      }
+    },
+
+    //用户点击获取的数据
+    handleChange(data) {
+      console.log('data', data);
+      this.processTaskId = data.detailId;
+    },
+    // 清空模糊查询信息
+    clearAllTasks() {
+      this.allTasks = [];
+    },
+
+    // 数组最后一项有值 添加一条交付物输入框
+    addDeliverInput() {
+      if (this.deliverSort[this.deliverSort.length - 1].name) {
+        this.deliverSort.push({ name: '' });
+      }
+    },
+
+    // 设置提交参数
+    async setParameters() {
+      const {
+        projectId,
+        task,
+        name,
+        startTime,
+        endTime,
+        hasRole,
+        roleIdList,
+        roleId,
+        description,
+        processTaskId,
+        checkerIdList,
+        isGlobal,
+      } = this;
+      if (!name) {
+        this.$t.ui.showToast('请输入名称');
+        return;
+      }
+      if ((!roleIdList || !roleIdList.length) && !hasRole) {
+        this.$t.ui.showToast('请选择负责人');
+        return;
+      }
+      if (!checkerIdList || !checkerIdList.length) {
+        this.$t.ui.showToast('请选择检查人');
+        return;
+      }
+      const deliverList = [];
+      this.deliverSort.forEach(item => {
+        if (item.name) {
+          deliverList.push(item.name);
+        }
+      });
+      const params = {
+        name,
+        startTime: startTime ? this.$moment(startTime).format('x') - 0 : '',
+        endTime: endTime ? this.$moment(endTime).format('x') - 0 : '',
+        roleIdList: hasRole ? [roleId] : roleIdList,
+        description,
+        projectId,
+        parentTaskId: task && task.id ? task.id : '', // 父任务
+        processTaskId, // 上道工序 TODO
+        checkerIdList,
+        global: isGlobal ? 1 : 0,
+        deliverList,
+      };
+      await this.handleSubmit(params);
+    },
+
+    /**
+     * 新建任务
+     * @param name 任务名
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @param roleIdList 负责人id（数组）
+     * @param description 描述
+     * @param projectId 所属项目id
+     * @param parentTaskId 所属任务id
+     * @param processTaskId 上道工序（任务id）
+     * @param checkerIdList 检查人id（数组）
+     * @param global 是否日常任务 0否 1是
+     * @param deliverList 交付物名字（数组）
+     */
+    async handleSubmit(params) {
+      try {
+        const data = await this.$u.api.saveTask(params);
+        // TODO 任务新建成功  继续 or 取消
+        this.$emit('closeMask');
+        const newTasks = {
+          data: data[0],
+          processTaskId: params.processTaskId,
+        };
+        // 将新加的任务加到store
+        // 判断不是子任务
+        if (!this.task || !this.task.id) {
+          this.addNewTasks(newTasks);
+        }
+      } catch (error) {
+        this.$emit('closeMask');
+        console.error('error: ', error);
+      }
+    },
+
+    // 添加任务后更新tasks
+    addNewTasks(data) {
+      const oldTasks = this.$u.deepClone(this.tasks);
+      let res = data.data;
+      console.log('添加任务后更新tasks', data);
+      // 判断有没有选择上道工序
+      if (data.processTaskId) {
+        const index = oldTasks.find(item => item.detailId === data.processTaskId);
+        if (index) {
+          oldTasks.splice(index + 1, 0, res);
+        }
+      } else {
+        this.setAddPosition(res, oldTasks);
+      }
+    },
+
+    // 设置添加位置
+    setAddPosition(res, oldTasks) {
+      console.log('设置添加位置', res, oldTasks);
+
+      if (res.planStart - 0 < oldTasks[0].planStart - 0) {
+        // 开始时间小于列表的第一个 插入最前面
+        oldTasks.splice(0, 0, res);
+      } else if (res.planStart - 0 === oldTasks[0].planStart - 0) {
+        // 开始时间等于列表的第一个 插入第二
+        oldTasks.splice(1, 0, res);
+      } else if (res.planStart - 0 >= oldTasks[oldTasks.length - 1].planStart - 0) {
+        // 开始时间大等于列表的最后一个 插入最后
+        oldTasks.splice(-1, 0, res);
+      } else {
+        // 判断开始时间在列表中间的哪个位置
+        for (let i = 0; i < oldTasks.length; i++) {
+          const item = oldTasks[i];
+          if (res.planStart - 0 > item.planStart - 0) {
+            if (res.planStart - 0 <= oldTasks[i + 1].planStart - 0) {
+              oldTasks.splice(i + 1, 0, res);
+              // console.log('res: ', res);
+              // return;
+            }
+          }
+        }
+      }
+      // TODO: 不能全更新
+      console.log('oldTasks: ', oldTasks);
+      this.updateTasks([...oldTasks]);
+      const params = { roleId: this.roleId, projectId: this.projectId };
+      this.getPermanent(params);
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.form {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  max-height: 400px;
+  overflow-y: scroll;
+}
+
+.drop-item {
+  border-bottom: 1px solid #f1f1f1;
+  padding: 16rpx;
+}
+
+::v-deep.u-input--border {
+  border: none;
+  border-radius: 0;
+}
+::v-deep.u-dropdown__menu__item > uni-view {
+  border: none !important;
+  padding: 5px;
+}
+.u-input {
+  border-bottom: 1px solid #dcdfe6;
+}
+
+.new-projects-box {
+  margin-top: 20px;
+  padding: 15px;
+  width: 100%;
+  overflow: hidden;
+}
+
+.w {
+  width: 300px;
+  height: 39px;
+}
+
+::v-deep .u-dropdown__menu__item .u-flex {
+  border: 0 !important;
+  border-bottom: 1px solid #dcdfe6 !important;
+  padding: 0 20rpx;
+}
+</style>
diff --git a/src/components/Title/components/CreateTask.vue b/src/components/Title/components/CreateTask.vue
index 6d8d38c..70b7d08 100644
--- a/src/components/Title/components/CreateTask.vue
+++ b/src/components/Title/components/CreateTask.vue
@@ -2,20 +2,54 @@
   <div class="new-projects-box">
     <div class="form">
       <!-- 项目名称 -->
-      <view class="mb-3 font-bold text-base flex justify-center">新建任务</view>
-      <div class="flex items-center mb-2">
-        <div>名称<span class="text-red-500">*</span>：</div>
-        <u-input max-length="5" v-model="name" :type="type" :border="border" />
+      <view class="new-projects-title font-bold text-base flex justify-center items-center text-black">新建任务</view>
+      <div class="form-item flex items-center">
+        <div class="mr-4">名称<span class="text-red-500">*</span></div>
+        <u-input :maxlength="8" v-model="name" type="text" :inputAlign="'right'" :clearable="false" placeholder="请输入任务名称" />
       </div>
+
+      <!-- 开始时间 -->
+      <div class="form-item flex items-center">
+        <div class="mr-4">开始时间<span class="text-red-500" v-if="source">*</span></div>
+        <div class="flex justify-end items-center flex-1">
+          <u-input
+            placeholder="请选择开始时间"
+            v-model="startTime"
+            type="text"
+            :inputAlign="'right'"
+            :clearable="false"
+            @click="$emit('showTime', 1)"
+          />
+          <u-icon class="ml-1" name="arrow-right" color="#969799" size="28"></u-icon>
+        </div>
+      </div>
+
+      <!-- 结束时间 -->
+      <div class="form-item flex items-center">
+        <div class="mr-4">结束时间<span class="text-red-500" v-if="source">*</span></div>
+        <div class="flex justify-end items-center flex-1">
+          <u-input
+            placeholder="请选择结束时间"
+            v-model="endTime"
+            type="text"
+            :inputAlign="'right'"
+            :clearable="false"
+            @click="$emit('showTime', 2)"
+          />
+          <u-icon class="ml-1" name="arrow-right" color="#969799" size="28"></u-icon>
+        </div>
+      </div>
+
       <!-- 起止时间 -->
-      <div class="mb-2">
+      <!-- <div class="form-item">
         <div>起止时间：</div>
         <u-input placeholder="请选择起止时间" v-model="timeValue" :type="type" :border="border" @click="$emit('showTime')" />
-      </div>
+      </div> -->
+
       <!-- 多选框 -->
-      <div class="flex justify-between items-center">
-        <div>负责人<span class="text-red-500">*</span>：</div>
-        <div class="flex-1" v-if="hasRole">{{ roleName }}</div>
+      <div class="form-item flex justify-between items-center">
+        <div class="mr-4">负责人<span class="text-red-500">*</span></div>
+        <div class="flex-1 text-right" v-if="hasRole">{{ roleName }}</div>
         <div label="负责人" class="flex-1" v-else>
           <u-dropdown disabled ref="uDropdown" placeholder="请选择负责人">
             <u-dropdown-item :title="roleList">
@@ -34,79 +68,80 @@
           </u-dropdown>
         </div>
       </div>
-      <!-- 下拉图标 -->
-      <div class="flex justify-center my-6">
-        <u-icon v-if="arrow" name="arrow-down" size="28" @click="openDropdown"></u-icon>
-        <u-icon v-else name="arrow-up" size="28" @click="closeSecondDropdown"></u-icon>
+
+      <!-- 描述 -->
+      <div class="form-item flex items-center">
+        <div class="mr-4">描述</div>
+        <u-input v-model="description" :maxlength="48" type="text" :inputAlign="'right'" :clearable="false" />
+      </div>
+
+      <!-- 所属项目 -->
+      <div class="form-item flex items-center">
+        <div class="mr-4">所属项目<span class="text-red-500">*</span></div>
+        <div class="flex-1 text-right">{{ project.name }}</div>
       </div>
-      <!-- 下拉框的内容 -->
-      <div v-if="show" class="mb-6">
-        <!-- 描述 -->
-        <div class="flex items-center mb-2">
-          <div>描述：</div>
-          <u-input v-model="description" max-length="48" type="textarea" height="36" auto-height :border="border" />
-        </div>
-        <!-- 所属项目 -->
-        <div class="w flex items-center mb-2">
-          <div>所属项目<span class="text-red-500">*</span>：</div>
-          <div>{{ project.name }}</div>
-        </div>
-        <!-- 所属任务 -->
-        <div class="w flex items-center mb-2" v-if="task && task.id">
-          <div>所属任务：</div>
-          <div>{{ task.name }}</div>
+
+      <!-- 所属任务 -->
+      <div class="form-item flex items-center" v-if="task && task.id">
+        <div class="mr-4">所属任务</div>
+        <div class="flex-1 text-right">{{ task.name }}</div>
+      </div>
+
+      <!-- 上道工序 -->
+      <div class="form-item flex items-center">
+        <div class="mr-4">上道工序</div>
+        <InputSearch
+          @searchPrevTask="searchPrevTask"
+          :dataSource="allTasks"
+          @select="handleChange"
+          @clearAllTasks="clearAllTasks"
+          placeholder="请输入上道工序"
+        />
+      </div>
+
+      <!-- 检查人多选框 -->
+      <div class="form-item flex justify-between items-center">
+        <div class="mr-4">检查人<span class="text-red-500">*</span></div>
+        <div label="检查人" class="flex-1">
+          <u-dropdown ref="dropdown">
+            <u-dropdown-item :title="checkerList">
+              <view class="slot-content bg-white">
+                <div
+                  class="flex flex-row justify-between mb-1 drop-item"
+                  v-for="(checkoutOption, Index) in checkoutOptions"
+                  :key="Index"
+                  @click="choose(Index)"
+                >
+                  <view v-model="checkoutOption.value">{{ checkoutOption.name }}</view>
+                  <u-icon v-if="checkoutOption.dropdownShow" name="checkbox-mark" color="#2979ff" size="28"></u-icon>
+                </div>
+              </view>
+            </u-dropdown-item>
+          </u-dropdown>
         </div>
-        <!-- 上道工序 -->
-        <div class="flex items-center mb-2">
-          <div>上道工序：</div>
-          <InputSearch
-            @searchPrevTask="searchPrevTask"
-            :dataSource="allTasks"
-            @select="handleChange"
-            @clearAllTasks="clearAllTasks"
-            placeholder="请输入上道工序"
+      </div>
+
+      <!-- 是否是日常任务 -->
+      <div class="form-item flex justify-between items-center">
+        是否是日常任务
+        <u-switch v-model="isGlobal" size="28"></u-switch>
+      </div>
+
+      <div class="form-item flex justify-between items-center" v-for="(sort, sortIndex) in deliverSort" :key="sortIndex">
+        <div class="mr-4">{{ `交付物${sortIndex + 1}` }}</div>
+        <div class="flex-1">
+          <u-input
+            @blur="addDeliverInput"
+            v-model="sort.name"
+            :placeholder="`交付物名称${sortIndex + 1}`"
+            type="text"
+            :inputAlign="'right'"
+            :clearable="false"
           />
         </div>
-        <!-- 检查人多选框 -->
-        <div class="flex justify-between items-center">
-          <div>检查人<span class="text-red-500">*</span>：</div>
-          <div label="检查人" class="flex-1">
-            <u-dropdown ref="dropdown">
-              <u-dropdown-item :title="checkerList">
-                <view class="slot-content bg-white">
-                  <div
-                    class="flex flex-row justify-between mb-1 drop-item"
-                    v-for="(checkoutOption, Index) in checkoutOptions"
-                    :key="Index"
-                    @click="choose(Index)"
-                  >
-                    <view v-model="checkoutOption.value">{{ checkoutOption.name }}</view>
-                    <u-icon v-if="checkoutOption.dropdownShow" name="checkbox-mark" color="#2979ff" size="28"></u-icon>
-                  </div>
-                </view>
-              </u-dropdown-item>
-            </u-dropdown>
-          </div>
-        </div>
-        <!-- 是否是日常任务 -->
-        <div class="flex justify-between items-center mt-6">
-          是否是日常任务：
-          <u-switch v-model="isGlobal" size="28"></u-switch>
-        </div>
-        <div class="mt-6">
-          <div>交付物：</div>
-          <div v-for="(sort, sortIndex) in deliverSort" :key="sortIndex">
-            <u-input
-              @blur="addDeliverInput"
-              v-model="sort.name"
-              :placeholder="`交付物名称${sortIndex + 1}`"
-              :type="type"
-              :border="border"
-            />
-          </div>
-        </div>
       </div>
-      <div class="flex items-center mb-6">
+
+      <div class="form-btn flex items-center mt-4">
         <u-button type="primary" size="medium" @click="setParameters">提交</u-button>
       </div>
     </div>
@@ -130,6 +165,10 @@ export default {
       type: Object,
       default: null,
     },
+    source: {
+      type: String,
+      default: '',
+    },
   },
   data() {
     return {
@@ -138,7 +177,9 @@ export default {
       isGlobal: false, //是否日常任务
       name: '', //名称
       showChooseTime: false,
-      timeValue: '', //起止时间
+      // timeValue: '', //起止时间
+      // taskStartTime: '', // 新建任务开始时间
+      // taskEndTime: '', // 新建任务结束时间
       description: '', //描述
       projectShow: false, //所属项目模糊搜索展示
       processTaskId: '', //上道工序
@@ -165,13 +206,13 @@ export default {
     ...mapGetters('project', ['projectId']),
   },
 
-  watch: {
-    endTime(val) {
-      if (val) {
-        this.timeValue = this.startTime + ' 至 ' + val;
-      }
-    },
-  },
+  // watch: {
+  //   endTime(val) {
+  //     if (val) {
+  //       this.timeValue = this.startTime + ' 至 ' + val;
+  //     }
+  //   },
+  // },
 
   mounted() {
     // 获取负责人和检查人列表
@@ -301,9 +342,30 @@ export default {
         isGlobal,
       } = this;
       if (!name) {
-        this.$t.ui.showToast('请输入名称');
+        this.$t.ui.showToast('请输入任务名称');
         return;
       }
+      if (this.source) {
+        if (!startTime) {
+          this.$t.ui.showToast('请选择开始时间');
+          return;
+        }
+
+        if (!endTime) {
+          this.$t.ui.showToast('请选择结束时间');
+          return;
+        }
+      }
+
+      if (startTime && endTime) {
+        let start = startTime ? this.$moment(startTime).format('x') - 0 : '';
+        let end = endTime ? this.$moment(endTime).format('x') - 0 : '';
+        if (start > end) {
+          this.$t.ui.showToast('结束时间不能小于开始时间');
+          return;
+        }
+      }
+
       if ((!roleIdList || !roleIdList.length) && !hasRole) {
         this.$t.ui.showToast('请选择负责人');
         return;
@@ -422,8 +484,8 @@ export default {
 
 <style lang="scss" scoped>
 .form {
-  display: flex;
-  flex-direction: column;
+  // display: flex;
+  // flex-direction: column;
   width: 100%;
   max-height: 400px;
   overflow-y: scroll;
@@ -434,23 +496,52 @@ export default {
   padding: 16rpx;
 }
 
-::v-deep.u-input--border {
-  border: none;
-  border-radius: 0;
-}
+// ::v-deep.u-input--border {
+//   border: none;
+//   border-radius: 0;
+//   padding: 0 !important;
+// }
 ::v-deep.u-dropdown__menu__item > uni-view {
   border: none !important;
   padding: 5px;
 }
-.u-input {
-  border-bottom: 1px solid #dcdfe6;
-}
+// .u-input {
+//   border-bottom: 1px solid #dcdfe6;
+// }
 
 .new-projects-box {
   margin-top: 20px;
-  padding: 15px;
+  // padding: 15px;
   width: 100%;
   overflow: hidden;
+  color: #595959;
+}
+
+.new-projects-title {
+  height: 60px;
+}
+
+.form-item {
+  padding: 0 16px;
+  height: 48px;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+}
+
+.form-item ::v-deep .input-group uni-input {
+  border: 0;
+  font-size: 14px;
+  text-align: right;
+}
+
+.form-btn {
+  height: 60px;
+}
+
+.form-btn .u-btn {
+  width: 156px;
+  height: 32px;
+  font-size: 16px;
+  border-radius: 4px;
 }
 
 .w {
@@ -460,7 +551,7 @@ export default {
 
 ::v-deep .u-dropdown__menu__item .u-flex {
   border: 0 !important;
-  border-bottom: 1px solid #dcdfe6 !important;
-  padding: 0 20rpx;
+  // border-bottom: 1px solid #dcdfe6 !important;
+  padding: 0 !important;
 }
 </style>
diff --git a/tsconfig.json b/tsconfig.json
index 730626d..7b76c1e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "allowJs": true,
     "types": [
       "@dcloudio/types",
       "miniprogram-api-typings",