调整计划

src/views/check/dialog.edit.vue

@@ -30,6 +30,7 @@
             <el-col :span="6">
               <el-form-item prop="checkType" label="检查类型:">
                 <el-select
+                  :disabled="isChildren()"
                   label="检查类型"
                   v-model="formData.checkType"
                   placeholder="请选择检查类型"
@@ -48,6 +49,7 @@
             <el-col :span="6">
               <el-form-item prop="planCycle" label="检查周期:">
                 <el-select
+                  :disabled="isChildren()"
                   prop="planCycle"
                   label="检查周期"
                   v-model="formData.planCycle"
@@ -71,10 +73,11 @@
                 v-if="NowBuild()"
               >
                 <el-checkbox
+                  :disabled="isChildren()"
                   v-model="formData.buildTaskNow"
                   size="medium"
                   @change="handleCheckboxChange"
-                  >默认从下个周期生成任务，<br>勾选后从当前周期立即生成任务</el-checkbox
+                  >默认从下个周期生成任务，<br />勾选后从当前周期立即生成任务</el-checkbox
                 >
               </el-form-item>
             </el-col>
@@ -85,6 +88,7 @@
                 v-if="formData.planCycle == 6"
               >
                 <el-date-picker
+                  :disabled="isChildren()"
                   v-model="formData.startDate"
                   style="width: 240px"
                   value-format="yyyy-MM-dd hh:mm:ss"
@@ -102,6 +106,7 @@
                 v-if="formData.planCycle == 6"
               >
                 <el-date-picker
+                  :disabled="isChildren()"
                   v-model="formData.endDate"
                   style="width: 240px"
                   value-format="yyyy-MM-dd hh:mm:ss"
@@ -115,6 +120,7 @@
             <el-col :span="6">
               <el-form-item prop="execOrgType" label="检查机构类型:">
                 <el-select
+                  :disabled="isChildren()"
                   @change="cleanExecOrgList"
                   prop="execOrgType"
                   label="检查机构类型"
@@ -137,6 +143,7 @@
             <el-col :span="6">
               <el-form-item prop="roleIds" label="检查角色:">
                 <el-select
+                  :disabled="isChildren()"
                   label="检查角色"
                   v-model="formData.roleIds"
                   placeholder="请选择检查角色"
@@ -157,6 +164,7 @@
             <el-col :span="6">
               <el-form-item prop="checkOrgType" label="受检机构类型:">
                 <el-select
+                  :disabled="isChildren()"
                   @change="cleanCheckOrgList"
                   prop="checkOrgType"
                   label="受检机构类型"
@@ -177,6 +185,7 @@
             <el-col :span="6">
               <el-form-item prop="count" label="检查次数:">
                 <el-input-number
+                  :disabled="isChildren()"
                   style="margin-left: 10px"
                   v-model="formData.count"
                   controls-position="right"
@@ -186,12 +195,12 @@
                 ></el-input-number>
               </el-form-item>
             </el-col>
-           
           </el-row>
           <el-row>
             <el-col :span="6">
               <el-form-item :span="6" prop="execOrgIds" label="检查机构">
                 <org-tree-select
+                  :disabled="isChildren()"
                   v-model="formData.execOrgIds"
                   :queryData="parseInt(formData.execOrgType)"
                   ref="execorgTreeSelect"
@@ -204,6 +213,7 @@
             <el-col :span="6">
               <el-form-item :span="6" prop="checkOrgIds" label="受检机构">
                 <org-tree-select
+                  :disabled="isChildren()"
                   v-model="formData.checkOrgIds"
                   :queryData="parseInt(formData.checkOrgType)"
                   ref="checkorgTreeSelect"
@@ -239,6 +249,7 @@
           </el-row>
           <el-form-item :span="6" prop="description" label="备注">
             <el-input
+              :disabled="isChildren()"
               v-model="formData.description"
               :maxlength="255"
               clearable
@@ -250,7 +261,7 @@
         <el-table :data="tableData" style="width: 100%" height="400px">
           <el-table-column label="是否扫描">
             <template v-slot="{ row }">
-              <el-switch
+              <el-switch :disabled="!getshenglianshe(row)"
                 v-model="row.pointScan"
                 active-text="是"
                 inactive-text="否"
@@ -261,7 +272,7 @@
 
           <el-table-column label="必完成项">
             <template v-slot="{ row }">
-              <el-switch
+              <el-switch :disabled="!getshenglianshe(row)"
                 v-model="row.required"
                 active-text="是"
                 inactive-text="否"
@@ -272,6 +283,7 @@
           <el-table-column prop="ruleName" label="检查手册"> </el-table-column>
           <el-table-column prop="itemName" label="检查项"> </el-table-column>
           <el-table-column prop="pointName" label="检查内容"> </el-table-column>
+          <el-table-column v-if="false" prop="ofOrgId" label="所属机构id"> </el-table-column>
           <el-table-column prop="areaName" label="检查区域"> </el-table-column>
           <el-table-column prop="businessType" label="数据来源">
             <template slot-scope="r">
@@ -282,7 +294,12 @@
           </el-table-column>
           <el-table-column prop="areaName" label="操作">
             <template v-slot="{ row }">
-              <el-button type="text" @click="removeRow(row)">删除</el-button>
+              <el-button
+                v-if="getshenglianshe(row)"
+                type="text"
+                @click="removeRow(row)"
+                >删除</el-button
+              >
             </template>
           </el-table-column>
         </el-table>
@@ -310,7 +327,7 @@ import OrgTree from "@/components/orgTree";
 import korgTree from "@/components/k-orgTree";
 import * as api from "@/api/safetycheck/plan";
 import { statusOptions } from "@/views/commonOption";
-import { findAllRole,findRoleByType } from "@/api/system/role";
+import { findAllRole, findRoleByType } from "@/api/system/role";
 import { getLabel } from "@/views/commonOption";
 import DialogSelect from "@/views/safetycheck/ruleManager/dialog.select.point.vue";
 export default {
@@ -369,6 +386,22 @@ export default {
     ...mapGetters(["orgId", "orgName"]),
   },
   methods: {
+    //省联社内容不能删除
+    getshenglianshe(row) {
+      if (row.ofOrgId == this.orgId) {
+        return true;
+      } else return false;
+    },
+    //编辑内容判断
+    isChildren() {
+      // console.log(this.formData.distributePlanStatus,"distributePlanStatus")
+      if (
+        this.formData.distributePlanStatus != 1 &&
+        (this.formData.hasEdit != 1 || this.id == null)
+      ) {
+        return false;
+      } else return true;
+    },
     NowBuild() {
       if (this.formData.planCycle == 6) return false;
       else return true;
@@ -379,14 +412,14 @@ export default {
     cleanExecOrgList() {
       this.execOrgIds = null;
       this.formData.execOrgList = [];
-      this.formData.roleIds=[];
-      this.formData.execOrgIds=[];
+      this.formData.roleIds = [];
+      this.formData.execOrgIds = [];
       this.getRolesByOrg();
     },
     cleanCheckOrgList() {
       this.checkOrgIds = null;
       this.formData.checkOrgList = [];
-      this.formData.checkOrgIds=[];
+      this.formData.checkOrgIds = [];
     },
     tenantIdnormalizer(node, instanceId) {
       if (node.children && !node.children.length) {
@@ -438,7 +471,7 @@ export default {
       //   orgType: null,
       // };
       findRoleByType(this.formData.execOrgType).then((res) => {
-        console.log(res,"res")
+        console.log(res, "res");
         this.planRoles = res;
       });
     },
@@ -494,12 +527,14 @@ export default {
         this.formData.checkOrgIds = null;
         this.formData.execOrgIds = null;
         this.formData.rulePointIds = null;
+        this.formData.distributePlanStatus = null;
       }
     },
     onSelect(selectList) {
       // console.log(selectList,"selectList");
       for (let i = 0; i < selectList.length; i++) {
         let tem = {
+          ofOrgId:this.orgId,
           pointScan: selectList[i].pointScan,
           required: !selectList[i].required,
           ruleName: selectList[i].ruleName,

src/views/check/index.vue

@@ -312,6 +312,14 @@
                 size="mini"
                 type="text"
                 icon="el-icon-arrow-down"
+                v-if="newcheckCanPublish(r.row)"
+                @click="newshowDialogDistribute(r.row)"
+                v-hasPermi="['core:checkplan:distribute']"
+                >下发</el-button>
+                <el-button
+                size="mini"
+                type="text"
+                icon="el-icon-arrow-down"
                 v-if="chehui(r.row)"
                 @click="chhuile(r.row)"
                 v-hasPermi="['core:checkplan:distribute']"
@@ -434,6 +442,42 @@ export default {
       }
       return false;
     },
+    newcheckCanPublish(row){
+      if (row.planStatus==2&& row.parentId != -1&& row.planOfOrgType ==1) {
+        return true;
+      }
+      return false;
+    },
+    newshowDialogDistribute(row){
+      this.$modal
+        .confirm("是否下发!", "提示")
+        .then(() => {
+          // 用户点击了确认按钮
+          console.log("执行操作...");
+          this.loading = true;
+      api
+        .distributeCheHui(row.id)
+        .then((response) => {
+          // console.log(response, "then");
+          if (response.data == 0) {
+            this.loading = false;
+          } else {
+            this.getList();
+            this.loading = false;
+          }
+        })
+        .catch((response) => {
+          // console.log(response, "catch");
+          this.getList();
+          this.loading = false;
+        });
+        })
+        .catch(() => {
+          // 用户点击了取消按钮
+          console.log("取消操作...");
+        });
+
+    },
         //已完成下发的计划不显示下发按钮
     checkCanPublish(row) {
       // console.log(row.planOfOrgType == "1","row.planOfOrgType")

src/views/resumption/plan/index.vue

@@ -453,7 +453,7 @@ export default {
       return false;
     },
     newcheckCanPublish(row){
-      if (row.planStatus==2&& row.parentId != -1) {
+      if (row.planStatus==2&& row.parentId != -1&& row.planOfOrgType ==1) {
         return true;
       }
       return false;