Merge branch 'feature/审核穿透' into 'master'

Feature/审核穿透

See merge request !2

.npmignore

+.DS_Store
+node_modules/
+npm-debug.log
+yarn-error.log
+yarn.lock
+.vscode/
+# Editor directories and files
+.idea
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+
+src
+README.md
\ No newline at end of file

README.md

+<!--
+ * @Description:
+ * @Date: 2021-09-08 15:26:40
+-->
+
+# 0.1.19
+
+1. 增加 npmignore 文件
+
+# 0.1.18
+
+1. BI 组件增加 from 入参
+
+2. 增加服务商审核人字段

package.json

 {
   "name": "xrk-bi",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "xrk-bi",
   "author": "xrk",
   "main": "dist/bundler.js",

src/packages/bi/src/main.vue

@@ -3,7 +3,7 @@
  * @Author: jml
  * @Date: 2021-02-26 15:38:10
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2021-07-28 21:56:47
+ * @LastEditTime: 2021-09-08 15:00:42
 -->
 <template>
   <div class="xrk-components-bi bi" :class="{ 'bi-print': print }">
@@ -54,6 +54,7 @@ export default {
     useScale: [Number, String, Boolean],
     cantEdit: [Number, String],
     projectType: [Number, String],
+    from: [Number, String],
     getBaseInfo: {
       type: Function,
       default: () => {}

src/packages/bi/src/mixin/index.js

@@ -31,6 +31,10 @@ export default {
     baseFontSize() {
       const { isPrint } = this;
       return isPrint ? printWidth : Math.min(window.innerWidth / 10, 75);
+    },
+    platform() {
+      // gongye , cso
+      return this.Bi.from;
     }
   }
 };

src/packages/bi/src/project/20-configurable.vue

@@ -123,7 +123,7 @@ export default {
   computed: {
     catalogueArr() {
       const hasSingleChoice = this.showSingleChoice.length > 0;
-      const { page1 = 0, page2 = 0, page3Info = [] } = this;
+      const { page2 = 0, page3Info = [] } = this;
       return [
         {
           name: '项目总览',
@@ -225,7 +225,11 @@ export default {
         totalTopicNum,
         chooseTopicNum,
         isContrainGroupAnalyse,
-        isContrainSingleAnalyse
+        isContrainSingleAnalyse,
+
+        isAuditCso, // 乙方可见
+        isAuditGongye, // 甲方可见
+        csoAuditUser // 审核人姓名
       } = info;
       this.biInfo = {
         biInfoId: id,
@@ -249,7 +253,7 @@ export default {
           pos: aspNamePosition
         }
       ];
-      this.baseInfo = [
+      const _baseInfo = [
         [
           {
             name: '项目名称',
@@ -293,6 +297,25 @@ export default {
           }
         ]
       ];
+      const showReviewer = () => {
+        switch (this.platform) {
+          case 'gongye':
+            return isAuditGongye == 1;
+          case 'cso':
+            return isAuditCso == 1;
+        }
+        return false;
+      };
+      this.baseInfo = showReviewer()
+        ? _baseInfo.concat([
+            [
+              {
+                name: '服务商审核人',
+                value: csoAuditUser || '-'
+              }
+            ]
+          ])
+        : _baseInfo;
       this.textData = [
         [
           {