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

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

@@ -61,17 +61,14 @@
                                             clearable
                                     ></el-input>
                                 </el-form-item>
-                                <el-form-item v-if="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
-                                    <el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
-                                        <el-option
-                                                v-for="item in standStateOptions"
-                                                placeholder="请选择"
-                                                :key="item.value"
-                                                :value="item.value"
-                                                :label="item.label"
-                                        ></el-option>
-                                    </el-select>
-                                </el-form-item>
+                              <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+                                <el-input
+                                    v-model="form.standEnName"
+                                    placeholder="请输入标准英文名称"
+                                    clearable
+                                ></el-input>
+                              </el-form-item>
+
                                 <el-form-item v-if="verifySarStandard" label="标准发布日期" prop="issueTime" class="add-form-item form-item-disabled">
                                     <el-date-picker
                                             v-model="form.issueTime"
@@ -114,13 +111,7 @@
                                         ></el-option>
                                     </el-select>
                                 </el-form-item>
-                                <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-                                    <el-input
-                                            v-model="form.standEnName"
-                                            placeholder="请输入标准英文名称"
-                                            clearable
-                                    ></el-input>
-                                </el-form-item>
+
 
                                 <el-form-item class="add-form-item form-item-disabled" style="margin-left: -210px">
                                     <el-button
@@ -149,6 +140,17 @@
                                             :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys"
                                             :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"></tree-select-new>
                                 </el-form-item>
+                              <el-form-item v-if="verifySarStandard" label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
+                                <el-select :popper-append-to-body="false" v-model="form.textStatus" placeholder="请选择文本状态">
+                                  <el-option
+                                      v-for="item in standStateOptions"
+                                      placeholder="请选择"
+                                      :key="item.value"
+                                      :value="item.value"
+                                      :label="item.label"
+                                  ></el-option>
+                                </el-select>
+                              </el-form-item>
                                 <el-form-item v-if="verifySarStandard && form.standInData === '1'"  label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
                                     <el-input
                                             v-model="form.gxhbq"