Merge branch 'ch/bug8022' of eta_forum/eta_forum_admin_front into master

src/views/business_manage/addBusiness.vue

@@ -96,7 +96,7 @@
         </div>
       </template>
       <template v-if="currentStep === 2">
-        <div class="second-step-form-wrap" v-if="currentRoute !== 'editBusiness'">
+        <div class="second-step-form-wrap" v-if="currentRoute !== 'editBusiness' && currentRoute !== 'businessDetail'">
           <t-form :data="secondFormData" :rules="rules" ref="formRef" label-width="120px" inline
             class="second-step-form">
             <div class="form-line">
@@ -112,8 +112,9 @@
         <div class="second-step-form-wrap" v-else>
           <t-button theme="primary" type="submit"
             style="margin: 20px;"
+            v-if="currentRoute !== 'businessDetail'"
             @click="handleShowRenewal()">添加续约</t-button>
-            <t-table
+          <t-table
             :columns="tableColOpts"
             :data="recordData"
             row-key="EtaBusinessContractId"
@@ -169,7 +170,7 @@
   </div>
 </template>
 <script setup>
-import { ref, reactive, onMounted, useTemplateRef, nextTick } from 'vue';
+import { ref, reactive, onMounted, useTemplateRef, nextTick, computed } from 'vue';
 import Steps from "./components/Steps.vue";
 import SetPermission from "./components/SetPermission.vue";
 import EditBox from "./components/EditBox.vue";
@@ -247,24 +248,29 @@ const teamSizeOpts = reactive([
     label: '超过200人'
   }
 ])
-const tableColOpts = ref([
+
+const tableColOpts = computed(() => [
   {
-    colKey:'SigningTime',
-    title:'运维时间',
-    align: 'center'
-  },{
-    colKey:'ExpiredTime',
-    title:'到期时间',
+    colKey: 'SigningTime',
+    title: '运维时间',
     align: 'center'
-  },{
-    colKey:'ExpireDay',
-    title:'到期天数',
+  },
+  {
+    colKey: 'ExpiredTime',
+    title: '到期时间',
     align: 'center'
   },
   {
-    align: 'center', colKey: 'opt', title: '操作'
-  }
-])
+    colKey: 'ExpireDay',
+    title: '到期天数',
+    align: 'center'
+  },
+  ...(currentRoute.value !== 'businessDetail' ? [{
+    colKey: 'opt',
+    title: '操作',
+    align: 'center'
+  }] : []),
+]);
 
 const tradeArr = ref([]); // 需要在getIndustry方法中赋值
 const salesArr = ref([]); // 需要在getSale方法中赋值