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

src/api/unqualProcess.js

@@ -65,7 +65,7 @@ export function meetingByMonth(params) {
 export function addUn(
   closeState,standId, standSerialNumber, standName,
   itemsNum, itemsName, productType,
-  productLine, productName, reason, responsibleUnit,
+  productLine, productName,productId,reason, responsibleUnit,
   dutyEngineer, authEngineer, qaEngineer, planCloseTime) {
   const data = {
     closeState,
@@ -77,6 +77,7 @@ export function addUn(
     productType,
     productLine, //产品线
     productName, //项目名称
+    productId, //项目编号
     reason, //不合规项目
     responsibleUnit, //责任部门
     dutyEngineer, //责任工程师

src/pages/details/complianceDetails/index.vue

@@ -54,8 +54,8 @@
           </template>
         </el-table-column>
       </el-table>
-      <pagination :page="page" :total="total" @pageChange="pageChange"
+<!--      <pagination :page="page" :total="total" @pageChange="pageChange"-->
-                  @pageSizeChange="pageSizeChange"></pagination>
+<!--                  @pageSizeChange="pageSizeChange"></pagination>-->
     </div>
 
     <!--满足-->

src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue

@@ -456,7 +456,7 @@
     ></Role-tree>
     <el-drawer
       title="批量填写"
-      :visible.sync="modalshowflag"
+      :visible.sync="modalShowFlag"
       :wrapperClosable="false"
       size="800px">
       <div class="demo-drawer-content">
@@ -531,32 +531,6 @@
             </el-date-picker>
           </el-form-item>
           <br>
-<!--          <el-divider><span><b>在产产品</b></span></el-divider>-->
-<!--          <el-formItem label="合规原因" class="add-form-item">-->
-<!--            <el-input-->
-<!--              v-model="batchEditForm.zcComplianceReasons"-->
-<!--              placeholder="请输入合规原因"-->
-<!--            ></el-input>-->
-<!--          </el-formItem>-->
-<!--          <el-form-item label="不合规项目" class="add-form-item">-->
-<!--            <el-input-->
-<!--              v-model="batchEditForm.zcNoCompliance"-->
-<!--              placeholder="请输入不合规项目"-->
-<!--            ></el-input>-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="不合规应对措施" class="add-form-item">-->
-<!--            <el-input-->
-<!--              v-model="batchEditForm.zcCountermeasures"-->
-<!--              placeholder="请输入不合规应对措施"-->
-<!--            ></el-input>-->
-<!--          </el-form-item>-->
-<!--          <el-form-item label="完成时间" class="add-form-item">-->
-<!--            <el-date-picker-->
-<!--              v-model="batchEditForm.zcCompletionTime"-->
-<!--              type="date"-->
-<!--              placeholder="选择日期">-->
-<!--            </el-date-picker>-->
-<!--          </el-form-item>-->
         </el-form>
       </div>
       <div class="demo-drawer-footer">
@@ -628,7 +602,7 @@ export default {
       todoId: "",
       showColumn: true,
       drawerTitle: "", //drawer标题
-      modalshowflag: false, // drawer开关
+      modalShowFlag: false, // drawer开关
       selectList: [],
       treeData: [], // 人员数据
       roleForm: {
@@ -723,10 +697,10 @@ export default {
           }
         });
       });
-      this.modalshowflag = false;
+      this.modalShowFlag = false;
     },
     cancelBatchEditForm() {
-      this.modalshowflag = false;
+      this.modalShowFlag = false;
     },
     //批量编辑
     batchEdit() {
@@ -739,15 +713,7 @@ export default {
         this.batchEditForm.countermeasures = "";
         //完成时间
         this.batchEditForm.completionTime = "";
-        //合规
+        this.modalShowFlag = true;
-        this.batchEditForm.zcComplianceReasons = "";
-        //不合规
-        this.batchEditForm.zcNoCompliance = "";
-        //应对措施
-        this.batchEditForm.zcCountermeasures = "";
-        //完成时间
-        this.batchEditForm.zcCompletionTime = "";
-        this.modalshowflag = true;
       } else {
         this.$message.warning("请选择要编辑的数据");
       }

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
@@ -428,6 +425,14 @@
                       ></el-option>
                     </el-select>
                   </el-form-item>
+                  <el-form-item prop="projectNumber" label="项目编号" style="width: 100%; margin-right:10px"
+                                class="add-form-item">
+                    <el-input
+                      :disabled="true"
+                      v-model="addForm.projectNumber"
+                      placeholder="请输入项目编号"
+                    />
+                  </el-form-item>
                   <el-form-item prop="productType" label="产品类型" style="width: 100%; margin-right:10px"
                                 class="add-form-item">
                     <el-input
@@ -486,9 +491,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 +548,7 @@
           class="common-button-primary"
           icon="el-icon-check"
           type="primary"
+          :loading="submiting"
           @click="submit">提交
         </el-button>
         <el-button
@@ -566,6 +572,12 @@
       :nodeList="nodeListMore"
       @checkedRole="drawerMore"
     />
+    <MechanismTree
+      is-title="选择部门信息"
+      :is-visible.sync="modalshowflagZRBM"
+      :nodeList="nodeListZRBM"
+      @checkedRole="drawerCheckZRBM"
+    />
   </div>
 </template>
 
@@ -599,6 +611,7 @@ export default {
         itemsNum: "", //条款号
         itemsName: "", //条款名称
         productType: "",
+        projectNumber: "",
         productLine: "", //产品线
         productName: "", //项目名称
         reason: "", //不合规项目
@@ -630,6 +643,9 @@ export default {
         productName: [
           { required: true, message: "请输入项目名称", trigger: "change" }
         ],
+        projectNumber: [
+          { required: true, message: "请输入项目编号", trigger: "change" }
+        ],
         reason: [
           { required: true, message: "请输入不合规项目", trigger: "blur" }
         ],
@@ -671,12 +687,19 @@ export default {
       // 新增编辑框的disabled
       serialNumber: true,
 
+      // 提交按钮loading
+      submiting: false,
+      // 选择人（单选）
       roleShowflag: false,
       nodeList: [],
-
+      // 选择人（多选）
       titleMore: '',
       nodeListMore: [],
       roleShowMore: false,
+
+      // 选择责任部门
+      nodeListZRBM: [],
+      modalshowflagZRBM: false
     };
   },
   methods: {
@@ -877,6 +900,7 @@ export default {
       const productType = this.addForm.productType;
       const productLine = this.addForm.productLine;
       const productName = this.addForm.productName;
+      const productId = this.addForm.projectNumber;
       const reason = this.addForm.reason;
       const responsibleUnit = this.addForm.responsibleUnit;
       const dutyEngineer = this.addForm.dutyEngineer;
@@ -886,13 +910,15 @@ export default {
       if (this.drawerTitle === "新增") {
         this.$refs["addForm"].validate((valid) => {
           if (valid) {
+            this.submiting = true
             addUn(
               closeState, standId, standSerialNumber,
               standName, itemsNum, itemsName, productType,
-              productLine, productName, reason,
+              productLine, productName, productId,reason,
               responsibleUnit, dutyEngineer,
               authEngineer, qaEngineer, planCloseTime).then(res => {
               if (res.ok) {
+                this.submiting = false
                 this.$message.success("新增成功");
                 this.drawerTable = false;
                 this.getTableByPage();
@@ -900,11 +926,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 +940,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 +948,7 @@ export default {
             });
           } else {
             this.$message.warning("请完善基础信息");
+            this.submiting = false
           }
         });
       }
@@ -954,7 +984,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 +997,7 @@ export default {
               }
             }
           }
-        });
+        });*/
       });
     },
     //新增事件
@@ -1063,12 +1093,13 @@ export default {
 
     /** 项目名称change事件 */
     handleChange(val) {
+      console.log(val);
       if (this.drawerTitle === '编辑') {
         this.addForm.standName = ''
         this.addForm.standSerialNumber = ''
-        this.addForm.responsibleUnit = ''
       }
       this.addForm.productId = val.id
+      this.addForm.projectNumber = val.projectNumber
       this.addForm.productLine = val.productLine
       this.addForm.productName = val.projectName
       this.addForm.productType = val.projectPlatfor
@@ -1080,7 +1111,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 +1150,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() {
     //查询已维护的项目