FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!213
This commit is contained in:
王夏晖
2021-11-30 19:06:17 +08:00
parent 5f5ff0a3d8 e83ac0acc8
commit d38a6770ad
18 changed files with 688 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/unqualProcess.js
+4 -2
View File
@@ -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, //条款号
src/components/CustomFormComponents/File.vue
+12 -1
View File
@@ -22,13 +22,23 @@
v-if="reUpload || showUploadBtn">{{ uploadText || '重新上传' }}</el-button> v-if="reUpload || showUploadBtn">{{ uploadText || '重新上传' }}</el-button>
</ul> </ul>
<template style="margin-left: 105px;" v-else> <template style="margin-left: 105px;" v-else>
<ul class="file-file__wrap">
<li class="file-item"
v-for="(file, index) in showFileList"
:key="index"
:title="file.name"
@click="handlePreview(file)">
{{ file.name }}
</li>
</ul>
<el-button <el-button
size="small" size="small"
@click="clickButtonToUpload('opinionFileList')" @click="clickButtonToUpload('opinionFileList')"
icon="el-icon-upload" icon="el-icon-upload"
class="form-upload-btn" class="form-upload-btn"
> >
{{ (value === 'null' || value === '' || value == null) && (!processModel || (processModel && !disabled)) ? '点击上传' : '查看已上传的文件' }} <!-- {{ (value === 'null' || value === '' || value == null) && (!processModel || (processModel && !disabled)) ? '点击上传' : '查看已上传的文件' }}-->
上传
</el-button> </el-button>
</template> </template>
<el-dialog <el-dialog
@@ -152,6 +162,7 @@ export default {
} }
}, },
mounted() { mounted() {
this.getShowFileList()
if (this.showFileModel) { if (this.showFileModel) {
this.getShowFileList() this.getShowFileList()
} }
src/pages/details/otherStandardDetails/index.vue
+5 -4
View File
@@ -126,7 +126,7 @@
</p> </p>
<template v-for="(child, childIndex) in item.child2"> <template v-for="(child, childIndex) in item.child2">
<p class="half"> <p class="half">
<label style=" margin-right: 143px;">{{ child.attrName }}</label> <label style=" margin-right: 150px;">{{ child.attrName }}</label>
<span>{{ child.value || '-' }}</span> <span>{{ child.value || '-' }}</span>
</p> </p>
</template> </template>
@@ -3282,7 +3282,9 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
/deep/.el-collapse-item__header {
border-bottom: none !important;
}
/deep/ .decomposition-btn { /deep/ .decomposition-btn {
position: absolute; position: absolute;
top: 6px; top: 6px;
@@ -3294,7 +3296,6 @@ export default {
color: #07C160; color: #07C160;
border: 1px solid #07C160; border: 1px solid #07C160;
background: rgba(1, 193, 96, 0.1); background: rgba(1, 193, 96, 0.1);
/deep/ .icon-separate { /deep/ .icon-separate {
display: inline-block; display: inline-block;
margin-right: 3px; margin-right: 3px;
@@ -3598,7 +3599,7 @@ export default {
} }
& > div:not(.modular-item-more) { & > div:not(.modular-item-more) {
border-bottom: 1px solid #E5E5E5; /*border-bottom: 1px solid #E5E5E5;*/
min-height: 43px; min-height: 43px;
line-height: 43px; line-height: 43px;
src/pages/processCenter/pages/components/ProcessMixin.vue
+13 -1
View File
@@ -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: {
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+1
View File
@@ -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
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+1 -1
View File
@@ -601,7 +601,7 @@ export default {
}, },
//流程提交事件 //流程提交事件
handleSubmit() { handleSubmit() {
let fileFlag let fileFlag = true
this.dataList.forEach(item => { this.dataList.forEach(item => {
if(!item.fileType){ if(!item.fileType){
fileFlag = false fileFlag = false
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+1 -1
View File
@@ -618,7 +618,7 @@ export default {
}, },
//流程提交事件 //流程提交事件
handleSubmit() { handleSubmit() {
let fileFlag let fileFlag = true
this.dataList.forEach(item => { this.dataList.forEach(item => {
if(!item.fileType){ if(!item.fileType){
fileFlag = false fileFlag = false
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+77 -72
View File
@@ -404,8 +404,6 @@ export default {
this.listForm.children = dataListChildren; this.listForm.children = dataListChildren;
this.listForm.dataList = this.dataList; this.listForm.dataList = this.dataList;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
console.log(json);
return;
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.userId, userId: this.userId,
@@ -423,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) {
@@ -431,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 {
@@ -463,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 => {
@@ -543,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;
} }
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+54 -75
View File
@@ -142,6 +142,7 @@
> >
</el-input> </el-input>
<el-input <el-input
@click.native="handlePrice(scope.row)"
v-else v-else
:disabled="acceptShow" :disabled="acceptShow"
v-model="scope.row.complianceReasons" v-model="scope.row.complianceReasons"
@@ -171,6 +172,7 @@
<el-input <el-input
v-else v-else
:disabled="acceptShow" :disabled="acceptShow"
@click.native="handlePrice(scope.row)"
v-model="scope.row.noCompliance" v-model="scope.row.noCompliance"
placeholder="请输入不合规项目" placeholder="请输入不合规项目"
> >
@@ -193,6 +195,7 @@
<el-input <el-input
v-else v-else
:disabled="acceptShow" :disabled="acceptShow"
@click.native="handlePrice(scope.row)"
v-model="scope.row.countermeasures" v-model="scope.row.countermeasures"
placeholder="请输入应对措施" placeholder="请输入应对措施"
> >
@@ -217,8 +220,10 @@
:disabled="acceptShow" :disabled="acceptShow"
class="datePickLen" class="datePickLen"
clearable clearable
@click.native="handlePrice(scope.row)"
v-model="scope.row.completionTime" v-model="scope.row.completionTime"
type="date" type="date"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择日期"> placeholder="请选择日期">
</el-date-picker> </el-date-picker>
</template> </template>
@@ -582,6 +587,7 @@ export default {
}, },
data() { data() {
return { return {
comFlag: true,
total: 0, total: 0,
currentPage: 1, currentPage: 1,
pageSize: 20, pageSize: 20,
@@ -640,20 +646,10 @@ export default {
listForm: { listForm: {
projectNumber: "", //项目编号 projectNumber: "", //项目编号
projectName: "", //项目名称 projectName: "", //项目名称
dataList: [ dataList: [], //项目下的标准数据
{
complianceReasons: "",
zcComplianceReasons: ""
}
], //项目下的标准数据
children: [] //标准下的分解单数据 children: [] //标准下的分解单数据
}, },
dataList: [ dataList: [], //展示的标准数据
{
complianceReasons: "",
zcComplianceReasons: ""
}
], //展示的标准数据
commentText: "", //审批意见 commentText: "", //审批意见
detailData: [], //流程历史数据 detailData: [], //流程历史数据
userId: this.$store.getters.userInfo.userId, userId: this.$store.getters.userInfo.userId,
@@ -716,54 +712,17 @@ export default {
item.countermeasures = this.batchEditForm.countermeasures; item.countermeasures = this.batchEditForm.countermeasures;
//完成时间 //完成时间
item.completionTime = this.batchEditForm.completionTime; item.completionTime = this.batchEditForm.completionTime;
}else if(item.standId === items){
item.complianceReasons = this.batchEditForm.complianceReasons;
//不合规
item.noCompliance = this.batchEditForm.noCompliance;
//应对措施
item.countermeasures = this.batchEditForm.countermeasures;
//完成时间
item.completionTime = this.batchEditForm.completionTime;
} }
}); });
}); });
// for (let a = 0; a < this.dataList.length; a++) {
// for (let b = 0; b < this.selectList.length; b++) {
// if (this.dataList[a].id === this.selectList[b]) {
// console.log('11');
// //合规
// this.dataList[a].complianceReasons = this.batchEditForm.complianceReasons
// //不合规
// this.dataList[a].noCompliance = this.batchEditForm.noCompliance
// //应对措施
// this.dataList[a].countermeasures = this.batchEditForm.countermeasures
// //完成时间
// this.dataList[a].completionTime = this.batchEditForm.completionTime
// //合规
// this.dataList[a].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
// //不合规
// this.dataList[a].zcNoCompliance = this.batchEditForm.zcNoCompliance
// //应对措施
// this.dataList[a].zcCountermeasures = this.batchEditForm.zcCountermeasures
// //完成时间
// this.dataList[a].zcCompletionTime = this.batchEditForm.zcCompletionTime
// } else {
// for (let i = 0; i < this.dataList[a].children.length; i++) {
// if (this.dataList[a].children[i].id === this.selectList[b]) {
// //合规
// this.dataList[a].children[i].complianceReasons = this.batchEditForm.complianceReasons
// //不合规
// this.dataList[a].children[i].noCompliance = this.batchEditForm.noCompliance
// //应对措施
// this.dataList[a].children[i].countermeasures = this.batchEditForm.countermeasures
// //完成时间
// this.dataList[a].children[i].completionTime = this.batchEditForm.completionTime
// //合规
// this.dataList[a].children[i].zcComplianceReasons = this.batchEditForm.zcComplianceReasons
// //不合规
// this.dataList[a].children[i].zcNoCompliance = this.batchEditForm.zcNoCompliance
// //应对措施
// this.dataList[a].children[i].zcCountermeasures = this.batchEditForm.zcCountermeasures
// //完成时间
// this.dataList[a].children[i].zcCompletionTime = this.batchEditForm.zcCompletionTime
// }
// }
// }
//
// }
// }
this.modalshowflag = false; this.modalshowflag = false;
}, },
cancelBatchEditForm() { cancelBatchEditForm() {
@@ -871,6 +830,7 @@ export default {
}, },
//动态表单读取 //动态表单读取
getFormFieldList(item) { getFormFieldList(item) {
console.log(item);
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
if (item.form === undefined) { if (item.form === undefined) {
@@ -881,6 +841,9 @@ export default {
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList; this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => { this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> { item.children.forEach(items=> {
if(items.key === item.standId){ if(items.key === item.standId){
this.$set(items, "standName", item.standName); this.$set(items, "standName", item.standName);
@@ -897,6 +860,7 @@ export default {
dataChildren.forEach((item,index) => { dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item) dataListChildren = dataListChildren.concat(item)
}) })
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren this.dataList = dataListChildren
this.total = this.dataList.length; this.total = this.dataList.length;
} else { } else {
@@ -904,6 +868,9 @@ export default {
let dataChildren = [] let dataChildren = []
let dataListChildren = [] let dataListChildren = []
this.listForm.dataList.forEach(item => { this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> { item.children.forEach(items=> {
if(items.key === item.standId){ if(items.key === item.standId){
this.$set(items, "standName", item.standName); this.$set(items, "standName", item.standName);
@@ -920,6 +887,7 @@ export default {
dataChildren.forEach((item,index) => { dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item) dataListChildren = dataListChildren.concat(item)
}) })
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren this.dataList = dataListChildren
this.total = this.dataList.length; this.total = this.dataList.length;
// this.dataList = item.form.dataList[0].children; // this.dataList = item.form.dataList[0].children;
@@ -964,31 +932,42 @@ export default {
this.isSubmit = false; this.isSubmit = false;
}); });
}, },
handlePrice(row){
if(row.complianceReasons !== '' || (row.noCompliance !== '' && row.countermeasures !== '' && row.completionTime !== '') || (row.complianceReasons === '' && row.noCompliance === '' && row.countermeasures === '' && row.completionTime === '')){
this.comFlag = true
}else{
this.comFlag = false
}
},
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
this.isSubmit = true; if(!this.comFlag){
this.listForm.commentText = this.commentText; this.$message.warning('请填写完整的不符合项信息')
const json = JSON.stringify(this.listForm); }else{
this.$http.post("lawss/activiti/completeTask", { this.isSubmit = true;
taskIds: this.taskIds, this.listForm.commentText = this.commentText;
userId: this.userId, const json = JSON.stringify(this.listForm);
json: json this.$http.post("lawss/activiti/completeTask", {
}, { taskIds: this.taskIds,
_this: this userId: this.userId,
}, res => { json: json
if (res.success) { }, {
this.$message.success(res.message); _this: this
this.$router.push("/processCenter"); }, res => {
} if (res.success) {
this.isSubmit = false; this.$message.success(res.message);
}, e => { this.$router.push("/processCenter");
}); }
this.isSubmit = false;
}, e => {
});
}
}, },
//标准表格选择框改变 //标准表格选择框改变
selectStandChange(data) { selectStandChange(data) {
this.selectList = []; this.selectList = [];
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
this.selectList.push(data[i].id); this.selectList.push(data[i].id || data[i].standId);
localStorage.setItem("selectList", JSON.stringify(this.selectList)); localStorage.setItem("selectList", JSON.stringify(this.selectList));
} }
}, },
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+60 -26
View File
@@ -468,36 +468,70 @@ export default {
}, },
//动态表单读取 //动态表单读取
getFormFieldList(item) { getFormFieldList(item) {
console.log(item);
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
this.listForm.prcNum = this.prcNum; if (item.form === undefined) {
this.listForm.prcName = this.prcName; let dataChildren = []
this.listForm["id"] = item.id; let dataListChildren = []
this.listForm.dataList = item.dataList; this.listForm.prcNum = this.prcNum;
let dataChildren = [] this.listForm.prcName = this.prcName;
let dataListChildren = [] this.listForm["id"] = item.id;
this.listForm.dataList.forEach(item => { this.listForm.dataList = item.dataList;
item.children.forEach(items=> { this.listForm.dataList.forEach(item => {
if(items.key === item.standId){ if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.$set(items, "standName", item.standName); this.dataList.push(item)
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
} }
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
}
})
}) })
}) this.listForm.dataList.forEach(item => {
this.listForm.dataList.forEach(item => { dataChildren.push(item.children)
dataChildren.push(item.children) })
}) dataChildren.forEach((item,index) => {
dataChildren.forEach((item,index) => { dataListChildren = dataListChildren.concat(item)
dataListChildren = dataListChildren.concat(item) })
}) dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren this.dataList = dataListChildren
this.total = this.dataList.length; this.total = this.dataList.length;
// this.dataList = item.dataList; } else {
// this.dataList.distributePerson = item.dataList[0].distributePerson; this.listForm = item.form;
// this.listForm.breakdownList = item.breakdownList; let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
}
})
})
this.listForm.dataList.forEach(item => {
dataChildren.push(item.children)
})
dataChildren.forEach((item,index) => {
dataListChildren = dataListChildren.concat(item)
})
dataListChildren = this.dataList.concat(dataListChildren)
this.dataList = dataListChildren
this.total = this.dataList.length;
// this.dataList = item.form.dataList[0].children;
// this.total = item.form.dataList[0].children.length;
}
}); });
}, },
//驳回事件 //驳回事件
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+20 -12
View File
@@ -295,7 +295,7 @@
align="center" align="center"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standNumber }}</a> <a @click="handlePreview(scope.row)">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -305,7 +305,7 @@
width="260px" width="260px"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="handlePreview(scope.row)">{{ scope.row.standName }}</a> <a @click="handlePreview(scope.row)">{{ scope.row.standName || scope.row.lawsName }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -349,7 +349,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''"> <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
</span> </span>
<span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span> <!-- <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -361,7 +361,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''"> <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
</span> </span>
<span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span> <!-- <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -1267,6 +1267,7 @@ export default {
this.$message.warning('请勿添加重复数据') this.$message.warning('请勿添加重复数据')
} else { } else {
this.sarAccessInfoList.push(item) this.sarAccessInfoList.push(item)
console.log('1270',this.sarAccessInfoList)
// this.$refs.accessTypeSelect.clearSelection() // this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection() this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection() this.$refs.searchTable.clearSelection()
@@ -1383,17 +1384,17 @@ export default {
let rowlist3 = [] let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) { for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id) rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].ssrq === null) { if (this.sarAccessInfoList[i].ssrq === null || this.sarAccessInfoList[i].ssrq === undefined) {
rowlist1.push(this.sarAccessInfoList[i].ssrq = '-') rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
} else { } else {
rowlist1.push(this.sarAccessInfoList[i].ssrq.toString()) rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
} }
if (this.sarAccessInfoList[i].xcxssrqgj === null) { if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-') rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
} else { } else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString()) rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
} }
if (this.sarAccessInfoList[i].zccssrqgj === null) { if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-') rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
} else { } else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString()) rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
@@ -1712,14 +1713,21 @@ export default {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND' this.sarAccessInfoSearch.standType = 'INLAND'
this.selectPage() this.selectPage()
} else { } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
this.sarAccessInfoSearch.standType = 'FOREIGN' this.sarAccessInfoSearch.standType = 'FOREIGN'
this.selectPage() this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
this.sarAccessInfoSearch.standType = 'LAWS'
this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
this.sarAccessInfoSearch.standType = 'BUSINESS'
this.pageInfo()
} }
}, },
// 数据搜索table判断checked状态 // 数据搜索table判断checked状态
selectable(row) { selectable(row) {
return row.isRelateAccess === '1' console.log('1723',row)
return row.isRelateAccess === '1' || row.isRelateAccess === undefined
}, },
// 数据搜索 table select事件 // 数据搜索 table select事件
sarAccessInfoSearchSelect(val) { sarAccessInfoSearchSelect(val) {
@@ -2257,9 +2265,9 @@ export default {
}, res => { }, res => {
this.sarAccessInfoList = res.data.records this.sarAccessInfoList = res.data.records
this.sarAccessInfoList.forEach(item => { this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) { if (item.standYear === null && item.standType !== null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber item.standNumber = item.standSortShow + ' ' + item.standNumber
} else { } else if (item.standYear !== null && item.standType !== null){
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
} }
if (item.attrInfoMap === null) { if (item.attrInfoMap === null) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+149 -58
View File
@@ -166,7 +166,7 @@
align="center" align="center"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a> <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -175,7 +175,7 @@
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 || scope.row.lawsName}}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -193,7 +193,8 @@
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span> <span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span v-else-if="scope.row.putTime">{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -213,7 +214,7 @@
width="120px" width="120px"
label="文本状态"> label="文本状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span> <span>{{ textStatusMap[scope.row.textStatus] || scope.row.standStatusShow}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -269,7 +270,7 @@
fixed="left" fixed="left"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a> <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -279,7 +280,7 @@
width="260px" width="260px"
> >
<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 || scope.row.lawsName}}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -323,7 +324,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''"> <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
</span> </span>
<span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span> <!-- <span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -335,7 +336,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''"> <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
</span> </span>
<span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span> <!-- <span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -647,8 +648,8 @@ export default {
dataSourceOptions: [ dataSourceOptions: [
{value: 'INLAND_STAND', label: '国内标准法规'}, {value: 'INLAND_STAND', label: '国内标准法规'},
{value: 'FOREIGN_STAND', label: '海外标准法规'}, {value: 'FOREIGN_STAND', label: '海外标准法规'},
// {value: 'FOREIGN_LAWS', label: '国内外政策'}, {value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'BUSINESS', label: '企业标准 '}, {value: 'BUSINESS', label: '企业标准 '},
// {value: 'TEMP', label: '标准法规清单 '} // {value: 'TEMP', label: '标准法规清单 '}
], ],
// 新增、编辑 数据搜索字段 // 新增、编辑 数据搜索字段
@@ -1096,6 +1097,66 @@ export default {
} }
] ]
// 国内外政策可查字段 // 国内外政策可查字段
}else if (val === 'FOREIGN_LAWS'){
this.twoOptions=[
{
label: '适用车辆类型',
value: 'SYCLLX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '政策编号',
value: 'LAWS_NUMBER',
type: 'INPUT',
disabled: false
}, {
label: '中文名称',
value: 'LAWS_NAME',
type: 'INPUT',
disabled: false
}, {
label: '英文名称',
value: 'LAWS_EN_NAME',
type: 'INPUT',
disabled: false
}, {
label: '个性化标签',
value: 'GXHBQXX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '新车型实施日期(文本)',
value: 'XCXSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '在产车实施日期(文本)',
value: 'ZCCSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '维护工程师',
value: 'ZCGCS',
type: 'SEL_OPTION',
selVal: "USERLIST",
disabled: false
}
]
// 标准法规清单可查字段
}else {
this.twoOptions=[
{
label: '清单名称',
value: 'ACCESS_CONTENT',
type: 'INPUT',
disabled: false
}, {
label: '国家地区',
value: 'COUNTRY',
type: 'SEL_OPTION',
disabled: false
}
]
} }
}, },
/** /**
@@ -1258,19 +1319,19 @@ export default {
let rowlist3 = [] let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) { for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id) rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].ssrq === null) { if (this.sarAccessInfoList[i].ssrq === null || this.sarAccessInfoList[i].ssrq === undefined) {
rowlist1.push(this.sarAccessInfoList[i].ssrq = '-') rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
}else { } else {
rowlist1.push(this.sarAccessInfoList[i].ssrq.toString()) rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
} }
if (this.sarAccessInfoList[i].xcxssrqgj === null) { if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-') rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
}else { } else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString()) rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
} }
if (this.sarAccessInfoList[i].zccssrqgj === null) { if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-') rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
}else { } else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString()) rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
} }
} }
@@ -1433,52 +1494,76 @@ export default {
// }) // })
// }, // },
pageInfo() { pageInfo() {
StandardsInfoPage(this.sarAccessInfoSearch).then(res =>{ if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
this.sarAccessInfoSearchList = res.data.list StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
this.sarAccessInfoSearchList.forEach(item => { this.sarAccessInfoSearchList = res.data.list
if (item.standYear === null) { this.sarAccessInfoSearchList.forEach(item => {
item.standNumber = item.standSortShow + ' ' + item.standNumber if (item.standYear === null) {
} else { item.standNumber = item.standSortShow + ' ' + item.standNumber
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear } else {
} item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
if (item.attrInfoMap === null) { }
this.$set(item, 'zccssrqgj', '') if (item.attrInfoMap === null) {
this.$set(item, 'xcxssrqgj', '') this.$set(item, 'zccssrqgj', '')
this.$set(item, 'ssrq', '') this.$set(item, 'xcxssrqgj', '')
this.$set(item, 'sycpx', '') this.$set(item, 'ssrq', '')
this.$set(item, 'typeApplicable', '') this.$set(item, 'sycpx', '')
this.$set(item, 'nylx', '') this.$set(item, 'typeApplicable', '')
this.$set(item, 'zrbm', '') this.$set(item, 'nylx', '')
this.$set(item, 'cycvppsbm', '') this.$set(item, 'zrbm', '')
this.$set(item, 'cycvppscn', '') this.$set(item, 'cycvppsbm', '')
this.$set(item, 'kccvppsbm', '') this.$set(item, 'cycvppscn', '')
this.$set(item, 'kccvppscn', '') this.$set(item, 'kccvppsbm', '')
}else { this.$set(item, 'kccvppscn', '')
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ) } else {
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ) this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'ssrq', item.attrInfoMap.SSRQ) this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX) this.$set(item, 'ssrq', item.attrInfoMap.SSRQ)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX) this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX) this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'zrbm', item.attrInfoMap.ZRBM) this.$set(item, 'nylx', item.attrInfoMap.NYLX)
this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM) this.$set(item, 'zrbm', item.attrInfoMap.ZRBM)
this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN) this.$set(item, 'cycvppsbm', item.attrInfoMap.CYCVPPSBM)
this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM) this.$set(item, 'cycvppscn', item.attrInfoMap.CYCVPPSCN)
this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN) this.$set(item, 'kccvppsbm', item.attrInfoMap.KCCVPPSBM)
} this.$set(item, 'kccvppscn', item.attrInfoMap.KCCVPPSCN)
}
})
this.drawerTotal = res.data.count
}, e => {
}) })
this.drawerTotal = res.data.count }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'){
}, e => { this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, {
}) _this: this,
}, res => {
console.log('1640',res)
this.sarAccessInfoSearchList = res.data.list
}, e => {
})
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, {
_this: this,
}, res => {
console.log('1648',res)
this.sarAccessInfoSearchList = res.data.list
}, e => {
})
}
}, },
// 查询数据搜索 table 数据 // 查询数据搜索 table 数据
selectLawsStands () { selectLawsStands () {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND' this.sarAccessInfoSearch.standType = 'INLAND'
this.pageInfo() this.pageInfo()
} else { } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
this.sarAccessInfoSearch.standType = 'FOREIGN' this.sarAccessInfoSearch.standType = 'FOREIGN'
this.pageInfo() this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
this.sarAccessInfoSearch.standType = 'LAWS'
this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
this.sarAccessInfoSearch.standType = 'BUSINESS'
this.pageInfo()
} }
}, },
selectPage() { selectPage() {
@@ -1525,14 +1610,20 @@ export default {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND' this.sarAccessInfoSearch.standType = 'INLAND'
this.selectPage() this.selectPage()
} else { } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
this.sarAccessInfoSearch.standType = 'FOREIGN' this.sarAccessInfoSearch.standType = 'FOREIGN'
this.selectPage() this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
this.sarAccessInfoSearch.standType = 'LAWS'
this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
this.sarAccessInfoSearch.standType = 'BUSINESS'
this.pageInfo()
} }
}, },
// 数据搜索table判断checked状态 // 数据搜索table判断checked状态
selectable (row) { selectable (row) {
return row.isRelateAccess === '1' return row.isRelateAccess === '1' || row.isRelateAccess === undefined
}, },
// 数据搜索 table select事件 // 数据搜索 table select事件
sarAccessInfoSearchSelect (val) { sarAccessInfoSearchSelect (val) {
@@ -2071,9 +2162,9 @@ export default {
}, res => { }, res => {
this.sarAccessInfoList = res.data.records this.sarAccessInfoList = res.data.records
this.sarAccessInfoList.forEach(item => { this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) { if (item.standYear === null && item.standType !== null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber item.standNumber = item.standSortShow + ' ' + item.standNumber
} else { } else if (item.standYear !== null && item.standType !== null){
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
} }
if (item.attrInfoMap === null) { if (item.attrInfoMap === null) {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+134 -43
View File
@@ -211,7 +211,7 @@
width="180px" width="180px"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a> <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -220,7 +220,7 @@
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 || scope.row.lawsName}}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -250,7 +250,8 @@
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span> <span v-if="scope.row.xcxssrqgj">{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span v-else-if="scope.row.putTime">{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -270,7 +271,7 @@
align="center" align="center"
label="文本状态"> label="文本状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span> <span>{{ textStatusMap[scope.row.textStatus] || scope.row.standStatusShow}}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -327,7 +328,7 @@
align="center" align="center"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber }}</a> <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standNumber || scope.row.lawsNumber || scope.row.standCode}}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -337,7 +338,7 @@
width="260px" width="260px"
> >
<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 || scope.row.lawsName }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -381,7 +382,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''"> <span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
</span> </span>
<span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span> <!-- <span v-else>{{ scope.row.zccssrqgj.slice(0, 10) }}</span>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -393,7 +394,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''"> <span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
</span> </span>
<span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span> <!-- <span v-else>{{ scope.row.xcxssrqgj.slice(0, 10) }}</span>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -719,8 +720,8 @@ export default {
dataSourceOptions: [ dataSourceOptions: [
{value: 'INLAND_STAND', label: '国内标准法规'}, {value: 'INLAND_STAND', label: '国内标准法规'},
{value: 'FOREIGN_STAND', label: '海外标准法规'}, {value: 'FOREIGN_STAND', label: '海外标准法规'},
// {value: 'FOREIGN_LAWS', label: '国内外政策'}, {value: 'FOREIGN_LAWS', label: '国内外政策'},
// {value: 'BUSINESS', label: '企业标准 '}, {value: 'BUSINESS', label: '企业标准 '},
// {value: 'TEMP', label: '标准法规清单 '} // {value: 'TEMP', label: '标准法规清单 '}
], ],
// 新增、编辑 数据搜索字段 // 新增、编辑 数据搜索字段
@@ -1096,6 +1097,66 @@ export default {
} else if (val === 'FOREIGN_STAND') { } else if (val === 'FOREIGN_STAND') {
this.selectLawsStands() this.selectLawsStands()
// 国内外政策可查字段 // 国内外政策可查字段
}else if (val === 'FOREIGN_LAWS'){
this.twoOptions=[
{
label: '适用车辆类型',
value: 'SYCLLX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '政策编号',
value: 'LAWS_NUMBER',
type: 'INPUT',
disabled: false
}, {
label: '中文名称',
value: 'LAWS_NAME',
type: 'INPUT',
disabled: false
}, {
label: '英文名称',
value: 'LAWS_EN_NAME',
type: 'INPUT',
disabled: false
}, {
label: '个性化标签',
value: 'GXHBQXX',
type: 'SEL_OPTION',
disabled: false
}, {
label: '新车型实施日期(文本)',
value: 'XCXSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '在产车实施日期(文本)',
value: 'ZCCSSRQ',
type: 'DATE_PIC_OPTS',
disabled: false
}, {
label: '维护工程师',
value: 'ZCGCS',
type: 'SEL_OPTION',
selVal: "USERLIST",
disabled: false
}
]
// 标准法规清单可查字段
}else {
this.twoOptions=[
{
label: '清单名称',
value: 'ACCESS_CONTENT',
type: 'INPUT',
disabled: false
}, {
label: '国家地区',
value: 'COUNTRY',
type: 'SEL_OPTION',
disabled: false
}
]
} }
}, },
/** /**
@@ -1258,17 +1319,17 @@ export default {
let rowlist3 = [] let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) { for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id) rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].ssrq === null) { if (this.sarAccessInfoList[i].ssrq === null || this.sarAccessInfoList[i].ssrq === undefined) {
rowlist1.push(this.sarAccessInfoList[i].ssrq = '-') rowlist1.push(this.sarAccessInfoList[i].ssrq = '-')
} else { } else {
rowlist1.push(this.sarAccessInfoList[i].ssrq.toString()) rowlist1.push(this.sarAccessInfoList[i].ssrq.toString())
} }
if (this.sarAccessInfoList[i].xcxssrqgj === null) { if (this.sarAccessInfoList[i].xcxssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === undefined) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-') rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '-')
} else { } else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString()) rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
} }
if (this.sarAccessInfoList[i].zccssrqgj === null) { if (this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].zccssrqgj === undefined) {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-') rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '-')
} else { } else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString()) rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
@@ -1542,41 +1603,65 @@ export default {
}, },
// 查询数据搜索 table 数据 // 查询数据搜索 table 数据
pageInfo() { pageInfo() {
StandardsInfoPage(this.sarAccessInfoSearch).then(res => { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND' || this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND'){
this.sarAccessInfoSearchList = res.data.list StandardsInfoPage(this.sarAccessInfoSearch).then(res => {
this.sarAccessInfoSearchList = res.data.list
//为空转换 //为空转换
for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) { for (let i = 0; i < this.sarAccessInfoSearchList.length; i++) {
//适用车型为空 //适用车型为空
if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){ if (this.sarAccessInfoSearchList[i].attrInfoMap.CLLX === '[]'){
this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null this.sarAccessInfoSearchList[i].attrInfoMap.CLLX = null
}
//适用认证为空
if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){
this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null
}
} }
//适用认证为空 this.sarAccessInfoSearchList.forEach(item => {
if (this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ === '[]'){ if (item.standYear === null) {
this.sarAccessInfoSearchList[i].attrInfoMap.SYRZ = null item.standNumber = item.standSortShow + ' ' + item.standNumber
} } else {
} item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
this.sarAccessInfoSearchList.forEach(item => { }
if (item.standYear === null) { this.addWord(item)
item.standNumber = item.standSortShow + ' ' + item.standNumber })
} else { this.changeText(this.sarAccessInfoSearchList)
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear this.drawerTotal = res.data.count
} }, e => {
this.addWord(item)
}) })
this.changeText(this.sarAccessInfoSearchList) }else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS'){
this.drawerTotal = res.data.count this.$http.get('lawss/sarLawsInfo/page', this.sarAccessInfoSearch, {
}, e => { _this: this,
}) }, res => {
console.log('1640',res)
this.sarAccessInfoSearchList = res.data.list
}, e => {
})
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS'){
this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.sarAccessInfoSearch, {
_this: this,
}, res => {
console.log('1648',res)
this.sarAccessInfoSearchList = res.data.list
}, e => {
})
}
}, },
// 查询按钮 // 查询按钮
selectLawsStands() { selectLawsStands() {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfoSearch.standType = 'INLAND' this.sarAccessInfoSearch.standType = 'INLAND'
this.pageInfo() this.pageInfo()
} else { } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
this.sarAccessInfoSearch.standType = 'FOREIGN' this.sarAccessInfoSearch.standType = 'FOREIGN'
this.pageInfo() this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
this.sarAccessInfoSearch.standType = 'LAWS'
this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
this.sarAccessInfoSearch.standType = 'BUSINESS'
this.pageInfo()
} }
}, },
/** 高级查询查询按钮*/ /** 高级查询查询按钮*/
@@ -1601,14 +1686,20 @@ export default {
if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') { if (this.sarAccessInfoSearch.dataSource === 'INLAND_STAND') {
this.sarAccessInfo.standType = 'INLAND' this.sarAccessInfo.standType = 'INLAND'
this.selectPage() this.selectPage()
} else { } else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_STAND') {
this.sarAccessInfo.standType = 'FOREIGN' this.sarAccessInfoSearch.standType = 'FOREIGN'
this.selectPage() this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'FOREIGN_LAWS') {
this.sarAccessInfoSearch.standType = 'LAWS'
this.pageInfo()
}else if (this.sarAccessInfoSearch.dataSource === 'BUSINESS') {
this.sarAccessInfoSearch.standType = 'BUSINESS'
this.pageInfo()
} }
}, },
// 数据搜索table判断checked状态 // 数据搜索table判断checked状态
selectable(row) { selectable(row) {
return row.isRelateAccess === '1' return row.isRelateAccess === '1' || row.isRelateAccess === undefined
}, },
// 数据搜索 table select事件 // 数据搜索 table select事件
sarAccessInfoSearchSelect(val) { sarAccessInfoSearchSelect(val) {
@@ -2058,9 +2149,9 @@ export default {
} }
this.sarAccessInfoList.forEach(item => { this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) { if (item.standYear === null && item.standType !== null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber item.standNumber = item.standSortShow + ' ' + item.standNumber
} else { } else if (item.standYear !== null && item.standType !== null){
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
} }
}) })
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+12 -3
View File
@@ -409,7 +409,7 @@
<!-- 新增样式 --> <!-- 新增样式 -->
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form <el-form
v-if="reloadAddForm" v-if="reloadAddForm && modalshowflag"
ref="sarStandardsInfoForm" ref="sarStandardsInfoForm"
:model="sarStandardsInfoEO" :model="sarStandardsInfoEO"
:rules="sarStandardsInfoRules" :rules="sarStandardsInfoRules"
@@ -1887,7 +1887,7 @@
<loading :loading="OCRLoading">数据加载中……</loading> <loading :loading="OCRLoading">数据加载中……</loading>
<div class="demo-drawer-footer"> <div class="demo-drawer-footer">
<el-button size="mini" @click="OCRclose">取消</el-button> <el-button size="mini" @click="OCRclose">取消</el-button>
<el-button type="primary" size="mini" @click="OCRsubmit">转换</el-button> <el-button type="primary" :loading="OCRSubmitLoading" size="mini" @click="OCRsubmit">{{ OCRSubmitButton }}</el-button>
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
@@ -1947,6 +1947,8 @@ export default {
}, },
data() { data() {
return { return {
OCRSubmitLoading: false,
OCRSubmitButton: '',
OCRType: '', OCRType: '',
OCRoptions: [], OCRoptions: [],
OCRDatas: [], OCRDatas: [],
@@ -2671,6 +2673,7 @@ export default {
} else if (this.OCRDatas.length === 0) { } else if (this.OCRDatas.length === 0) {
this.$message.warning('请选择一个文件') this.$message.warning('请选择一个文件')
} else { } else {
this.OCRSubmitLoading = true
if (this.OCRType === '0') { if (this.OCRType === '0') {
let json = { let json = {
standNumber: this.ocrList[0].standYear ? this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber + '-' + this.ocrList[0].standYear : this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber, standNumber: this.ocrList[0].standYear ? this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber + '-' + this.ocrList[0].standYear : this.ocrList[0].standSortShow + ' ' + this.ocrList[0].standNumber,
@@ -2687,6 +2690,7 @@ export default {
}, },
(res) => { (res) => {
this.OCRModel = false this.OCRModel = false
this.OCRSubmitLoading = false
if (res.ok) { if (res.ok) {
this.$message.success('OCR实别成功') this.$message.success('OCR实别成功')
} else { } else {
@@ -2698,13 +2702,15 @@ export default {
} else if (this.OCRType === '1') { } else if (this.OCRType === '1') {
let splitEo = {} let splitEo = {}
splitEo.standId = this.OCRDatas[0].standId splitEo.standId = this.OCRDatas[0].standId
splitEo.fileType = this.setWBType(this.OCRDatas[0].standFileClassify) splitEo.fileType = this.OCRDatas[0].standFileClassify
// splitEo.fileType = this.setWBType(this.OCRDatas[0].standFileClassify)
splitEo.attId = this.OCRDatas[0].attId splitEo.attId = this.OCRDatas[0].attId
splitEo.fileName = this.OCRDatas[0].fileName splitEo.fileName = this.OCRDatas[0].fileName
this.$http.postData('lawss/sarFileSplitInfo/fileSplit', splitEo, { this.$http.postData('lawss/sarFileSplitInfo/fileSplit', splitEo, {
_this: this _this: this
}, res => { }, res => {
this.OCRModel = false this.OCRModel = false
this.OCRSubmitLoading = false
if (res.ok) { if (res.ok) {
this.$message.success('拆分成功') this.$message.success('拆分成功')
} else { } else {
@@ -2720,12 +2726,15 @@ export default {
if (type === '0') { if (type === '0') {
text = 'OCR识别' text = 'OCR识别'
this.OCRTitle = '选择OCR识别文件' this.OCRTitle = '选择OCR识别文件'
this.OCRSubmitButton = '转换'
} else if (type === '1') { } else if (type === '1') {
text = '拆分' text = '拆分'
this.OCRTitle = '选择拆分文件' this.OCRTitle = '选择拆分文件'
this.OCRSubmitButton = '拆分'
} else if (type === '2') { } else if (type === '2') {
text = '编辑' text = '编辑'
this.OCRTitle = '选择编辑文件' this.OCRTitle = '选择编辑文件'
} }
if (this.ocrList.length > 1 && (type === '0' || type === '1' || type === '2')) { if (this.ocrList.length > 1 && (type === '0' || type === '1' || type === '2')) {
this.$message.warning('仅能选择一条数据进行' + text) this.$message.warning('仅能选择一条数据进行' + text)
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+2 -2
View File
@@ -477,13 +477,12 @@
<!-- 新增样式 --> <!-- 新增样式 -->
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form <el-form
v-if="reloadAddForm" v-if="reloadAddForm && modalshowflag"
ref="sarBussionessStandForm" ref="sarBussionessStandForm"
:model="sarBussionessStandEO" :model="sarBussionessStandEO"
:rules="sarBussionessStandRules" :rules="sarBussionessStandRules"
class="label-input-form" class="label-input-form"
> >
<!-- <custom-input-for-standards--> <!-- <custom-input-for-standards-->
<!-- :config="{--> <!-- :config="{-->
<!-- attrName: '代替企标编号',--> <!-- attrName: '代替企标编号',-->
@@ -1212,6 +1211,7 @@
> >
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form :model="productModelAdd" <el-form :model="productModelAdd"
v-if="productModal"
ref="productModelAdd" ref="productModelAdd"
:rules="productRules" :rules="productRules"
class="label-input-form" class="label-input-form"
src/pages/regulatoryRepository/foreignRegulationsDatabase/index.vue
+1 -1
View File
@@ -355,7 +355,7 @@
<!-- 新增样式 --> <!-- 新增样式 -->
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form <el-form
v-if="reloadAddForm" v-if="reloadAddForm && modalshowflag"
ref="sarLawsStandEO" ref="sarLawsStandEO"
:model="sarLawsStandEO" :model="sarLawsStandEO"
:rules="sarLawsStandRules" :rules="sarLawsStandRules"
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -2
View File
@@ -770,7 +770,7 @@
<!-- 新增样式 --> <!-- 新增样式 -->
<div class="demo-drawer-content"> <div class="demo-drawer-content">
<el-form <el-form
v-if="reloadAddForm" v-if="reloadAddForm && modalshowflag"
ref="sarStandardsInfoForm" ref="sarStandardsInfoForm"
:model="sarStandardsInfoEO" :model="sarStandardsInfoEO"
:rules="sarStandardsInfoRules" :rules="sarStandardsInfoRules"
@@ -4272,7 +4272,6 @@ export default {
} }
}) })
} else if (this.ocrList.length === 1 && type === '2'){ } else if (this.ocrList.length === 1 && type === '2'){
console.log('4228',this.ocrList)
this.selectStandardPro(this.ocrList[0], 'edit') this.selectStandardPro(this.ocrList[0], 'edit')
} }
}, },
src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
+141 -155
View File
@@ -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>