营地权限添加

src/views/campsiteManage/index.vue

@@ -64,7 +64,7 @@
         </el-table-column>
         <el-table-column align="center" width="300" label="操作">
           <template scope="scope">
-            <el-button size="small" type="success" @click="handleUpdate(scope.row)" v-if="campsiteshop_btn_update">编辑
+            <el-button size="small" type="success" @click="handleUpdate(scope.row)">{{campsiteshop_btn_update?"编辑":"查看"}}
             </el-button>
             <el-button size="small" type="primary" v-if="(scope.row.saleState==2|| scope.row.saleState==0) && campsiteshop_btn_update_salestatus" @click="upStatus(scope.row)">上架
             </el-button>
@@ -92,7 +92,7 @@
       </div>
     </div>
     <!-- 营地modal弹窗 -->
-    <oneCampsite v-if="oneCampsiteDialogVisible" :oneRow="oneRow"  :title="modalTitle" v-on:oneCampsiteDialogEvent = "oneCampsiteDialogEvent"></oneCampsite>
+    <oneCampsite v-if="oneCampsiteDialogVisible" :campsiteshop_btn_update="campsiteshop_btn_update" :oneRow="oneRow"  :title="modalTitle" v-on:oneCampsiteDialogEvent = "oneCampsiteDialogEvent"></oneCampsite>
   </div>
 </template>
 
@@ -169,7 +169,7 @@ import {
         campsiteshop_btn_del: false,//删除
       }
     },
-    created() {debugger
+    created() {
       this.campsite_btn_save = this.elements['campsite:btn_save'];
       this.campsiteshop_btn_update = this.elements['campsiteshop:btn_update'];
       this.campsiteshop_btn_update_salestatus = this.elements['campsiteshop:btn_update_salestatus'];

src/views/campsiteManage/modal/oneCampsiteModal.vue

@@ -94,13 +94,13 @@
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="cancel">取 消</el-button>
-      <el-button type="primary" v-if="title=='创建' && !isCreate" @click="create()">确 定</el-button>
-      <el-button type="primary" v-if="title=='编辑' && !isCreate" @click="update()">确 定</el-button>
+      <el-button type="primary" v-if="title=='创建' && !isCreate && campsiteshop_btn_update" @click="create()">确 定</el-button>
+      <el-button type="primary" v-if="title=='编辑' && !isCreate && campsiteshop_btn_update" @click="update()">确 定</el-button>
     </div>
     <!--编辑营地地址-->
-    <campsiteModal v-if="showCampsiteVisible" :obj="campsiteObj" v-on:campsiteEvent = "campsiteEvent"></campsiteModal>
+    <campsiteModal v-if="showCampsiteVisible && campsiteshop_btn_update" :obj="campsiteObj" v-on:campsiteEvent = "campsiteEvent"></campsiteModal>
     <!--编辑营地标签-->
-    <campsiteLabelModal v-if="editLableVisible" :allLabelList="allLabelList" :checkList="checkList" v-on:tourLabelEvent = "tourLabelEvent"></campsiteLabelModal>
+    <campsiteLabelModal v-if="editLableVisible && campsiteshop_btn_update" :allLabelList="allLabelList" :checkList="checkList" v-on:tourLabelEvent = "tourLabelEvent"></campsiteLabelModal>
   </div>
 </template>
 <style>
@@ -146,10 +146,9 @@
   } from '../../../utils/auth';
   import {mapGetters} from 'vuex';
   export default {
-    props: ["oneRow", "title"],
+    props: ["oneRow", "title", "campsiteshop_btn_update"],
     name: 'upkeepDialog',
     components: {
-//      Editor,
       UE,
       campsiteModal,
       campsiteLabelModal

src/views/vehicle/vehicleSchedulManage/vehicleRecords.vue

@@ -20,10 +20,10 @@
           <div>止：{{scope.row.bookEndDate}}</div>
         </template>
       </el-table-column>
-      <el-table-column width="100" align="center" label="用途">
+      <el-table-column width="150" align="center" label="用途">
         <template scope="scope">
           <!--/*1-租车、2-分公司使用、3-维修、4、展览、5、旅游、6、保养、7、预约中、8、禁用*/-->
-          <span>{{scope.row.bookType==1?"租房车":scope.row.bookType==4?"展览":scope.row.bookType==5?"房车游":scope.row.bookType==6?"保养":scope.row.bookType==7?"预约中":scope.row.bookType==8?"禁用":'未知用途'}}</span>
+          <span>{{scope.row.bookType==1?"租房车":scope.row.bookType==4?"展览":scope.row.bookType==5?"房车游":scope.row.bookType==6?"保养":scope.row.bookType==7?"预约中":scope.row.bookType==8?"禁用":scope.row.bookType==2?"分公司使用":'未知用途'}}</span>
         </template>
       </el-table-column>
       <el-table-column width="200" align="center" label="订单号">
@@ -53,7 +53,7 @@
       </el-table-column>
       <el-table-column align="center" label="操作" width="300">
         <template scope="scope">
-          <el-button size="small" type="success" @click="toShowDialog(scope.row)">详情</el-button>
+          <el-button size="small" type="success" @click="toShowDialog(scope.row)" v-if="scope.row.bookType !=2 && scope.row.bookType !=3">详情</el-button>
           <el-button size="small" type="success" @click="getLogInfo(scope.row)">重新安排</el-button>
         </template>
       </el-table-column>