diff --git a/src/api/unqualProcess.js b/src/api/unqualProcess.js
index c51fad700..229f11353 100644
--- a/src/api/unqualProcess.js
+++ b/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, //责任工程师
diff --git a/src/pages/details/complianceDetails/index.vue b/src/pages/details/complianceDetails/index.vue
index 30cb0f9ab..8c64e0cd7 100644
--- a/src/pages/details/complianceDetails/index.vue
+++ b/src/pages/details/complianceDetails/index.vue
@@ -54,8 +54,8 @@
-
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
index 16cfd87e2..f0d287889 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
@@ -456,7 +456,7 @@
>
@@ -531,32 +531,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -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() {
//查询已维护的项目