diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
index 2a9d53cf0..910c210c9 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
@@ -137,10 +137,6 @@
               prop="productType"
               width="100"
               label="产品类型">
-<!--              <template slot-scope="scope">
-                <div v-if="scope.row.productType === 'research'">在研</div>
-                <div v-if="scope.row.productType === 'product'">在产</div>
-              </template>-->
             </el-table-column>
             <el-table-column
               prop="productLine"
@@ -161,6 +157,7 @@
             <el-table-column
               prop="responsibleUnit"
               width="180"
+              show-overflow-tooltip
               label="责任部门">
             </el-table-column>
             <el-table-column
@@ -486,9 +483,9 @@
                   <el-form-item prop="responsibleUnit" label="责任部门" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
-                      :disabled="true"
                       v-model="addForm.responsibleUnit"
                       placeholder="请输入责任部门"
+                      @click.native="choiceZRBM"
                       />
                   </el-form-item>
                   <el-form-item prop="reason" label="不合规项目" style="width: 100%; margin-right:10px"
@@ -543,6 +540,7 @@
           class="common-button-primary"
           icon="el-icon-check"
           type="primary"
+          :loading="submiting"
           @click="submit">提交
         </el-button>
         <el-button
@@ -566,6 +564,12 @@
       :nodeList="nodeListMore"
       @checkedRole="drawerMore"
     />
+    <MechanismTree
+      is-title="选择部门信息"
+      :is-visible.sync="modalshowflagZRBM"
+      :nodeList="nodeListZRBM"
+      @checkedRole="drawerCheckZRBM"
+    />
   </div>
 </template>
 
@@ -671,12 +675,19 @@ export default {
       // 新增编辑框的disabled
       serialNumber: true,
 
+      // 提交按钮loading
+      submiting: false,
+      // 选择人（单选）
       roleShowflag: false,
       nodeList: [],
-
+      // 选择人（多选）
       titleMore: '',
       nodeListMore: [],
       roleShowMore: false,
+
+      // 选择责任部门
+      nodeListZRBM: [],
+      modalshowflagZRBM: false
     };
   },
   methods: {
@@ -886,6 +897,7 @@ export default {
       if (this.drawerTitle === "新增") {
         this.$refs["addForm"].validate((valid) => {
           if (valid) {
+            this.submiting = true
             addUn(
               closeState, standId, standSerialNumber,
               standName, itemsNum, itemsName, productType,
@@ -893,6 +905,7 @@ export default {
               responsibleUnit, dutyEngineer,
               authEngineer, qaEngineer, planCloseTime).then(res => {
               if (res.ok) {
+                this.submiting = false
                 this.$message.success("新增成功");
                 this.drawerTable = false;
                 this.getTableByPage();
@@ -900,11 +913,13 @@ export default {
             });
           } else {
             this.$message.warning("请完善基础信息");
+            this.submiting = false
           }
         });
       } else {
         this.$refs["addForm"].validate((valid) => {
           if (valid) {
+            this.submiting = true
             editUn(
               closeState, standId, standSerialNumber,
               standName, itemsNum, itemsName, productType,
@@ -912,6 +927,7 @@ export default {
               dutyEngineer, authEngineer, qaEngineer,
               planCloseTime, id).then(res => {
               if (res.ok) {
+                this.submiting = false
                 this.$message.success("编辑成功");
                 this.drawerTable = false;
                 this.getTableByPage();
@@ -919,6 +935,7 @@ export default {
             });
           } else {
             this.$message.warning("请完善基础信息");
+            this.submiting = false
           }
         });
       }
@@ -954,7 +971,7 @@ export default {
           }
         });
         this.dataList = res.data.records;
-        this.dataList.forEach(item => {
+        /*this.dataList.forEach(item => {
           // 责任部门转换
           if (item.zrbm !== null || item.zrbm !== "") {
             let k = (item.zrbm || "").split(",");
@@ -967,7 +984,7 @@ export default {
               }
             }
           }
-        });
+        });*/
       });
     },
     //新增事件
@@ -1066,7 +1083,6 @@ export default {
       if (this.drawerTitle === '编辑') {
         this.addForm.standName = ''
         this.addForm.standSerialNumber = ''
-        this.addForm.responsibleUnit = ''
       }
       this.addForm.productId = val.id
       this.addForm.productLine = val.productLine
@@ -1080,7 +1096,6 @@ export default {
     standChange(item) {
       this.addForm.standName = item.standName
       this.addForm.standSerialNumber = item.standSort + '-' + item.standNumber + '-' + item.standYear
-      this.addForm.responsibleUnit = item.zrbm || "--";
     },
     /** 责任工程师选择 */
     choiceZRR(type, title, id) {
@@ -1120,6 +1135,27 @@ export default {
       this.roleShowMore = true
     },
 
+    /** 选择责任部门 */
+    choiceZRBM(type, title, id) {
+      this.nodeListZRBM = []
+      this.nodeListZRBM.push(id)
+      this.modalshowflagZRBM = true
+    },
+    drawerCheckZRBM(data) {
+      let idList = ''
+      let nameList = ''
+      data.forEach(item => {
+        if (nameList.length > 0) {
+          nameList += ','
+          idList += ','
+        }
+        idList += item.id
+        nameList += item.name
+      })
+      this.addForm.responsibleUnit = nameList;
+
+    },
+
   },
   mounted() {
     //查询已维护的项目