Merge branch 'web-v2' into web-v2-pro

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/index.vue

@@ -50,7 +50,7 @@
             <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
             <p class="reset-button-one" @click="resetQuery">重置</p>
           </el-form-item>
-          <el-form-item style="float: right;" v-hasPermi="['safety:checkPlan_1:add']">
+          <el-form-item style="float: right;" v-hasPermi="['security:checkPlan_1:add']">
             <el-col :span="1.5">
               <p class="inquire-button-one"
                  style="width:130px;"
@@ -86,13 +86,13 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-hasPermi="['safety:checkPlan_1:query']"
+                <p class="table-button-p" v-hasPermi="['security:checkPlan_1:query']"
                    v-if="scope.row.checkStatus!=1" @click="addDialogOpen(3,scope.row)">详情</p>
-                <p class="table-button-p" v-hasPermiAnd="['safety:checkPlan_1:query','safety:checkPlan_1:edit']"
+                <p class="table-button-p" v-hasPermiAnd="['security:checkPlan_1:query','security:checkPlan_1:edit']"
                    v-if="scope.row.checkStatus==1" @click="addDialogOpen(2,scope.row)">编辑</p>
-                <p class="table-button-p" v-hasPermi="['safety:checkManage_3:list']"
+                <p class="table-button-p" v-hasPermi="['security:checkManage_3:list']"
                    @click="goPage(2,scope.row)">自查管理</p>
-                <p class="table-button-p" v-hasPermi="['safety:checkPlan_1:remove']"
+                <p class="table-button-p" v-hasPermi="['security:checkPlan_1:remove']"
                    v-if="scope.row.checkStatus==1" @click="deleteObj(scope.row)">删除</p>
                 <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/listPage.vue

@@ -94,11 +94,11 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-hasPermi="['safety:checkManage_3:query']"
+                <p class="table-button-p" v-hasPermi="['security:checkManage_3:query']"
                    v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
-                <p class="table-button-p" v-hasPermiAnd="['safety:checkManage_3:query','safety:checkManage_3:edit']"
+                <p class="table-button-p" v-hasPermiAnd="['security:checkManage_3:query','security:checkManage_3:edit']"
                    v-if="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
-                <p class="table-button-p" v-hasPermiAnd="['safety:checkManage_3:query','safety:checkManage_3:edit']"
+                <p class="table-button-p" v-hasPermiAnd="['security:checkManage_3:query','security:checkManage_3:edit']"
                    v-if="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
                 <p class="table-button-p"
                    style="color:#999" v-if="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>

src/views/safetyCheck/schoolInspection/inspectionGroup/index.vue

@@ -36,7 +36,7 @@
           <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
           <p class="reset-button-one" @click="resetQuery">重置</p>
         </el-form-item>
-        <el-form-item style="float: right;" v-hasPermi="['safety:checkGroup:add']">
+        <el-form-item style="float: right;" v-hasPermi="['security:checkGroup:add']">
           <el-col :span="1.5">
             <p class="inquire-button-one"
                style="width:130px;"
@@ -82,9 +82,9 @@
           <template slot-scope="scope">
             <div class="table-button-box">
               <p class="table-button-null"></p>
-              <p class="table-button-p" @click="addDialogOpen(3,scope.row)" v-hasPermi="['safety:checkGroup:query']">详情</p>
-              <p class="table-button-p" @click="addDialogOpen(2,scope.row)" v-hasPermiAnd="['safety:checkGroup:query','safety:checkGroup:edit']">编辑</p>
-              <p class="table-button-p" @click="deleteObj(scope.row)" v-hasPermi="['safety:checkGroup:remove']">删除</p>
+              <p class="table-button-p" @click="addDialogOpen(3,scope.row)" v-hasPermi="['security:checkGroup:query']">详情</p>
+              <p class="table-button-p" @click="addDialogOpen(2,scope.row)" v-hasPermiAnd="['security:checkGroup:query','security:checkGroup:edit']">编辑</p>
+              <p class="table-button-p" @click="deleteObj(scope.row)" v-hasPermi="['security:checkGroup:remove']">删除</p>
               <p class="table-button-null"></p>
             </div>
           </template>
@@ -112,7 +112,7 @@
     },
     data(){
       return{
-        tableButtonType:this.hasPermiDom(['safety:checkGroup:query','safety:checkGroup:edit','safety:checkGroup:remove']),
+        tableButtonType:this.hasPermiDom(['security:checkGroup:query','security:checkGroup:edit','security:checkGroup:remove']),
         addDialogType:false,
         addDialogData:{},
         queryParams:{

src/views/safetyCheck/schoolInspection/inspectionPlan/index.vue

@@ -50,7 +50,7 @@
             <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
             <p class="reset-button-one" @click="resetQuery">重置</p>
           </el-form-item>
-          <el-form-item style="float: right;" v-hasPermi="['safety:checkPlan:add']">
+          <el-form-item style="float: right;" v-hasPermi="['security:checkPlan:add']">
             <el-col :span="1.5">
               <p class="inquire-button-one"
                  style="width:130px;"
@@ -86,13 +86,13 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-hasPermi="['safety:checkPlan:query']"
+                <p class="table-button-p" v-hasPermi="['security:checkPlan:query']"
                    v-if="scope.row.checkStatus!=1" @click="addDialogOpen(3,scope.row)">详情</p>
-                <p class="table-button-p" v-hasPermiAnd="['safety:checkPlan:query','safety:checkPlan:edit']"
+                <p class="table-button-p" v-hasPermiAnd="['security:checkPlan:query','security:checkPlan:edit']"
                    v-if="scope.row.checkStatus==1" @click="addDialogOpen(2,scope.row)">编辑</p>
-                <p class="table-button-p" v-hasPermi="['safety:checkManage:list']"
+                <p class="table-button-p" v-hasPermi="['security:checkManage_2:list']"
                    @click="goPage(2,scope.row)">巡查管理</p>
-                <p class="table-button-p" v-hasPermi="['safety:checkPlan:remove']"
+                <p class="table-button-p" v-hasPermi="['security:checkPlan:remove']"
                    v-if="scope.row.checkStatus==1" @click="deleteObj(scope.row)">删除</p>
                 <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>
                 <p class="table-button-null"></p>

src/views/safetyCheck/schoolInspection/inspectionPlan/listPage.vue

@@ -94,13 +94,13 @@
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
-                <p class="table-button-p" v-hasPermi="['safety:checkManage_2:query']"
+                <p class="table-button-p" v-hasPermi="['security:checkManage_2:query']"
                    v-if="scope.row.manageStatus==0||scope.row.manageStatus==2" @click="goAddPage(3,scope.row.id)">详情</p>
-                <p class="table-button-p" v-hasPermiAnd="['safety:checkManage_2:query','safety:checkManage_2:edit']"
+                <p class="table-button-p" v-hasPermiAnd="['security:checkManage_2:query','security:checkManage_2:edit']"
                    v-if="scope.row.manageStatus==1 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">编辑</p>
-                <p class="table-button-p" v-hasPermiAnd="['safety:checkManage_2:query','safety:checkManage_2:edit']"
+                <p class="table-button-p" v-hasPermiAnd="['security:checkManage_2:query','security:checkManage_2:edit']"
                    v-if="scope.row.manageStatus==0 && scope.row.isCheck==1" @click="goAddPage(2,scope.row.id)">开始检查</p>
-                <p class="table-button-p" v-hasPermiAnd="['safety:checkManage_2:query','safety:checkManage_2:edit']"
+                <p class="table-button-p" v-hasPermiAnd="['security:checkManage_2:query','security:checkManage_2:edit']"
                    style="color:#999" v-if="scope.row.manageStatus==0 && scope.row.isCheck==0">开始检查</p>
                 <p class="table-button-p" v-if="scope.row.isEndProcess==1" @click="lookDocumentButton(1,scope.row)">整改报告</p>
                 <p class="table-button-p" v-if="scope.row.isAttachment == 1" @click="lookDocumentListButton(1,scope.row)">查看附件</p>

src/views/safetyCheck/startInspection/index.vue

@@ -204,7 +204,7 @@
           </div>
         </el-form>
       </div>
-      <div class="bottom-button-max-box">
+      <div class="bottom-button-max-box" v-hasPermi="['safety:checkManage_4:edit']">
         <p></p>
         <p class="add-button-two-90" @click="upDataButton(1)">保存</p>
         <p class="inquire-button-one" @click="upDataButton(2)">提交</p>
@@ -564,7 +564,6 @@
         let self = this;
         for(let i=0;i<self.planList.length;i++){
           if(self.planList[i].id == val){
-            this.$set(this.addForm,'id',self.planList[i].id);
             self.findCheckManage(self.planList[i].id);
             return
           }
@@ -589,6 +588,7 @@
           this.buildBySubList(response.data.buildId,1);
           this.$set(this,'addForm',{
             id:response.data.id,
+            checkPlanId:response.data.checkPlanId,
             title:response.data.title,
             subId:response.data.subId,
             buildId:response.data.buildId,
@@ -605,6 +605,7 @@
       //初始化数据
       initializationAddFormData(){
         this.$set(this.addForm,'id','');
+        this.$set(this.addForm,'checkPlanId','');
         this.$set(this.addForm,'title','');
         this.$set(this.addForm,'checkRange',3);
         this.$set(this.addForm,'checkType','');
@@ -618,6 +619,7 @@
         this.$set(this,'addForm',{
           checkRange:3,
           id:"",
+          checkPlanId:"",
           subId:"",
           buildId:"",
           deptId:"",