build

src/components/newResultInfo/supplier.vue

@@ -85,9 +85,9 @@
 
           <el-table-column label="营业收入(净)" align="center" min-width="115px">
             <template slot-scope="scope">
-              <div style="display:flex;justify-content:center" :style="`${scope.row.companyName === '合计-元隆雅图' ? '' :getCurrentValueStyle(scope.row.msale_total, scope.row.total_tips)}`">
+              <div style="display:flex;justify-content:center" :style="`${isAmountProp(scope.row.companyName) ? '' :getCurrentValueStyle(scope.row.msale_total, scope.row.total_tips)}`">
                {{ 
-                isAmountProp( scope.row.companyName)
+                isAmountProp(scope.row.companyName)
                   ? unit2TenThousand(calcAmount('msale_total', scope.row.companyNo), isTenThound)
                   : unit2TenThousand(scope.row.msale_total, isTenThound) 
                 }}
@@ -117,7 +117,7 @@
 
             <el-table-column label="毛利完成" align="center" min-width="90px">
               <template slot-scope="scope">
-                <div :style="`${scope.row.companyName === '合计-元隆雅图' ? '' : getCurrentValueStyle(scope.row.gross_completion, scope.row.cost_tips)}`">
+                <div :style="`${isAmountProp(scope.row.companyName) ? '' : getCurrentValueStyle(scope.row.gross_completion, scope.row.cost_tips)}`">
                   {{ costField 
                     ?  isAmountProp(scope.row.companyName) ? unit2TenThousand(calcAmount('gross_completion', scope.row.companyNo), isTenThound) : unit2TenThousand(scope.row.gross_completion, isTenThound) 
                     : '***' 
@@ -129,7 +129,7 @@
 
             <el-table-column label="毛利完成%" align="center" min-width="85px">
               <template slot-scope="scope">
-                <div :style="scope.row.companyName === '合计-元隆雅图' ? '' : getCurrentRateStyle(scope.row.gross_completion_rate)">
+                <div :style="isAmountProp(scope.row.companyName) ? '' : getCurrentRateStyle(scope.row.gross_completion_rate)">
                   {{  isAmountProp(scope.row.companyName) ? calcAmountGrossCompletionRate(scope.row.companyNo) : scope.row.gross_completion_rate + '%' }}
                 </div>
               </template>

src/pages/newResultsInfo.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="new-results" v-loading="state.loading" style="min-height: 300px">
-    <div v-if="!state.error && isShow">
+    <div v-if="!state.error && isShow && hasPermission">
       <div
         style="
           color:red;
@@ -64,11 +64,11 @@
     </div>
 
     <template v-else-if="!state.loading">
-      <unusual-state 
-        :hasPermission="isShow" 
-        :message="state.message" 
-        path="newReport" 
-      />
+      <div style="color:red;display:flex;justify-content:center;align-items:center;margin-top:10px">
+         <i class="el-icon-warning-outline" style="font-size:18px;margin-right:5px"></i>
+        该报表为信息部内部报表,暂不对外开放
+      </div>
+      <!-- <unusual-state :hasPermission="isShow" :message="state.message" path="newReport" /> -->
     </template>
   </div>
 </template>
@@ -142,7 +142,6 @@ export default {
       const openid = getOpenid()
       const code = getParameterByName('code')
       const result = await userRequest.userinfo({ ...(openid ? { openid } : { code }) })
-
       //  const result = {
       //  "code": 0,
       //  "message": "获取成功",