Merge branch 'changAnDaXue-web' of http://192.168.1.43:3000/git/sass-lab-web into changAnDaXue-web

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/cabinetLockDisposition/index.vue

@@ -18,7 +18,6 @@
             <el-col :span="1.5">
               <p class="add-button-one-90"
                  @click="tableButton(1)"
-                 v-hasPermi="['demo:demo:add']"
               >新增</p>
             </el-col>
           </el-form-item>
@@ -38,21 +37,18 @@
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="操作" width="200" show-overflow-tooltip v-if="tableButtonType">
+          <el-table-column label="操作" width="200" show-overflow-tooltip>
             <template slot-scope="scope">
               <div class="table-button-box">
                 <p class="table-button-null"></p>
                 <p class="table-button-p"
                    @click="tableButton(2,scope.row)"
-                   v-hasPermi="['demo:demo:detail']"
                 >详情</p>
                 <p class="table-button-p"
                    @click="tableButton(3,scope.row)"
-                   v-hasPermi="['demo:demo:edit']"
                 >编辑</p>
                 <p class="table-button-p"
                    @click="tableButton(4,scope.row)"
-                   v-hasPermi="['demo:demo:del']"
                 >删除</p>
                 <p class="table-button-null"></p>
               </div>
@@ -106,7 +102,6 @@
     name: 'index',
     data () {
       return {
-        tableButtonType:this.hasPermiDom(['demo:demo:detail','demo:demo:edit','demo:demo:del',]),
         //页面状态
         pageType:1,
         //页面遮罩