From ed12e2f634756bb9e529f20886b4544aadeefc93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AA=86=E4=B9=90?= <342503599@qq.com>
Date: Wed, 2 Nov 2022 10:22:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E5=B7=A5=E7=A8=8B=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86(=E5=88=86=E9=83=A8=E5=88=86=E9=A1=B9=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86):=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/api/scheduleInfo.js             |   3 +-
 .../projectFront/scheduleManage/ganttwo.vue   |  67 ++-
 .../scheduleManage/projectNodeDetail.vue      |  20 +-
 .../scheduleManage/projectNodeManage2.vue     | 436 +++++++++---------
 4 files changed, 283 insertions(+), 243 deletions(-)

diff --git a/src/assets/js/api/scheduleInfo.js b/src/assets/js/api/scheduleInfo.js
index 0fd217e6..500012c5 100644
--- a/src/assets/js/api/scheduleInfo.js
+++ b/src/assets/js/api/scheduleInfo.js
@@ -15,8 +15,9 @@ export const deletetProgressItemApi = data => post('/xmgl/progressItem/delete',
 
 // 分布分项管理2 -- 页面
 export const getProgressListDataApi = data => get('/xmgl/progressTask/getParentChildList', data);// 获取列表
-export const importDataApi = data => get('/xmgl/progressTask/importData', data);// 导入
 export const editProgressListDataApi = data => post('/xmgl/progressTask/updateProgressTask', data);// 编辑
+export const getProgressTaskApi = data => get('/xmgl/progressTask/getById', data);// 查看详情
+
 
 
 
diff --git a/src/views/projectFront/scheduleManage/ganttwo.vue b/src/views/projectFront/scheduleManage/ganttwo.vue
index 59ed3c8a..1ce509ac 100644
--- a/src/views/projectFront/scheduleManage/ganttwo.vue
+++ b/src/views/projectFront/scheduleManage/ganttwo.vue
@@ -1,29 +1,40 @@
 <template>
   <div style="height: 900px">
-    <div ref="gantt" style="height: 100%"></div>
+    <div ref="gantt" style="height: 100%" v-loading="ganttLoading"></div>
   </div>
 </template>
   <script>
 import { gantt } from "dhtmlx-gantt";
 import moment from "moment";
+import {getProgressListDataApi} from "@/assets/js/api/scheduleInfo";
 export default {
   name: "gantt",
-  props: {
-    tasks: {
-      type: Object,
-      default() {
-        return { data: [], links: [] };
-      },
-    },
-  },
+//   props: {
+//     tasks: {
+//       type: Object,
+//       default() {
+//         return { data: [], links: [] };
+//       },
+//     },
+//   },
   data() {
     return {
       title: "",
       width: 800,
       visible: false,
       disablesubmit: false,
+      ganttLoading: false,
+      tasks: {
+        data: [],
+        links: []
+      },
+      projectSn:''
     };
   },
+  created(){
+    this.projectSn = this.$store.state.projectSn;
+    this.getProgressListData()
+  },
   mounted: function () {
     //日期格式化
     gantt.config.xml_date = "%Y-%m-%d";
@@ -131,10 +142,13 @@ export default {
     //左侧显示列名
     gantt.config.columns = [
       { name: "text", label: "计划名称", tree: true, width: "*" },
-      { name: "start_date", label: "开始时间", align: "center" },
-      { name: "end_date", label: "结束时间", align: "center" },
+      { name: "startDate", label: "预计开始时间", align: "center" },
+      { name: "finishDate", label: "预计结束时间", align: "center" },
+      { name: "actualStartDate", label: "实际开始时间", align: "center" },
+      { name: "actualFinishDate", label: "实际结束时间", align: "center" },
+      { name: "duration", label: "工期", align: "center" },
       {
-        name: "progress",
+        name: "progressRatio",
         label: "进度",
         align: "center",
         template: function (obj) {
@@ -192,7 +206,7 @@ export default {
       return task.text;
     };
     gantt.init(this.$refs.gantt);
-    gantt.parse(this.$props.tasks);
+    gantt.parse(this.tasks);
     let this_ = this;
     //添加后触发
     gantt.attachEvent("onAfterTaskAdd", function (id, item) {
@@ -229,8 +243,31 @@ export default {
     });
   },
   methods: {
+     //获取列表数据
+     getProgressListData() {
+        this.ganttLoading= true;
+        this.tasks.data = [];
+      let data = {
+        projectSn: this.projectSn,
+      };
+      getProgressListDataApi(data).then((res) => {
+        if (res.code == 200) {
+          console.log("获取到的列表", res);
+          this.tasks.data = res.result;
+           // 数据解析:将数据解析到gantt列数据中
+           gantt.parse(this.tasks);
+           console.log('获取到的列表',this.tasks)
+          // 刷新数据
+          gantt.refreshData();
+          this.ganttLoading= false;
+        }else{
+            this.$message.error('查询失败！');
+        }
+      });
+    },
     changeTask() {
       const taskCount = gantt.getTaskCount();
+      console.log('看一下',taskCount)
       let taskData = [];
       let openTask = [];
       for (let i = 0; i < taskCount; i++) {
@@ -254,11 +291,11 @@ export default {
         }
         taskData.push(taskOne);
       }
-      this.$props.tasks.data = taskData;
+      this.tasks.data = taskData;
       //清空数据
       gantt.clearAll();
       //加载
-      gantt.parse(this.$props.tasks);
+      gantt.parse(this.tasks);
       //遍历打开，使之前打开的父级继续打开
       openTask.forEach((id) => {
         gantt.open(id);
diff --git a/src/views/projectFront/scheduleManage/projectNodeDetail.vue b/src/views/projectFront/scheduleManage/projectNodeDetail.vue
index ade31a78..b26410b4 100644
--- a/src/views/projectFront/scheduleManage/projectNodeDetail.vue
+++ b/src/views/projectFront/scheduleManage/projectNodeDetail.vue
@@ -256,7 +256,7 @@
   </div>
 </template>
 <script>
-import { getDetailInfoApi, addPlanInfoApi } from "@/assets/js/api/scheduleInfo";
+import { getProgressTaskApi,getDetailInfoApi, addPlanInfoApi } from "@/assets/js/api/scheduleInfo";
 export default {
   props: ["id"],
   mounted() {},
@@ -341,17 +341,17 @@ export default {
     //获取详情数据
     getDetailInfo() {
       let data = {
-        projectSn: this.projectSn,
-        itemId: this.seedId,
+        id: this.seedId,
       };
-      getDetailInfoApi(data).then((res) => {
+      getProgressTaskApi(data).then((res) => {
         if (res.code == 200) {
-          this.itemForm = res.result.itemDetail;
-          this.planList = res.result.feedbackList;
-          //获取项目的基本信息的附件
-          this.fileList = res.result.itemDetail.fileUrl
-            ? [JSON.parse(res.result.itemDetail.fileUrl)]
-            : [];
+          console.log('查看详情',res)
+          // this.itemForm = res.result.itemDetail;
+          // this.planList = res.result.feedbackList;
+          // //获取项目的基本信息的附件
+          // this.fileList = res.result.itemDetail.fileUrl
+          //   ? [JSON.parse(res.result.itemDetail.fileUrl)]
+          //   : [];
         } else {
           this.$message.error(res.message);
         }
diff --git a/src/views/projectFront/scheduleManage/projectNodeManage2.vue b/src/views/projectFront/scheduleManage/projectNodeManage2.vue
index 905ab11b..3e195646 100644
--- a/src/views/projectFront/scheduleManage/projectNodeManage2.vue
+++ b/src/views/projectFront/scheduleManage/projectNodeManage2.vue
@@ -13,24 +13,19 @@
               class="expintBtn"
               size="medium"
               type="primary"
-              @click="downloadMmp"
+              @click="downloadFn"
             >
-              下载模板
+              <a class="down" :href="downUrl" download>下载模板</a>
             </el-button>
-            <el-button @click="test">
-                测试
-            </el-button>
-            <!-- uploadUrl +  :data="{ projectSn: projectSn,createUserId: createUserId}"
-             :action="$http.defaults.baseURL + '/xmgl/progressTask/importData'" -->
             <el-upload
               class="upload-demo expintBtn"
               name="mppFile"
-              action=""
-              :before-upload="beforeUpload"
               :on-success="handleImportSuccess"
               :on-change="handleImportChange"
+              :before-upload="beforeUpload"
               :file-list="fileList"
-              :http-request="upload"
+              :action="$http.defaults.baseURL + 'xmgl/progressTask/importData'"
+              :data="{ projectSn: projectSn, createUserId: createUserId }"
               :show-file-list="false"
             >
               <el-button size="medium" type="primary">导入</el-button>
@@ -46,12 +41,16 @@
             lazy
             row-key="id"
             default-expand-all
-            :tree-props="{ children: 'children'}"
+            :tree-props="{ children: 'children' }"
             @row-click="showDetail"
           >
-          <!-- 分部分项工程名称 -->
-          <el-table-column width="400" prop="taskName" :label="$t('message.projectManage.NameOfSubProject')">
-          </el-table-column>
+            <!-- 分部分项工程名称 -->
+            <el-table-column
+              width="400"
+              prop="taskName"
+              :label="$t('message.projectManage.NameOfSubProject')"
+            >
+            </el-table-column>
             <!-- 计划开始日期 -->
             <el-table-column
               prop="startDate"
@@ -61,7 +60,13 @@
             <!-- 预计完成日期 -->
             <el-table-column
               prop="finishDate"
-              :label="$t('message.projectManage.predictCompleteDate')"
+              label="计划完成日期"
+            >
+            </el-table-column>
+             <!-- 实际开始日期 -->
+             <el-table-column
+              prop="actualStartDate"
+              label="实际开始日期"
             >
             </el-table-column>
             <!-- 实际完成日期 -->
@@ -86,8 +91,7 @@
             >
               <template slot-scope="scope">
                 <el-tag
-                  v-show="
-                    (scope.row.id && scope.row.status == 0)"
+                  v-show="scope.row.id && scope.row.status == 0"
                   type="info"
                   effect="plain"
                   size="medium"
@@ -96,8 +100,7 @@
                   {{ $t("message.projectManage.notStart") }}
                 </el-tag>
                 <el-tag
-                  v-show="
-                    (scope.row.id && scope.row.status == 1)"
+                  v-show="scope.row.id && scope.row.status == 1"
                   type="warning"
                   effect="plain"
                   size="medium"
@@ -106,8 +109,7 @@
                   {{ $t("message.projectManage.underway") }}
                 </el-tag>
                 <el-tag
-                  v-show="
-                    (scope.row.id && scope.row.status == 2)"
+                  v-show="scope.row.id && scope.row.status == 2"
                   type="success"
                   effect="plain"
                   size="medium"
@@ -119,9 +121,12 @@
             </el-table-column>
             <el-table-column width="150" label="操作">
               <template slot-scope="scope">
-                  <el-button  @click.native.stop="editBefore(scope.row)" type="text">
-                   <i class="el-icon-edit"></i>编辑
-                  </el-button>
+                <el-button
+                  @click.native.stop="editBefore(scope.row)"
+                  type="text"
+                >
+                  <i class="el-icon-edit"></i>编辑
+                </el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -143,7 +148,7 @@
             :rules="addEditRules"
             :model="workerInfo"
           >
-          <!-- 分部分项工程名称 -->
+            <!-- 分部分项工程名称 -->
             <el-form-item
               :label="$t('message.projectManage.NameOfSubProject')"
               prop="taskName"
@@ -154,140 +159,147 @@
                 :placeholder="$t('message.workType.placeholder')"
               ></el-input>
             </el-form-item>
-              <!-- 预计开始日期 -->
-              <el-form-item
-                :label="$t('message.projectManage.predictStartDate')"
-                prop="startDate"
+            <!-- 预计开始日期 -->
+            <el-form-item
+              :label="$t('message.projectManage.predictStartDate')"
+              prop="startDate"
+            >
+              <el-date-picker
+                v-model="workerInfo.startDate"
+                type="date"
+                placeholder="计划开始日期"
+                value-format="yyyy-MM-dd"
               >
-                <el-date-picker
-                  v-model="workerInfo.startDate"
-                  type="date"
-                  placeholder="计划开始日期"
-                  value-format="yyyy-MM-dd"
-                >
-                </el-date-picker>
-              </el-form-item>
-              <!-- 预计结束日期 -->
-              <el-form-item
-                :label="$t('message.projectManage.predictFinishDate')"
-                prop="finishDate"
+              </el-date-picker>
+            </el-form-item>
+            <!-- 预计结束日期 -->
+            <el-form-item
+              :label="$t('message.projectManage.predictFinishDate')"
+              prop="finishDate"
+            >
+              <el-date-picker
+                v-model="workerInfo.finishDate"
+                type="date"
+                placeholder="计划完成时间"
+                value-format="yyyy-MM-dd"
               >
-                <el-date-picker
-                  v-model="workerInfo.finishDate"
-                  type="date"
-                  placeholder="计划完成时间"
-                  value-format="yyyy-MM-dd"
-                >
-                </el-date-picker>
-              </el-form-item>
-              <!-- 实际开始时间 -->
-              <el-form-item label="实际开始时间" prop="actualStartDate">
-                <el-date-picker
-                  v-model="workerInfo.actualStartDate"
-                  type="date"
-                  placeholder="实际开始时间"
-                  value-format="yyyy-MM-dd"
-                >
-                </el-date-picker>
-              </el-form-item>
-              <!-- 实际完成时间 -->
-              <el-form-item label="实际完成时间" prop="actualFinishDate">
-                <el-date-picker
-                  v-model="workerInfo.actualFinishDate"
-                  type="date"
-                  placeholder="实际完成时间"
-                  value-format="yyyy-MM-dd"
-                >
-                </el-date-picker>
-              </el-form-item>
-              <!-- 负责人 -->
-              <el-form-item
-                :label="$t('message.projectManage.principal')"
-                prop="personCharge"
+              </el-date-picker>
+            </el-form-item>
+            <!-- 实际开始时间 -->
+            <el-form-item label="实际开始时间" prop="actualStartDate">
+              <el-date-picker
+                v-model="workerInfo.actualStartDate"
+                type="date"
+                placeholder="实际开始时间"
+                value-format="yyyy-MM-dd"
               >
-                <el-select
-                  v-model="workerInfo.personCharge"
-                  filterable
-                  :placeholder="$t('message.projectManage.pleaseChoose')"
-                >
-                  <el-option
-                    v-for="item in principalLsit"
-                    :key="item.userId"
-                    :label="item.workerName"
-                    :value="item.userId"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-              <!-- 完成状态 -->
-              <el-form-item label="完成状态" prop="status">
-                <el-select v-model="workerInfo.status" placeholder="请选择">
-                  <el-option label="未开始" :value="0"></el-option>
-                  <el-option label="进行中" :value="1"></el-option>
-                  <el-option label="已完成" :value="2"></el-option>
-                </el-select>
-              </el-form-item>
-               <!-- 任务模式 -->
-               <el-form-item label="任务模式" prop="taskTypeId">
-                <el-select v-model="workerInfo.taskTypeId" placeholder="请选择">
-                  <el-option label="手动" :value="0"></el-option>
-                  <el-option label="自动" :value="1"></el-option>
-                </el-select>
-              </el-form-item>
-              <el-form-item
-                :label="$t('message.projectManage.accessory')"
-                prop="fileUrl"
+              </el-date-picker>
+            </el-form-item>
+            <!-- 实际完成时间 -->
+            <el-form-item label="实际完成时间" prop="actualFinishDate">
+              <el-date-picker
+                v-model="workerInfo.actualFinishDate"
+                type="date"
+                placeholder="实际完成时间"
+                value-format="yyyy-MM-dd"
               >
-                <el-upload
-                  class="upload-demo"
-                  :action="uploadUrl"
-                  :on-preview="handlePreview"
-                  :on-remove="handleRemove"
-                  :on-success="handleSuccess"
-                  multiple
-                  :file-list="fileList"
-                  :limit="5"
-                  name="files"
+              </el-date-picker>
+            </el-form-item>
+            <!-- 负责人 -->
+            <el-form-item
+              :label="$t('message.projectManage.principal')"
+              prop="personCharge"
+            >
+              <el-select
+                v-model="workerInfo.personCharge"
+                filterable
+                :placeholder="$t('message.projectManage.pleaseChoose')"
+              >
+                <el-option
+                  v-for="item in principalLsit"
+                  :key="item.userId"
+                  :label="item.workerName"
+                  :value="item.userId"
                 >
-                  <el-button size="small" type="primary" plain>
-                    <!-- 点击上传 -->
-                    {{ $t("message.projectManage.clickUpdate") }}
-                  </el-button>
-                </el-upload>
-              </el-form-item>
-              <!-- 任务工期 -->
-              <el-form-item label="任务工期" prop="duration">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <!-- 完成状态 -->
+            <el-form-item label="完成状态" prop="status">
+              <el-select v-model="workerInfo.status" placeholder="请选择">
+                <el-option label="未开始" :value="0"></el-option>
+                <el-option label="进行中" :value="1"></el-option>
+                <el-option label="已完成" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+            <!-- 进度 -->
+            <el-form-item label="进度" prop="progressRatio">
               <el-input
-                :disabled = "showTime"
+                v-model="workerInfo.progressRatio"
+                :placeholder="$t('message.workType.placeholder')"
+              ></el-input>
+            </el-form-item>
+            <!-- 任务模式 -->
+            <el-form-item label="任务模式" prop="taskTypeId">
+              <el-select v-model="workerInfo.taskTypeId" placeholder="请选择">
+                <el-option label="手动" :value="0"></el-option>
+                <el-option label="自动" :value="1"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item
+              :label="$t('message.projectManage.accessory')"
+              prop="fileUrl"
+            >
+              <el-upload
+                class="upload-demo"
+                :action="uploadUrl"
+                :on-preview="handlePreview"
+                :on-remove="handleRemove"
+                :on-success="handleSuccess"
+                multiple
+                :file-list="fileList"
+                :limit="5"
+                name="files"
+              >
+                <el-button size="small" type="primary" plain>
+                  <!-- 点击上传 -->
+                  {{ $t("message.projectManage.clickUpdate") }}
+                </el-button>
+              </el-upload>
+            </el-form-item>
+            <!-- 任务工期 -->
+            <el-form-item label="任务工期" prop="duration">
+              <el-input
+                :disabled="workerInfo.taskTypeId == '1'"
                 v-model="workerInfo.duration"
                 :placeholder="$t('message.workType.placeholder')"
               ></el-input>
             </el-form-item>
-              <!-- 备注 -->
-              <el-form-item label="备注" prop="remark">
+            <!-- 备注 -->
+            <el-form-item label="备注" prop="remark">
               <el-input
                 v-model="workerInfo.remark"
                 :placeholder="$t('message.workType.placeholder')"
               ></el-input>
             </el-form-item>
-            </el-form>
-            </div>
-            <div class="dialog-footer">
-              <el-button
-                class="cancleBtn"
-                @click="dialogVisible = false"
-                icon="el-icon-circle-close"
-                size="medium"
-                >{{ $t("message.personnelPosition.cancel") }}
-              </el-button>
-              <el-button
-                type="primary"
-                icon="el-icon-circle-check"
-                @click="submitBtn"
-                size="medium"
-                >{{ $t("message.personnelPosition.determine") }}
-              </el-button>
-            </div>
+          </el-form>
+        </div>
+        <div class="dialog-footer">
+          <el-button
+            class="cancleBtn"
+            @click="dialogVisible = false"
+            icon="el-icon-circle-close"
+            size="medium"
+            >{{ $t("message.personnelPosition.cancel") }}
+          </el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-circle-check"
+            @click="submitBtn"
+            size="medium"
+            >{{ $t("message.personnelPosition.determine") }}
+          </el-button>
+        </div>
       </el-dialog>
 
       <!-- //查看大图 -->
@@ -304,11 +316,8 @@
 </template>
   <script>
 import {
-    getProgressListDataApi,
-    importDataApi,
-    editProgressListDataApi,
-
-
+  getProgressListDataApi,
+  editProgressListDataApi,
   addProgressManageApi,
   addProgressItemApi,
   getPrincipalLsitApi,
@@ -318,7 +327,7 @@ import {
   deletetProgressItemApi,
 } from "@/assets/js/api/scheduleInfo";
 import detailpage from "./projectNodeDetail";
-import axios from 'axios'
+import axios from "axios";
 export default {
   components: {
     detailpage,
@@ -327,8 +336,9 @@ export default {
   data() {
     return {
       fileList: [], //上传文件
+      downUrl: "", //下载文件地址
       projectSn: "",
-      createUserId:"",
+      createUserId: "",
       listData: [],
       isAddSon: false,
       uploadUrl: "",
@@ -336,21 +346,22 @@ export default {
       dialogVisible: false, //新增弹窗
       workerInfo: {
         taskName: "",
-        startDate:"",
-        finishDate:"",
-        actualStartDate:"",
-        actualFinishDate:"",
-        personCharge:"",
-        status:"",
-        taskTypeId:"",
-        fileUrl:"",
-        duration:"",
-        remark:"",
+        startDate: "",
+        finishDate: "",
+        actualStartDate: "",
+        actualFinishDate: "",
+        personCharge: "",
+        status: "",
+        taskTypeId: "",
+        progressRatio: "",
+        fileUrl: "",
+        duration: "",
+        remark: "",
       },
       principalLsit: [], //负责人
       fileList: [],
       seedId: "",
-      showTime:false, //工期
+      showTime: false, //工期
       queryInfo: {},
       type: "add",
       // type: "detail",
@@ -383,52 +394,36 @@ export default {
   },
   created() {
     this.projectSn = this.$store.state.projectSn;
-    this.createUserId = this.$store.state.userInfo.userId
+    this.createUserId = this.$store.state.userInfo.userId;
     this.uploadUrl = this.$store.state.UPLOADURL;
     this.fileUrl = this.$store.state.FILEURL;
     this.getProgressListData();
   },
   methods: {
-    // 测试
-    test(){
-        console.log('----测试')
-        importDataApi({projectSn: this.projectSn,createUserId: this.createUserId}).then((res)=>{
-            console.log('=====',res)
-        })
-    },
     // 下载模板
-    downloadMmp(){
-
-    },
-    beforeUpload(file){
-        // console.log('上传的文件',file)
-        const fd = new FormData();
-        fd.append("file", file);
+    downloadFn() {
+      this.downUrl =
+        this.$store.state.BASEURL + "xmgl/progressTask/downloadTemplate";
     },
     // 导入成功
-    handleImportSuccess(res){
-        console.log('上传成功',res)
+    handleImportSuccess(res) {
+      console.log("上传成功", res);
     },
-    // 上传时
-    handleImportChange(file, fileList){
-        console.log((file, fileList))
+    //
+    beforeUpload(file) {
+      console.log("=========", file);
     },
-    upload(param) {
-        const formData = new FormData() 
-        formData.append('file', param.file)
-        const url = this.$http.defaults.baseURL + '/xmgl/progressTask/importData'
-        axios.get(url, formData).then(res => {
-          console.log('成功了吗',res)
-        }).catch(response => {
-           console.log('图片上传失败')
-         })
+    // 上传mpp文件触发
+    handleImportChange(file, fileList) {
+      console.log("=[====]");
+      // console.log((file, fileList))
     },
 
     // 点击行查看详情
-    showDetail(row){
-        console.log('查详情',row)
-        this.type = "detail";
-        this.seedId = row.id;
+    showDetail(row) {
+      console.log("查详情", row);
+      this.type = "detail";
+      this.seedId = row.id;
     },
     //关闭详请组件
     closeDetailFn(val) {
@@ -455,8 +450,8 @@ export default {
       };
       getPrincipalLsitApi(data).then((res) => {
         if (res.code == 200) {
-            console.log('负责人',res)
-            this.principalLsit = res.result;
+          console.log("负责人", res);
+          this.principalLsit = res.result;
         }
       });
     },
@@ -486,24 +481,27 @@ export default {
 
     // 编辑按钮
     editBefore(val) {
-        console.log('=====',val)
-        this.workerInfo = (JSON.parse(JSON.stringify(val)))
-        this.fileList = val.fileUrl ? JSON.parse(val.fileUrl) : [];
-        this.dialogVisible = true;
+      console.log("=====", val);
+      this.workerInfo = JSON.parse(JSON.stringify(val));
+      this.fileList = val.fileUrl ? JSON.parse(val.fileUrl) : [];
+      this.dialogVisible = true;
     },
     //编辑
     submitBtn() {
-        //  if(this.workerInfo.state == "2" && this.workerInfo.actualStartDate == "" && this.workerInfo.actualFinishDate == "" ){
-            // this.$message.error("请输入实际开始完成时间");
-            // }
-        this.$refs.addEditForm.validate((valid) => {
-          if(valid) {
-            if(this.workerInfo.state == "1" && this.workerInfo.actualStartDate == "") {
-              this.$message.error("请输入实际开始时间");
-            }else {
-              //赋值
-              let data = this.workerInfo;
-              data.projectSn = this.projectSn;
+      this.$refs.addEditForm.validate((valid) => {
+        if (valid) {
+          if (this.workerInfo.status == "1" && this.workerInfo.actualStartDate == null) {
+            this.$message.error("请输入实际开始时间！");
+          } else if (this.workerInfo.status == "2") {
+            if (this.workerInfo.actualStartDate == null) {
+              this.$message.error("请输入实际开始时间！");
+            } else if (this.workerInfo.actualFinishDate == null) {
+              this.$message.error("请输入实际完成时间！");
+            }
+          } else {
+            //赋值
+            let data = this.workerInfo;
+            data.projectSn = this.projectSn;
               console.log('编辑的参数',data)
               editProgressListDataApi(data).then((res)=>{
                 console.log('编辑成功了吗',res)
@@ -513,16 +511,20 @@ export default {
                     this.getProgressListData()
                 }
               })
-            }
-          } else {
-            return false;
           }
-        });
-      }
+        } else {
+          return false;
+        }
+      });
     },
+  },
 };
 </script>
   <style lang="less" scoped>
+.down {
+  text-decoration: none;
+  color: #fff;
+}
 .expintBtn {
   display: inline-block !important;
   margin-right: 10px;