Merge branch 'develop' into FOTON

# Conflicts:
#	src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
#	src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -584,7 +584,18 @@
                                 @click.native="choiceZRR3('kccvppsbm', '卡车VPPS', sarStandardsInfoEO.kccvppsbm)"></el-input>
                     </el-form-item>
                   </template>
-
+                  <template v-else-if="field.attrField === 'DYBXH'">
+                    <el-form-item
+                      prop="DYBXH"
+                      label-width="150px"
+                      class="add-form-item"
+                    >
+                      <template slot="label">模块结构单元变型号</template>
+                      <el-input v-model="sarStandardsInfoEO.DYBXH" placeholder="选择模块结构单元变型号"
+                                clearable
+                                @click.native="choiceZRR4('dybxh', '模块结构单元', sarStandardsInfoEO.dybxh)"></el-input>
+                    </el-form-item>
+                  </template>
                   <template v-else-if="field.attrField === 'CYCVPPSCN'">
                     <el-form-item title="关联模块--乘用车VPPS中文名称" label="关联模块--乘用车VPPS中文名称" label-width="150px"
                                   prop="cycvppscn" class="add-form-item">

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -3374,7 +3374,7 @@ export default {
       let routeUrl = this.$router.resolve({
         name: 'OtherBussStandardDetails',
         params: {
-          id: item.standId,
+          id: item.id,
           pageType: 'BUSINESS_STAND'
         }
       })