平衡表fix

src/views/datasheet_manage/balanceSheetEdit.vue

@@ -29,7 +29,7 @@
             :disabled="isView||isStaticTable"
           />
         </li>
-        <li>
+        <li v-if="excelInfo.Button&&excelInfo.Button.OpWorkerButton">
           <el-cascader
             v-model="sheetForm.user"
             :options="userList"
@@ -416,8 +416,10 @@ export default {
           VersionName:this.staticTableName
         }).then(res=>{
           if(res.Ret===200){
+            this.$message.success(res.Msg);
             this.getVersionList()
             this.showSaveStaticTable=false
+            this.$refs.balanceTableRef.getChartList()//更新图表数据
           }
         })
         return
@@ -524,6 +526,7 @@ export default {
       this.setTableWorker()// 保存协作人
       this.saveTableInfo()// 保存父表基础信息
       this.$refs.balanceTableRef.saveChildSheet('manualSave')
+      this.$refs.balanceTableRef.getChartList()//更新图表数据
 
     },
 

src/views/datasheet_manage/common/customTable.js

@@ -147,7 +147,11 @@ export function setCellBg(e) {
 }
 
 //右键菜单
-export function getRightClickMenu(pos,canEdit=false) {
+export function getRightClickMenu(pos,canEdit=false,isStaticTable=false) {
+  // 如果是静态表则只有清空功能
+  if(isStaticTable){
+    return [{ label: bus.$i18nt ? bus.$i18nt.t('SystemManage.ReportApprove.clear_btn'):"清空", key: "reset" }]
+  }
 
   let cellMenu = [
     { label: bus.$i18nt ? bus.$i18nt.t('Edb.CalculatesAll.select_date'):"根据日期选择指标值", key: "choose-target" },

src/views/datasheet_manage/components/BalanceAddChart.vue

@@ -674,12 +674,12 @@ export default {
           rightTwoArr.push(...[item.minData,item.maxData])
         }
       })
-      this.formData.leftMin=Math.min(...leftArr)||0
-      this.formData.leftMax=Math.max(...leftArr)||0
-      this.formData.rightMin=Math.min(...rightArr)||0
-      this.formData.rightMax=Math.max(...rightArr)||0
-      this.formData.rightTwoMin=Math.min(...rightTwoArr)||0
-      this.formData.rightTwoMax=Math.max(...rightTwoArr)||0
+      this.formData.leftMin=leftArr.length?Math.min(...leftArr):0
+      this.formData.leftMax=leftArr.length?Math.max(...leftArr):0
+      this.formData.rightMin=rightArr.length? Math.min(...rightArr):0
+      this.formData.rightMax=rightArr.length? Math.max(...rightArr):0
+      this.formData.rightTwoMin=rightTwoArr.length? Math.min(...rightTwoArr):0
+      this.formData.rightTwoMax=rightTwoArr.length? Math.max(...rightTwoArr):0
     },
 
     // 找出选择的最大最小值

src/views/datasheet_manage/components/BalanceSheetChartItem.vue

@@ -11,7 +11,8 @@
             />
         </div>
         <div class="opt-box">
-            <span>{{$t('Chart.Detail.source')}}：{{ JSON.parse(chartInfo.SourcesFrom).text}}</span>
+            <span v-if="JSON.parse(chartInfo.SourcesFrom).isShow">{{$t('Chart.Detail.source')}}：{{ JSON.parse(chartInfo.SourcesFrom).text}}</span>
+            <span></span>
             <div>
                 <!-- 加入我的图库 -->
                 <span class="btn-o" @click="handleAddMyChart" v-if="!isStaticTable">{{$t('Chart.chart_addmy_btn')}}</span>

src/views/datasheet_manage/components/BalanceSheetList.vue

@@ -30,21 +30,21 @@
             class="editsty"
             @click="itemHandle(row, 'edit')"
             style="margin-right: 10px"
-            v-if="$parent.isSheetBtnShow('edit')"
+            v-if="$parent.isSheetBtnShow('edit')&&row.Button.OpButton"
             >{{row.CanEdit?$t("ETable.Btn.edit_btn"):row.Editor+$t('OnlineExcelPage.editing_msg')}}</span
           >
           <span
             class="editsty"
             @click="itemHandle(row, 'refresh')"
             style="margin-right: 10px"
-            v-if="$parent.isSheetBtnShow('refresh')"
+            v-if="$parent.isSheetBtnShow('refresh')&&row.Button.RefreshButton"
             >{{ $t("ETable.Btn.refresh_btn") }}</span
           >
           <span
             class="editsty"
             @click="itemHandle(row, 'save')"
             style="margin-right: 10px"
-            v-if="$parent.isSheetBtnShow('otherSave')"
+            v-if="$parent.isSheetBtnShow('otherSave')&&row.Button.CopyButton"
             >{{ $t("ETable.Btn.save_as") }}</span
           >
           <span
@@ -58,7 +58,7 @@
             class="deletesty"
             @click="itemHandle(row, 'del')"
             style="margin-right: 10px"
-            v-if="$parent.isSheetBtnShow('del')"
+            v-if="$parent.isSheetBtnShow('del')&&row.Button.DeleteButton"
             >{{ $t("Table.delete_btn") }}</span
           >
         </template>
@@ -104,7 +104,7 @@ export default {
         },
         {
           label: this.$t('ETable.BalanceSheetTable.updater'),
-          key: 'updater',
+          key: 'UpdateUserRealName',
           width: '120px',
         },
         {

src/views/datasheet_manage/components/BalanceTable.vue

@@ -1256,7 +1256,7 @@ export default {
         pos = 'cell'
       }
       this.config.contextMenuOption = pos === 'cell'
-        ? getRightClickMenu(pos, (cell.DataType === 1 && [1, 2].includes(cell.DataTimeType)) || [5, 7, 8].includes(cell.DataType))
+        ? getRightClickMenu(pos, (cell.DataType === 1 && [1, 2].includes(cell.DataTimeType)) || [5, 7, 8].includes(cell.DataType),this.isStaticTable)
         : getRightClickMenu(pos)
 
       this.$nextTick(() => {

src/views/datasheet_manage/sheetList.vue

@@ -722,6 +722,18 @@ export default {
     /* 选中分类变化时 */
     nodeChange({ UniqueCode, ExcelInfoId, ExcelClassifyId }, node) {
       console.log(this.select_id,ExcelInfoId,'UniqueCode');
+
+      // 点击的是平衡表模块的表格直接进入预览页
+      if(this.sourceMap[this.$route.path]===5&&ExcelInfoId>0){
+        this.$router.push({
+            path:'/viewBalanceSheet',
+            query:{
+              id:ExcelInfoId
+            }
+        })
+        return
+      }
+
       this.search_txt = "";
       this.select_node = UniqueCode;
       this.select_classify = !ExcelInfoId ? ExcelClassifyId : 0;