修改工作安排，集中文印，规章

src/api/peopleChuRu/leaveOne.js

@@ -50,4 +50,13 @@ export function exportLeaveOne(query) {
     method: 'get',
     params: query
   })
+}
+
+// 查询部门 
+export function getDept2(query) {
+  return request({
+    url: '/system/dept/list',
+    method: 'get',
+    params: query
+  })
 }

src/layout/components/AppMain.vue

@@ -32,7 +32,7 @@
           <span>重要消息</span>
         </div>
         <div class="tkbox-title-right">
-          <img src="../../assets/images/关闭.png" alt @click="showfun" />
+          <img src="../../assets/images/关闭.png" alt @click="showfun2" />
         </div>
       </div>
       <div class="tkbox-main">
@@ -125,28 +125,32 @@ export default {
   },
   methods: {
     showfun() {
+      this.open = false;
       printTriggerClear().then(res => {
         // console.log(res)
       });
-      this.open = false;
+      
     },
     showfun2() {
+       this.open2 = false;
       printTriggerClear().then(res => {
         // console.log(res)
       });
-      this.open2 = false;
+     
     },
     showfun3() {
+      this.open3 = false;
       printTriggerClear().then(res => {
         // console.log(res)
       });
-      this.open3 = false;
+      
     },
     showfun4() {
+      this.open4=false;
       printTriggerClear().then(res => {
         // console.log(res)
       });
-      this.open4 = false;
+      
     },
     quchulifun() {
       printTriggerClear().then(res => {
@@ -252,7 +256,7 @@ export default {
   background-repeat: no-repeat;
   position: absolute;
   left: 20%;
-  top: 30%;
+  top: 10%;
 }
 
 .tkbox2 {
@@ -263,7 +267,7 @@ export default {
   background-repeat: no-repeat;
   position: absolute;
   right: 26%;
-  top: 30%;
+  top: 10%;
 }
 
 .tkbox3 {
@@ -274,7 +278,7 @@ export default {
   background-repeat: no-repeat;
   position: absolute;
   left: 20%;
-  top: 38%;
+  top: 15%;
 }
 
 .tkbox4 {
@@ -285,7 +289,7 @@ export default {
   background-repeat: no-repeat;
   position: absolute;
   right: 26%;
-  top: 38%;
+  top: 15%;
 }
 
 .tkbox-title {

src/views/PrintsLog/printlog/index.vue

@@ -127,6 +127,7 @@
           type="primary"
           @click="handleUpdate"
           style="width: 76px; height: 36px"
+          v-hasPermi="['PrintsLog:printlog:add']"
           >归还</el-button
         >
       </el-col>
@@ -227,7 +228,7 @@
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
-          <el-button size="btk" type="text" @click="handlesee(scope.row)"
+          <el-button size="btk" type="text" @click="handlesee(scope.row)" v-hasPermi="['PrintsLog:printlog:query']"  
             >查看</el-button
           >
           <!-- <el-button size="mini" type="text" v-if="scope.row.statusG==1||scope.row.statusG==2">已归还</el-button> -->

src/views/PrintsManage/manage/index.vue

@@ -259,6 +259,7 @@
             type="text"
             v-if="scope.row.printStatus == 1"
             @click="handlePrint(scope.row)"
+            v-hasPermi="['PrintsLog:printlog:edit']"
             >打印</el-button
           >
           <el-button
@@ -581,10 +582,10 @@ export default {
       default: 50,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
-    // fileType: {
-    //   type: Array,
-    //   default: () => ["doc", "xls", "ppt", "txt", "pdf"],
-    // },
+    fileType: {
+      type: Array,
+      default: () => ["doc", "xls", "ppt",  "pdf",'zip'],
+    },
     // 是否显示提示
     isShowTip: {
       type: Boolean,
@@ -843,12 +844,15 @@ export default {
           if (fileExtension && fileExtension.indexOf(type) > -1) return true;
           return false;
         });
-        // if (!isTypeOk) {
-        //   this.$message.error(
-        //     `文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`
-        //   );
-        //   return false;
-        // }
+        if (!isTypeOk) {
+          this.$message.error(
+            `文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`
+          );
+          this.form.name = null;
+          this.form.size=null;
+          this.form.type=null;
+          return false;
+        }
       }
       // 校检文件大小
       if (this.fileSize) {
@@ -924,7 +928,7 @@ export default {
           this.getList();
           // var open=window.open();
           // let url='http://192.168.5.188:8080/profile/print/';
-          let url = "http://192.168.5.66:8089/profile/print/";
+          let url = "http://localhost:8089/profile/print/";
           location.href = url + res.printFileName;
         }
       });

src/views/bdglregular/regularinfo/index.vue

@@ -455,8 +455,9 @@
             clearable
             size="small"
             v-model="form.inspectionTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="datetime"
+            default-time="00:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择检查时间"
             :disabled="disabled"
           ></el-date-picker>
@@ -485,8 +486,9 @@
             clearable
             size="small"
             v-model="form.rectificationTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="datetime"
+            default-time="00:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择整改时间"
             :disabled="disabled"
           ></el-date-picker>
@@ -883,6 +885,30 @@ export default {
       this.title = "经常性检查";
       this.jiannum = 0;
       this.btnnum = null;
+           var today = new Date();
+      var y = today.getFullYear();
+      var M = today.getMonth() + 1;
+      var d = today.getDate();
+      var h = today.getHours();
+      var m = today.getMinutes();
+      var s = today.getSeconds();
+      var w = today.getDay();
+      if (M < 10) {
+        M = "0" + M;
+      }
+      if (d < 10) {
+        d = "0" + d;
+      }
+      if (h < 10) {
+        h = "0" + h;
+      }
+      if (m < 10) {
+        m = "0" + m;
+      }
+      if (s < 10) {
+        s = "0" + s;
+      }
+      this.form.inspectionTime = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
     },
     /** 整改按钮操作 */
     handleUpdate(row) {
@@ -949,7 +975,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          if (this.form.documentProof[0].url) {
+          if (this.form.documentProof) {
             this.form.documentProof = this.form.documentProof[0].url;
           }
 

src/views/bdglregular/specialinfo/index.vue

@@ -135,7 +135,7 @@
           type="success"
           v-if="queryParams.caoZuoType == 0"
           @click="handleAdd"
-          style="background: #1D96FF"
+          style="background: #1d96ff"
           >减分录入</el-button
         >
       </el-col>
@@ -144,7 +144,7 @@
           type="success"
           v-if="queryParams.caoZuoType == 1"
           @click="handleAdd"
-          style="background: #1D96FF"
+          style="background: #1d96ff"
           >加分录入</el-button
         >
       </el-col>
@@ -399,8 +399,8 @@
             clearable
             size="small"
             v-model="form.inspectionTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="datetime"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择检查时间"
             :disabled="disabled"
           ></el-date-picker>
@@ -422,8 +422,9 @@
             clearable
             size="small"
             v-model="form.rectificationTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="datetime"
+            default-time="00:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="选择整改时间"
             :disabled="disabled"
           ></el-date-picker>
@@ -623,25 +624,25 @@ export default {
     };
   },
   created() {
-    this.queryParams={
-        pageNum: 1,
-        pageSize: 10,
-        inspectedUnitId: null,
-        inspectedUnit: null,
-        inspectionTime: null,
-        score: null,
-        rectificationTime: null,
-        currentState: null,
-        question: null,
-        chargePeopleId: null,
-        chargePeople: null,
-        correctiveAction: null,
-        pictureProof: null,
-        documentProof: null,
-        createUserId: null,
-        createUser: null,
-        caoZuoType: 0,
-      };
+    this.queryParams = {
+      pageNum: 1,
+      pageSize: 10,
+      inspectedUnitId: null,
+      inspectedUnit: null,
+      inspectionTime: null,
+      score: null,
+      rectificationTime: null,
+      currentState: null,
+      question: null,
+      chargePeopleId: null,
+      chargePeople: null,
+      correctiveAction: null,
+      pictureProof: null,
+      documentProof: null,
+      createUserId: null,
+      createUser: null,
+      caoZuoType: 0,
+    };
     //部门数据
     getDept().then((res) => {
       if (res.code == 200) {
@@ -660,7 +661,7 @@ export default {
         this.total = res.total;
         this.loading = false;
       });
-    } else if (this.$route.query.obj) {     
+    } else if (this.$route.query.obj) {
       this.queryParams.inspectedUnitId = this.$route.query.obj.id;
       this.queryParams.currentState = this.$route.query.obj.name + "";
 
@@ -675,7 +676,7 @@ export default {
   },
   watch: {
     $route(to, from) {
-      this.queryParams={
+      this.queryParams = {
         pageNum: 1,
         pageSize: 10,
         inspectedUnitId: null,
@@ -779,6 +780,30 @@ export default {
       this.title = "专项检查";
       this.jiannum = 0;
       this.btnnum = null;
+      var today = new Date();
+      var y = today.getFullYear();
+      var M = today.getMonth() + 1;
+      var d = today.getDate();
+      var h = today.getHours();
+      var m = today.getMinutes();
+      var s = today.getSeconds();
+      var w = today.getDay();
+      if (M < 10) {
+        M = "0" + M;
+      }
+      if (d < 10) {
+        d = "0" + d;
+      }
+      if (h < 10) {
+        h = "0" + h;
+      }
+      if (m < 10) {
+        m = "0" + m;
+      }
+      if (s < 10) {
+        s = "0" + s;
+      }
+      this.form.inspectionTime = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -840,7 +865,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-          if (this.form.documentProof[0].url) {
+          if (this.form.documentProof) {
             this.form.documentProof = this.form.documentProof[0].url;
           }
           if (this.form.id != null) {

src/views/grassrootsregistration/bdgleven/index.vue

@@ -464,9 +464,11 @@ export default {
     // 转义视图不加标签
     onEditor(str) {
       //可以在这里进行对应的操作 quill为富文本对象,html为富文本对象内内容由html标签组成,text为quill内容里面的所有文本内容
-      var str = str.replace(/<\/?[^>]*>/g, ""); //去除HTML tag
-      str = str.replace(/[ | ]*\n/g, "\n"); //去除行尾空白
-      return str;
+      if (str) {
+        var str = str.replace(/<\/?[^>]*>/g, ""); //去除HTML tag
+        str = str.replace(/[ | ]*\n/g, "\n"); //去除行尾空白
+        return str;
+      }
     },
     // 重置表单人员
     ChongZhiRen() {
@@ -500,6 +502,7 @@ export default {
       this.loading = true;
       listBdgleven(this.queryParams).then((response) => {
         this.bdglevenList = response.rows;
+        console.log(this.bdglevenList);
         this.total = response.total;
         this.loading = false;
       });

src/views/peopleChuRu/bdglLeave/index.vue

@@ -150,7 +150,7 @@
           >
           <el-col
             v-if="scope.row.status1 == 3"
-            :title="scope.row.bdglLeaveFus[0].specialApproval"
+            :title="scope.row.bdglLeaveFus.length>0?scope.row.bdglLeaveFus[0].specialApproval:''"
             style="color: #1f73d7"
             >特殊审批</el-col
           >
@@ -183,7 +183,7 @@
           >
           <el-col
             v-if="scope.row.status2 == 3"
-            :title="scope.row.bdglLeaveFus[1].specialApproval"
+            :title="scope.row.bdglLeaveFus.length>0?[1].specialApproval:''"
             style="color: #1f73d7"
             >特殊审批</el-col
           >
@@ -1273,7 +1273,6 @@ export default {
   height: 36px; */
   background: transparent;
   color: #fff;
-  border: 1px solid white !important;
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {

src/views/peopleChuRu/leaveOne/index.vue

@@ -388,8 +388,13 @@
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column label="序号" align="center" type="index" />
       <el-table-column label="请假人员" align="center" prop="peopleId" />
-      <!-- <el-table-column label="单位" align="center" prop="unitId" /> -->
-      <el-table-column label="单位" align="center" prop="unitName" />
+      <el-table-column
+        label="单位"
+        align="center"
+        prop="unitId"
+        :formatter="unit3Format"
+      />
+      <!-- <el-table-column label="单位" align="center" prop="unitName" /> -->
       <el-table-column
         label="请假开始时间"
         align="center"
@@ -511,7 +516,7 @@
     />
 
     <!-- 添加或修改人员请假对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="500px" append-to-body>
       <el-form
         ref="form"
         :model="form"
@@ -568,6 +573,7 @@
             type="datetime"
             default-time="00:00:00"
             placeholder="选择请假开始时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -579,6 +585,7 @@
             type="datetime"
             default-time="00:00:00"
             placeholder="选择请假结束时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -590,6 +597,7 @@
             type="datetime"
             default-time="00:00:00"
             placeholder="请输入离队时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -601,6 +609,7 @@
             type="datetime"
             default-time="00:00:00"
             placeholder="请输入归队时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -712,6 +721,7 @@ import {
   addLeaveOne,
   updateLeaveOne,
   exportLeaveOne,
+  getDept2
 } from "@/api/peopleChuRu/leaveOne";
 import {
   getUser,
@@ -796,6 +806,7 @@ export default {
       // 树形结构列表
       deptOptions: [],
       renYuan: [],
+      unitlist:[]
     };
   },
   created() {
@@ -803,7 +814,22 @@ export default {
     // 获取单位树形
     this.getBuMeng();
   },
+  mounted(){
+     getDept2().then(res=>{
+         this.unitlist=res.data;
+     })
+  },
   methods: {
+    unit3Format(row, column) {
+      var deptName = "";
+        this.unitlist.map((item) => {
+          if (item.deptId == row.unitId) {
+            deptName = item.deptName;
+          }
+        });
+      
+      return deptName;
+    },
     // 获取部门列表
     getBuMeng() {
       getDept().then((res) => {

src/views/pt.vue

@@ -186,7 +186,7 @@
                 </div>
               </div>
               <div class="demo-a">
-                <a href="#" class="a">思想政治</a>
+                <a href="#" class="a">思想政治教育</a>
               </div>
             </li>
             <li>
@@ -736,28 +736,32 @@ export default {
         .catch(() => {});
     },
     showfun() {
+       this.open = false;
       printTriggerClear().then((res) => {
         // console.log(res)
       });
-      this.open = false;
+     
     },
     showfun2() {
+      this.open2 = false;
       printTriggerClear().then((res) => {
         // console.log(res)
       });
-      this.open2 = false;
+      
     },
     showfun3() {
+       this.open3 = false;
       printTriggerClear().then((res) => {
         // console.log(res)
       });
-      this.open3 = false;
+     
     },
     showfun4() {
+       this.open4 = false;
       printTriggerClear().then((res) => {
         // console.log(res)
       });
-      this.open4 = false;
+     
     },
     quchulifun() {
       printTriggerClear().then((res) => {

src/views/regulations/fileinfo/index.vue

@@ -642,6 +642,11 @@ export default {
         pageSize: this.queryParams.pageSize,
       }).then((res) => {
         this.fileinfoList = res.rows;
+        this.fileinfoList.map(item=>{
+          item.parentDirName='http://localhost:8089'+item.parentDirName;
+
+        })
+       console.log(1)
         this.total = res.total;
       });
     },
@@ -731,6 +736,10 @@ export default {
         pageSize: this.queryParams.pageSize,
       }).then((res) => {
         this.fileinfoList = res.rows;
+        this.fileinfoList.map(item=>{
+          item.parentDirName='http://localhost:8089'+item.parentDirName;
+
+        })
         this.total = res.total;
       });
       // console.log(row)
@@ -747,12 +756,13 @@ export default {
       }).then((res) => {
         res.rows.forEach((item) => {
           if (item.subclassification == 0) {
+
             this.directory = res.rows;
             this.total1 = res.total;
             this.addbtn = false;
           } else {
             // this.addbtn = true;
-            this.queryParams1.pageNum = 1;
+            this.queryParams1.pageNum=1;
             return;
           }
         });
@@ -781,6 +791,11 @@ export default {
       this.loading = true;
       listFileinfo(this.queryParams).then((response) => {
         this.fileinfoList = response.rows;
+        this.fileinfoList.map(item=>{
+          item.parentDirName='http://localhost:8089'+item.parentDirName;
+
+        })
+       
         console.log(this.fileinfoList);
         this.total = response.total;
         this.loading = false;
@@ -922,11 +937,11 @@ export default {
             pageSize: this.queryParams1.pageSize,
             //  common: this.queryParams1.common,
           }).then((res) => {
-            console.log(res);
+            console.log(res)
             this.directory = res.rows;
-            this.total1 = res.total;
-
-            if (this.parentId == 0) {
+            this.total1=res.total;
+           
+            if (this.parentId==0) {
               this.addbtn = true;
               this.RankList();
 
@@ -934,6 +949,7 @@ export default {
               this.loading1 = false;
               this.$modal.msgSuccess("删除成功");
             } else {
+             
               this.addbtn = false;
               this.RankList();
 
@@ -1010,10 +1026,10 @@ export default {
 </script>
 
 <style scoped>
-::v-deep .vue-treeselect__placeholder {
+::v-deep .vue-treeselect__placeholder{
   color: #bdbdbd4f !important;
 }
-::v-deep .el-table__row .el-table__cell {
+::v-deep .el-table__row .el-table__cell{
   text-align: center !important;
 }
 .jichu {
@@ -1099,12 +1115,12 @@ export default {
 /* 阅读按钮1样式 */
 .el-button--reads {
   color: #ffffff;
-  width: 50px;
+  width: 67px;
   height: 30px;
   background-color: #1d96ff;
   border-radius: 4px;
   font-size: 14px;
-  /* background-image: url("../../../images/uploads.png"); */
+  background-image: url("../../../images/uploads.png");
   background-repeat: no-repeat;
   background-position: 8px 6px;
   /* text-align: center; */
@@ -1114,7 +1130,7 @@ export default {
 /* 删除按钮样式 */
 .el-button--dels {
   color: #ffffff;
-  width: 50px;
+  width: 60px;
   height: 30px;
   background-color: #ff4949;
   border-radius: 4px;
@@ -1123,7 +1139,7 @@ export default {
   background-position: 8px 6px;
   /* text-align: center; */
   line-height: 5px;
-  /* margin-right: 10px; */
+  margin-right: 10px;
 }
 /* 查看按钮样式 */
 .el-button--reads .chakan {
@@ -1132,7 +1148,7 @@ export default {
 /* 阅读按钮样式 */
 .el-button--reads .chakan1 {
   padding-top: 2px;
-  /* margin-left: 7px; */
+  margin-left: 7px;
 }
 /* 表格 */
 .tdfirst {
@@ -1331,7 +1347,7 @@ table {
 .undeline {
   /* text-decoration: underline; */
   /* text-align: start; */
-  color: #00f0ff;
+  color: #00F0FF;
   cursor: pointer;
 }
 /* 序号居中 */
@@ -1399,17 +1415,17 @@ body,
   right: 5px;
 }
 ::v-deep .el-pager li.active {
-  background-color: #1d96ff;
+  background-color: #1D96FF;
   color: white;
 }
 ::v-deep .el-pager .number {
   background-color: #196299;
   color: white;
 }
-::v-deep .el-pagination .el-select .el-input .el-input__inner {
+::v-deep .el-pagination .el-select .el-input .el-input__inner{
   background-color: #196299 !important ;
 }
-::v-deep .el-pagination__editor.el-input .el-input__inner {
+::v-deep .el-pagination__editor.el-input .el-input__inner{
   background-color: #196299 !important ;
 }
 ::v-deep .btn-prev {

src/views/workingArrangements/planTask/index.vue

@@ -109,11 +109,7 @@
         prop="unitName"
         :formatter="unit3Format"
       /> -->
-      <el-table-column
-        label="发布人"
-        align="center"
-        prop="username"
-      />
+      <el-table-column label="发布人" align="center" prop="username" />
       <el-table-column
         label="计划类型"
         align="center"
@@ -164,7 +160,7 @@
             size="btlook"
             type="text"
             @click="ViewProgress(scope.row)"
-            v-if="scope.row.common == 1"
+            v-if="scope.row.common == 1&&scope.row.taskProgress!='100'"
           >
             <span>进度录入</span>
           </el-button>
@@ -213,19 +209,15 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
-
-
     <!-- 添加或修改工作计划对话框 -->
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="1020px"
+      width="990px"
       append-to-body
       class="el-dialog__header"
       :close-on-click-modal="false"
     >
-     <div class="userAgree">
       <el-form
         ref="form"
         :model="form"
@@ -326,6 +318,7 @@
             v-model="form.startTime"
             type="datetime"
             placeholder="请选择开始时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -336,8 +329,8 @@
             v-model="form.endTime"
             type="datetime"
             placeholder="请选择结束时间"
-            style="width: 200px"
             default-time="00:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -362,25 +355,20 @@
           />
         </el-form-item>
       </el-form>
-     </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
-
-
     <!-- 进度录入弹框 -->
     <el-dialog
       :title="title"
       :visible.sync="open1"
-      width="1040px"
+      width="980px"
       append-to-body
       class="el-dialog__header"
       :close-on-click-modal="false"
     >
-    <div class="userAgree">
       <el-form
         ref="Progress"
         :model="Progress"
@@ -461,25 +449,20 @@
           </el-date-picker>
         </el-form-item>
       </el-form>
-    </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm1">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-    
-
-
     <!-- 单人进度查看弹框 -->
     <el-dialog
       :title="title"
       :visible.sync="open2"
-      width="1020px"
+      width="980px"
       append-to-body
       class="el-dialog__header"
       :close-on-click-modal="false"
     >
-   <div class="userAgree">
       <el-form
         ref="singleTable"
         :model="singleTable"
@@ -502,16 +485,39 @@
           style="margin-bottom: 20px"
           color="rgba(41, 231, 205, 1)"
         ></el-progress>
-        <div class="jiben">任务周期</div>
-        <el-form-item prop="comWeek">
+        <div class="jiben">任务信息</div>
+              <el-form-item label="发布人" prop="username" label-width="auto" >
+          <el-input
+            placeholder="请输入发布人"
+            v-model="singleTable.username"
+            :disabled="true"
+            class="ipt"
+            style="color:#fff;width:350px;"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="comWeek" label="任务周期" label-width="100px">
           <!-- <el-input
             v-model="singleTable."
             class="big"
           /> -->
-          <div class="thistext">
+          <div
+            style="
+              width: 350px;
+              border: 1px solid #fff;
+              border-radius: 4px;
+              min-height: 35px;
+              height: auto !important;
+              line-height: 35px;
+              text-indent: 1em;
+              margin-bottom: 20px;
+              color:#fff;
+            "
+          >
             {{ singleTable.startTime }} 至 {{ singleTable.endTime }}
           </div>
         </el-form-item>
+        
         <!-- <div class="thistext"></div> -->
         <div class="jiben">附件文档</div>
         <el-form-item prop="file">
@@ -531,44 +537,40 @@
           >
         </el-form-item>
         <!-- <a :href="singleTable.planProgress.file" style="color:white">下载附件</a> -->
-        <div class="jiben">备注</div>
-        <!-- <el-form-item prop="remark">
+        <div class="jiben">任务描述</div>
+        <!-- <el-form-item prop="contents">
           <el-input
-            v-model="ProgressLook.remark"
+            v-model="ProgressLook.contents"
             type="textarea"
             placeholder="请输入内容"
           />
         </el-form-item> -->
-        <div class="thistext">{{ singleTable.remark }}</div>
-        <div class="jiben">任务描述</div>
-        <!-- <el-form-item prop="contents">
+        <div class="thistext">{{ singleTable.contents }}</div>
+        <div class="jiben">备注</div>
+        <!-- <el-form-item prop="remark">
           <el-input
-            v-model="ProgressLook.contents"
+            v-model="ProgressLook.remark"
             type="textarea"
             placeholder="请输入内容"
           />
         </el-form-item> -->
-        <div class="thistext">{{ singleTable.contents }}</div>
+        <div class="thistext">{{ singleTable.remark }}</div>
+        
       </el-form>
-   </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
-
-
     <!-- 多人进度查看弹框 -->
     <el-dialog
       :title="title"
       :visible.sync="open3"
-      width="1020px"
+      width="980px"
       append-to-body
       class="el-dialog__header jinduchakan"
       :close-on-click-modal="false"
     >
-    <div class="userAgree">
       <el-form
         ref="moreTable"
         :model="moreTable"
@@ -584,18 +586,37 @@
           style="margin-bottom: 20px"
           color="rgba(41, 231, 205, 1)"
         ></el-progress>
-        <div class="jiben">任务周期</div>
-        <!-- <el-form-item prop="comWeek">
+        <div class="jiben">任务信息</div>
+         <el-form-item label="发布人" prop="username" label-width="auto" >
           <el-input
-            label="计划名称"
-            v-model="moreTable.startTime"
-            class="big"
+            placeholder="请输入发布人"
+            v-model="moreTable.username"
             :disabled="true"
-          />
-        </el-form-item> -->
-        <div class="thistext">
-          {{ moreTable.startTime }} 至 {{ moreTable.endTime }}
-        </div>
+            class="ipt"
+            style="color:#fff;width:350px;"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="comWeek" label="任务周期" label-width="100px">
+          <!-- <el-input
+            v-model="singleTable."
+            class="big"
+          /> -->
+          <div  style="
+              width: 350px;
+              border: 1px solid #fff;
+              border-radius: 4px;
+              min-height: 35px;
+              height: auto !important;
+              line-height: 35px;
+              text-indent: 1em;
+              margin-bottom: 20px;
+              color:#fff;
+            ">
+            {{ moreTable.startTime }} 至 {{ moreTable.endTime }}
+          </div>
+        </el-form-item>
+        
         <!-- <div class="thistext"></div> -->
         <div class="jiben">附件文档</div>
         <el-form-item prop="file">
@@ -616,29 +637,29 @@
             >下载附件</a
           >
         </el-form-item>
-        <div class="jiben">备注</div>
-        <!-- <el-form-item prop="remark">
+        <div class="jiben">任务描述</div>
+        <!-- <el-form-item prop="contents">
           <el-input
-            v-model="ProgressLook.remark"
+            v-model="ProgressLook.contents"
             type="textarea"
             placeholder="请输入内容"
           />
         </el-form-item> -->
-        <div class="thistext">{{ moreTable.remark }}</div>
-        <div class="jiben">任务描述</div>
-        <!-- <el-form-item prop="contents">
+        <div class="thistext">{{ moreTable.contents }}</div>
+        <div class="jiben">备注</div>
+        <!-- <el-form-item prop="remark">
           <el-input
-            v-model="ProgressLook.contents"
+            v-model="ProgressLook.remark"
             type="textarea"
             placeholder="请输入内容"
           />
         </el-form-item> -->
-        <div class="thistext">{{ moreTable.contents }}</div>
+        <div class="thistext">{{ moreTable.remark }}</div>
         <div class="jiben">执行人信息</div>
         <el-table
           :data="moreTable.planProgresses"
           border
-          style="width: 97%; background: #004d86"
+          style="width: 100%; background: #004d86"
           class="tabless"
         >
           <el-table-column prop="peopleName" label="执行人" width="180">
@@ -673,10 +694,6 @@
           </el-table-column>
         </el-table>
       </el-form>
-    </div>
-
-
-
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -1005,29 +1022,29 @@ export default {
       this.form.username = Cookies.get("nickName");
       this.form.userId = Cookies.get("userId");
       var today = new Date();
-        var y = today.getFullYear();
-        var M = today.getMonth() + 1;
-        var d = today.getDate();
-        var h = today.getHours();
-        var m = today.getMinutes();
-        var s = today.getSeconds();
-        var w = today.getDay();
-        if (M < 10) {
-          M = "0" + M;
-        }
-        if (d < 10) {
-          d = "0" + d;
-        }
-        if (h < 10) {
-          h = "0" + h;
-        }
-        if (m < 10) {
-          m = "0" + m;
-        }
-        if (s < 10) {
-          s = "0" + s;
-        }
-        this.form.startTime = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+      var y = today.getFullYear();
+      var M = today.getMonth() + 1;
+      var d = today.getDate();
+      var h = today.getHours();
+      var m = today.getMinutes();
+      var s = today.getSeconds();
+      var w = today.getDay();
+      if (M < 10) {
+        M = "0" + M;
+      }
+      if (d < 10) {
+        d = "0" + d;
+      }
+      if (h < 10) {
+        h = "0" + h;
+      }
+      if (m < 10) {
+        m = "0" + m;
+      }
+      if (s < 10) {
+        s = "0" + s;
+      }
+      this.form.startTime = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
       // 获取执行单位列表
       getDept2().then((res) => {
         // console.log(res,2)
@@ -1047,6 +1064,8 @@ export default {
         this.Progress.id = res.data.planProgress.id;
         this.Progress.taskId = res.data.id;
         this.Progress.planProgress = res.data.planProgress.schedule;
+        this.Progress.peopleId = res.data.workProgress.peopleId;
+        // this.Progress.fileName = res.data.fileName;
         console.log(this.Progress.planProgress.schedule);
       });
     },
@@ -1062,6 +1081,9 @@ export default {
         this.singleTable.planProgresses =
           this.singleTable.planProgress.schedule;
         console.log(this.singleTable);
+        this.singleTable.peopleName=res.data.peopleName.split(",").map(Number);
+        this.singleTable.file='http://192.168.2.250:8089'+this.singleTable.file;
+        this.getZhuChi(res.data.unitId);
         // this.singleTable.jindu=singleTable.planProgress.schedule
         // console.log(this.singleTable)
       });
@@ -1078,6 +1100,10 @@ export default {
         console.log(res);
         this.comstatus = 0;
         this.moreTable = res.data;
+        this.moreTable.planProgresses.map(item=>{
+            item.file='http://192.168.2.250:8089'+item.file;
+        })
+        this.moreTable.file='http://192.168.2.250:8089'+this.moreTable.file;
         this.moreTable.planProgresses.forEach((item) => {
           this.comstatus +=
             item.schedule / this.moreTable.planProgresses.length;
@@ -1463,7 +1489,7 @@ export default {
 /* 备注 */
 .thistext {
   color: white;
-  width: 940px;
+  width: 930px;
   border: 1px solid #fff;
   border-radius: 4px;
   height: auto;
@@ -1475,7 +1501,7 @@ export default {
 }
 /* 完成进度 */
 .complue .el-input__inner {
-  width: 900px;
+  width: 940px;
 }
 .complue {
   width: 940px;
@@ -1534,9 +1560,6 @@ export default {
 .el-progress-bar__outer {
   background-color: rgba(25, 98, 153, 1);
 }
-.el-progress-bar{
-  width: 97% !important;
-}
 /* 上下箭头 */
 .el-icon-arrow-up,
 .el-icon-arrow-down {
@@ -1589,11 +1612,5 @@ export default {
 }
 .vue-treeselect__menu {
   color: #606266;
-}
- .el-dialog__body {
-  padding: 30px 0px 0px 34px;
-}
- .el-dialog__footer {
-  margin-right: 26px !important;
 }
 </style>

src/views/workingArrangements/workTask/index.vue

@@ -199,7 +199,7 @@
       />
       <el-table-column
         label="操作"
-        align="center"
+        align="left"
         class-name="small-padding fixed-width"
       >
         <template slot-scope="scope">
@@ -207,7 +207,7 @@
             size="btlook"
             type="text"
             @click="ViewProgress(scope.row)"
-            v-if="scope.row.common == 1"
+            v-if="scope.row.common == 1 && scope.row.taskProgress != '100'"
           >
             <span>进度录入</span>
           </el-button>
@@ -259,168 +259,162 @@
     <el-dialog
       :title="title"
       :visible.sync="open"
-      width="1020px"
+      width="980px"
       append-to-body
       :close-on-click-modal="false"
     >
-      <div class="userAgree">
-        <el-form
-          ref="form"
-          :model="form"
-          :rules="rules"
-          label-width="100px"
-          :inline="true"
-        >
-          <div class="jiben">基本信息</div>
-          <el-form-item label="任务名称" prop="name">
-            <el-input
-              placeholder="请选择任务名称"
-              v-model="form.name"
-              @click.native="planName"
-            />
-          </el-form-item>
-          <el-form-item label="任务编号" prop="number">
-            <el-input
-              placeholder="请选择任务编号"
-              label="任务编号"
-              v-model="form.number"
-              :disabled="true"
-              class="ipt"
-            >
-            </el-input>
-          </el-form-item>
-          <el-form-item label="发布单位" prop="adminId">
-            <treeselect
-              v-model="form.adminId"
-              :options="part"
-              @select="selectPeo"
-              class="threeselects"
-              disabled
-              placeholder="请选择发布单位"
-            />
-          </el-form-item>
-          <el-form-item label="执行单位" prop="unitId">
-            <treeselect
-              v-model="form.unitId"
-              :options="users"
-              class="threeselects"
-              @select="selectPeo1"
-              placeholder="请选择执行单位"
-            />
-          </el-form-item>
-          <el-form-item label="任务类型" prop="type">
-            <el-select
-              v-model="form.type"
-              style="width: 200px"
-              clearable
-              placeholder="请选择任务类型"
-              size="small"
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="100px"
+        :inline="true"
+      >
+        <div class="jiben">基本信息</div>
+        <el-form-item label="任务名称" prop="name">
+          <el-input
+            placeholder="请选择任务名称"
+            v-model="form.name"
+            @click.native="planName"
+          />
+        </el-form-item>
+        <el-form-item label="任务编号" prop="number">
+          <el-input
+            placeholder="请选择任务编号"
+            label="任务编号"
+            v-model="form.number"
+            :disabled="true"
+            class="ipt"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item label="发布单位" prop="adminId">
+          <treeselect
+            v-model="form.adminId"
+            :options="part"
+            @select="selectPeo"
+            class="threeselects"
+            disabled
+            placeholder="请选择发布单位"
+          />
+        </el-form-item>
+        <el-form-item label="执行单位" prop="unitId">
+          <treeselect
+            v-model="form.unitId"
+            :options="users"
+            class="threeselects"
+            @select="selectPeo1"
+            placeholder="请选择执行单位"
+          />
+        </el-form-item>
+        <el-form-item label="任务类型" prop="type">
+          <el-select
+            v-model="form.type"
+            style="width: 200px"
+            clearable
+            placeholder="请选择任务类型"
+            size="small"
+          >
+            <el-option
+              v-for="(item, i) in ziDian"
+              :key="i"
+              :label="item.dictLabel"
+              :value="parseInt(item.dictSort)"
             >
-              <el-option
-                v-for="(item, i) in ziDian"
-                :key="i"
-                :label="item.dictLabel"
-                :value="parseInt(item.dictSort)"
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="发布人" prop="username">
+          <el-input
+            placeholder="请输入发布人"
+            v-model="form.username"
+            :disabled="true"
+            class="ipt"
+          >
+          </el-input>
+        </el-form-item>
+        <div>
+          <el-form-item label="执行人" prop="peopleName" label-width="100px">
+            <div>
+              <el-select
+                multiple
+                v-model="form.peopleName"
+                id="execute"
+                ref="peoplenames"
+                placeholder="请选择执行人"
               >
-              </el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="发布人" prop="username">
-            <el-input
-              placeholder="请输入发布人"
-              v-model="form.username"
-              :disabled="true"
-              class="ipt"
-            >
-            </el-input>
-          </el-form-item>
-          <div>
-            <el-form-item label="执行人" prop="peopleName" label-width="100px">
-              <div>
-                <el-select
-                  multiple
-                  v-model="form.peopleName"
+                <el-option
+                  v-for="item in executor"
+                  :key="item.deptId"
+                  :label="item.nickName"
+                  :value="item.userId"
                   id="execute"
-                  ref="peoplenames"
-                  placeholder="请选择执行人"
-                >
-                  <el-option
-                    v-for="item in executor"
-                    :key="item.deptId"
-                    :label="item.nickName"
-                    :value="item.userId"
-                    id="execute"
-                    @click.native="returnExecutor(item.deptId, item.nickName)"
-                  />
-                </el-select>
-              </div>
-            </el-form-item>
-          </div>
-          <el-form-item label="开始时间" prop="startTime">
-            <el-date-picker
-              placeholder="请选择开始时间"
-              clearable
-              size="small"
-              v-model="form.startTime"
-              type="datetime"
-              style="width: 200px"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="结束时间" label-width="100px" prop="endTime">
-            <el-date-picker
-              placeholder="请选择结束时间"
-              clearable
-              size="small"
-              v-model="form.endTime"
-              type="datetime"
-              default-time="00:00:00"
-            >
-            </el-date-picker>
-          </el-form-item>
-          <div class="jiben">任务附件</div>
-          <el-form-item style="margin-left: 30px">
-            <fileUpload v-model="form.file" />
-          </el-form-item>
-          <div class="jiben">任务描述</div>
-          <el-form-item prop="contents">
-            <el-input
-              v-model="form.contents"
-              type="textarea"
-              placeholder="请输入内容"
-              style="width: 950px"
-            />
-          </el-form-item>
-          <div class="jiben">备注</div>
-          <el-form-item prop="remark">
-            <el-input
-              v-model="form.remark"
-              type="textarea"
-              placeholder="请输入内容"
-              style="width: 950px"
-            />
+                  @click.native="returnExecutor(item.deptId, item.nickName)"
+                />
+              </el-select>
+            </div>
           </el-form-item>
-        </el-form>
-      </div>
+        </div>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker
+            placeholder="请选择开始时间"
+            clearable
+            size="small"
+            v-model="form.startTime"
+            type="datetime"
+            style="width: 200px"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" label-width="100px" prop="endTime">
+          <el-date-picker
+            placeholder="请选择结束时间"
+            clearable
+            size="small"
+            v-model="form.endTime"
+            type="datetime"
+            default-time="00:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <div class="jiben">任务附件</div>
+        <el-form-item style="margin-left: 30px">
+          <fileUpload v-model="form.file" />
+        </el-form-item>
+        <div class="jiben">任务描述</div>
+        <el-form-item prop="contents">
+          <el-input
+            v-model="form.contents"
+            type="textarea"
+            placeholder="请输入内容"
+            style="width: 950px"
+          />
+        </el-form-item>
+        <div class="jiben">备注</div>
+        <el-form-item prop="remark">
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+            style="width: 950px"
+          />
+        </el-form-item>
+      </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
-
-
-
     <!-- 进度录入弹框 -->
     <el-dialog
       :title="title"
       :visible.sync="open1"
-      width="1020px"
+      width="980px"
       append-to-body
       class="el-dialog__header"
       :close-on-click-modal="false"
     >
-    <div class="userAgree">
       <el-form
         ref="Progress"
         :model="Progress"
@@ -472,26 +466,20 @@
           </el-date-picker>
         </el-form-item>
       </el-form>
-    </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm1">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
-
-
-
     <!-- 单人进度查看弹框 -->
     <el-dialog
       :title="title"
       :visible.sync="open2"
-      width="1020px"
+      width="980px"
       append-to-body
       class="el-dialog__header"
       :close-on-click-modal="false"
     >
-    <div class="userAgree">
       <el-form
         ref="singleTable"
         :model="singleTable"
@@ -514,13 +502,32 @@
           style="margin-bottom: 20px"
           color="rgba(41, 231, 205, 1)"
         ></el-progress>
-        <div class="jiben">任务周期</div>
-        <el-form-item prop="comWeek">
+        <div class="jiben">任务信息</div>
+        <el-form-item label="执行人" prop="peopleName" label-width="100px">
+          <div>
+            <el-select
+              multiple
+              v-model="singleTable.peopleName"
+              ref="peoplenames"
+              placeholder="请选择执行人"
+              style="width: 350px"
+            >
+              <el-option
+                v-for="item in executor"
+                :key="item.deptId"
+                :label="item.nickName"
+                :value="item.userId"
+                @click.native="returnExecutor(item.deptId, item.nickName)"
+              />
+            </el-select>
+          </div>
+        </el-form-item>
+        <el-form-item prop="comWeek" label="任务周期" label-width="100px">
           <!-- <el-input
             v-model="singleTable."
             class="big"
           /> -->
-          <div class="thistext">
+          <div style="width: 350px">
             {{ singleTable.startTime }} 至 {{ singleTable.endTime }}
           </div>
         </el-form-item>
@@ -542,31 +549,25 @@
             >下载附件</a
           >
         </el-form-item>
-        <div class="jiben">备注</div>
-        <div class="thistext">{{ singleTable.remark }}</div>
         <div class="jiben">任务描述</div>
         <div class="thistext">{{ singleTable.contents }}</div>
+        <div class="jiben">备注</div>
+        <div class="thistext">{{ singleTable.remark }}</div>
       </el-form>
-    </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
-
-
-
-
     <!-- 多人进度查看弹框 -->
     <el-dialog
       :title="title"
       :visible.sync="open3"
-      width="1020px"
+      width="980px"
       append-to-body
       class="el-dialog__header jinduchakan"
       :close-on-click-modal="false"
     >
-    <div class="userAgree">
       <el-form
         ref="moreTable"
         :model="moreTable"
@@ -582,10 +583,61 @@
           style="margin-bottom: 20px"
           color="rgba(41, 231, 205, 1)"
         ></el-progress>
-        <div class="jiben">任务周期</div>
+        <div class="jiben">任务信息</div>
+        <!-- <el-form-item label="发布人" prop="peopleName" label-width="100px">
+          <div>
+            <el-select
+              multiple
+              v-model="moreTable.peopleName"
+              ref="peoplenames"
+              placeholder="请选择发布人"
+              style="width: 350px"
+            >
+              <el-option
+                v-for="item in executor"
+                :key="item.deptId"
+                :label="item.nickName"
+                :value="item.userId"
+                @click.native="returnExecutor(item.deptId, item.nickName)"
+              />
+            </el-select>
+          </div>
+        </el-form-item> -->
+        <el-form-item label="发布人" prop="username" label-width="auto" >
+          <el-input
+            placeholder="请输入发布人"
+            v-model="moreTable.username"
+            :disabled="true"
+            class="ipt"
+            style="color:#fff;width:350px;"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="comWeek" label="任务周期" label-width="100px">
+          <!-- <el-input
+            v-model="singleTable."
+            class="big"
+          /> -->
+          <div
+            style="
+              width: 350px;
+              border: 1px solid #fff;
+              border-radius: 4px;
+              min-height: 35px;
+              height: auto !important;
+              line-height: 35px;
+              text-indent: 1em;
+              margin-bottom: 20px;
+              color:#fff;
+            "
+          >
+            {{ moreTable.startTime }} 至 {{ moreTable.endTime }}
+          </div>
+        </el-form-item>
+        <!-- <div class="jiben">任务周期</div>
         <div class="thistext">
           {{ moreTable.startTime }} 至 {{ moreTable.endTime }}
-        </div>
+        </div> -->
         <!-- <div class="thistext"></div> -->
         <div class="jiben">附件文档</div>
         <el-form-item prop="file">
@@ -606,15 +658,15 @@
             >下载附件</a
           >
         </el-form-item>
-        <div class="jiben">备注</div>
-        <div class="thistext">{{ moreTable.remark }}</div>
         <div class="jiben">任务描述</div>
         <div class="thistext">{{ moreTable.contents }}</div>
+        <div class="jiben">备注</div>
+        <div class="thistext">{{ moreTable.remark }}</div>
         <div class="jiben">执行人信息</div>
         <el-table
           :data="moreTable.workProgresses"
           border
-          style="width: 97%; background: #004d86"
+          style="width: 100%; background: #004d86"
           class="tabless"
         >
           <el-table-column prop="peopleName" label="执行人" width="180">
@@ -649,12 +701,165 @@
           </el-table-column>
         </el-table>
       </el-form>
-    </div>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm2">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      :title="title"
+      :visible.sync="open2"
+      width="980px"
+      append-to-body
+      class="el-dialog__header"
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="singleTable"
+        :model="singleTable"
+        :rules="rules"
+        label-width="100px"
+        :inline="true"
+      >
+        <div class="jiben">完成进度</div>
+        <!-- <el-form-item prop="comPlan"> -->
+        <!-- <el-input
+            label="计划名称"
+            v-model="ProgressLook.comPlan"
+            class="big"
+          /> -->
+        <!-- </el-form-item> -->
+        <el-progress
+          :text-inside="true"
+          :stroke-width="24"
+          :percentage="singleTable.planProgresses"
+          style="margin-bottom: 20px"
+          color="rgba(41, 231, 205, 1)"
+        ></el-progress>
+        <div class="jiben">任务信息</div>
+        <!-- <el-form-item label="执行人" prop="peopleName" label-width="100px">
+          <div>
+            <el-select
+              multiple
+              v-model="singleTable.peopleName"
+              ref="peoplenames"
+              placeholder="请选择执行人"
+              style="width: 350px"
+            >
+              <el-option
+                v-for="item in executor"
+                :key="item.deptId"
+                :label="item.nickName"
+                :value="item.userId"
+                @click.native="returnExecutor(item.deptId, item.nickName)"
+              />
+            </el-select>
+          </div>
+        </el-form-item> -->
+         <el-form-item label="发布人" prop="username" label-width="auto" >
+          <el-input
+            placeholder="请输入发布人"
+            v-model="singleTable.username"
+            :disabled="true"
+            class="ipt"
+            style="color:#fff;width:350px;"
+          >
+          </el-input>
+        </el-form-item>
+        <el-form-item prop="comWeek" label="任务周期" label-width="100px">
+          <!-- <el-input
+            v-model="singleTable."
+            class="big"
+          /> -->
+          <div  style="
+              width: 350px;
+              border: 1px solid #fff;
+              border-radius: 4px;
+              min-height: 35px;
+              height: auto !important;
+              line-height: 35px;
+              text-indent: 1em;
+              margin-bottom: 20px;
+              color:#fff;
+            ">
+            {{ singleTable.startTime }} 至 {{ singleTable.endTime }}
+          </div>
+        </el-form-item>
+        <!-- <div class="thistext"></div> -->
+        <div class="jiben">附件文档</div>
+        <el-form-item prop="file">
+          <el-input
+            label="附件名称"
+            v-model="singleTable.fileName"
+            style="width: 820px"
+          />
+          <!-- <div>{{singleTableb.fileName}}</div> -->
+          <a
+            :href="singleTable.file"
+            download
+            title="下载"
+            style="color: white; margin-left: 10px"
+            class="downloadfile"
+            >下载附件</a
+          >
+        </el-form-item>
+        <div class="jiben">备注</div>
+        <div class="thistext">{{ singleTable.remark }}</div>
+        <div class="jiben">任务描述</div>
+        <div class="thistext">{{ singleTable.contents }}</div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm2">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 多人进度查看弹框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="open4"
+      width="450px"
+      append-to-body
+      class="el-dialog__header jinduchakan"
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="moreTable"
+        :model="daoruobj"
+        :rules="rules"
+        label-width="100px"
+        :inline="true"
+      >
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker
+            placeholder="请选择开始时间"
+            clearable
+            size="small"
+            v-model="daoruobj.startTime"
+            type="datetime"
+            default-time="00:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            style="width: 200px"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" label-width="100px" prop="endTime">
+          <el-date-picker
+            placeholder="请选择结束时间"
+            clearable
+            size="small"
+            v-model="daoruobj.endTime"
+            type="datetime"
+            default-time="00:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
+          >
+          </el-date-picker>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm4">导 出</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -804,8 +1009,11 @@ export default {
         accomplishTime: "",
         taskId: "",
         id: "",
+        publisherId: "",
       },
       defaultTime: null,
+      daoruobj: {},
+      open4: null,
     };
   },
   created() {
@@ -859,6 +1067,8 @@ export default {
         this.Progress.id = res.data.workProgress.id;
         this.Progress.taskId = res.data.id;
         this.Progress.planProgress = res.data.workProgress.schedule;
+        // this.Progress.peopleId = res.data.workProgress.publisherId;
+        this.Progress.publisherId = res.data.workProgress.publisherId;
       });
     },
     // 进度查看单人进度
@@ -874,8 +1084,17 @@ export default {
         this.singleTable.planProgresses =
           this.singleTable.workProgress.schedule;
         this.Progress.id = this.singleTable.workProgress.id;
+
+        this.singleTable.file =
+          "http://192.168.2.250:8089" + this.singleTable.file;
+        console.log(this.singleTable.file, 1);
         this.singleTable.fileName = this.singleTable.workProgress.fileName;
-        console.log(this.singleTable.fileName);
+        this.singleTable.peopleName = res.data.peopleName
+
+          .split(",")
+          .map(Number);
+        this.getZhuChi(res.data.unitId);
+
         // console.log(this.Progress.id);
         // this.singleTable.jindu=singleTable.planProgress.schedule
         // console.log(this.singleTable)
@@ -892,6 +1111,10 @@ export default {
         this.comstatus = 0;
         this.moreTable = res.data;
         console.log(this.moreTable);
+        this.moreTable.file = "http://192.168.2.250:8089" + this.moreTable.file;
+        this.moreTable.workProgresses.map((item) => {
+          item.file = "http://192.168.2.250:8089" + item.file;
+        });
         this.moreTable.workProgresses.forEach((item) => {
           this.comstatus +=
             item.schedule / this.moreTable.workProgresses.length;
@@ -917,6 +1140,7 @@ export default {
       this.open1 = false;
       this.open2 = false;
       this.open3 = false;
+      this.open4 = false;
     },
     // 表单重置
     reset() {
@@ -1036,6 +1260,7 @@ export default {
         s = "0" + s;
       }
       this.form.startTime = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+      // this.form.endTime = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
 
       // 获取执行单位列表
       getDept2().then((res) => {
@@ -1220,15 +1445,32 @@ export default {
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
+      this.open4 = true;
+      this.title = "导出工作数据";
+      // this.$modal
+      //   .confirm("是否确认导出所有工作任务数据项？")
+      //   .then(() => {
+      //     this.exportLoading = true;
+      //     return exportWorkTask(queryParams);
+      //   })
+      //   .then((response) => {
+      //     this.$download.name(response.msg);
+      //     this.exportLoading = false;
+      //   })
+      //   .catch(() => {});
+    },
+    //导出
+    submitForm4() {
       this.$modal
         .confirm("是否确认导出所有工作任务数据项？")
         .then(() => {
           this.exportLoading = true;
-          return exportWorkTask(queryParams);
+          return exportWorkTask(this.daoruobj);
         })
         .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
+          this.open4 = false;
         })
         .catch(() => {});
     },
@@ -1439,7 +1681,7 @@ export default {
 /* 备注 */
 .thistext {
   color: white;
-  width: 940px;
+  width: 930px;
   border: 1px solid #fff;
   border-radius: 4px;
   min-height: 35px;
@@ -1509,9 +1751,6 @@ export default {
 .el-progress-bar__outer {
   background-color: rgba(25, 98, 153, 1);
 }
-.el-progress-bar{
-  width: 97% !important;
-}
 /* 上下箭头 */
 .el-icon-arrow-up,
 .el-icon-arrow-down {
@@ -1554,10 +1793,4 @@ export default {
 .vue-treeselect__menu {
   color: #606266;
 }
-.userAgree .el-dialog__body {
-  padding: 30px 0px 0px 34px;
-}
-.userAgree .el-dialog__footer {
-  margin-right: 26px !important;
-}
 </style>