luowei 1 anno fa
parent
commit
c635878466

+ 21 - 3
src/views/core/accessPlan/index.vue

@@ -765,9 +765,9 @@ export default {
               }
               
               }else{
-                msg =  "因不存在已完成任务,本次修改内容将立即生效";
-              
-                this.$modal
+                if (request.isHaveTask==false) {
+                  msg = "是否确认修改?";
+              this.$modal
               .confirm(msg)
               .then(function () {
                 return updatePlan(request);
@@ -780,6 +780,24 @@ export default {
               })
               .catch(() => {
               });
+                }else{
+                  msg =  "因不存在已完成任务,本次修改内容将立即生效";
+              
+              this.$modal
+            .confirm(msg)
+            .then(function () {
+              return updatePlan(request);
+            })
+            .then(() => {
+              this.$modal.msgSuccess("编辑成功");
+              this.open = false;
+              this.getList();
+
+            })
+            .catch(() => {
+            });
+                }
+             
               }
               
             }else{

+ 4 - 3
src/views/resumptionEvaluate/evaluate/addEvaluate.vue

@@ -3,7 +3,7 @@
     <DialogCom
       :visible.sync="isShow"
       :width="'500px'"
-      :title="`${id ? '编辑' : '新增'}外包履职评价计划`"
+      :title="`${id ? '编辑' : '新增'}外包履职评价任务`"
       @close="closeHandler"
       append-to-body
     >
@@ -48,8 +48,8 @@
 <script>
 import { guid } from "@/utils/index.js";
 export default {
-  name: "SocWebAddEvaluate",
   dicts: ["evaluate_type"],
+  name: "SocWebAddEvaluate",
   data() {
     return {
       ruleForm: {},
@@ -102,8 +102,9 @@ export default {
   },
 };
 </script>
+
 <style lang="scss" scoped>
 .el-select {
   width: 100%;
 }
-</style>
+</style>

+ 20 - 16
src/views/resumptionEvaluate/evaluate/editDialog.vue

@@ -2,7 +2,7 @@
   <div class="rule-type">
     <DialogCom
       @colse="onHide"
-      :title="`${id ? '编辑' : '新增'}外包履职评价计划`"
+      :title="`${id ? '编辑' : '新增'}外包履职评价任务`"
       :visible.sync="isShow"
       width="1500px"
     >
@@ -86,13 +86,13 @@
               </el-form-item>
             </el-col>
            
-            <el-col :span="4">
+            <!-- <el-col :span="4">
               <el-form-item prop="buildTaskNow" label="立即生效:" v-if="!(id&&(isDistribute==1))">
                 <el-checkbox v-model="formData.buildTaskNow" size="medium"
                   >勾选后当前周期开始生效</el-checkbox
                 >
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
         </el-form>
         <el-button
@@ -151,9 +151,19 @@ import {
   getEvaluateById,
   editEvaluate,
 } from "@/api/resumption/outsourcing.js";
-
 export default {
   dicts: ["evaluate_cycle", "sys_org_type"],
+  components: { DialogSelect },
+
+  props: {
+    orgTypeOptions: {
+      type: Array,
+    },
+    ruleTypeOptions: {
+      type: Array,
+    },
+  },
+
   data() {
     return {
       isDistribute:0,
@@ -194,20 +204,14 @@ export default {
       },
     };
   },
-  props: {
-    orgTypeOptions: {
-      type: Array,
-    },
-    ruleTypeOptions: {
-      type: Array,
-    },
-  },
-  watch: {},
+
   computed: {
     ...mapGetters(["orgId", "orgName"]),
   },
+
+  watch: {},
   mounted() {},
-  components: { DialogSelect },
+
   methods: {
     //数据格式化
     typeFormat(row) {
@@ -380,7 +384,7 @@ export default {
     },
     // 事件
     //apimark//
-  },
+  }
 };
 </script>
 
@@ -396,4 +400,4 @@ export default {
   color: #999;
   height: 10px;
 }
-</style>
+</style>