Merge remote-tracking branch 'origin/dev_2nd_LCYH' into dev_2nd_LCYH

jero-web/src/common/lang/en-us.js

@@ -1723,7 +1723,7 @@ module.exports = {
   cantTransferToYourself:"Can't transfer to yourself",
   theDataYouInitiate:'The data you selected does not meet the process initiation criteria. Please recheck and initiate',
   dataWithProcessReleasedCannotBeReset:'Data with a process status of list to be released cannot be reset',
-  reasonForReturnOfDesignCompliance:'Reason for return of design compliance',
+  reasonForReturnOfDesignCompliance:'Reason for compliance return',
   noteone:'Note: CSV format is supported. The value is within 20M and the number is 1 to 10',
   notetwo:'\n1. Provide the modified or expanded batch of "Announcement" and supporting materials;\n2. Verification materials shall be submitted to ensure that products meet the relevant requirements of national laws and regulations, technologies, standards and technical specifications;\n',
   notethree:'Provide supporting materials',

jero-web/src/common/lang/zh-cn.js

@@ -1826,7 +1826,7 @@ module.exports = {
   notecsv:'注:支持CSV格式，大小20M以内',
   theDataYouInitiate:'您所选的数据，均不符合流程发起条件，请重新检查后发起',
   dataWithProcessReleasedCannotBeReset:'流程状态为清单待发布的数据不能被重置',
-  reasonForReturnOfDesignCompliance:'设计符合性确认退回原因',
+  reasonForReturnOfDesignCompliance:'符合性退回原因',
   notetwo:'\n1、提供变更或扩展后的《公告》批次及证明材料;\n2、应提交验证材料，保障产品符合国家法律法规、技术、标准及技术规范等相关要求;\n',
   notethree:'\n提供证明材料\n',
   verifyComplianceConfirmReturnReason:'验证符合性确认退回原因',

jero-web/src/components/CollectionType/index.vue

@@ -966,8 +966,19 @@
           }
         })
       },
-      generateRandom() {
-        return Math.random().toString(32)
+      generateRandom(size = 16) {
+        let urlAlphabet =
+          'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict'
+
+        let id = ''
+        // A compact alternative for `for (var i = 0; i < step; i++)`.
+        let i = size
+        while (i--) {
+          // `| 0` is more compact and faster than `Math.floor()`.
+          id += urlAlphabet[(Math.random() * 64) | 0]
+        }
+        return id
+        // return Math.random().toString(32)
       },
       addconfig() {
         let paramsConfigData = Object.keys(this.detailDate.paramsConfigData)

jero-web/src/components/CollectionTypeDisabled/index.vue

@@ -728,8 +728,8 @@
               </a-button>
             </div>
           </div>
-            <div @click="addconfig" class='addicon'
-                 v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
+          <div @click="addconfig" class='addicon'
+               v-if="Object.keys(detailDate.paramsConfigData).length - 1 == index && index < 9">
             <a-icon type="plus"/>
           </div>
           <div @click="delconfig(item)" class='delicon'
@@ -840,15 +840,29 @@
           }
         })
       },
-      generateRandom() {
-        return Math.random().toString(32)
+      generateRandom(size = 16) {
+
+        let urlAlphabet =
+          'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict'
+
+        let id = ''
+        // A compact alternative for `for (var i = 0; i < step; i++)`.
+        let i = size
+        while (i--) {
+          // `| 0` is more compact and faster than `Math.floor()`.
+          id += urlAlphabet[(Math.random() * 64) | 0]
+        }
+        return id
+        // return Math.random().toString(32)
       },
+
       addconfig() {
         let paramsConfigData = Object.keys(this.detailDate.paramsConfigData)
         for (let i = 0; i < paramsConfigData.length; i++) {
           if (i == paramsConfigData.length - 1) {
             let name = paramsConfigData[i]
             let generateRandom = this.generateRandom()
+            console.log(generateRandom)
             this.detailDate.paramsConfigData[generateRandom] = JSON.parse(JSON.stringify(this.detailDate.paramsConfigData[name]))
             this.detailDate.paramsConfigData[generateRandom].forEach(res => {
               if (res.type === 'pull_more') {