Merge remote-tracking branch 'origin/web-v2' into web-v2

src/views/comprehensive/personnel/onDutyConfiguration/index.vue

@@ -32,7 +32,8 @@
           <p class="return-year-month-button inquire-button-one" v-show="yearMonthType===1" @click="returnPresent">回到本月</p>
           <p class="flex-p"></p>
           <p class="all-button add-button-one-90" @click="allButton">{{allButtonType?'取消全选':'全选'}}</p>
-          <p class="add-button inquire-button-one" @click="addButton">+ 新增</p>
+          <p class="add-button inquire-button-one" @click="addButton"
+             v-hasPermi="['laboratory:duty:add']">+ 新增</p>
         </div>
         <div class="month-max-big-box scrollbar-box" v-if="yearMonthType === 1">
           <div class="month-week-box">
@@ -568,6 +569,10 @@
           this.getListYmd();
           this.$set(this,'pageType',1)
         }else if(type=='info'){
+          if(!this.hasPermiDom(['laboratory:duty:query'])){
+            this.msgError('您没有相关权限,无法查看.')
+            return
+          }
           let obj = {
             checkTreeId:this.checkTreeId,
             time:item.value,

src/views/comprehensive/personnel/onDutyConfiguration/infoPage.vue

@@ -20,7 +20,8 @@
           <el-table-column label="操作" align="left" width="210" v-if="tableButtonType && !propsData.type">
             <template slot-scope="scope">
               <div class="button-box">
-                <p class="table-min-button" style="color:#0183FA;margin-left:0!important;" @click="delUserButton(scope.row)">移除</p>
+                <p class="table-min-button" style="color:#0183FA;margin-left:0!important;" @click="delUserButton(scope.row)"
+                   v-hasPermi="['laboratory:duty:remove']">移除</p>
               </div>
             </template>
           </el-table-column>
@@ -48,7 +49,7 @@
     },
     data(){
       return{
-        tableButtonType:this.hasPermiDom(['laboratory:plan:query','laboratory:planjoin:edit','laboratory:distribution:list','laboratory:plan:query','laboratory:plan:edit','laboratory:plan:remove']),
+        tableButtonType:this.hasPermiDom(['laboratory:duty:remove']),
         listData:[],
         loading:false,
         param:{

src/views/comprehensive/personnel/patrolRecord/index.vue

@@ -268,6 +268,10 @@
         if(type == 'index'){
           this.$set(this,'pageType',1)
         }else if(type=='info'){
+          if(!this.hasPermiDom(['laboratory:xxpIns:query'])){
+            this.msgError('您没有相关权限,无法查看.')
+            return
+          }
           let obj = {
             checkTreeId:this.checkTreeId,
             time:item.value,

src/views/emergencyManagement/electronicInformationBoard/index.vue

@@ -33,6 +33,7 @@
       <el-form-item
         style="float: right;">
         <p class="inquire-button-one"
+           v-hasPermi="['laboratory:cardInfo:add']"
            @click="addButton(1)"
         >+ 新增</p>
       </el-form-item>
@@ -53,8 +54,10 @@
         <template slot-scope="scope">
           <div class="button-box" style="display: flex">
             <p class="table-min-button" style="margin-left:0;" @click="addButton(2,scope.row)"
+               v-hasPermi="['laboratory:cardInfo:edit']"
             >编辑</p>
             <p class="table-min-button" @click="delButton(scope.row)"
+               v-hasPermi="['laboratory:cardInfo:remove']"
             >删除</p>
           </div>
         </template>
@@ -119,7 +122,7 @@
     name: 'index',
     data(){
       return{
-        tableButtonType:this.hasPermiDom(['laboratory:plan:query','laboratory:planjoin:edit']),
+        tableButtonType:this.hasPermiDom(['laboratory:cardInfo:edit','laboratory:cardInfo:remove']),
         showSearch: true,
         loading: false,
         deptOptions:[],