dedsudiyu 6 months ago
parent
commit
d2779b48d8

+ 1 - 0
src/views/safetyCheck/collegeInspect/selfInspectionManage/index.vue

@@ -356,6 +356,7 @@
           this.$set(this,'pageType',2);
           this.$set(this,'pageType',2);
           let obj = JSON.parse(JSON.stringify(row))
           let obj = JSON.parse(JSON.stringify(row))
           obj.showType = true;
           obj.showType = true;
+          obj.pageType = 2;
           this.$set(this,'propsData',obj);
           this.$set(this,'propsData',obj);
         }else if(type == 2){
         }else if(type == 2){
           //开始检查
           //开始检查

+ 4 - 4
src/views/safetyCheck/collegeWorktable/dataScreening.vue

@@ -29,7 +29,7 @@
 
 
 <script>
 <script>
   import {
   import {
-    securityIndexStatisticsCheck,
+    securityCollegeStatisticsCollegeCheck,
   } from '@/api/safetyCheck/indexDemoOne'
   } from '@/api/safetyCheck/indexDemoOne'
   export default {
   export default {
     name: 'dataScreening',
     name: 'dataScreening',
@@ -50,17 +50,17 @@
 
 
     },
     },
     mounted(){
     mounted(){
-      this.securityIndexStatisticsCheck();
+      this.securityCollegeStatisticsCollegeCheck();
     },
     },
     methods: {
     methods: {
-      securityIndexStatisticsCheck(){
+      securityCollegeStatisticsCollegeCheck(){
         let obj = {
         let obj = {
           source:this.propsData.source,
           source:this.propsData.source,
           schoolAdmin:this.propsData.schoolAdmin,
           schoolAdmin:this.propsData.schoolAdmin,
           deptId:this.propsData.deptId,
           deptId:this.propsData.deptId,
           subIds:this.propsData.subIds,
           subIds:this.propsData.subIds,
         }
         }
-        securityIndexStatisticsCheck(obj).then(response => {
+        securityCollegeStatisticsCollegeCheck(obj).then(response => {
           this.$set(this,'newData',{
           this.$set(this,'newData',{
             checkNum:response.data.checkNum+'',
             checkNum:response.data.checkNum+'',
             checkItemsNum:response.data.checkItemsNum,
             checkItemsNum:response.data.checkItemsNum,

+ 16 - 2
src/views/safetyCheck/components/checkItem.vue

@@ -104,21 +104,35 @@
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div class="table-button-box">
                 <div class="table-button-box">
                   <p class="table-button-null"></p>
                   <p class="table-button-null"></p>
+                  <!-- 校级 -->
                   <p class="table-button-p"
                   <p class="table-button-p"
-                     v-if="scope.row.checkStatus == 0"
+                     v-if="scope.row.checkStatus == 0 && propsData.pageType == 1"
                      @click="tableButton(1,scope.row)"
                      @click="tableButton(1,scope.row)"
                      v-hasPermiRouter="['security:checkPlan:detail']"
                      v-hasPermiRouter="['security:checkPlan:detail']"
                   >开始检查</p>
                   >开始检查</p>
+                  <!-- 院级 -->
+                  <p class="table-button-p"
+                     v-if="scope.row.checkStatus == 0 && propsData.pageType == 2"
+                     @click="tableButton(1,scope.row)"
+                     v-hasPermiRouter="['security:checkPlan_1:detail']"
+                  >开始检查</p>
                   <p class="table-button-p"
                   <p class="table-button-p"
                      v-if="scope.row.checkStatus == 1"
                      v-if="scope.row.checkStatus == 1"
                      @click="tableButton(2,scope.row)"
                      @click="tableButton(2,scope.row)"
 
 
                   >详情</p>
                   >详情</p>
+                  <!-- 校级 -->
                   <p class="table-button-p"
                   <p class="table-button-p"
-                     v-if="scope.row.checkStatus == 2"
+                     v-if="scope.row.checkStatus == 2 && propsData.pageType == 1"
                      @click="tableButton(3,scope.row)"
                      @click="tableButton(3,scope.row)"
                      v-hasPermiRouter="['security:checkPlan:detail']"
                      v-hasPermiRouter="['security:checkPlan:detail']"
                   >编辑</p>
                   >编辑</p>
+                  <!-- 院级 -->
+                  <p class="table-button-p"
+                     v-if="scope.row.checkStatus == 2 && propsData.pageType == 2"
+                     @click="tableButton(3,scope.row)"
+                     v-hasPermiRouter="['security:checkPlan_1:detail']"
+                  >编辑</p>
                   <p class="table-button-null"></p>
                   <p class="table-button-null"></p>
                 </div>
                 </div>
               </template>
               </template>

+ 1 - 0
src/views/safetyCheck/schoolInspect/inspectManage/index.vue

@@ -356,6 +356,7 @@
           this.$set(this,'pageType',2);
           this.$set(this,'pageType',2);
           let obj = JSON.parse(JSON.stringify(row))
           let obj = JSON.parse(JSON.stringify(row))
           obj.showType = true;
           obj.showType = true;
+          obj.pageType = 1;
           this.$set(this,'propsData',obj);
           this.$set(this,'propsData',obj);
         }else if(type == 2){
         }else if(type == 2){
           //开始检查
           //开始检查