Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -63,12 +63,13 @@ export function meetingByMonth(params) {
|
|||||||
|
|
||||||
//未符合项模块新增
|
//未符合项模块新增
|
||||||
export function addUn(
|
export function addUn(
|
||||||
closeState, standSerialNumber, standName,
|
closeState,standId, standSerialNumber, standName,
|
||||||
itemsNum, itemsName, productType,
|
itemsNum, itemsName, productType,
|
||||||
productLine, productName, reason, responsibleUnit,
|
productLine, productName, reason, responsibleUnit,
|
||||||
dutyEngineer, authEngineer, qaEngineer, planCloseTime) {
|
dutyEngineer, authEngineer, qaEngineer, planCloseTime) {
|
||||||
const data = {
|
const data = {
|
||||||
closeState,
|
closeState,
|
||||||
|
standId,
|
||||||
standSerialNumber, //标准号
|
standSerialNumber, //标准号
|
||||||
standName, //标准名称
|
standName, //标准名称
|
||||||
itemsNum, //条款号
|
itemsNum, //条款号
|
||||||
@@ -92,12 +93,13 @@ export function addUn(
|
|||||||
|
|
||||||
//未符合项模块编辑
|
//未符合项模块编辑
|
||||||
export function editUn(
|
export function editUn(
|
||||||
closeState, standSerialNumber, standName,
|
closeState, standId, standSerialNumber, standName,
|
||||||
itemsNum, itemsName, productType,
|
itemsNum, itemsName, productType,
|
||||||
productLine, productName, reason, responsibleUnit,
|
productLine, productName, reason, responsibleUnit,
|
||||||
dutyEngineer, authEngineer, qaEngineer, planCloseTime, id) {
|
dutyEngineer, authEngineer, qaEngineer, planCloseTime, id) {
|
||||||
const data = {
|
const data = {
|
||||||
closeState,
|
closeState,
|
||||||
|
standId,
|
||||||
standSerialNumber, //标准号
|
standSerialNumber, //标准号
|
||||||
standName, //标准名称
|
standName, //标准名称
|
||||||
itemsNum, //条款号
|
itemsNum, //条款号
|
||||||
|
|||||||
@@ -80,7 +80,19 @@ export default {
|
|||||||
{
|
{
|
||||||
label: '外部标准化会后管理流程',
|
label: '外部标准化会后管理流程',
|
||||||
value: "22"
|
value: "22"
|
||||||
}
|
},
|
||||||
|
{
|
||||||
|
label: "企标复审流程",
|
||||||
|
value: "23"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '企标废止流程',
|
||||||
|
value: "24"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: '企标制修订计划管控',
|
||||||
|
value: "25"
|
||||||
|
},
|
||||||
],
|
],
|
||||||
formDisableFlag: false,
|
formDisableFlag: false,
|
||||||
pickerOptions: {
|
pickerOptions: {
|
||||||
|
|||||||
@@ -676,6 +676,7 @@ export default {
|
|||||||
this.roleForm = mes.roleForm;
|
this.roleForm = mes.roleForm;
|
||||||
this.commentText = mes.commentText;
|
this.commentText = mes.commentText;
|
||||||
this.dataList = mes.form.dataList;
|
this.dataList = mes.form.dataList;
|
||||||
|
this.fileType = mes.form.fileType
|
||||||
this.dataList.forEach(item => {
|
this.dataList.forEach(item => {
|
||||||
if(!item.productLine){
|
if(!item.productLine){
|
||||||
this.dataList = null
|
this.dataList = null
|
||||||
|
|||||||
@@ -421,7 +421,6 @@ export default {
|
|||||||
},
|
},
|
||||||
//批量分发按钮
|
//批量分发按钮
|
||||||
choiceZRRS(row, type, index) {
|
choiceZRRS(row, type, index) {
|
||||||
console.log(row);
|
|
||||||
this.selectedId = row.id || row.standId;
|
this.selectedId = row.id || row.standId;
|
||||||
this.type = type;
|
this.type = type;
|
||||||
if (type === 1) {
|
if (type === 1) {
|
||||||
@@ -429,13 +428,20 @@ export default {
|
|||||||
this.nodeList = [];
|
this.nodeList = [];
|
||||||
this.zrIndex = index;
|
this.zrIndex = index;
|
||||||
this.zrType = type;
|
this.zrType = type;
|
||||||
this.nodeList.push(row);
|
if (row.workPeopleId) {
|
||||||
|
this.nodeList = row.workPeopleId.split(",");
|
||||||
|
}else{
|
||||||
|
this.nodeList.push(row);
|
||||||
|
}
|
||||||
this.modalshowflag = true;
|
this.modalshowflag = true;
|
||||||
} else if (type === 2) {
|
} else if (type === 2) {
|
||||||
// 批量
|
// 批量
|
||||||
if (this.selectList.length > 0) {
|
if (this.selectList.length > 0) {
|
||||||
this.zrType = type;
|
this.zrType = type;
|
||||||
this.nodeList = [];
|
this.nodeList = [];
|
||||||
|
if (row.workPeopleId) {
|
||||||
|
this.nodeList = row.workPeopleId.split(",");
|
||||||
|
}
|
||||||
this.modalshowflag = true;
|
this.modalshowflag = true;
|
||||||
this.drawerTitle = "批量选择责任人";
|
this.drawerTitle = "批量选择责任人";
|
||||||
} else {
|
} else {
|
||||||
@@ -461,6 +467,75 @@ export default {
|
|||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
checkedRole(data) {
|
||||||
|
console.log(data);
|
||||||
|
var idList = "";
|
||||||
|
var nameList = "";
|
||||||
|
data.forEach(item => {
|
||||||
|
if (nameList.length > 0) {
|
||||||
|
nameList += ",";
|
||||||
|
idList += ",";
|
||||||
|
}
|
||||||
|
idList += item.id;
|
||||||
|
nameList += item.name;
|
||||||
|
});
|
||||||
|
//单选操作
|
||||||
|
if (this.type === 1) {
|
||||||
|
this.dataList.forEach(item => {
|
||||||
|
if(item.standId === this.selectedId){
|
||||||
|
item.workPeople = nameList || '请选择责任人'
|
||||||
|
item.workPeopleId = idList;
|
||||||
|
}
|
||||||
|
if (item.children) {
|
||||||
|
item.children.forEach(items => {
|
||||||
|
if (items.id === this.selectedId) {
|
||||||
|
items.workPeople = nameList;
|
||||||
|
items.workPeopleId = idList;
|
||||||
|
// this.$set(items,'workPeople',data[0].name)
|
||||||
|
//this.$set(items,'workPeopleId',data[0].id)
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
this.dataList = JSON.parse(JSON.stringify(this.dataList));
|
||||||
|
} else if (this.type === 2) {
|
||||||
|
this.selectList.forEach(item => {
|
||||||
|
this.dataList.map(items => {
|
||||||
|
if (item.standId === items.standId) {
|
||||||
|
items.workPeople = nameList || '请选择责任人'
|
||||||
|
items.workPeopleId = idList;
|
||||||
|
// this.$message.warning('您只能针对条款进行分发')
|
||||||
|
}
|
||||||
|
if (items.children) {
|
||||||
|
items.children.map(childrenItem => {
|
||||||
|
if (childrenItem.id === item.id) {
|
||||||
|
childrenItem.workPeople = nameList;
|
||||||
|
childrenItem.workPeopleId = idList;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
this.dataList = JSON.parse(JSON.stringify(this.dataList));
|
||||||
|
} else if (this.type === 3) {
|
||||||
|
// console.log("529",this.workPeopleList)
|
||||||
|
for (let i = 0; i < this.workPeopleList.children.length; i++) {
|
||||||
|
|
||||||
|
this.workPeopleList.children[i].workPeople = data[0].name;
|
||||||
|
this.workPeopleList.children[i].workPeopleId = data[0].id;
|
||||||
|
// console.log(row.children[i].id)
|
||||||
|
// console.log(row.children[i].workPeople)
|
||||||
|
}
|
||||||
|
|
||||||
|
// items.children.map(childrenItem => {
|
||||||
|
//
|
||||||
|
// childrenItem.workPeople = data[0].name;
|
||||||
|
// childrenItem.workPeopleId = data[0].id;
|
||||||
|
// })
|
||||||
|
|
||||||
|
}
|
||||||
|
this.modalshowflag = false;
|
||||||
|
},
|
||||||
setChildren(children, type) {
|
setChildren(children, type) {
|
||||||
// 编辑多个子层级
|
// 编辑多个子层级
|
||||||
children.map(j => {
|
children.map(j => {
|
||||||
@@ -541,74 +616,6 @@ export default {
|
|||||||
this.roleRow = this.$refs.tree.getCheckedNodes()[0];
|
this.roleRow = this.$refs.tree.getCheckedNodes()[0];
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
checkedRole(data) {
|
|
||||||
var idList = "";
|
|
||||||
var nameList = "";
|
|
||||||
data.forEach(item => {
|
|
||||||
if (nameList.length > 0) {
|
|
||||||
nameList += ",";
|
|
||||||
idList += ",";
|
|
||||||
}
|
|
||||||
idList += item.id;
|
|
||||||
nameList += item.name;
|
|
||||||
});
|
|
||||||
//单选操作
|
|
||||||
if (this.type === 1) {
|
|
||||||
this.dataList.forEach(item => {
|
|
||||||
if(item.standId === this.selectedId){
|
|
||||||
item.workPeople = nameList;
|
|
||||||
item.workPeopleId = idList;
|
|
||||||
}
|
|
||||||
if (item.children) {
|
|
||||||
item.children.forEach(items => {
|
|
||||||
if (items.id === this.selectedId) {
|
|
||||||
items.workPeople = nameList;
|
|
||||||
items.workPeopleId = idList;
|
|
||||||
// this.$set(items,'workPeople',data[0].name)
|
|
||||||
//this.$set(items,'workPeopleId',data[0].id)
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
this.dataList = JSON.parse(JSON.stringify(this.dataList));
|
|
||||||
} else if (this.type === 2) {
|
|
||||||
this.selectList.forEach(item => {
|
|
||||||
this.dataList.map(items => {
|
|
||||||
if (item.standId === items.standId) {
|
|
||||||
items.workPeople = nameList;
|
|
||||||
items.workPeopleId = idList;
|
|
||||||
// this.$message.warning('您只能针对条款进行分发')
|
|
||||||
}
|
|
||||||
if (items.children) {
|
|
||||||
items.children.map(childrenItem => {
|
|
||||||
if (childrenItem.id === item.id) {
|
|
||||||
childrenItem.workPeople = nameList;
|
|
||||||
childrenItem.workPeopleId = idList;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
this.dataList = JSON.parse(JSON.stringify(this.dataList));
|
|
||||||
} else if (this.type === 3) {
|
|
||||||
// console.log("529",this.workPeopleList)
|
|
||||||
for (let i = 0; i < this.workPeopleList.children.length; i++) {
|
|
||||||
|
|
||||||
this.workPeopleList.children[i].workPeople = data[0].name;
|
|
||||||
this.workPeopleList.children[i].workPeopleId = data[0].id;
|
|
||||||
// console.log(row.children[i].id)
|
|
||||||
// console.log(row.children[i].workPeople)
|
|
||||||
}
|
|
||||||
|
|
||||||
// items.children.map(childrenItem => {
|
|
||||||
//
|
|
||||||
// childrenItem.workPeople = data[0].name;
|
|
||||||
// childrenItem.workPeopleId = data[0].id;
|
|
||||||
// })
|
|
||||||
|
|
||||||
}
|
|
||||||
this.modalshowflag = false;
|
|
||||||
},
|
|
||||||
cancleUserInfo() {
|
cancleUserInfo() {
|
||||||
this.modalshowflag = false;
|
this.modalshowflag = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -116,6 +116,7 @@
|
|||||||
prop="standName"
|
prop="standName"
|
||||||
fixed="left"
|
fixed="left"
|
||||||
width="180"
|
width="180"
|
||||||
|
show-overflow-tooltip
|
||||||
label="标准名称">
|
label="标准名称">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
|
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
|
||||||
@@ -129,16 +130,17 @@
|
|||||||
<el-table-column
|
<el-table-column
|
||||||
prop="itemsName"
|
prop="itemsName"
|
||||||
width="180"
|
width="180"
|
||||||
|
show-overflow-tooltip
|
||||||
label="条款名称">
|
label="条款名称">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="productType"
|
prop="productType"
|
||||||
width="180"
|
width="180"
|
||||||
label="产品类型">
|
label="产品类型">
|
||||||
<template slot-scope="scope">
|
<!-- <template slot-scope="scope">
|
||||||
<div v-if="scope.row.productType === 'research'">在研</div>
|
<div v-if="scope.row.productType === 'research'">在研</div>
|
||||||
<div v-if="scope.row.productType === 'product'">在产</div>
|
<div v-if="scope.row.productType === 'product'">在产</div>
|
||||||
</template>
|
</template>-->
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="productLine"
|
prop="productLine"
|
||||||
@@ -148,6 +150,7 @@
|
|||||||
<el-table-column
|
<el-table-column
|
||||||
prop="productName"
|
prop="productName"
|
||||||
width="180"
|
width="180"
|
||||||
|
show-overflow-tooltip
|
||||||
label="项目名称">
|
label="项目名称">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
@@ -168,11 +171,13 @@
|
|||||||
<el-table-column
|
<el-table-column
|
||||||
prop="authEngineer"
|
prop="authEngineer"
|
||||||
width="150"
|
width="150"
|
||||||
|
show-overflow-tooltip
|
||||||
label="认证工程师">
|
label="认证工程师">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="qaEngineer"
|
prop="qaEngineer"
|
||||||
width="150"
|
width="150"
|
||||||
|
show-overflow-tooltip
|
||||||
label="质量工程师">
|
label="质量工程师">
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<el-table-column
|
<el-table-column
|
||||||
@@ -414,7 +419,7 @@
|
|||||||
ref="addForm">
|
ref="addForm">
|
||||||
<el-form-item prop="productName" label="项目名称" style="width: 100%; margin-right:10px"
|
<el-form-item prop="productName" label="项目名称" style="width: 100%; margin-right:10px"
|
||||||
class="add-form-item">
|
class="add-form-item">
|
||||||
<el-select v-model="addForm.productName"@change="handleChange" placeholder="请选择项目名称">
|
<el-select v-model="addForm.productName" filterable @change="handleChange" placeholder="请选择项目名称">
|
||||||
<el-option
|
<el-option
|
||||||
v-for="item in ProjectDatas"
|
v-for="item in ProjectDatas"
|
||||||
:key="item.id"
|
:key="item.id"
|
||||||
@@ -429,7 +434,7 @@
|
|||||||
:disabled="true"
|
:disabled="true"
|
||||||
v-model="addForm.productType"
|
v-model="addForm.productType"
|
||||||
placeholder="请输入产品类型"
|
placeholder="请输入产品类型"
|
||||||
:maxlength="500" />
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
|
<el-form-item prop="productLine" label="产品线" style="width: 100%; margin-right:10px"
|
||||||
class="add-form-item">
|
class="add-form-item">
|
||||||
@@ -437,12 +442,13 @@
|
|||||||
:disabled="true"
|
:disabled="true"
|
||||||
v-model="addForm.productLine"
|
v-model="addForm.productLine"
|
||||||
placeholder="请输入产品线"
|
placeholder="请输入产品线"
|
||||||
:maxlength="500" />
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
|
<el-form-item prop="standSerialNumber" label="标准号" style="width: 100%; margin-right:10px"
|
||||||
class="add-form-item">
|
class="add-form-item">
|
||||||
<el-select
|
<el-select
|
||||||
v-model="addForm.standSerialNumber"
|
v-model="addForm.standSerialNumber"
|
||||||
|
filterable
|
||||||
:disabled="serialNumber"
|
:disabled="serialNumber"
|
||||||
@change="standChange"
|
@change="standChange"
|
||||||
placeholder="请选择标准号">
|
placeholder="请选择标准号">
|
||||||
@@ -460,7 +466,7 @@
|
|||||||
:disabled="true"
|
:disabled="true"
|
||||||
v-model="addForm.standName"
|
v-model="addForm.standName"
|
||||||
placeholder="请输入标准名称"
|
placeholder="请输入标准名称"
|
||||||
:maxlength="500" />
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="itemsNum" label="条款号" style="width: 100%; margin-right:10px"
|
<el-form-item prop="itemsNum" label="条款号" style="width: 100%; margin-right:10px"
|
||||||
class="add-form-item add-input">
|
class="add-form-item add-input">
|
||||||
@@ -483,7 +489,7 @@
|
|||||||
:disabled="true"
|
:disabled="true"
|
||||||
v-model="addForm.responsibleUnit"
|
v-model="addForm.responsibleUnit"
|
||||||
placeholder="请输入责任部门"
|
placeholder="请输入责任部门"
|
||||||
:maxlength="500" />
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="reason" label="不合规项目" style="width: 100%; margin-right:10px"
|
<el-form-item prop="reason" label="不合规项目" style="width: 100%; margin-right:10px"
|
||||||
class="add-form-item">
|
class="add-form-item">
|
||||||
@@ -497,21 +503,24 @@
|
|||||||
<el-input
|
<el-input
|
||||||
v-model="addForm.dutyEngineer"
|
v-model="addForm.dutyEngineer"
|
||||||
placeholder="请输入责任工程师"
|
placeholder="请输入责任工程师"
|
||||||
:maxlength="500" />
|
@click.native="choiceZRR"
|
||||||
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="authEngineer" label="认证工程师" style="width: 100%; margin-right:10px"
|
<el-form-item prop="authEngineer" label="认证工程师" style="width: 100%; margin-right:10px"
|
||||||
class="add-form-item">
|
class="add-form-item">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="addForm.authEngineer"
|
v-model="addForm.authEngineer"
|
||||||
placeholder="请输入认证工程师"
|
placeholder="请输入认证工程师"
|
||||||
:maxlength="500" />
|
@click.native="choiceMore('authEngineer','选择认证工程师',addForm.authEngineer)"
|
||||||
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item prop="qaEngineer" label="质量工程师" style="width: 100%; margin-right:10px"
|
<el-form-item prop="qaEngineer" label="质量工程师" style="width: 100%; margin-right:10px"
|
||||||
class="add-form-item">
|
class="add-form-item">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="addForm.qaEngineer"
|
v-model="addForm.qaEngineer"
|
||||||
placeholder="请输入质量工程师"
|
placeholder="请输入质量工程师"
|
||||||
:maxlength="500" />
|
@click.native="choiceMore('qaEngineer','选择质量工程师',addForm.qaEngineer)"
|
||||||
|
/>
|
||||||
</el-form-item>
|
</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">
|
class="add-form-item">
|
||||||
@@ -544,6 +553,19 @@
|
|||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
</el-drawer>
|
</el-drawer>
|
||||||
|
<Role-tree
|
||||||
|
check-box
|
||||||
|
is-title="选择责任工程师"
|
||||||
|
:is-visible.sync="roleShowflag"
|
||||||
|
:nodeList="nodeList"
|
||||||
|
@checkedRole="drawerCheck"
|
||||||
|
/>
|
||||||
|
<Role-tree
|
||||||
|
:is-title="titleMore"
|
||||||
|
:is-visible.sync="roleShowMore"
|
||||||
|
:nodeList="nodeListMore"
|
||||||
|
@checkedRole="drawerMore"
|
||||||
|
/>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -557,32 +579,16 @@ export default {
|
|||||||
return {
|
return {
|
||||||
loading: false,
|
loading: false,
|
||||||
nonList: [], //未符合项表格数据
|
nonList: [], //未符合项表格数据
|
||||||
projectModel: false, //项目弹窗
|
|
||||||
listModel: false, //标准弹窗
|
|
||||||
itemModel: false, //条款弹窗
|
|
||||||
replaceLoading: false,
|
replaceLoading: false,
|
||||||
//项目检索条件
|
|
||||||
projectSearch: {
|
|
||||||
projectNumber: "",
|
|
||||||
projectName: ""
|
|
||||||
},
|
|
||||||
//项目数据
|
//项目数据
|
||||||
ProjectDatas: [],
|
ProjectDatas: [],
|
||||||
itemsData: [],
|
itemsData: [],
|
||||||
standList: [],
|
|
||||||
selectItems: [],
|
selectItems: [],
|
||||||
dataList: [],
|
dataList: [],
|
||||||
standPage: 1,
|
|
||||||
standPageSize: this.$store.getters.userInfo.configContent,
|
|
||||||
standTotal: 0,
|
|
||||||
replacePage: 1,
|
|
||||||
replacePageSize: this.$store.getters.userInfo.configContent,
|
|
||||||
replaceTotal: 0,
|
|
||||||
page: 1,
|
page: 1,
|
||||||
pageSize: this.$store.getters.userInfo.configContent,
|
pageSize: this.$store.getters.userInfo.configContent,
|
||||||
total: 0,
|
total: 0,
|
||||||
drawerTitle: "",
|
drawerTitle: "",
|
||||||
breakId: "",
|
|
||||||
//存放被勾选的项目的数据
|
//存放被勾选的项目的数据
|
||||||
selectList: [],
|
selectList: [],
|
||||||
addForm: {
|
addForm: {
|
||||||
@@ -664,10 +670,26 @@ export default {
|
|||||||
historySeeForm: {},
|
historySeeForm: {},
|
||||||
// 新增编辑框的disabled
|
// 新增编辑框的disabled
|
||||||
serialNumber: true,
|
serialNumber: true,
|
||||||
addFormEdit: {}
|
|
||||||
|
roleShowflag: false,
|
||||||
|
nodeList: [],
|
||||||
|
|
||||||
|
titleMore: '',
|
||||||
|
nodeListMore: [],
|
||||||
|
roleShowMore: false,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
getData() {
|
||||||
|
// 从数据库中查询各下拉框数据
|
||||||
|
this.$http.get("sys/dictype/getDicTypeListCode", "", {
|
||||||
|
_this: this
|
||||||
|
}, res => {
|
||||||
|
this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
|
||||||
|
this.getTableByPage();
|
||||||
|
}, e => {
|
||||||
|
})
|
||||||
|
},
|
||||||
// 查询未符合项table列表
|
// 查询未符合项table列表
|
||||||
getTableByPage() {
|
getTableByPage() {
|
||||||
this.myLoading.loadData = true;
|
this.myLoading.loadData = true;
|
||||||
@@ -843,35 +865,33 @@ export default {
|
|||||||
});
|
});
|
||||||
|
|
||||||
},
|
},
|
||||||
//点击清空按钮事件
|
|
||||||
clearSearch() {
|
|
||||||
this.projectSearch = {
|
|
||||||
projectName: "",
|
|
||||||
projectNumber: ""
|
|
||||||
};
|
|
||||||
this.getProjectData();
|
|
||||||
},
|
|
||||||
//提交
|
//提交
|
||||||
submit() {
|
submit() {
|
||||||
|
const id = this.addForm.id;
|
||||||
|
const closeState = this.addForm.closeState;
|
||||||
|
const standId = this.addForm.productId // 此处standId储存项目下的标准的id
|
||||||
|
const standSerialNumber = this.addForm.standSerialNumber;
|
||||||
|
const standName = this.addForm.standName;
|
||||||
|
const itemsNum = this.addForm.itemsNum;
|
||||||
|
const itemsName = this.addForm.itemsName;
|
||||||
|
const productType = this.addForm.productType;
|
||||||
|
const productLine = this.addForm.productLine;
|
||||||
|
const productName = this.addForm.productName;
|
||||||
|
const reason = this.addForm.reason;
|
||||||
|
const responsibleUnit = this.addForm.responsibleUnit;
|
||||||
|
const dutyEngineer = this.addForm.dutyEngineer;
|
||||||
|
const authEngineer = this.addForm.authEngineer;
|
||||||
|
const qaEngineer = this.addForm.qaEngineer;
|
||||||
|
const planCloseTime = this.addForm.planCloseTime;
|
||||||
if (this.drawerTitle === "新增") {
|
if (this.drawerTitle === "新增") {
|
||||||
const closeState = this.addForm.closeState;
|
|
||||||
const standSerialNumber = this.addForm.standSerialNumber;
|
|
||||||
const standName = this.addForm.standName;
|
|
||||||
const itemsNum = this.addForm.itemsNum;
|
|
||||||
const itemsName = this.addForm.itemsName;
|
|
||||||
const productType = this.addForm.productType;
|
|
||||||
const productLine = this.addForm.productLine;
|
|
||||||
const productName = this.addForm.productName;
|
|
||||||
const reason = this.addForm.reason;
|
|
||||||
const responsibleUnit = this.addForm.responsibleUnit;
|
|
||||||
const dutyEngineer = this.addForm.dutyEngineer;
|
|
||||||
const authEngineer = this.addForm.authEngineer;
|
|
||||||
const qaEngineer = this.addForm.qaEngineer;
|
|
||||||
const planCloseTime = this.addForm.planCloseTime;
|
|
||||||
this.$refs["addForm"].validate((valid) => {
|
this.$refs["addForm"].validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
addUn(closeState, standSerialNumber, standName, itemsNum, itemsName, productType,
|
addUn(
|
||||||
productLine, productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, planCloseTime).then(res => {
|
closeState, standId, standSerialNumber,
|
||||||
|
standName, itemsNum, itemsName, productType,
|
||||||
|
productLine, productName, reason,
|
||||||
|
responsibleUnit, dutyEngineer,
|
||||||
|
authEngineer, qaEngineer, planCloseTime).then(res => {
|
||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
this.$message.success("新增成功");
|
this.$message.success("新增成功");
|
||||||
this.drawerTable = false;
|
this.drawerTable = false;
|
||||||
@@ -883,25 +903,14 @@ export default {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
const id = this.addForm.id;
|
|
||||||
const closeState = this.addForm.closeState;
|
|
||||||
const standSerialNumber = this.addForm.standSerialNumber;
|
|
||||||
const standName = this.addForm.standName;
|
|
||||||
const itemsNum = this.addForm.itemsNum;
|
|
||||||
const itemsName = this.addForm.itemsName;
|
|
||||||
const productType = this.addForm.productType;
|
|
||||||
const productLine = this.addForm.productLine;
|
|
||||||
const productName = this.addForm.productName;
|
|
||||||
const reason = this.addForm.reason;
|
|
||||||
const responsibleUnit = this.addForm.responsibleUnit;
|
|
||||||
const dutyEngineer = this.addForm.dutyEngineer;
|
|
||||||
const authEngineer = this.addForm.authEngineer;
|
|
||||||
const qaEngineer = this.addForm.qaEngineer;
|
|
||||||
const planCloseTime = this.addForm.planCloseTime;
|
|
||||||
this.$refs["addForm"].validate((valid) => {
|
this.$refs["addForm"].validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
editUn(closeState, standSerialNumber, standName, itemsNum, itemsName, productType,
|
editUn(
|
||||||
productLine, productName, reason, responsibleUnit, dutyEngineer, authEngineer, qaEngineer, planCloseTime, id).then(res => {
|
closeState, standId, standSerialNumber,
|
||||||
|
standName, itemsNum, itemsName, productType,
|
||||||
|
productLine, productName, reason, responsibleUnit,
|
||||||
|
dutyEngineer, authEngineer, qaEngineer,
|
||||||
|
planCloseTime, id).then(res => {
|
||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
this.$message.success("编辑成功");
|
this.$message.success("编辑成功");
|
||||||
this.drawerTable = false;
|
this.drawerTable = false;
|
||||||
@@ -915,7 +924,10 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
addDrawerClose() {
|
addDrawerClose() {
|
||||||
this.addForm = {};
|
this.addForm = {}
|
||||||
|
if (this.drawerTitle === '编辑') {
|
||||||
|
this.getData()
|
||||||
|
}
|
||||||
this.drawerTable = false;
|
this.drawerTable = false;
|
||||||
}, // 关闭新增drawer
|
}, // 关闭新增drawer
|
||||||
//带入条款确定事件
|
//带入条款确定事件
|
||||||
@@ -931,68 +943,9 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
},
|
},
|
||||||
//带入标准取消事件
|
|
||||||
closeStand() {
|
|
||||||
this.listModel = false;
|
|
||||||
},
|
|
||||||
//带入标准确定事件
|
|
||||||
OkStand() {
|
|
||||||
if (this.standList.length > 1) {
|
|
||||||
this.$message.warning("您只能选择一条标准进行带入");
|
|
||||||
} else if (this.standList.length <= 0) {
|
|
||||||
this.$message.warning("请至少选择一条数据进行带入");
|
|
||||||
} else {
|
|
||||||
this.breakId = this.standList[0].standId;
|
|
||||||
this.addForm.standName = this.standList[0].standName;
|
|
||||||
this.addForm.standSerialNumber = this.standList[0].standSort + "-" + this.standList[0].standNumber + "-" + this.standList[0].standYear || this.standList[0].standSort + "-" + this.standList[0].standNumber;
|
|
||||||
this.addForm.responsibleUnit = this.standList[0].zrbm || "--";
|
|
||||||
this.addForm.standId = this.standList[0].standId;
|
|
||||||
this.drawerTitle = "新增";
|
|
||||||
this.drawerTable = true;
|
|
||||||
this.listModel = false;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
getItem() {
|
|
||||||
this.$http.get("SarStandItems/sar-stand-items/findAllItems", {
|
|
||||||
ids: this.breakId,
|
|
||||||
type: "FBGBJBD"
|
|
||||||
}, {
|
|
||||||
_this: this
|
|
||||||
}, res => {
|
|
||||||
this.itemsData = res.data;
|
|
||||||
this.replaceTotal = res.data.length;
|
|
||||||
}, e => {
|
|
||||||
this.$message.error("添加失败");
|
|
||||||
});
|
|
||||||
},
|
|
||||||
//手动查找
|
|
||||||
handSeek() {
|
|
||||||
this.itemModel = true;
|
|
||||||
this.getItem();
|
|
||||||
},
|
|
||||||
//带入项目取消事件
|
|
||||||
closeDrawer() {
|
|
||||||
this.projectModel = false;
|
|
||||||
},
|
|
||||||
//带入项目确定事件
|
|
||||||
OkDrawer() {
|
|
||||||
if (this.selectList.length > 1) {
|
|
||||||
this.$message.warning("您只能选择一条数据进行带入");
|
|
||||||
} else if (this.selectList.length === 0) {
|
|
||||||
this.$message.warning("请选择一条数据进行带入");
|
|
||||||
} else {
|
|
||||||
this.projectId = this.selectList[0].id;
|
|
||||||
this.addForm.productLine = this.selectList[0].productLine;
|
|
||||||
this.addForm.productType = this.selectList[0].projectPlatfor;
|
|
||||||
this.addForm.productName = this.selectList[0].projectName;
|
|
||||||
this.getStandData();
|
|
||||||
this.projectModel = false;
|
|
||||||
this.listModel = true;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
//查询项目下的标准
|
//查询项目下的标准
|
||||||
getStandData(val) {
|
getStandData(productId) {
|
||||||
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: val.id }, {
|
this.$http.get("sarStandProjectLibrary/queryStandInfo", { id: productId }, {
|
||||||
_this: this
|
_this: this
|
||||||
}, res => {
|
}, res => {
|
||||||
res.data.records.forEach(item => {
|
res.data.records.forEach(item => {
|
||||||
@@ -1028,9 +981,11 @@ export default {
|
|||||||
//编辑事件
|
//编辑事件
|
||||||
projectEdit(row) {
|
projectEdit(row) {
|
||||||
this.drawerTitle = "编辑";
|
this.drawerTitle = "编辑";
|
||||||
this.addForm = row;
|
this.addForm = row
|
||||||
this.addFormEdit = row
|
let productId = row.standId
|
||||||
this.getProjectData()
|
this.getProjectData()
|
||||||
|
this.getStandData(productId)
|
||||||
|
this.serialNumber = false
|
||||||
this.drawerTable = true;
|
this.drawerTable = true;
|
||||||
},
|
},
|
||||||
//点击查看按钮事件
|
//点击查看按钮事件
|
||||||
@@ -1113,32 +1068,63 @@ export default {
|
|||||||
this.addForm.standSerialNumber = ''
|
this.addForm.standSerialNumber = ''
|
||||||
this.addForm.responsibleUnit = ''
|
this.addForm.responsibleUnit = ''
|
||||||
}
|
}
|
||||||
this.addForm.productLine = val.productLine
|
this.addForm.productId = val.id
|
||||||
this.addForm.productName = val.projectName
|
this.addForm.productLine = val.productLine
|
||||||
this.addForm.productType = val.projectPlatfor
|
this.addForm.productName = val.projectName
|
||||||
this.serialNumber = false
|
this.addForm.productType = val.projectPlatfor
|
||||||
this.getStandData(val)
|
this.serialNumber = false
|
||||||
|
let productId = val.id
|
||||||
|
this.getStandData(productId)
|
||||||
},
|
},
|
||||||
/** 标准号change事件 */
|
/** 标准号change事件 */
|
||||||
standChange(item) {
|
standChange(item) {
|
||||||
this.addForm.standName = item.standName
|
this.addForm.standName = item.standName
|
||||||
this.addForm.standSerialNumber = item.standSort + '-' + item.standNumber + '-' + item.standYear
|
this.addForm.standSerialNumber = item.standSort + '-' + item.standNumber + '-' + item.standYear
|
||||||
this.addForm.responsibleUnit = item.zrbm || "--";
|
this.addForm.responsibleUnit = item.zrbm || "--";
|
||||||
}
|
},
|
||||||
|
/** 责任工程师选择 */
|
||||||
|
choiceZRR(type, title, id) {
|
||||||
|
this.nodeList = []
|
||||||
|
this.nodeList.push(id)
|
||||||
|
this.type = type
|
||||||
|
this.roleShowflag = true
|
||||||
|
},
|
||||||
|
drawerCheck(data) {
|
||||||
|
this.addForm.dutyEngineer = data[0].name.slice(0,data[0].name.indexOf('('))
|
||||||
|
this.roleShowflag = false
|
||||||
|
},
|
||||||
|
/** 选择认证工程师和质量工程师 */
|
||||||
|
choiceMore(type, title, id) {
|
||||||
|
this.nodeListMore = []
|
||||||
|
this.nodeListMore.push(id)
|
||||||
|
this.type = type
|
||||||
|
this.titleMore = title
|
||||||
|
this.roleShowMore = true
|
||||||
|
},
|
||||||
|
drawerMore(data) {
|
||||||
|
var idList = ''
|
||||||
|
var nameList = ''
|
||||||
|
data.forEach(item => {
|
||||||
|
if (nameList.length > 0) {
|
||||||
|
nameList += ','
|
||||||
|
idList += ','
|
||||||
|
}
|
||||||
|
idList += item.id
|
||||||
|
nameList += item.name.slice(0,item.name.indexOf('('))
|
||||||
|
})
|
||||||
|
if (this.type === 'authEngineer') {
|
||||||
|
this.addForm.authEngineer = nameList
|
||||||
|
} else {
|
||||||
|
this.addForm.qaEngineer = nameList
|
||||||
|
}
|
||||||
|
this.roleShowMore = true
|
||||||
|
},
|
||||||
|
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
//查询已维护的项目
|
//查询已维护的项目
|
||||||
this.getProjectData();
|
this.getProjectData();
|
||||||
// 从数据库中查询各下拉框数据
|
this.getData()
|
||||||
this.$http.get("sys/dictype/getDicTypeListCode", "", {
|
|
||||||
_this: this
|
|
||||||
}, res => {
|
|
||||||
this.zrbmOptions = res.data.ZRBMCLASS; // 责任部门
|
|
||||||
this.getTableByPage();
|
|
||||||
}, e => {
|
|
||||||
});
|
|
||||||
// 加载所有的部门
|
// 加载所有的部门
|
||||||
this.getOrgTreeSource();
|
this.getOrgTreeSource();
|
||||||
}
|
}
|
||||||
@@ -1146,7 +1132,9 @@ export default {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
|
.el-select-dropdown__item.selected {
|
||||||
|
color: #606266 !important;
|
||||||
|
}
|
||||||
#rectification-dataBase {
|
#rectification-dataBase {
|
||||||
/deep/ .table-wrap {
|
/deep/ .table-wrap {
|
||||||
.el-table__fixed {
|
.el-table__fixed {
|
||||||
@@ -1192,9 +1180,12 @@ export default {
|
|||||||
|
|
||||||
.add-form-item {
|
.add-form-item {
|
||||||
/deep/ .el-input__inner {
|
/deep/ .el-input__inner {
|
||||||
width: 300px;
|
width: 370px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/deep/.label-input-form .add-form-item .el-input--suffix {
|
||||||
|
padding-right: 0px;
|
||||||
|
}
|
||||||
|
|
||||||
.add-input {
|
.add-input {
|
||||||
/deep/ .el-input__inner {
|
/deep/ .el-input__inner {
|
||||||
@@ -1214,14 +1205,9 @@ export default {
|
|||||||
background-color: #fff;
|
background-color: #fff;
|
||||||
color: #7e8083;
|
color: #7e8083;
|
||||||
}
|
}
|
||||||
/deep/.el-select-dropdown__item.selected {
|
|
||||||
color: #8d8e91;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/deep/.el-select-dropdown__item.selected {
|
|
||||||
color: #8d8e91 !important;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
Reference in New Issue
Block a user