Browse Source

Merge branch 'release_v1.0.1' of http://git.qmth.com.cn/sop/web into release_v1.0.1

刘洋 1 year ago
parent
commit
41767568d6

+ 5 - 3
src/views/report/project-analysis/sop-detail-drill-dialog.vue

@@ -38,9 +38,9 @@
       }"
       v-loading="loading"
     >
-      <template #custom-type="{ col, row }">
-        {{ customerTypeFilter(row[col.colKey]) }}
-      </template>
+<!--      <template #custom-type="{ col, row }">-->
+<!--        {{ customerTypeFilter(row[col.colKey]) }}-->
+<!--      </template>-->
       <template #begin-time="{ col, row }">
         {{ timestampFilter(row[col.colKey]) }}
       </template>
@@ -57,6 +57,8 @@ import {customerTypeFilter, issuesReasonTypeFilter, issuesTypeFilter, timestampF
 const tableColumns = [
   { colKey: 'serviceName', title: '服务单元' },
   { colKey: 'crmNo', title: '项目单号' },
+  { colKey: 'sopNo', title: 'SOP' },
+  { colKey: 'statusStr', title: 'SOP状态' },
   { colKey: 'beginTime', title: '派单时间', cell: 'begin-time'},
   { colKey: 'customManagerName', title: '客户经理' },
   { colKey: 'customManagerTypeStr', title: '客户类型' ,cell: 'custom-type'},

+ 1 - 1
src/views/report/sop-analysis/index.vue

@@ -123,7 +123,7 @@
                 v-for="(item, index) in result7"
                 :key="index"
               >
-                <div class="item-head"> {{ item.region_name }} </div>
+                <div class="item-head"> {{ centerGroup === 'SUPPLIER' ?item.supplier:item.region_name }} </div>
                 <div class="item-body">
                   <div class="row1">
                     <div class="grid-item">