Merge branch 'develop' into FOTON

# Conflicts:
#	src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

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

@@ -1334,9 +1334,9 @@
                     QCRBUSS: [
                         { required: true, message: '请选择起草人', trigger: 'change' }
                     ],
-                    DTQBBHBUSS: [
-                        { required: true, message: '请选择代替企标编号', trigger: 'change' }
-                    ],
+                    // DTQBBHBUSS: [
+                    //     { required: true, message: '请选择代替企标编号', trigger: 'change' }
+                    // ],
                 },
                 zrUserIds: [], // 选择多个会签责任人
                 userType:'', // 选择用户ID判断

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

@@ -428,7 +428,7 @@
               v-model="handleSelectForm.syzd"
               @change="isRelateAccessChange"
               :popper-append-to-body="false"
-              placeholder="请选择标准状态">
+              placeholder="请选择适用认证">
               <el-option
                 v-for="(item, index) in syzdSelect"
                 :key="index"
@@ -1020,6 +1020,7 @@ export default {
     },
     //手动查找的清空按钮
     clearLawBtn(){
+      this.handleSelectForm.syzd = ''
       this.lawInfoTableLoading = true
       this.handleSelectForm.lawNumber = ''
       this.handleSelectForm.textStatus = ''

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -167,7 +167,7 @@
             :label="standLabelNum">
             <template slot-scope="scope">
               <a v-if="sarAccessInfo.dataSource === 'INLAND_STAND' || sarAccessInfo.dataSource === 'FOREIGN_STAND'" @click="handlePreview(scope.row)" class="table-jump">{{
-                  scope.row.standNumber
+                    scope.row.standNumber
                 }}</a>
               <a v-else-if="sarAccessInfo.dataSource === 'FOREIGN_LAWS'" @click="handlePreview(scope.row)" class="table-jump">{{
                   scope.row.lawsNumber