Merge branch 'crm14.1'

src/views/datasheet_manage/sheetList.vue

@@ -167,38 +167,34 @@
             </span>
             <ul class="action-ul">
               <li
-                v-permission="permissionBtn.etaTablePermission.etaTable_excel_save"
                 class="editsty"
                 @click="saveHandle"
                 v-if="
                   sheetDetailInfo.Source === 1 &&
-                  sheetDetailInfo.Button.OpButton
+                  sheetDetailInfo.Button.OpButton&&permissionBtn.checkPermissionBtn(permissionBtn.etaTablePermission.etaTable_excel_save)
                 "
               >
                 保存
               </li>
               <template v-if="[2, 3].includes(sheetDetailInfo.Source)">
                 <li
-                  v-permission="permissionBtn.etaTablePermission.etaTable_customize_edit"
                   class="editsty"
                   @click="goEditHandle"
-                  v-if="sheetDetailInfo.Button.OpButton"
+                  v-if="sheetDetailInfo.Button.OpButton&&permissionBtn.checkPermissionBtn(permissionBtn.etaTablePermission.etaTable_customize_edit)"
                 >
                   编辑
                 </li>
                 <li
-                  v-permission="permissionBtn.etaTablePermission.etaTable_customize_refresh"
                   class="editsty"
                   @click="refreshSheet"
-                  v-if="sheetDetailInfo.Button.RefreshButton"
+                  v-if="sheetDetailInfo.Button.RefreshButton&&permissionBtn.checkPermissionBtn(permissionBtn.etaTablePermission.etaTable_customize_refresh)"
                 >
                   刷新
                 </li>
                 <li
-                  v-permission="permissionBtn.etaTablePermission.etaTable_customize_otherSave"
                   class="editsty"
                   @click="saveOtherHandle"
-                  v-if="sheetDetailInfo.Button.CopyButton"
+                  v-if="sheetDetailInfo.Button.CopyButton&&permissionBtn.checkPermissionBtn(permissionBtn.etaTablePermission.etaTable_customize_otherSave)"
                 >
                   另存为
                 </li>

src/views/sandbox_manage/index.vue

@@ -131,12 +131,17 @@
           </el-table-column>
           <el-table-column align="center" label="操作">
             <template slot-scope="scope">
-              <el-button type="text" @click="editChildSand(scope.row)" v-if="scope.row.CanEdit">编辑</el-button>
+              <el-button type="text" v-permission="permissionBtn.sandboxPermission.sandbox_saveView"
+                @click="editChildSand(scope.row)" v-if="scope.row.CanEdit">编辑</el-button>
               <!-- <el-button type="text" @click="handleSand(scope.row, 'editing')" v-else>{{scope.row.Editor||''}}编辑中...</el-button> -->
-              <el-button type="text" @click="editChildSand(scope.row)" v-else>{{scope.row.Editor||''}}编辑中...</el-button>
-              <el-button type="text" style="color: #f00" @click="removeChildSand(scope.row)">删除</el-button>
-              <el-button type="text" @click="handleSand(scope.row, 'view')">查看</el-button>
-              <el-button type="text" @click="copyImg(scope.row)">复制图片</el-button>
+              <el-button type="text" v-permission="permissionBtn.sandboxPermission.sandbox_saveView"
+                @click="editChildSand(scope.row)" v-else>{{scope.row.Editor||''}}编辑中...</el-button>
+              <el-button type="text" v-permission="permissionBtn.sandboxPermission.sandbox_del"
+                style="color: #f00" @click="removeChildSand(scope.row)">删除</el-button>
+              <el-button type="text" v-permission="permissionBtn.sandboxPermission.sandbox_saveView"
+                @click="handleSand(scope.row, 'view')">查看</el-button>
+              <el-button type="text" v-permission="permissionBtn.sandboxPermission.sandbox_addMy"
+                @click="copyImg(scope.row)">复制图片</el-button>
             </template>
           </el-table-column>