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

src/pages/processCenter/pages/creatProcess/xmpg/step1-5.vue

@@ -359,7 +359,7 @@ export default {
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.standId,
+          id: item.key || item.standId,
           pageType: "INLAND_STAND"
         }
       });

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

@@ -373,7 +373,7 @@ export default {
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.standId,
+          id: item.key || item.standId,
           pageType: "INLAND_STAND"
         }
       });

src/pages/processCenter/pages/creatProcess/xmpg/step5.vue

@@ -370,7 +370,7 @@ export default {
       let routeUrl = this.$router.resolve({
         name: "OtherStandardDetails",
         params: {
-          id: item.standId,
+          id: item.key || item.standId,
           pageType: "INLAND_STAND"
         }
       });

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

@@ -185,7 +185,7 @@
             <el-table-column
               prop="planCloseTime"
               width="150"
-              label="计划关闭时间">
+              label="整改完成时间">
               <template slot-scope="scope">
                 {{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }}
               </template>
@@ -261,7 +261,7 @@
                 <el-form-item class="add-form-item" label="质量工程师:">
                   <div class="seeItem">{{ historySeeForm.qaEngineer }}</div>
                 </el-form-item>
-                <el-form-item class="add-form-item" label="计划关闭时间:">
+                <el-form-item class="add-form-item" label="整改完成时间:">
                   <div class="seeItem">
                     {{ historySeeForm.planCloseTime ? historySeeForm.planCloseTime.substring(0, 11) : "-" }}
                   </div>
@@ -530,12 +530,12 @@
                       @click.native="choiceMore('qaEngineer','选择质量工程师',addForm.qaEngineer)"
                     />
                   </el-form-item>
-                  <el-form-item prop="planCloseTime" label="计划关闭时间" style="width: 100%; margin-right:10px"
+                  <el-form-item prop="planCloseTime" label="整改完成时间" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-date-picker
                       v-model="addForm.planCloseTime"
                       type="date"
-                      placeholder="请选择计划关闭时间"
+                      placeholder="请选择整改完成时间"
                       value-format="yyyy-MM-dd HH:mm:ss">
                     </el-date-picker>
                   </el-form-item>
@@ -775,7 +775,7 @@ export default {
         dutyEngineer: "", //责任工程师
         authEngineer: "", //认证工程师
         qaEngineer: "", //质量工程师
-        planCloseTime: "" //计划关闭时间
+        planCloseTime: "" //整改完成时间
       }, //表单数据
       formRules: {
         standSerialNumber: [
@@ -812,7 +812,7 @@ export default {
           { required: true, message: "请输入责任工程师", trigger: "change" }
         ],
         planCloseTime: [
-          { required: true, message: "请选择计划关闭时间", trigger: "change" }
+          { required: true, message: "请选择整改完成时间", trigger: "change" }
         ]
       },
       drawerTable: false, //表单模态窗