Merge branch 'develop' into FOTON

src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue

@@ -919,6 +919,13 @@
                     return;
                 }
                 let list = this.$refs.TXJGTree.getCheckedNodes()
+                if(list.length > 0){
+                    let parenList = list.filter ( item => item.parentId === null || item.parentId === '');
+                    if (parenList.length > 0) {
+                        this.$message.error('请选择二级及以下目录')
+                        return
+                    }
+                }
                 let id = ''
                 let name = ''
                 list.map(item => {

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -3160,7 +3160,11 @@ export default {
     },
     treeClick(treeNode) {
       this.selectSarMenu = treeNode
+      this.sarStandardsSearch.menuId = treeNode.id // 将当前二级菜单的id传回后台做标准的条件查询
+      this.sarStandardsSearch.treeType = treeNode.treeType
+      this.sarStandardsSearch.page = 1
       this.standCommonlySearch.menuId = treeNode.id
+      this.standCommonlySearch.treeType = treeNode.treeType
       this.standCommonlySearch.page = 1
       this.getDomesticStandardTable()
     },
@@ -3899,9 +3903,11 @@ export default {
       }
       const formData = {...data}
       if (!item) {
-        formData.menuId = this.selectSarMenu.id
-      } else {
         formData.menuId = this.standCommonlySearch.menuId
+        formData.treeType = this.standCommonlySearch.treeType
+      } else {
+        formData.menuId = this.selectSarMenu.id
+        formData.treeType = this.selectSarMenu.treeType
       }
       formData.nowOrderBy = this.nowOrder ? this.orderBy : ''
       formData.nowOrder = this.nowOrder

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, //表单模态窗