Browse Source

Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

qymljy 2 years ago
parent
commit
ca5904b0ac
1 changed files with 4 additions and 4 deletions
  1. 4 4
      src/components/normal-basic-layout/details/index.vue

+ 4 - 4
src/components/normal-basic-layout/details/index.vue

@@ -12,7 +12,7 @@
           <div>
             <slot name="customOperation"></slot>
           </div>
-          <div v-if="noPageChange === true">
+          <div v-if="!pageChange">
             <el-button :disabled="rowindex === 1" size="mini" icon="el-icon-arrow-left" @click="previous()"></el-button>
             <el-button :disabled="rowindex === total" size="mini" @click="next()"><i class="el-icon-arrow-right"></i></el-button>
           </div>
@@ -26,7 +26,7 @@
     </div>
     <div style="box-sizing: border-box;padding:10px">
       <el-row class="flex-align-stretch" :gutter="10">
-        <el-col style="flex:1 0 auto" :span="acitveApp.isdatateam?18:acitveApp.isdatafollowup?18:24">
+        <el-col style="flex:1;width:calc(100% - 400px)" :span="acitveApp.isdatateam?18:acitveApp.isdatafollowup?18:24">
           <tabTemp :tabs="tabs" :editData="editData" :idname="idname" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onTabClick="onTabClick">
             <div :slot="'slot' + index" v-for="(tab,index) in tabs" :key="tab.index">
               <slot :name="'slot' + index"></slot>
@@ -34,7 +34,7 @@
           </tabTemp>
           <slot name="custom"></slot>
         </el-col>
-        <el-col style="width:400px;flex:1 0 auto" :span="6">
+        <el-col style="width:400px;" :span="6">
           <group v-if="acitveApp.isdatateam" ref="group" style="margin-bottom:10px" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)" @onSuccess="onSuccess"></group>
           <follow-up v-if="acitveApp.isdatafollowup" ref="follow" :ownertable="ownertable?ownertable:idname.slice(0, this.idname.length - 2)"></follow-up>
         </el-col>
@@ -54,7 +54,7 @@ import tabTemp from './modules/tabs/tab.vue'
 import group from './modules/group/group.vue'
 import {mapGetters} from 'vuex'
 export default {
-  props:['titleText','mainAreaData','turnPageId','delApiId','idname','ownertable','formPath','oldFormPath','editData','tags','tabs','statusCheck','noPageChange'],
+  props:['titleText','mainAreaData','turnPageId','delApiId','idname','ownertable','formPath','oldFormPath','editData','tags','tabs','statusCheck','pageChange'],
   data () {
     return {
       routerName:'',