修复缺陷

src/views/resumption/plan/index.vue

@@ -712,14 +712,14 @@ export default {
       if (row.planStatus == 0) {
         msg = '是否确认删除名称为"' + row.planName + '"的任务？';
       } else if (row.planStatus == 1) {
-        if (row.planCycle == 1) {
+        if (row.planCycle == 2) {
           msg = "本次删除将强制删除今日所有任务?";
         } else {
           msg = "本次删除将强制删除当前任务时间及以后所有任务";
         }
       } else if (row.planStatus == 2) {
         if (row.hasTaskCurrentCycle) {
-          if (row.planCycle == 1) {
+          if (row.planCycle == 2) {
             msg = "本次删除将强制删除今日所有任务?";
           } else {
             msg = "本次删除将强制删除当前任务时间及以后所有任务";

src/views/safetycheck/plan/dialog.edit.vue

@@ -68,7 +68,7 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-            </el-col>            
+            </el-col>
             <el-col :span="6">
               <el-form-item
                 prop="startDate"
@@ -116,7 +116,7 @@
                   clearable
                 >
                   <el-option
-                    v-for="item in  dict.type.sys_org_type"
+                    v-for="item in dict.type.sys_org_type"
                     :key="item.value"
                     :label="item.label"
                     :value="parseInt(item.value)"
@@ -180,7 +180,7 @@
                   :max="9"
                 ></el-input-number>
               </el-form-item>
-            </el-col>          
+            </el-col>
             <el-col :span="6">
               <el-form-item :span="6" prop="execOrgIds" label="检查主体">
                 <org-tree-select
@@ -240,10 +240,16 @@
             />
           </el-form-item>
         </el-form>
-        <el-button @click="openSelect"  v-if="formData.id==null || formData.planOfOrgId == orgId"
+        <el-button
+          @click="openSelect"
+          v-if="formData.id == null || formData.planOfOrgId == orgId"
           ><span class="requiredlabel">选择检查内容</span>
         </el-button>
-        <el-button @click="deleteSelected"  v-if="formData.id==null || formData.planOfOrgId == orgId">批量删除</el-button>
+        <el-button
+          @click="deleteSelected"
+          v-if="formData.id == null || formData.planOfOrgId == orgId"
+          >批量删除</el-button
+        >
         <el-table
           :data="tableData"
           style="width: 100%; margin-top: 15px"
@@ -302,7 +308,10 @@
           <el-table-column prop="areaName" label="操作">
             <template v-slot="{ row }">
               <el-button
-                v-if="getshenglianshe(row) && (formData.Id==null || formData.planOfOrgId == orgId)"
+                v-if="
+                  getshenglianshe(row) &&
+                  (formData.Id == null || formData.planOfOrgId == orgId)
+                "
                 type="text"
                 @click="removeRow(row)"
                 >删除</el-button
@@ -380,8 +389,8 @@ export default {
         count: [{ required: true, message: "请选择任务次数" }],
         checkOrgTypes: [{ required: true, message: "请选择受检机构类型" }],
         roleIds: [{ required: true, message: "请选择检查人员" }],
-        startDate:[{ required: true, message: "请选择开始时间" }],
-        endDate:[{ required: true, message: "请选择结束时间" }]
+        startDate: [{ required: true, message: "请选择开始时间" }],
+        endDate: [{ required: true, message: "请选择结束时间" }],
       },
       statusOptions: statusOptions,
     };
@@ -678,7 +687,7 @@ export default {
           this.defbuildTaskNow = res.data.buildTaskNow;
           this.parentCount = res.data.parentCount;
           this.formData = res.data;
-          this.formData.planCycle=this.formData.planCycle+'';
+          this.formData.planCycle = this.formData.planCycle + "";
           this.tableData = res.data.rulePointList;
           if (this.formData.execOrgType) {
             this.formData.roleIds = this.formData.roleList.map(
@@ -834,9 +843,14 @@ export default {
             msg = "因不存在已完成任务，本次修改内容将立即生成。";
           }
 
-          this.$modal.confirm(msg).then(() => {
-            this.update(this.formData, imme);
-          });
+          this.$modal
+            .confirm(msg)
+            .then(() => {
+              this.update(this.formData, imme);
+            })
+            .catch(() => {
+              this.loading = false;
+            });
         } else if (this.formData.planStatus == 2) {
           this.update(this.formData, false);
         } else {
@@ -844,7 +858,7 @@ export default {
         }
       });
     },
-    async update(data, immediateEffect) {      
+    async update(data, immediateEffect) {
       await api
         .add(data, immediateEffect)
         .then((data) => {

src/views/safetycheck/plan/index.vue

@@ -340,7 +340,7 @@
               label="操作"
               width="200"
               fixed="right"
-              align="center"
+              header-align="center"
             >
               <template slot-scope="r">
                 <el-button

src/views/safetycheck/task/index.vue

@@ -336,33 +336,25 @@
               label="操作"
               fixed="right"
               header-align="center"
-              width="240px"
+              min-width="120px"
             >
-              <template slot-scope="r">
-                <!-- <el-button v-if="
-                            r.row.status == 'WAIT' &&
-                            queryParams.type == 'QUARTER'
-                        " type="text" @click="onEdit(r.row.id)">检查</el-button>
-                        <el-button v-else-if="
-                            r.row.status != 'NA' &&
-                            r.row.status != 'NOT' &&
-                            r.row.status != 'WAIT'
-                        " type="text" @click="onEdit(r.row.id, { isRead: true })">查看</el-button> -->
+              <template slot-scope="r">    
                 <el-button
                   type="text"
-                  @click="showDetail(r.row)"
+                  @click="showscanRecord(r.row)"
+                  v-if="(r.row.status == 2 || r.row.status == 3) && r.row.sourceType=='0'"
                   v-hasPermi="['core:task:query']"
                   icon="el-icon-view"
-                  >详情</el-button
+                  >扫描记录</el-button
                 >
                 <el-button
                   type="text"
-                  @click="showscanRecord(r.row)"
-                  v-if="r.row.status == 2 || r.row.status == 3"
+                  @click="showDetail(r.row)"
                   v-hasPermi="['core:task:query']"
                   icon="el-icon-view"
-                  >扫描记录</el-button
+                  >详情</el-button
                 >
+                
                 <el-button
                   type="text"
                   icon="el-icon-s-check"