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

src/pages/processCenter/pages/creatProcess/bzpg/step1.vue

@@ -243,9 +243,9 @@
       size="900px"
       custom-class="demo-drawer"
     >
-      <div class="demo-drawer-content">
+      <div class="demo-drawer-content" style="position: relative">
         <loading :loading="tableLoading">数据获取中</loading>
-        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+        <div style="">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
             <div class="left">
               <el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -2406,7 +2406,7 @@
         standNature: this.form.standNature, // 标准性质
         standEnName: this.form.standEnName, // 英文名称
         standName: this.form.standName, // 中文名称
-        signFlag: '1', // 是否需要会签
+        signFlag: '2', // 是否需要会签
         textStatus: '', // 文本状态
         standYear: '', // 标准年份
         // standInData: data.standInData ? data.standInData : '0', // 标准类型

src/pages/processCenter/pages/creatProcess/qbrk/step13.vue

@@ -2828,7 +2828,23 @@
                 }
                 return "";
             },
+            // 截取字符前后的逗号
+            subComma(str){
+              if(str && str!== ''){
+                if(str.indexOf(',') === 0){
+                  str = str.slice(1)
+                }
+                if(str.lastIndexOf(',') === str.length - 1){
+                  str = str.slice(0, -1)
+                }
+                return str
+              }else{
+                return ''
+              }
+            },
             assemble(ids,names){
+                ids = this.subComma(ids)
+                names = this.subComma(names)
                 let list= new Array();
                 if(ids && ids !== '' && names && names !== ''){
                     let idArray=ids.split(',');

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -2879,7 +2879,7 @@ export default {
         standNumber: [
           {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
           {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
-          {validator: this.verify.validateStandardItem, trigger: 'change'}
+          {validator: this.verify.validateStandardItem2, trigger: 'change'}
         ],
         standYear: [
           {required: true, message: '标准年份不能为空', trigger: 'change'},

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -2434,7 +2434,7 @@ export default {
         standNumber: [
           {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
           {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
-          {type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
+          {type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'}
         ],
         synopsis: [
           {type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'}
@@ -2468,7 +2468,7 @@ export default {
         standNumber: [
           {required: true, type: 'string', message: '标准编号不能为空', trigger: 'change'},
           {type: 'string', max: 100, message: '标准编号不能超过100个字符', trigger: 'change'},
-          {type: 'string', validator: this.verify.validateStandardItem, trigger: 'change'}
+          {type: 'string', validator: this.verify.validateStandardItem2, trigger: 'change'}
         ],
         standYear: [
           // {required: true, message: '标准年份/系列不能为空', trigger: 'change'},