bug 77919

src/common/lang/businessSupport/zh.js

@@ -1,7 +1,8 @@
 module.exports = {
   // 标准化活动
   standardizationActivity: {
-    nodeName: '节点名称' // 节点名称
+    nodeName: '节点名称', // 节点名称
+    currentNode: '当前节点'
   },
   // 问答库
   questionAnswer: {

src/components/InternalDetailPage.vue

@@ -2,8 +2,16 @@
   <a-spin :spinning="loading">
     <div class="detail-container">
       <div class="page-title">
-        <i class="iconfont icon-chexiao" @click="handleBack" />
+        <slot name="customIcon" v-if="customIcon" />
-        <span class="page-title-text">{{ title }}</span>
+        <i class="iconfont icon-chexiao" v-else @click="handleBack" />
+        <div class="page-title-text">
+          {{ title }}
+          <a-tooltip v-if="subTitleTooltip">
+            <template slot="title">{{ subTitle }}</template>
+            <div class="page-title-sub-title">{{ subTitle }}</div>
+          </a-tooltip>
+          <div class="page-title-sub-title" v-else>{{ subTitle }}</div>
+        </div>
         <div class="custom-operate">
           <slot name="titleRightCustom"></slot>
         </div>
@@ -42,6 +50,24 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    // 自定义图标
+    customIcon: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    // 副标题
+    subTitle: {
+      type: String,
+      required: false,
+      default: null
+    },
+    // 副标题是否需要tooltip
+    subTitleTooltip: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   methods: {
@@ -84,11 +110,21 @@ export default {
     font-weight: bold;
     color: #1D2129;
     flex: 1;
-    display: inline-block;
     width: 0;
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
+    display: flex;
+    align-items: center;
+  }
+
+  &-sub-title {
+    font-size: 16px;
+    font-family: PingFang SC-Regular, PingFang SC, sans-serif;
+    font-weight: 400;
+    color: #4E5969;
+    margin-left: 12px;
+    display: inline-block;
   }
 }
 

src/components/customField/AddForm.vue

@@ -1,4 +1,5 @@
 <template>
+  <a-spin :spinning="loading">
     <a-form-model :model="formInline" v-if="isFormInline" class="form-add" :rules="rules" ref="ruleForm">
       <div v-for="(val,index) in dataList" :key="index">
         <div v-if="val && val.length > 0" class="header-text">{{ index }}</div>
@@ -53,6 +54,7 @@
                                     :source="flag"
                                     :disabledSourceSearch="true"
                                     :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"
+                                    :exclude-standard-numbers="excludeStandardFields.includes(item.dbFieldName) ? excludeStandardNumbers : null"
                                     v-model="formInline[item.dbFieldName]" />
                 <!--   7, 多选组织机构  -->
                 <j-select-depart v-else-if="item.fieldShowType === FieldType.ORGAN_MORE.value"
@@ -133,7 +135,7 @@
                                 type="radio"
                                 :nameStr="formInline[item.dbFieldName + '_dictText']"
                                 :dict-id="item.dictId"
-                              :disabled="disabled || disabledFieldList.includes(item.dbFieldName)"/>
+                                :disabled="disabled || disabledFieldList.includes(item.dbFieldName)" />
               </a-form-model-item>
             </div>
           </template>
@@ -141,6 +143,7 @@
       </div>
       <upload-file ref="uploadFile" @change="uploadFileChange" :return-url="false"></upload-file>
     </a-form-model>
+  </a-spin>
 </template>
 
 <script>
@@ -159,7 +162,15 @@ import TreeSelection from '../selection/TreeSelection'
 
 export default {
   name: 'AddForm',
-  components: { UserSelection, JMultipleDatePicker, StandardSelection, JDictSelectTag, JMultiSelectTag, UploadFile, TreeSelection },
+  components: {
+    UserSelection,
+    JMultipleDatePicker,
+    StandardSelection,
+    JDictSelectTag,
+    JMultiSelectTag,
+    UploadFile,
+    TreeSelection
+  },
   props: {
     url: {
       type: Object,
@@ -231,6 +242,20 @@ export default {
       default: () => {
         return []
       }
+    },
+    // 不包含的标准从哪个字段取值
+    excludeStandardValFormFields: {
+      type: String,
+      required: false,
+      default: 'standard_number'
+    },
+    // 需要处理不包含标准的字段
+    excludeStandardFields: {
+      type: [Array],
+      required: false,
+      default: () => {
+        return []
+      }
     }
   },
   data () {
@@ -245,7 +270,8 @@ export default {
       dataList: [],
       ruleList: [],
       uploadName: '',
-      optionsData: {} // 用接口获取到的下拉数据
+      optionsData: {}, // 用接口获取到的下拉数据
+      excludeStandardNumbers: '' // 不包含的标准号
     }
   },
   methods: {
@@ -287,6 +313,10 @@ export default {
             dictField.forEach(field => {
               this.formInline[field.dbFieldName] = this.formInline[field.dbFieldName] || null
             })
+
+            // 处理标准选择不能选自己
+            this.excludeStandardNumbers = this.formInline[this.excludeStandardValFormFields]
+            console.log('11111111111111', this.excludeStandardNumbers, this.excludeStandardFields)
             this.loading = false
           } else {
             this.loading = false

src/components/selection/StandardSelectionModal.vue

@@ -99,6 +99,12 @@ export default {
       type: String,
       required: false,
       default: 'checkbox'
+    },
+    // 列表数据不包含的标准
+    excludeStandardNumbers: {
+      type:String,
+      required: false,
+      default: null
     }
   },
   data () {
@@ -184,7 +190,8 @@ export default {
       const query = {
         ...this.queryParam,
         pageNo: this.ipagination.current,
-        pageSize: this.ipagination.pageSize
+        pageSize: this.ipagination.pageSize,
+        excludeStandardNumbers: this.excludeStandardNumbers
       }
       // this.selectedRowKeys = []
       this.loading = true

src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue

@@ -18,6 +18,7 @@
                   :hiddenFieldList="hiddenFieldList"
                   :get-form-func="getFormFunc"
                   :get-document-info-func="getDocumentInfoFunc"
+                  :exclude-standard-fields="['substitute_standard_number', 'reference_standard']"
                   @submitFormData="submitFormData" />
         <div class="header-text-btn">
           <!--  稽查内容  -->

src/views/standardRegulationLibrary/domesticStandard/modules/DomesticStandardModal.vue

@@ -18,6 +18,7 @@
                   :special-placeholder="specialPlaceholder"
                   :default-value="defaultValue"
                   :disabled-field-list="disabledField"
+                  :exclude-standard-fields="excludeStandardFields"
                   @submitFormData="submitFormData" />
       </a-spin>
     </div>
@@ -72,6 +73,12 @@ export default {
         return ['standard_number_temp', 'replaced_by_standard_number', 'referenced_standard', 'standard_class', 'year_number']
       }
       return ['replaced_by_standard_number', 'referenced_standard']
+    },
+    excludeStandardFields () {
+      if (this.isEdit) {
+        return ['substitute_standard_number', 'reference_standard']
+      }
+      return []
     }
   },
   methods: {

src/views/standardRegulationLibrary/overseasStandard/modules/OverseasStandardModal.vue

@@ -18,6 +18,7 @@
                   :special-placeholder="specialPlaceholder"
                   :default-value="defaultValue"
                   :disabled-field-list="disabledField"
+                  :exclude-standard-fields="excludeStandardFields"
                   @submitFormData="submitFormData" />
       </a-spin>
     </div>
@@ -73,6 +74,12 @@ export default {
         return ['standard_class', 'year_number', 'standard_number_temp', 'replaced_by_standard_number', 'referenced_standard']
       }
       return ['replaced_by_standard_number', 'referenced_standard']
+    },
+    excludeStandardFields () {
+      if (this.isEdit) {
+        return ['substitute_standard_number', 'reference_standard']
+      }
+      return []
     }
   },
   methods: {

yarn.lock

@@ -225,82 +225,6 @@
     venn.js "~0.2.20"
     wolfy87-eventemitter "~5.1.0"
 
-"@antv/g6-core@0.8.22", "@antv/g6-core@^0.8.22":
-  version "0.8.22"
-  resolved "https://registry.yarnpkg.com/@antv/g6-core/-/g6-core-0.8.22.tgz#911db56aa4cb9a7883b642f911a66d4d5d25f3dc"
-  integrity sha512-tH7fO/xCZQnkMqc3N3mkMMpYbOTrcnZChDoSCdDM8ttQ1imK0anObnhdnVkjess7zJ230ySsX8UaE+lzoKFSbg==
-  dependencies:
-    "@antv/algorithm" "^0.1.8"
-    "@antv/dom-util" "^2.0.1"
-    "@antv/event-emitter" "~0.1.0"
-    "@antv/g-base" "^0.5.1"
-    "@antv/g-math" "^0.1.1"
-    "@antv/matrix-util" "^3.1.0-beta.3"
-    "@antv/path-util" "^2.0.3"
-    "@antv/util" "~2.0.5"
-    ml-matrix "^6.5.0"
-    tslib "^2.1.0"
-
-"@antv/g6-element@0.8.22":
-  version "0.8.22"
-  resolved "https://registry.yarnpkg.com/@antv/g6-element/-/g6-element-0.8.22.tgz#f5d52327a5fb51655bcaad39598c44da8595fe33"
-  integrity sha512-rTJgaFDeaiHEF5d+hdJEGbh+Z272bi+Zzu5aTDWCtFFgxtosdeOQGWdyhIEeLCstRvlP3RaaztBIsSZm5BWFsA==
-  dependencies:
-    "@antv/g-base" "^0.5.1"
-    "@antv/g6-core" "0.8.22"
-    "@antv/util" "~2.0.5"
-
-"@antv/g6-pc@0.8.22":
-  version "0.8.22"
-  resolved "https://registry.yarnpkg.com/@antv/g6-pc/-/g6-pc-0.8.22.tgz#217826518008b63160d0d777650fa19ebd3c7b29"
-  integrity sha512-sG17yhA4lXyiLddL/IlCqysbxw3pRspukwaxJ6W5tfDAdM2o04Odf60ppvPekQh/EF6nIZ95qcDl03v3z6NXZw==
-  dependencies:
-    "@ant-design/colors" "^4.0.5"
-    "@antv/algorithm" "^0.1.8"
-    "@antv/dom-util" "^2.0.1"
-    "@antv/event-emitter" "~0.1.0"
-    "@antv/g-base" "^0.5.1"
-    "@antv/g-canvas" "^0.5.2"
-    "@antv/g-math" "^0.1.1"
-    "@antv/g-svg" "^0.5.1"
-    "@antv/g6-core" "^0.8.22"
-    "@antv/g6-element" "0.8.22"
-    "@antv/g6-plugin" "0.8.22"
-    "@antv/hierarchy" "^0.6.10"
-    "@antv/layout" "^0.3.0"
-    "@antv/matrix-util" "^3.1.0-beta.3"
-    "@antv/path-util" "^2.0.3"
-    "@antv/util" "~2.0.5"
-    color "^3.1.3"
-    d3-force "^2.0.1"
-    dagre "^0.8.5"
-    insert-css "^2.0.0"
-    ml-matrix "^6.5.0"
-
-"@antv/g6-plugin@0.8.22":
-  version "0.8.22"
-  resolved "https://registry.yarnpkg.com/@antv/g6-plugin/-/g6-plugin-0.8.22.tgz#317a1f75f6378ddf54ef23bb3cf0dfddaa566415"
-  integrity sha512-3Z9hnNYwkJ7BAMLRoymWgrgTRXG7EDC2OlDAoRBSUvv/0sLVu7/kvobN3cY3rJF5rNwYmyTYb43ZfbK2UV4GVQ==
-  dependencies:
-    "@antv/dom-util" "^2.0.2"
-    "@antv/g-base" "^0.5.1"
-    "@antv/g-canvas" "^0.5.2"
-    "@antv/g-svg" "^0.5.2"
-    "@antv/g6-core" "0.8.22"
-    "@antv/g6-element" "0.8.22"
-    "@antv/matrix-util" "^3.1.0-beta.3"
-    "@antv/path-util" "^2.0.3"
-    "@antv/scale" "^0.3.4"
-    "@antv/util" "^2.0.9"
-    insert-css "^2.0.0"
-
-"@antv/g6@^4.8.21":
-  version "4.8.22"
-  resolved "https://registry.yarnpkg.com/@antv/g6/-/g6-4.8.22.tgz#80ddeb5f3ad658e98231ec6463b9e9bb971b1bd0"
-  integrity sha512-ZbfmaK5H5vULGJUWZLIBJSorF3kSSeSZvvxbOJzzfB72zJ+Pjjtviq2BeiVV+HAZ3Ux7ogvIH6zcwRb1JrIO8g==
-  dependencies:
-    "@antv/g6-pc" "0.8.22"
-
 "@antv/g6-core@0.8.21":
   version "0.8.21"
   resolved "https://registry.yarnpkg.com/@antv/g6-core/-/g6-core-0.8.21.tgz#efb55365e047f304a178eccc1249cd4feedb30c4"
@@ -483,16 +407,6 @@
     csstype "^3.0.8"
     tslib "^2.0.3"
 
-"@antv/util@^3.3.2":
-  version "3.3.5"
-  resolved "https://registry.yarnpkg.com/@antv/util/-/util-3.3.5.tgz#502f924833b37b39c3e4ca59c1982f4ed0e3d4c6"
-  integrity sha512-bVv1loamL/MgUEN9dNt7VKAsghO4Wgb+kzr8B9TgkM5tHgKk++xiTwi3pejIdgU8DDkzcyaRsO+VTOXJt8jLng==
-  dependencies:
-    fast-deep-equal "^3.1.3"
-    flru "^1.0.2"
-    gl-matrix "^3.3.0"
-    tslib "^2.3.1"
-
 "@antv/util@^3.3.2":
   version "3.3.4"
   resolved "https://registry.yarnpkg.com/@antv/util/-/util-3.3.4.tgz#305090df484a45f3c6fbab1c80a2e1885a452fab"
@@ -6127,11 +6041,6 @@ flatten@^1.0.2:
   resolved "https://registry.npmmirror.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
   integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
 
-flru@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flru/-/flru-1.0.2.tgz#1ae514c62b8b035ffff9ca9e4563ddcc817f4845"
-  integrity sha512-kWyh8ADvHBFz6ua5xYOPnUroZTT/bwWfrCeL0Wj1dzG4/YOmOcfJ99W8dOVyyynJN35rZ9aCOtHChqQovV7yog==
-
 flush-write-stream@^1.0.0:
   version "1.1.1"
   resolved "https://registry.npmmirror.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8"
@@ -7114,11 +7023,6 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-any-array@^2.0.0, is-any-array@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-any-array/-/is-any-array-2.0.1.tgz#9233242a9c098220290aa2ec28f82ca7fa79899e"
-  integrity sha512-UtilS7hLRu++wb/WBAw9bNuP1Eg04Ivn1vERJck8zJthEvXCBEBpGR/33u/xLKWEQf95803oalHrVDptcAvFdQ==
-
 is-any-array@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-any-array/-/is-any-array-2.0.1.tgz#9233242a9c098220290aa2ec28f82ca7fa79899e"
@@ -8453,37 +8357,6 @@ ml-array-rescale@^1.3.7:
     ml-array-max "^1.2.4"
     ml-array-min "^1.2.3"
 
-ml-matrix@^6.5.0:
-  version "6.10.5"
-  resolved "https://registry.yarnpkg.com/ml-matrix/-/ml-matrix-6.10.5.tgz#96210951b44c930e75181822f0a3f8e166b54ecc"
-  integrity sha512-3RNGo8Ls3JR/f+8t0pNrvoDW6SmLNDBpQN6FzkFvNx7FJ3GL7Ic1kdxlDYavU3pRwxJFgBrRwZ0FwE+JjX+tvQ==
-  dependencies:
-    is-any-array "^2.0.1"
-    ml-array-rescale "^1.3.7"
-
-ml-array-max@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/ml-array-max/-/ml-array-max-1.2.4.tgz#2373e2b7e51c8807e456cc0ef364c5863713623b"
-  integrity sha512-BlEeg80jI0tW6WaPyGxf5Sa4sqvcyY6lbSn5Vcv44lp1I2GR6AWojfUvLnGTNsIXrZ8uqWmo8VcG1WpkI2ONMQ==
-  dependencies:
-    is-any-array "^2.0.0"
-
-ml-array-min@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/ml-array-min/-/ml-array-min-1.2.3.tgz#662f027c400105816b849cc3cd786915d0801495"
-  integrity sha512-VcZ5f3VZ1iihtrGvgfh/q0XlMobG6GQ8FsNyQXD3T+IlstDv85g8kfV0xUG1QPRO/t21aukaJowDzMTc7j5V6Q==
-  dependencies:
-    is-any-array "^2.0.0"
-
-ml-array-rescale@^1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/ml-array-rescale/-/ml-array-rescale-1.3.7.tgz#c4d129320d113a732e62dd963dc1695bba9a5340"
-  integrity sha512-48NGChTouvEo9KBctDfHC3udWnQKNKEWN0ziELvY3KG25GR5cA8K8wNVzracsqSW1QEkAXjTNx+ycgAv06/1mQ==
-  dependencies:
-    is-any-array "^2.0.0"
-    ml-array-max "^1.2.4"
-    ml-array-min "^1.2.3"
-
 ml-matrix@^6.5.0:
   version "6.10.4"
   resolved "https://registry.yarnpkg.com/ml-matrix/-/ml-matrix-6.10.4.tgz#babee344b20062d9c123aa801c2e5d0d0c7477f6"