Sfoglia il codice sorgente

更改要是日记表格

sunyanqiang 3 anni fa
parent
commit
9e557f29fe

+ 2 - 2
src/api/grassrootsregistration/bdglsecrecy.js

@@ -17,9 +17,9 @@ export function getBdglsecrecy(id) {
   })
 }
 // 查看/手机/涉密载体登记本详细
-export function units(unitid) {
+export function units(unitid,sdate) {
   return request({
-    url: '/grassrootsregistration/bdglsecrecy/units?unitid=' + unitid,
+    url: `/grassrootsregistration/bdglsecrecy/units?unitid=${unitid}&sdate=${sdate}`,
     method: 'get'
   })
 }

+ 46 - 20
src/components/look_word/bdgldiary.vue

@@ -383,7 +383,8 @@
             style="font-family: '仿宋'"
           >
             <div style="margin-bottom: 10px">交接时间</div>
-            时 分
+            <span >时 分</span>
+            <span>{{message.dutyDate}}</span>
           </td>
           <td class="JR_right" colspan="8">
             <span align="center" style="仿宋">
@@ -663,7 +664,7 @@
 // import '@/utils/jquery.wordexport.js'
 import exportWord from "@/utils/exportWord.js";
 export default {
-  name: "bdgleven",
+  name: "bdglevens",
   props: ["message"],
   dicts: ["post_Level"],
   data() {
@@ -679,9 +680,11 @@ export default {
       },
       week: "",
       qinshu2: 0,
-      number: 5,
+      number: 6,
       time: [],
       guiTime: [],
+      faith2: [],
+      faith1: [],
       qingjia: {
         rowspan: 0,
         list: 0,
@@ -732,14 +735,16 @@ export default {
       exportWord(this.faith);
     },
     aaa(raw) {
-      if (raw != "" || raw != null) {
+      // console.log(raw);
+      if (raw != "" && raw != null) {
         return raw.replaceAll(",", "<br/>");
       } else {
         return (raw = null);
       }
     },
     bbb(raw) {
-      if (raw != "" || raw != null) {
+      console.log(raw,123456789);
+      if (raw != "" && raw != null) {
         return raw.replace(".00", "");
       } else {
         return (raw = null);
@@ -747,6 +752,41 @@ export default {
     },
     xunlians() {
       if (this.message.contextData) {
+        for (let index = 0; index < this.message.contextData.length; index++) {
+          this.faith1.push(this.message.contextData[index].dateline) 
+        }
+        if (this.faith1.indexOf('早晨') == -1){
+          this.message.contextData.push({dateline: '早晨', contents: '', percentage: ''})
+        }  
+        if(this.faith1.indexOf('上午') == -1 ){
+          this.message.contextData.push({dateline: '上午', contents: '', percentage: ''})
+        } 
+        if(this.faith1.indexOf('下午') == -1 ){
+          this.message.contextData.push({dateline: '下午', contents: '', percentage: ''})
+        } 
+        if(this.faith1.indexOf('晚上') == -1 ){
+          this.message.contextData.push({dateline: '晚上', contents: '', percentage: ''})
+        }
+      for (let index = 0; index < this.message.contextData.length; index++) {
+        console.log(this.message.contextData[index]);
+          if (this.message.contextData[index].dateline == '早晨') {
+            this.faith2[0] = this.message.contextData[index]
+          }
+
+          if (this.message.contextData[index].dateline == '上午') {
+            this.faith2[1] = this.message.contextData[index]
+          }
+
+          if (this.message.contextData[index].dateline == '下午') {
+            this.faith2[2] = this.message.contextData[index]
+          }
+
+          if (this.message.contextData[index].dateline == '晚上') {
+            this.faith2[3] = this.message.contextData[index]
+          }
+        }
+        this.message.contextData = this.faith2
+        
       } else {
         this.number = 6;
         this.meiShuJu = [
@@ -764,21 +804,7 @@ export default {
           },
         ];
       }
-      // console.log(this.message.contextData);
-      // console.log(this.message.contextData.早晨);
-      // const a = this.message.contextData.早晨 !== null && this.message.contextData.早晨 !== "",
-      //       b = this.message.contextData.上午 !== null && this.message.contextData.上午 !== "",
-      //       c = this.message.contextData.下午 !== null && this.message.contextData.下午 !== "",
-      //       d = this.message.contextData.晚上 !== null && this.message.contextData.晚上 !== ""
-      // console.log(a);
-      // console.log(b);
-      // console.log(c);
-      // console.log(d );
-      //   this.xlist.早晨 = this.message.contextData.早晨
-      //   this.xlist.上午 = this.message.contextData.上午
-      //   this.xlist.下午 = this.message.contextData.下午
-      //   this.xlist.晚上 = this.message.contextData.晚上
-      // }
+      
     },
     chapus() {
       if (this.message.inspect != null) {

+ 1 - 1
src/components/look_word/bdglfood.vue

@@ -840,7 +840,7 @@
               align="center"
               width="31"
             >
-              <span style="display: block; text-align: center"></span>
+              <span style="display: block; text-align: center"></span>
             </td>
             <td
               class="JR_left"

+ 3 - 2
src/views/bdglregular/regularcountinfo/index.vue

@@ -400,13 +400,14 @@ export default {
       this.$router
         .push({
           path: "/bdglregular/regularinfo",
-          query: { id: row.inspectedUnitId },
+          // query: { id: row.inspectedUnitId,inspectedUnitId:row.inspectedUnitId,currentState:currentState },
+          query: { obj: row },
         })
         .catch(() => {});
     },
     //饼状图点击事件
     eConsole(param) {
-      console.log(param);
+      // console.log(param);
       if (param.data.id) {
         this.$router
           .push({

+ 12 - 8
src/views/bdglregular/regularinfo/index.vue

@@ -1175,8 +1175,9 @@ export default {
       this.inspectionType = response.data;
     });
     if (this.$route.query.obj) {
-      this.queryParams.inspectedUnitId = this.$route.query.obj.id;
-      this.queryParams.currentState = this.$route.query.obj.name;
+      console.log(this.$route.query.obj,22);
+      this.queryParams.inspectedUnitId = this.$route.query.obj.inspectedUnitId||this.$route.query.obj.id;
+      this.queryParams.currentState = this.$route.query.obj.currentState||this.$route.query.obj.name;
       listRegularinfos(this.queryParams).then((res) => {
         this.regularinfoList = res.rows;
         this.total = res.total;
@@ -1214,8 +1215,8 @@ export default {
         caoZuoType: 0,
       };
       if (to.query.obj) {
-        this.queryParams.inspectedUnitId = to.query.obj.id;
-        this.queryParams.currentState = to.query.obj.name;
+        this.queryParams.inspectedUnitId = to.query.obj.inspectedUnitId||to.query.obj.id;
+        this.queryParams.currentState = to.query.obj.currentState || to.query.name;
         listRegularinfos(this.queryParams).then((res) => {
           this.regularinfoList = res.rows;
           this.total = res.total;
@@ -1239,7 +1240,7 @@ export default {
     getBuMeng() {
       getDeptss().then((res) => {
         this.deptOptions = res.data;
-        console.log(this.deptOptions)
+        console.log(this.deptOptions);
       });
     },
     danWiess() {
@@ -1302,9 +1303,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.queryParams.currentState = "";
-      console.log(this.queryParams);
-      this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        caoZuoType: 0,
+      };
+      // this.resetForm("queryForm");
       this.handleQuery();
     },
     // 多选框选中数据

+ 2 - 1
src/views/bdglregular/specialcountinfo/index.vue

@@ -392,7 +392,8 @@ export default {
       this.$router
         .push({
           path: "/bdglregular/specialinfo",
-          query: { id: row.inspectedUnitId },
+          // query: { id: row.inspectedUnitId },
+          query:{obj: row }
         })
         .catch(() => {});
     },

+ 12 - 4
src/views/bdglregular/specialinfo/index.vue

@@ -1044,8 +1044,8 @@ export default {
         this.loading = false;
       });
     } else if (this.$route.query.obj) {
-      this.queryParams.inspectedUnitId = this.$route.query.obj.id;
-      this.queryParams.currentState = this.$route.query.obj.name;
+      this.queryParams.inspectedUnitId = this.$route.query.obj.inspectedUnitId||this.$route.query.obj.id;
+      this.queryParams.currentState = this.$route.query.obj.currentState||this.$route.query.obj.name ;
       listSpecialinfos(this.queryParams).then((res) => {
         this.specialinfoList = res.rows;
         this.total = res.total;
@@ -1084,12 +1084,15 @@ export default {
           this.loading = false;
         });
       } else if (to.query.obj) {
-        this.queryParams.inspectedUnitId = to.query.obj.id;
+        // this.queryParams.inspectedUnitId = to.query.obj.id;
+        this.queryParams.inspectedUnitId = to.query.obj.inspectedUnitId||to.query.obj.id;
+        this.queryParams.currentState = to.query.obj.currentState || to.query.name;
         listSpecialinfos(this.queryParams).then((res) => {
           this.specialinfoList = res.rows;
           this.total = res.total;
           this.loading = false;
         });
+        console.log( this.queryParams,222);
       } else {
         this.getList();
       }
@@ -1151,7 +1154,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.resetForm("queryForm");
+      // this.resetForm("queryForm");
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        caoZuoType: 0,
+      };
       this.handleQuery();
     },
     // 多选框选中数据

+ 12 - 2
src/views/grassrootsregistration/bdgldiary/index.vue

@@ -551,15 +551,25 @@
               </el-select>
             </el-form-item>
             <el-form-item label="交接时间" prop="dutyDate">
-              <el-date-picker
+              <!-- <el-date-picker
                 clearable
                 size="small"
                 v-model="form.dutyDate"
                 type="date"
                 value-format="yyyy-MM-dd"
                 placeholder="请选择交接时间"
+                
               >
-              </el-date-picker>
+              </el-date-picker> -->
+              <el-time-picker
+                size="small"
+                v-model="form.dutyDate"
+                :picker-options="{
+                  selectableRange: '00:00:00 - 23:59:59',
+                }"
+                placeholder=""
+              >
+              </el-time-picker>
             </el-form-item>
             <div class="jiben">值班交接情况</div>
             <el-form-item prop="dutyinfoA">

+ 2 - 1
src/views/grassrootsregistration/bdgldrill/index.vue

@@ -249,7 +249,7 @@
         </el-form-item>
         <el-form-item label="周工作内容">
           <input
-            v-model="nr"
+            v-model="form.hr"
             placeholder=""
             style="
               width: 810px;
@@ -961,6 +961,7 @@ export default {
       this.getTreeselect();
       this.title = "添加军事训练登记簿";
       this.drillFus = [];
+      this.nr=null
     },
     //查看按钮操作
     handleChakan(row) {

+ 26 - 4
src/views/grassrootsregistration/bdglfood/index.vue

@@ -1664,7 +1664,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       // 人员列表
-      (this.renYuan = []), this.reset();
+      this.renYuan = [];
+      this.reset();
       this.getShu();
       this.getdict();
       this.open = true;
@@ -1698,14 +1699,33 @@ export default {
         // 采购食材
         this.caiGou = response.data.bdglFoodProcurements;
         // 交/退伙食费
-        this.expenses = response.data.bdglFoodBoardWagess;
+        if (response.data.bdglFoodBoardWagess.length>0) {
+          this.expenses = response.data.bdglFoodBoardWagess;
+        } else {
+          this.expenses = [
+            {
+              peopleId: null,
+              type: null,
+              sky: null,
+              standard: null,
+              money: null,
+            },
+          ];
+        }
+
         // 在食堂购物
         this.canteen = response.data.bdglFoodShoppings;
         // 后厨
         if (response.data.peopleIds !== null) {
-          this.form.peopleIds = response.data.peopleIds.split(",");
+          if(response.data.peopleIds !== ""){
+            this.form.peopleIds = response.data.peopleIds.split(",");
           this.arr = this.form.peopleIds;
           this.form.peopleIds = this.arr.map((i) => parseInt(i, 0));
+          }else{
+            this.form.peopleIds=null
+          }
+        }else{  
+          this.form.peopleIds=null
         }
         this.open = true;
         this.title = "修改伙食管理登记薄";
@@ -1730,7 +1750,9 @@ export default {
         if (valid) {
           if (this.form.id != null) {
             // 转换字符串
-            this.form.peopleIds = this.form.peopleIds.join(",");
+            if(this.form.peopleIds){
+                 this.form.peopleIds = this.form.peopleIds.join(",");
+            }
             // 追加元素
             this.Arr.push(this.meal);
             this.Arr.push(this.zhongCan);

+ 5 - 1
src/views/grassrootsregistration/bdglsecrecy/index.vue

@@ -624,10 +624,14 @@ export default {
     //查看按钮操作
     handleChakan(row) {
       const unitId = row.unitId;
+        // console.log(row);
+      // var stiem =row.startTime.substring(0,4)
+      var stiem =row.startTime
+      // console.log(stiem);
       // 是否隐藏按钮
       this.opens = false;
       const id = row.id || this.ids;
-      units(unitId).then((response) => {
+      units(unitId,stiem).then((response) => {
         this.wordInfo = response.data;
         this.title = "查看网络/手机/涉密载体登记本";
         this.menuRoleVisible = true;

+ 1 - 0
src/views/peopleChuRu/leaveOne/index.vue

@@ -283,6 +283,7 @@
         </el-form-item>
         <el-form-item label="请假人员" prop="peopleId">
           <el-select
+           multiple
             v-model="form.peopleId"
             placeholder="请选择请假人员"
             ref="headerSearchSelect"

+ 1 - 2
src/views/thought/parliament/index.vue

@@ -629,13 +629,12 @@ export default {
     // 获取所有人员
     getSuoYou() {
       getAll().then((response) => {
-        console.log(response)
         this.executors = response.data;
         // 添加的人员
         this.executor = response.data;
         // 记录人
         this.recodeexecutor = response.data;
-        console.log( this.recodeexecutor)
+        // console.log( this.recodeexecutor)
       });
     },
     // 转义视图不加标签

+ 2 - 7
src/views/workingArrangements/planTask/index.vue

@@ -133,6 +133,7 @@
         align="center"
         prop="peopleId"
         :formatter="unit2Format"
+        show-overflow-tooltip
       />
       <el-table-column
         label="计划开始时间"
@@ -1309,7 +1310,7 @@ export default {
           process.env.VUE_APP_BASE_API + this.moreTable.file;
         this.moreTable.planProgresses.forEach((item) => {
           this.comstatus +=
-            item.schedule / this.moreTable.planProgresses.length;
+           parseInt(item.schedule / this.moreTable.planProgresses.length);
         });
       });
     },
@@ -1781,12 +1782,6 @@ export default {
 .vue-treeselect__single-value {
   color: white;
 }
-/* 文字多余部分省略 */
-.el-table__cell .cell {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
 /* table表格 */
 ::v-deep .el-table th.el-table__cell {
   background-color: pink !important;

+ 3 - 3
src/views/workingArrangements/workTask/index.vue

@@ -127,6 +127,7 @@
         align="center"
         prop="peopleId"
         :formatter="unit2Format"
+        show-overflow-tooltip
       />
       <!-- <el-table-column label="编号" align="center" prop="number" /> -->
       <el-table-column
@@ -185,7 +186,7 @@
             v-if="scope.row.common == 2 || scope.row.common == 0"
           >
             <!-- 多人进度查看 -->
-            <span class="chakan">查看</span>
+          <span class="chakan">查看</span>
           </el-button>
           <el-button
             size="btu"
@@ -1230,7 +1231,6 @@ export default {
       this.open2 = true;
       this.title = "进度查看";
       // 获取当前行的id
-
       singProgress(row.id).then((res) => {
         console.log(res);
         this.singleTable = res.data;
@@ -1267,7 +1267,7 @@ export default {
 
         this.moreTable.workProgresses.forEach((item) => {
           this.comstatus +=
-            item.schedule / this.moreTable.workProgresses.length;
+          parseInt(item.schedule / this.moreTable.workProgresses.length);
         });
       });
     },

+ 87 - 105
src/views/workingArrangements/worktaskplan/index.vue

@@ -95,7 +95,7 @@
       :header-cell-style="{ background: '#003C69', color: 'white' }"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center">
+      <el-table-column label="序号" align="center" width="50">
         <template scope="scope">
           <span>{{
             (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1
@@ -133,12 +133,14 @@
         align="center"
         prop="taskCount"
         v-if="taskCounts"
+        width="100"
       />
       <el-table-column
         label="当前进度"
         align="center"
         prop="taskProgress"
         v-if="taskProgres"
+          width="100"
       >
         <template slot-scope="scope">
           <span>{{ scope.row.taskProgress }}%</span>
@@ -149,6 +151,7 @@
         align="center"
         prop="unitCount"
         v-if="unitCounts"
+          width="100"
       />
       <el-table-column
         label="备注"
@@ -157,6 +160,15 @@
         show-overflow-tooltip
       />
 
+        <el-table-column
+        v-if="aaa == 0"
+        label="任务说明"
+        align="center"
+        prop="planDetail.taskDescription"
+        show-overflow-tooltip
+      />
+
+
       <el-table-column
         label="操作"
         align="center"
@@ -191,11 +203,11 @@
           >
           <el-button
             v-if="aaa != 0"
-            size="btk"
+            size="btzx"
             type="text"
             @click="handleUpdateAdd(scope.row)"
             v-hasPermi="['workingArrangements:taskplandetail:add']"
-            >添加</el-button
+            >添加分支任务</el-button
           >
           <el-button
             v-if="aaa != 0"
@@ -789,9 +801,9 @@
         :inline="true"
       >
         <el-form-item label="任务名称" prop="taskName">
-          <el-input v-model="form8.taskName" placeholder="" disabled />
+          <el-input v-model="form8.taskName" placeholder="" disabled  class="ren_wu1"/>
         </el-form-item>
-        <el-form-item label="开始时间" prop="startTime">
+        <el-form-item label="开始时间" prop="startTime" style="margin-right: 155px;">
           <el-date-picker
             clearable
             v-model="form8.startTime"
@@ -816,11 +828,12 @@
         <el-form-item label="发布人" prop="createBy">
           <el-input v-model="form8.createBy" disabled></el-input>
         </el-form-item>
-        <div style="height: 33px; color: #fff; font-size: 15px">附件</div>
+        <div style="height: 33px; color: #fff; font-size: 15px;padding-left: 26px;">附件</div>
         <div
           v-for="(item, i2) in form8.annexList"
           :key="i2 + '   '"
           class="box3"
+          style="margin-left: 22px;"
         >
           <el-input
             label="附件名称"
@@ -836,8 +849,17 @@
             >下载附件</a
           >
         </div>
-        <div style="height: 33px; color: #fff; font-size: 15px">备注</div>
-        <el-form-item label="" prop="remarkInfo">
+           <div style="height: 33px; color: #fff; font-size: 15px;margin-left: 26px;">任务说明</div>
+        <el-form-item label="" prop="remarkInfo" style="margin-left: 20px;">
+          <el-input
+            v-model="form9.taskDescription"
+            type="textarea"
+            placeholder="请输入内容"
+            disabled
+          />
+        </el-form-item>
+        <div style="height: 33px; color: #fff; font-size: 15px;margin-left: 26px;">备注</div>
+        <el-form-item label="" prop="remarkInfo" style="margin-left: 20px;">
           <el-input
             v-model="form8.remarkInfo"
             type="textarea"
@@ -845,7 +867,8 @@
             disabled
           />
         </el-form-item>
-        <div class="jiben">反馈说明</div>
+        <div v-if="form9.feedbackDescription">
+         <div class="jiben">反馈说明</div>
         <el-form-item label="" prop="feedbackDescription">
           <el-input
             v-model="form9.feedbackDescription"
@@ -854,11 +877,12 @@
             disabled
           />
         </el-form-item>
-        <!-- <fileUpload v-model="form2.annexLists" class="m-l-20" :limit="5" /> -->
+        </div>
         <div
           v-for="(item, i3) in form9.annexList"
           :key="i3 + '    '"
           class="box3"
+          style="margin-left: 26px;"
         >
           <el-input
             label="附件名称"
@@ -949,6 +973,15 @@
             >下载附件</a
           >
         </div>
+         <div style="height: 33px; color: #fff; ">任务说明</div>
+        <el-form-item label="" prop="remarkInfo" >
+          <el-input
+            v-model="nairong"
+            type="textarea"
+            placeholder="请输入内容"
+            disabled
+          />
+        </el-form-item>
         <div style="height: 33px; color: #fff; font-size: 15px">备注</div>
         <el-form-item label="" prop="remarkInfo">
           <el-input
@@ -974,95 +1007,6 @@
       </div>
     </el-dialog>
 
-    <!-- 审批 -->
-    <el-dialog
-      title="审批"
-      :visible.sync="openxShen"
-      width="800px"
-      append-to-body
-      :close-on-click-modal="false"
-      custom-class="box4"
-    >
-      <el-form
-        ref="form"
-        :model="form4"
-        :rules="rules"
-        label-width="80px"
-        :inline="true"
-      >
-        <el-form-item label="执行单位" prop="unitId">
-          <treeselect
-            v-model="form4.unitId"
-            :options="deptOptions"
-            placeholder="请选择单位"
-          />
-        </el-form-item>
-        <el-form-item label="执行人员" prop="peopleId">
-          <el-select v-model="form4.peopleId" placeholder="请选择执行人员">
-            <el-option
-              v-for="(item, i1) in executor"
-              :key="i1 + ' '"
-              :label="item.nickName"
-              :value="item.userId"
-            />
-          </el-select>
-        </el-form-item>
-        <div class="jiben">任务说明</div>
-        <el-form-item label="" prop="taskDescription">
-          <el-input
-            v-model="form4.taskDescription"
-            type="textarea"
-            placeholder="请输入内容"
-          />
-        </el-form-item>
-        <div class="jiben">执行反馈</div>
-        <el-form-item label="反馈时间" prop="startTime">
-          <el-date-picker
-            clearable
-            v-model="form4.feedbackTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-          >
-          </el-date-picker>
-        </el-form-item>
-        <div class="jiben">反馈说明</div>
-        <el-input
-          v-model="form4.feedbackDescription"
-          type="textarea"
-          placeholder="请输入内容"
-        />
-        <div class="jiben">任务附件</div>
-        <div
-          v-for="(item, i3) in form4.annexList"
-          :key="i3 + '    '"
-          class="box3"
-        >
-          <el-input
-            label="附件名称"
-            v-model="item.name"
-            style="width: 820px"
-            disabled
-          />
-          <a
-            :href="url + item.url"
-            :download="item.name"
-            title="下载"
-            style="color: white; margin-left: 10px"
-            >下载附件</a
-          >
-        </div>
-        <div class="jiben">驳回原因</div>
-        <el-input
-          v-model="form4.rejectContent"
-          type="textarea"
-          placeholder=""
-        />
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFormTong">通 过</el-button>
-        <el-button @click="cancelBo">驳 回</el-button>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
@@ -1220,6 +1164,8 @@ export default {
       taskProgres: true,
       // 执行单位数
       unitCounts: true,
+      // 执行按钮任务说明
+      nairong:null
     };
   },
   created() {
@@ -1242,14 +1188,15 @@ export default {
   methods: {
     // 执行人查看
     handleUpdatebZXCK(row) {
-      this.usersid = row.bdglWorkTaskPlanDetailList[0].id;
+      // console.log(row);
+      this.usersid = row.planDetail.id;
       this.form8.id = row.id;
       getWorktaskplan(this.form8.id).then((res) => {
-        console.log(res);
         this.form8 = res.data;
       });
       taskplandetailIds(this.usersid).then((res) => {
         this.form9 = res.data;
+         console.log(res,2);
       });
       this.title = "查看";
       this.openzxck = true;
@@ -1349,10 +1296,12 @@ export default {
     // 点击执行
     handleUpdateb(row) {
       console.log(row);
-      this.usersid = row.bdglWorkTaskPlanDetailList[0].id;
+      this. nairong=row.planDetail.taskDescription
+      this.usersid = row.planDetail.id;
       this.form2.id = row.id;
       getWorktaskplan(this.form2.id).then((res) => {
         this.form2 = res.data;
+        //  console.log(this.form2);
       });
       this.getChaKan(this.usersid);
       this.title = "编辑";
@@ -1707,6 +1656,9 @@ export default {
 .ren_wu {
   width: 501px;
 }
+.ren_wu1 {
+  width: 636px;
+}
 /* 基本信息背景 */
 .jiben {
   width: 700px;
@@ -1765,13 +1717,17 @@ export default {
 }
 
 ::v-deep .box5 .box3 .el-input {
-  width: 470px !important;
+  width: 577px !important;
 }
 ::v-deep .box5 .el-dialog__footer {
-  margin-right: 158px;
+  margin-right: 88px;
+}
+
+::v-deep .box5 .el-textarea__inner{
+    width: 687px !important;
 }
 ::v-deep .box5 .el-dialog__body {
-  margin-left: 123px;
+  margin-left: 69px;
 }
 
 ::v-deep .box .el-dialog__footer {
@@ -1797,4 +1753,30 @@ hr {
 ::v-deep .box4 .el-dialog__footer {
   margin-right: 79px;
 }
+
+/* 查看 添加分支任务*/
+.el-button--btzx.is-active,
+.el-button--btzx:active {
+  background: #1d96ff;
+  border-color: #1d96ff;
+  color: #FFFFFF;
+}
+
+.el-button--btzx:focus,
+.el-button--btzx:hover {
+  background: #41a4fa;
+  border-color: #41a4fa;
+  color: #FFFFFF;
+}
+
+.el-button--btzx {
+  width: 100px !important;
+  border: 1px solid transparent;
+  padding: 3px 8px;
+  font-size: 14px;
+  line-height: 1.5;
+  border-radius: 3px;
+  color: #fff;
+  background-color: #1d96ff;
+}
 </style>