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

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

@@ -1150,6 +1150,10 @@ export default {
           { required: true, message: '请输入标准名称', trigger: 'blur' },
           { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
         ],
+        standEnName: [
+          { required: true, message: '请输入标准英文名称', trigger: 'blur' },
+          { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }
+        ],
         standNature: [
           { required: true, message: '请选择标准性质', trigger: 'change' }
         ],

src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue

@@ -176,17 +176,17 @@
               label="责任部门">
             </el-table-column>
             <el-table-column
-              prop="dutyEngineerName"
+              prop="dutyEngineer"
               width="150"
               label="责任工程师">
             </el-table-column>
             <el-table-column
-              prop="authEngineerName"
+              prop="authEngineer"
               width="150"
               label="认证工程师">
             </el-table-column>
             <el-table-column
-              prop="qaEngineerName"
+              prop="qaEngineer"
               width="150"
               label="质量工程师">
             </el-table-column>