Merge branch 'develop' into 'test'

Develop

See merge request !85

src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/standInvolveProjectDetail.vue

@@ -129,7 +129,7 @@
                     class="common-button-primary"
                     size="mini"
                     v-btn-permission="'f0ea68cb2c01cd0063ea639ee9bd4cec'"
-                    @click="querySarProStateZero">查询
+                    @click="querySarProStateZero(1)">查询
                   </el-button>
                 </el-form-item>
                 <el-form-item class="search-item btn-box">

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>