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

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

Browse Source
This commit is contained in:
zhutianqi
2021-07-29 15:22:42 +08:00
parent d62f69ed7e abe054b2c0
commit f92621427a
26 changed files with 780 additions and 410 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/File.vue
+1 -1
View File
@@ -255,7 +255,7 @@ export default {
uploadSuccess(res, file, fileList) {
if (res.ok) {
// this.value += res.data.id + ','
this.$emit('input', this.value + res.data.id + ',')
this.$emit('input', this.value ? this.value + ',' : this.value+ res.data.id + ',')
this.$emit('success')
this.$message({
message: '文件上传成功',
src/components/treeSelect/treeSelectNew.vue
+4
View File
@@ -273,6 +273,10 @@
</script>
<style lang="less" scoped>
/deep/ .expanded{
background-image: none !important;
background-size:100% 100%;
}
.el-drawer__body{
& > div:first-child{
display: flex;
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+164 -103
View File
@@ -103,7 +103,6 @@
</el-table-column>
<el-table-column
prop="code"
fixed="left"
width="180px"
align="center"
label="标准号">
@@ -128,20 +127,20 @@
label="发布日期">
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="XCXSSRQ"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrqgj"
prop="ZCCSSRQ"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -150,6 +149,9 @@
align="center"
width="120px"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
@@ -324,26 +326,13 @@
}}</span>
</template>
</el-table-column>
<el-table-column
prop="applicationScope"
label="适用领域"
align="center">
<template slot-scope="scope">
<span
v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
}}</span>
</template>
</el-table-column>
<el-table-column
prop="updateTime"
label="更新时间"
sortable
align="center">
<template slot-scope="scope">
<div>
{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
}}
</div>
<span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -569,7 +558,7 @@
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="addList">
@click="getStandData">
查询
</el-button>
</el-form-item>
@@ -601,7 +590,6 @@
</el-table-column>
<el-table-column
prop="code"
fixed="left"
align="center"
label="标准号">
<template slot-scope="scope">
@@ -624,22 +612,25 @@
prop="issueTime"
align="center"
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="XCXSSRQ"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrqgj"
prop="ZCCSSRQ"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -647,6 +638,9 @@
prop="textStatus"
align="center"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
@@ -758,7 +752,7 @@ export default {
directorUser: "",
dockUserName: "",
ministerUserName: "",
directorUserName: "",
directorUserName: ""
},
formRules: {
listType: [
@@ -807,26 +801,26 @@ export default {
listForm: {
listType: "", //区分是哪个清单
listName: "", //清单名称
// applyRegion: "", //适用区域
descriptionList: "", //清单说明
fileId: "",
model: "", // 上传模板
modelName: "",
standId: "", //选择的清单的id
signFlag: "1", //是否会签 1为会签 2为不会签
inforlist: "", //用来存放标准列表的标准id
inforlist: " ", //用来存放标准列表的标准id
dataList: [{
code: "", //标准号
standName: "", //标准名称
issueTime: "", //发布日期
xcxssrqgj: "", //新车型实施日期
zccssrqgj: "", //在产车实施日期
XCXSSRQ: "", //新车型实施日期
ZCCSSRQ: "", //在产车实施日期
textStatus: "", //文本状态
id: ""
}]
},
choiceForm: {}, //选择标准清单列表
// countryOptions: [], //适用区域下拉框数据
standStateOptions: [],
standardTypeOptions: [
{
value: "INLAND",
@@ -844,7 +838,8 @@ export default {
user3: "",
user4: "",
user5: "",
standMap: new Map()
standMap: new Map(),
textStatusMap: {}// 文本状态id与name对应
};
},
methods: {
@@ -974,10 +969,9 @@ export default {
standType: "",
standNumber: ""
};
this.addList();
this.getStandData();
},
//点击添加事件
addList() {
getStandData() {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
standType: this.standardSearch.standType,
standNumber: this.standardSearch.standNumber,
@@ -988,12 +982,21 @@ export default {
}, res => {
this.standardData = res.data.list;
this.standardData.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
})
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
});
this.totalNo = res.data.count;
}, e => {
});
},
// 将文本状态的id与name对应
setMap(data) {
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label);
});
},
//点击添加事件
addList() {
this.standModel = true;
},
// 点击批量删除事件
@@ -1032,7 +1035,7 @@ export default {
_formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append("prcType", "4");
_formData.append("json", JSON.stringify({
form: this.form,
form: this.listForm,
roleForm: this.roleForm,
commentText: this.commentText
}));
@@ -1049,38 +1052,37 @@ export default {
if (this.dataList.length < 1) {
this.$message.warning("标准不能为空");
} else {
var json = Object.assign(this.listForm, this.roleForm)
console.log(json);
// this.$refs["qdfbForm"].validate((valid) => {
// if (valid) {
// this.$refs["Form"].validate((valid) => {
// if (valid) {
// this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
// _this: this
// }, res => {
// if (res.ok) {
// this.$http.post("lawss/activiti/completeTask", {
// taskIds: res.data,
// userId: this.$store.getters.userInfo.userId,
// json: JSON.stringify(json)
// }, {
// _this: this
// }, res => {
// if (res.success) {
// this.$message.success(res.message);
// this.$router.push("/processCenter");
// }
// });
// }
// });
// } else {
// return this.$message.warning("请完善人员信息");
// }
// });
// } else {
// return this.$message.warning("请完善基础信息");
// }
// });
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => {
if (valid) {
this.$refs["Form"].validate((valid) => {
if (valid) {
this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
_this: this
}, res => {
if (res.ok) {
this.$http.post("lawss/activiti/completeTask", {
taskIds: res.data,
userId: this.$store.getters.userInfo.userId,
json: JSON.stringify(json)
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
});
}
});
} else {
return this.$message.warning("请完善人员信息");
}
});
} else {
return this.$message.warning("请完善基础信息");
}
});
}
},
// 删除上传的文件
@@ -1101,16 +1103,24 @@ export default {
uploadBackSuccess(res, file, fileList) {
if (res.ok) {
let middle = [];
// let fids = [];
fileList.forEach(item => {
middle.push(item.name);
// fids.push(item.response.data.attId)
});
this.fileListName = middle;
this.fileIds.push(file.response.data.id);
// this.listForm.fileId = this.listForm.fileId + ',' + fids.join(',')
// this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
// this.$message.success('上传成功')
// this.listForm.fileName = this.fileListName.join(',');
// this.listForm.fileId = this.fileIds.join(',');
// if (this.listForm.fileName === null || this.listForm.fileName === undefined) {
// this.listForm.fileName = this.fileListName.join(",");
// } else {
// this.listForm.fileName = this.listForm.fileName + "," + this.fileListName.join(",");
// }
// if (this.listForm.fileId === null || this.listForm.fileId === undefined) {
// this.listForm.fileId = this.fileIds.join(",");
// } else {
// this.listForm.fileId = this.listForm.fileId + "," + this.fileIds.join(",");
// }
this.$message.success("上传成功");
} else {
this.$message.error(res.message);
fileList.pop();
@@ -1173,6 +1183,7 @@ export default {
var index1 = filename.lastIndexOf(".");
var index2 = filename.length;
var fileSuffix = filename.substring(index1, index2);
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
|| fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
@@ -1209,29 +1220,32 @@ export default {
},
//添加标准确定事件
okStand() {
let _this = this;
if (this.standList.length < 1) {
_this.$message.warning("请选择需要添加进清单的数据");
this.$message.warning("请选择需要添加进清单的数据");
} else {
let exits = []
_this.standList.map(item => {
let exits = [];
this.standList.map(item => {
let newStand = false;
for (let itemKey of _this.dataList) {
for (let itemKey of this.dataList) {
if (item.id == itemKey.id) {
newStand = true;
break;
}
}
if (newStand) {
_this.$message.warning("请勿重复添加数据");
this.$message.warning("请勿重复添加数据");
} else {
_this.dataList.push(item);
exits.push(item.id)
this.dataList.push(item);
exits.push(item.id);
}
});
this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
if (this.listForm.inforlist === null || this.listForm.inforlist === undefined || this.listForm.inforlist === "") {
this.listForm.inforlist = exits.join(",");
} else {
this.listForm.inforlist = this.listForm.inforlist + "," + exits.join(",");
}
this.standardData = [];
_this.standModel = false;
this.standModel = false;
}
},
//选择清单确定事件
@@ -1247,25 +1261,35 @@ export default {
}
this.listForm.standId = bringData[0].id;
this.listForm.listName = bringData[0].detailedListName;
this.listForm.applyRegion = bringData[0].applicationScope;
this.listForm.descriptionList = bringData[0].remark;
this.listForm.fileId = bringData[0].fileId;
this.listForm.fileId = bringData[0].fileIds;
this.listForm.fileName = bringData[0].fileName;
this.ListModel = false;
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", { id: bringData[0].id }, {
_this: this
}, res => {
if (res.data == null) {
res.data = [];
}
this.dataList = res.data;
this.listForm.dataList = res.data;
let formId = [];
this.dataList.map(item => {
formId.push(item.id);
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
{ id: bringData[0].id, page: this.page, Size: this.pageSize }, {
_this: this
}, res => {
if (res.data == null) {
res.data = [];
}
this.dataList = res.data;
this.dataList.forEach(item => {
if (item.xcxssrqgj === null){
this.$set(item, "XCXSSRQ", '');
this.$set(item, "ZCCSSRQ", '');
}else{
this.$set(item, "XCXSSRQ", item.xcxssrqgj);
this.$set(item, "ZCCSSRQ", item.zccssrqgj);
}
})
this.listForm.dataList = res.data;
let formId = [];
this.dataList.map(item => {
formId.push(item.id);
});
this.listForm.inforlist = formId.join(",");
}, e => {
});
this.listForm.inforlist = formId.join(",");
}, e => {
});
} else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行带入");
} else {
@@ -1320,11 +1344,11 @@ export default {
},
pageChangeNo(page) {
this.pageNo = page;
this.addList();
this.getStandData();
},
pageSizeChangeNo(pageSize) {
this.pageSizeNo = this.$store.getters.userInfo.configContent;
this.addList();
this.getStandData();
}
},
@@ -1336,10 +1360,13 @@ export default {
_this: this
}, res => {
this.countryOptions = res.data.COUNTRY;
this.standStateOptions = res.data.WBZTCLASS; // 文本状态
this.setMap(this.standStateOptions);
});
this.selectionList();
this.selectSign();
this.getTree();
this.getStandData();
for (let i = 0; i < this.dataList.length; i++) {
this.standMap.set(this.dataList[i].id, this.dataList[i]);
}
@@ -1359,6 +1386,40 @@ export default {
}
}
.fileClass {
cursor: pointer;
}
.fileClass:hover {
color: #0c91e5;
}
p {
& > a {
cursor: pointer;
}
& > i {
display: inline-block;
margin-left: 3px;
width: 18px;
height: 16px;
background-repeat: no-repeat;
background-size: 100% 100%;
background-position: center center;
vertical-align: sub;
cursor: pointer;
}
.icon-download {
background-image: url("~assets/images/shangqi/img/download.png");
}
.icon-download2 {
background-image: url("~assets/images/shangqi/img/download2.png");
}
}
.choiceBtn {
.el-button--primary {
width: 150px;
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+91 -73
View File
@@ -125,22 +125,25 @@
prop="issueTime"
align="center"
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="XCXSSRQ"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrqgj"
prop="ZCCSSRQ"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -149,6 +152,9 @@
align="center"
width="120px"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
@@ -329,7 +335,7 @@
sortable
align="center">
<template slot-scope="scope">
<span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -390,27 +396,14 @@
}}</span>
</template>
</el-table-column>
<el-table-column
prop="applicationScope"
label="适用领域"
align="center">
<template slot-scope="scope">
<span
v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
}}</span>
</template>
</el-table-column>
<el-table-column
prop="updateTime"
label="更新时间"
sortable
align="center">
<template slot-scope="scope">
<div>
{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-D hh:mm:ss") : scope.row.updateTime
}}
</div>
</template>
<template slot-scope="scope">
<span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="updatePeople"
@@ -470,26 +463,13 @@
}}</span>
</template>
</el-table-column>
<el-table-column
prop="applicationScope"
label="适用领域"
align="center">
<template slot-scope="scope">
<span
v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
}}</span>
</template>
</el-table-column>
<el-table-column
prop="updateTime"
label="更新时间"
sortable
align="center">
<template slot-scope="scope">
<div>
{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
}}
</div>
<span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -555,7 +535,7 @@
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="addList">
@click="getStandData">
查询
</el-button>
</el-form-item>
@@ -610,24 +590,24 @@
align="center"
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="xcxssrqgj"
prop="XCXSSRQ"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrqgj"
prop="ZCCSSRQ"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
@@ -635,6 +615,9 @@
prop="textStatus"
align="center"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
@@ -746,7 +729,7 @@ export default {
directorUser: "",
dockUserName: "",
ministerUserName: "",
directorUserName: "",
directorUserName: ""
},
formRules: {
listType: [
@@ -806,14 +789,15 @@ export default {
code: "", //标准号
standName: "", //标准名称
issueTime: "", //发布日期
xcxssrqgj: "", //新车型实施日期
zccssrqgj: "", //在产车实施日期
XCXSSRQ: "", //新车型实施日期
ZCCSSRQ: "", //在产车实施日期
textStatus: "", //文本状态
id: ""
}]
},
choiceForm: {}, //选择标准清单列表
// countryOptions: [], //适用区域下拉框数据
standStateOptions: [],
standardTypeOptions: [
{
value: "INLAND",
@@ -831,7 +815,8 @@ export default {
user3: "",
user4: "",
user5: "",
standMap: new Map()
standMap: new Map(),
textStatusMap: {}// 文本状态id与name对应
};
},
methods: {
@@ -949,10 +934,9 @@ export default {
standType: "",
standNumber: ""
};
this.addList();
this.getStandData();
},
//点击添加事件
addList() {
getStandData() {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
standType: this.standardSearch.standType,
standNumber: this.standardSearch.standNumber,
@@ -963,12 +947,26 @@ export default {
}, res => {
this.standardData = res.data.list;
this.standardData.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
if(item.attrInfoMap === null){
this.$set(item, "ZCCSSRQ", '');
this.$set(item, "XCXSSRQ", '');
}else{
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
}
})
this.totalNo = res.data.count;
}, e => {
});
},
// 将文本状态的id与name对应
setMap(data) {
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label);
});
},
//点击添加事件
addList() {
this.standModel = true;
},
// 点击批量删除事件
@@ -1024,8 +1022,7 @@ export default {
if (this.dataList.length < 1) {
this.$message.warning("标准不能为空");
} else {
var json = Object.assign(this.listForm, this.roleForm)
console.log(json);
var json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => {
if (valid) {
this.$refs["Form"].validate((valid) => {
@@ -1066,10 +1063,8 @@ export default {
middle.push(item.name);
files.push(item.response.data.id);
});
this.listForm.fileName = middle.join(',');
this.listForm.fileId = files.join(',');
// this.fileListName = middle;
// this.fileIds = files;
this.fileListName = middle;
this.fileIds = files;
},
fileUpload() {
this.fileMadel = true;
@@ -1083,17 +1078,18 @@ export default {
});
this.fileListName = middle;
this.fileIds.push(file.response.data.id);
if(this.listForm.fileName === null || this.listForm.fileName === undefined){
this.listForm.fileName = this.fileListName.join(',')
// this.listForm.fileName = this.fileListName.join(',');
// this.listForm.fileId = this.fileIds.join(',');
if (this.listForm.fileName === null || this.listForm.fileName === undefined) {
this.listForm.fileName = this.fileListName.join(",");
} else {
this.listForm.fileName = this.listForm.fileName + ',' + this.fileListName.join(',');
this.listForm.fileName = this.listForm.fileName + "," + this.fileListName.join(",");
}
if(this.listForm.fileId === null || this.listForm.fileId === undefined){
this.listForm.fileId = this.fileIds.join(',')
}else {
this.listForm.fileId = this.listForm.fileId + ',' + this.fileIds.join(',')
if (this.listForm.fileId === null || this.listForm.fileId === undefined) {
this.listForm.fileId = this.fileIds.join(",");
} else {
this.listForm.fileId = this.listForm.fileId + "," + this.fileIds.join(",");
}
console.log(this.listForm);
this.$message.success("上传成功");
} else {
this.$message.error(res.message);
@@ -1103,6 +1099,7 @@ export default {
// 相关附件 上传之前钩子
beforeUpload(file) {
var filename = file.name;
// this.listForm.fileName = this.listForm.fileName + ',' + file.name
var index1 = filename.lastIndexOf(".");
var index2 = filename.length;
var fileSuffix = filename.substring(index1, index2);
@@ -1196,7 +1193,7 @@ export default {
if (this.standList.length < 1) {
this.$message.warning("请选择需要添加进清单的数据");
} else {
let exits = []
let exits = [];
this.standList.map(item => {
let newStand = false;
for (let itemKey of this.dataList) {
@@ -1209,13 +1206,13 @@ export default {
this.$message.warning("请勿重复添加数据");
} else {
this.dataList.push(item);
exits.push(item.id)
exits.push(item.id);
}
});
if(this.listForm.inforlist === null || this.listForm.inforlist === undefined){
this.listForm.inforlist = exits.join(',')
if (this.listForm.inforlist === null || this.listForm.inforlist === undefined || this.listForm.inforlist === "") {
this.listForm.inforlist = exits.join(",");
} else {
this.listForm.inforlist = this.listForm.inforlist + ',' + exits.join(',')
this.listForm.inforlist = this.listForm.inforlist + "," + exits.join(",");
}
this.standardData = [];
this.standModel = false;
@@ -1236,7 +1233,11 @@ export default {
this.listForm.listName = bringData[0].detailedListName;
this.listForm.descriptionList = bringData[0].remark;
this.listForm.fileId = bringData[0].fileIds;
this.listForm.fileName = bringData[0].fileName;
if(bringData[0].fileName === null ){
this.listForm.fileName = ''
} else {
this.listForm.fileName = bringData[0].fileName;
}
this.ListModel = false;
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
{ id: bringData[0].id, page: this.page, Size: this.pageSize }, {
@@ -1246,6 +1247,15 @@ export default {
res.data = [];
}
this.dataList = res.data;
this.dataList.forEach(item => {
if (item.xcxssrqgj === null){
this.$set(item, "XCXSSRQ", '');
this.$set(item, "ZCCSSRQ", '');
}else{
this.$set(item, "XCXSSRQ", item.xcxssrqgj);
this.$set(item, "ZCCSSRQ", item.zccssrqgj);
}
})
this.listForm.dataList = res.data;
let formId = [];
this.dataList.map(item => {
@@ -1308,11 +1318,11 @@ export default {
},
pageChangeNo(page) {
this.pageNo = page;
this.addList();
this.getStandData();
},
pageSizeChangeNo(pageSize) {
this.pageSizeNo = this.$store.getters.userInfo.configContent;
this.addList();
this.getStandData();
}
},
@@ -1323,10 +1333,13 @@ export default {
_this: this
}, res => {
this.countryOptions = res.data.COUNTRY;
this.standStateOptions = res.data.WBZTCLASS; // 文本状态
this.setMap(this.standStateOptions);
});
this.selectionList();
this.selectSign();
this.getTree();
this.getStandData();
for (let i = 0; i < this.dataList.length; i++) {
this.standMap.set(this.dataList[i].id, this.dataList[i]);
}
@@ -1345,12 +1358,15 @@ export default {
padding: 0 20px 0;
}
}
.fileClass {
cursor: pointer;
}
.fileClass:hover{
.fileClass:hover {
color: #0c91e5;
}
p {
& > a {
cursor: pointer;
@@ -1367,6 +1383,7 @@ export default {
vertical-align: sub;
cursor: pointer;
}
.icon-download {
background-image: url("~assets/images/shangqi/img/download.png");
}
@@ -1375,6 +1392,7 @@ export default {
background-image: url("~assets/images/shangqi/img/download2.png");
}
}
.choiceBtn {
.el-button--primary {
width: 150px;
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+67 -20
View File
@@ -37,18 +37,19 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="listForm.model">
<p> {{ listForm.modelName }}
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList"
:key="item.id"> {{ item.name }}
<i
title="下载"
@click="downloadFile(listForm.model)"
@click="downloadFile(item.id)"
class="icon-download"
v-btn-permission="''"
/>
<i
title="下载带水印"
@click="downloadFileByWater(listForm.model,listForm.modelName)"
@click="downloadFileByWater(item.id, item.name)"
class="icon-download2"
v-btn-permission="''"
/>
@@ -78,8 +79,11 @@
width="180px"
label="标准号">
<template slot-scope="scope">
<p v-if="scope.row.standYear">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
<p v-else>{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -94,21 +98,30 @@
label="发布日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
prop="XCXSSRQ"
sortable
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
prop="ZCCSSRQ"
sortable
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
width="120px"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
@@ -236,6 +249,7 @@ export default {
selectedList: [], //选择清单的选择框
selectList: [], //选择标准的选择框
bringData: [],
fileList:[],
fileIds: "",
commentText: "", //填写会签意见
page: 1,
@@ -267,7 +281,8 @@ export default {
user3: "",
user4: "",
user5: "",
standMap: new Map()
standMap: new Map(),
textStatusMap: {}// 文本状态id与name对应
};
},
methods: {
@@ -312,15 +327,14 @@ export default {
getFormFieldList(item) {
this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item));
console.log(this.listForm.fileName);
this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.dataList = item.dataList;
this.listForm.applyUpdUserId = item.applyUpdUserId;
this.listForm.jlUserId = item.jlUserId;
this.listForm.zrUserId = item.zrUserId;
this.fileIds = item.fileId
this.fileIds = item.fileId;
this.getFileInfo();
});
},
@@ -331,11 +345,15 @@ export default {
}, {
_this: this
}, res => {
console.log(res);
this.$nextTick(() => {
res.data.map(item => {
this.listForm.modelName = item.oldFileName
this.listForm.model = item.id
// 赋值要回显的上传文件内容
this.fileList.push({
name: item.oldFileName,
uid: item.uid,
status: item.status,
id: item.id
});
});
});
}, e => {
@@ -369,8 +387,8 @@ export default {
},
//提交事件
handleSubmit() {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写会签意见')
if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
this.$message.warning("请填写会签意见");
}
this.listForm.commentText = this.commentText;
this.listForm.approvalOpinion = "";
@@ -412,7 +430,24 @@ export default {
pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent;
this.searchData();
},
// 将文本状态的id与name对应
setMap(data) {
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label);
});
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
},
},
computed: {
listNoDataText() {
@@ -421,9 +456,17 @@ export default {
},
watch: {},
mounted() {
//从数据库中查询下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
_this: this
}, res => {
this.countryOptions = res.data.COUNTRY;
this.standStateOptions = res.data.WBZTCLASS; // 文本状态
this.setMap(this.standStateOptions);
});
this.processTable();
this.getData();
}
},
};
</script>
@@ -437,12 +480,15 @@ export default {
padding: 0 20px 0;
}
}
.fileClass {
cursor: pointer;
}
.fileClass:hover{
.fileClass:hover {
color: #0c91e5;
}
p {
& > a {
cursor: pointer;
@@ -459,6 +505,7 @@ export default {
vertical-align: sub;
cursor: pointer;
}
.icon-download {
background-image: url("~assets/images/shangqi/img/download.png");
}
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+155 -17
View File
@@ -100,12 +100,14 @@
</el-table-column>
<el-table-column
prop="code"
fixed="left"
width="180px"
label="标准号">
<template slot-scope="scope">
<p v-if="scope.row.standYear" >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
<p v-else >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -120,21 +122,30 @@
label="发布日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
prop="XCXSSRQ"
sortable
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
prop="ZCCSSRQ"
sortable
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
width="120px"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
@@ -216,6 +227,52 @@
<div class="demo-drawer-content">
<div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
<div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
<div class="left">
<el-form :modal="standardSearch" :inline="true" class="label-input-form"
style="margin-left:10px">
<el-form-item label="类型" class="search-item search-item-last">
<el-select
@change="typeChange"
v-model="standardSearch.standType"
placeholder="请选择"
filterable
>
<el-option
v-for="item in standardTypeOptions"
:value="item.value"
:key="item.value"
:label="item.label"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="标准号/标准名称" class="search-item search-item-last">
<el-input
v-model="standardSearch.standNumber"
placeholder="请输入标准号或标准名称"
></el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
:loading="searching"
type="primary"
class="common-button-primary"
size="small"
v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
@click="getStandData">
查询
</el-button>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
class="common-button-default"
size="small"
v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
@click="clearStandSearch">清空
</el-button>
</el-form-item>
</el-form>
</div>
<el-table
:data="standardData"
tooltip-effect="dark"
@@ -234,38 +291,57 @@
</el-table-column>
<el-table-column
prop="code"
fixed="left"
align="center"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standSortShow }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
align="center"
label="标准名称"
>
</el-table-column>
<el-table-column
prop="issueTime"
align="center"
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="xcxssrq"
prop="XCXSSRQ"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
prop="ZCCSSRQ"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
align="center"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
@@ -315,6 +391,26 @@ export default {
standList: [], //新添加的标准
// 当前流程类型(1待办/2已办)
processType: 1,
searching: false,
standardTypeOptions: [
{
value: "INLAND",
label: "国内标准法规",
item: "INLAND"
},
{
value: "FOREIGN",
label: "海外标准法规",
item: "FOREIGN"
}
],
//查询添加标准相关数据
standardSearch: {
standType: "",
standNumber: "",
pageNo: 1,
pageSizeNo: this.$store.getters.userInfo.configContent
},
loading: false,
userId:this.$store.getters.userInfo.userId,
taskIds: this.$route.query.taskIds,
@@ -363,7 +459,8 @@ export default {
user3: "",
user4: "",
user5: "",
standMap: new Map()
standMap: new Map(),
textStatusMap: {}// 文本状态id与name对应
};
},
methods: {
@@ -383,6 +480,9 @@ export default {
handleTabs(name) {
this.active = name;
},
typeChange(type) {
this.standardSearch.standType = type;
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
@@ -394,15 +494,38 @@ export default {
});
window.open(routeUrl.href, "_blank");
},
//点击添加事件
addList() {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", "", {
clearStandSearch() {
this.standardSearch = {
standType: "",
standNumber: ""
};
this.getStandData();
},
getStandData() {
this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
standType: this.standardSearch.standType,
standNumber: this.standardSearch.standNumber,
page: this.pageNo,
pageSize: this.pageSizeNo
}, {
_this: this
}, res => {
this.standardData = res.data.list;
this.totalNo = res.data.pageCount
this.standardData.forEach(item => {
if(item.attrInfoMap === null){
this.$set(item, "ZCCSSRQ", '');
this.$set(item, "XCXSSRQ", '');
}else{
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
}
})
this.totalNo = res.data.count;
}, e => {
});
},
//点击添加事件
addList() {
this.standModel = true;
},
//添加标准select的改变
@@ -565,6 +688,12 @@ export default {
this.addList()
},
// 将文本状态的id与name对应
setMap(data) {
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label);
});
},
},
computed: {
listNoDataText () {
@@ -572,8 +701,17 @@ export default {
}
},
mounted() {
this.getData()
this.processTable()
//从数据库中查询下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
_this: this
}, res => {
this.countryOptions = res.data.COUNTRY;
this.standStateOptions = res.data.WBZTCLASS; // 文本状态
this.setMap(this.standStateOptions);
});
this.getData();
this.processTable();
this.getStandData();
},
};
</script>
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+46 -7
View File
@@ -74,12 +74,16 @@
fontWeight: 'bold', height: '48px'}">
<el-table-column
prop="code"
fixed="left"
width="180px"
label="标准号">
<template slot-scope="scope">
<p v-if="scope.row.standYear" >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
<p v-else >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standSortShow }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
@@ -94,21 +98,30 @@
label="发布日期">
</el-table-column>
<el-table-column
prop="xcxssrq"
prop="XCXSSRQ"
sortable
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="zccssrq"
prop="ZCCSSRQ"
sortable
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
prop="textStatus"
width="120px"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
@@ -272,7 +285,8 @@
user3: "",
user4: "",
user5: "",
standMap: new Map()
standMap: new Map(),
textStatusMap: {}// 文本状态id与name对应
};
},
methods: {
@@ -296,6 +310,17 @@
choiceShow() {
this.ListModel = true;
},
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
},
//保存事件
handleSave() {
@@ -415,7 +440,13 @@
pageSizeChange(pageSize) {
this.pageSize = this.$store.getters.userInfo.configContent;
this.searchData();
}
},
// 将文本状态的id与name对应
setMap(data) {
data.forEach(item => {
this.$set(this.textStatusMap, item.value, item.label);
});
},
},
computed: {
listNoDataText() {
@@ -423,6 +454,14 @@
}
},
mounted() {
//从数据库中查询下拉框数据
this.$http.get("sys/dictype/getDicTypeListCode", {}, {
_this: this
}, res => {
this.countryOptions = res.data.COUNTRY;
this.standStateOptions = res.data.WBZTCLASS; // 文本状态
this.setMap(this.standStateOptions);
});
this.getData()
this.processTable()
},
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+4 -1
View File
@@ -843,6 +843,7 @@
<el-upload
multiple
drag
:file-list="fileList"
:action="fileUrl"
ref="importfile"
name="file"
@@ -1162,6 +1163,7 @@
},
data () {
return {
fileList: [],
filterText:'',
textStatusMap: {}, // 文本状态id与name对应
standardDrawer: false,
@@ -1967,10 +1969,11 @@
importFileSuccess (response, file,fileList) {
// 上传成功后判断是否是两条数据是的话替换掉旧数据
if (fileList.length > 1) {
fileList.splice(0, 1)
this.fileList = fileList.splice(0, 1)
}
if (response.ok) {
this.fileMadel = false
this.fileList = []
if(this.fileType === 'fbgbjbd'){
this.form.fbgbjbd = response.data.id;
this.form.fbgbjbdName = response.data.name;
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+4 -1
View File
@@ -876,8 +876,11 @@
}
},
getRule(){
if (this.formTongGuo.approvalOpinion !== '1') {
if (this.formTongGuo.approvalOpinion === '0') {
this.rules.commentText.required = false
this.$refs.formTongGuo.clearValidate('commentText')
} else {
this.rules.commentText.required = true
}
},
popoverHide (checkedIds, checkedData) {
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+16 -15
View File
@@ -93,20 +93,19 @@
<el-table-column
prop="distributePerson"
label="分发责任人">
<!-- <template slot-scope="scope">-->
<!-- <el-input v-model="scope.row.distributePerson" v-show="false"></el-input>-->
<!-- <el-input-->
<!-- v-model="dataList.distributePerson"-->
<!-- placeholder="请选择分发责任人"-->
<!-- @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"-->
<!-- readonly-->
<!-- v-if="dataList[scope.$index].distributePerson==null"-->
<!-- />-->
<!-- </template>-->
<!-- <template slot-scope="scope">-->
<!-- <el-input-->
<!-- v-model="scope.row.distributePerson"-->
<!-- placeholder="请选择分发负责人"-->
<!-- readonly-->
<!-- @click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"-->
<!-- v-if="!scope.row.distributePerson"></el-input>-->
<!-- </template>-->
<template slot-scope="scope,text" v-if="showColumn">
<div>
<div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">
{{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson }}
{{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson
}}
</div>
</div>
</template>
@@ -409,8 +408,8 @@ export default {
label: "name"
},
roleForm: {
startUserName: this.$store.getters.userInfo.userName,
startUser: this.$store.getters.userInfo.id,
prcCreateUserName: this.$store.getters.userInfo.userName,
prcCreateUser: this.$store.getters.userInfo.userId,
qualityEngineer: "",
certifiedEngineer: "",
qualityEngineerName: "",
@@ -521,10 +520,11 @@ export default {
this.listForm.certifiedEngineer = data[0].id;
this.listForm.certifiedEngineerName = data[0].name;
} else if (this.type === "distributePerson") {
// this.dataList.distributePerson = data[0].id;
// this.dataList.distributePersonName = data[0].name;
this.dataList.distributePersonId = data[0].id;
this.dataList.distributePerson = data[0].name;
this.listForm.dataList[this.dsadadadsada].distributePersonId = data[0].id;
this.listForm.dataList[this.dsadadadsada].distributePerson = data[0].name;
console.log(this.dataList)
this.showColumn = false;
this.$nextTick(() => {
this.showColumn = true;
@@ -652,6 +652,7 @@ export default {
this.$message.warning("请选择分发责任人");
} else {
var json = Object.assign(this.listForm, this.roleForm);
console.log(json);
this.$refs["listForm"].validate((valid) => {
if (valid) {
this.$refs["roleForm"].validate((valid) => {
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+26 -23
View File
@@ -328,33 +328,36 @@ export default {
//驳回事件
beforeBack () {
this.listForm.passFlag = '1'
this.handleSubmit()
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.passFlag = '1'
this.handleSubmit()
}
},
//提交事件
handleSubmit() {
this.listForm.prcCreateUser = this.$store.getters.userInfo.userId;
this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId;
this.listForm.prcCreateUserName = this.$store.getters.userInfo.account;
this.listForm.zrUserId = this.$store.getters.userInfo.userId ;
this.listForm.commentText = this.commentText;
this.listForm.standId = this.listForm.standId;
this.listForm.breakdownList = this.listForm.breakdownList
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
}, e => {
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('请填写审批意见')
}else{
this.listForm.commentText = this.commentText
const json = JSON.stringify(this.listForm);
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
userId: this.userId,
json: json,
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message)
this.$router.push('/processCenter')
}
}, e => {
});
}
});
},
//标准表格选择框改变
selectStandChange(data) {
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+7 -1
View File
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
prop="workPeople"
align="center"
width="200"
label="责任人">
</el-table-column>
</el-table>
</div>
<div>
@@ -387,6 +392,7 @@ export default {
this.listForm.bzFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
console.log(json)
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+7 -1
View File
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
prop="workPeople"
align="center"
width="200"
label="责任人">
</el-table-column>
</el-table>
</div>
<div>
@@ -335,6 +340,7 @@ export default {
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg)
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+6 -1
View File
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
prop="workPeople"
align="center"
width="200"
label="责任人">
</el-table-column>
</el-table>
</div>
<div>
src/pages/processCenter/pages/creatProcess/xmpg2/step2.vue
+41 -33
View File
@@ -312,42 +312,50 @@ export default {
},
//驳回事件
beforeBack() {
this.listForm.BZFlag = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('审批意见不能为空')
}else{
this.listForm.BZFlag = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
}
},
//提交事件
handleSubmit() {
this.listForm.BZFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
}
if(this.commentText === null || this.commentText === undefined || this.commentText === ''){
this.$message.warning('审批意见不能为空')
}else{
this.listForm.BZFlag = "1";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
}, e => {
});
}
}
},
computed: {
listNoDataText() {
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+7 -1
View File
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
prop="workPeople"
align="center"
width="200"
label="责任人">
</el-table-column>
</el-table>
</div>
<div>
@@ -335,6 +340,7 @@
taskIds: this.taskIds,
pId: this.pId
}).then(res => {
console.log(res.mesg)
if (res) {
const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm);
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+6 -1
View File
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
prop="workPeople"
align="center"
width="200"
label="责任人">
</el-table-column>
</el-table>
</div>
<div>
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+6 -1
View File
@@ -46,7 +46,6 @@
row-key="standId"
height="70%"
border
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
>
@@ -175,6 +174,12 @@
</el-table-column>
</el-table-column>
</el-table-column>
<el-table-column
prop="workPeople"
align="center"
width="200"
label="责任人">
</el-table-column>
</el-table>
</div>
<div>
src/pages/processCenter/pages/processDetail/index.vue
+10 -2
View File
@@ -205,10 +205,18 @@ export default {
this.toProcessDetail('bzqdfbStep4',row)
}else if (prcType === '5'){
//标准项目合规评估 标准维度
this.toProcessDetail('xmpgStep7',row)
if(row.taskInfo === '标准法规部部长审批'){
this.toProcessDetail('xmpgStep7',row)
}else{
this.toProcessDetail('xmpgStep2',row)
}
}else if(prcType === '6'){
//标准项目合规评估 项目维度
this.toProcessDetail('xmpg2Step12',row)
if(row.taskInfo === '标准法规部领导审核'){
this.toProcessDetail('xmpg2Step12',row)
}else{
this.toProcessDetail('xmpg2Step2',row)
}
}
} else {
this.$message.warning('当前流程未全部办理完成，无法查看')
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+35 -27
View File
@@ -298,9 +298,6 @@
align="center"
width="210px"
label="标准实施日期">
<template slot-scope="scope">
<span>{{ scope.row.putTime ? $moment(scope.row.putTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -310,7 +307,9 @@
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
</span>
<span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -320,7 +319,9 @@
width="210px"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
</span>
<span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -873,7 +874,6 @@ export default {
}
},
created() {
this.selectLawsStands()
dicTypeData().then(res => {
// 责任部门数据字典
this.zrbmOptions = res.data.ZRBMCLASS
@@ -889,6 +889,7 @@ export default {
methods: {
// 高级检索
selectMoreBtn () {
this.selectLawsStands()
this.showSelectBox = !this.showSelectBox
this.showTableFlag = false
if (!this.showSelectBox) {
@@ -985,6 +986,7 @@ export default {
},
// 点击显示隐藏数据列表 按钮事件
isShowTable () {
this.selectLawsStands()
this.showTableFlag = !this.showTableFlag
this.selectedAccInfoSearchList = [] // 清空
},
@@ -1171,7 +1173,6 @@ export default {
return items.id == item.id
})
if(addList > -1){
this.$message.warning('请勿添加重复数据')
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
@@ -1182,6 +1183,7 @@ export default {
this.$refs.searchTable.clearSelection()
}
})
this.$message.warning('请勿添加重复数据')
} else {
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
}
@@ -1292,25 +1294,31 @@ export default {
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist1.push(this.sarAccessInfoList[i].putTime)
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
if (this.sarAccessInfoList[i].putTime === null) {
rowlist1.push(this.sarAccessInfoList[i].putTime = '')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '')
}else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
if (this.sarAccessInfoList[i].zccssrqgj === null) {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '')
}else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
}
}
rowlist = rowlist.join(',')
rowlist1 = rowlist1.join(',')
rowlist2 = rowlist2.join(',')
rowlist3 = rowlist3.join(',')
let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
sarAccessEO.inforlist = JSON.stringify(rowlist)
sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
sarAccessEO.inforlist = rowlist
sarAccessEO.inforlist1 = rowlist1
sarAccessEO.inforlist2 = rowlist2
sarAccessEO.inforlist3 = rowlist3
sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
// sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
// 判断是否有附件
@@ -1391,8 +1399,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1433,8 +1441,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1469,8 +1477,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1571,7 +1579,7 @@ export default {
for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id)
}
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
window.open(exportURL)
this.$message.success('导出信息成功')
}
@@ -1984,7 +1992,7 @@ export default {
}, {
_this: this
}, res => {
this.sarAccessInfoList = res.data
this.sarAccessInfoList = res.data.records
this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -2003,8 +2011,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+2 -26
View File
@@ -223,24 +223,12 @@
align="center"
width="180px"
label="适用车型">
<template slot-scope="scope">
<span v-if="scope.row.typeApplicable !== null && scope.row.typeApplicable.indexOf(',') > 0">
{{ scope.row.typeApplicable }}
</span>
<span v-else>{{ typeApplicableMap[scope.row.typeApplicable] }}</span>
</template>
</el-table-column>
<el-table-column
prop="nylx"
align="center"
width="180px"
label="能源类型">
<template slot-scope="scope">
<span v-if="scope.row.nylx !== null && scope.row.nylx.indexOf(',') > 0">
{{ scope.row.nylx }}
</span>
<span v-else>{{ nylxMap[scope.row.nylx] }}</span>
</template>
</el-table-column>
<el-table-column
prop="putTime"
@@ -282,12 +270,6 @@
width="210px"
align="center"
label="责任部门">
<template slot-scope="scope">
<span v-if="scope.row.zrbm !== null && scope.row.zrbm.indexOf(',') > 0">
{{ scope.row.zrbm }}
</span>
<span v-else>{{ zrbmMap[scope.row.zrbm] }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -295,12 +277,6 @@
width="180px"
align="center"
label="适用产品线">
<template slot-scope="scope">
<span v-if="scope.row.sycpx !== null && scope.row.sycpx.indexOf(',') > 0">
{{ scope.row.sycpx }}
</span>
<span>{{ sycpxMap[scope.row.sycpx] }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -490,7 +466,8 @@ export default {
}, {
_this: this
}, res => {
this.standinfoList = res.data;
this.standinfoList = res.data.records;
this.standardFormTotal = res.data.total
this.standinfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -498,7 +475,6 @@ export default {
item.standNumber = item.standSortShow + ' ' + item.standNumber + '-' + item.standYear
}
})
this.total = res.data.total;
}, e => {
});
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue
+38 -28
View File
@@ -290,9 +290,11 @@
width="210px"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
</template>
<template slot-scope="scope">
<span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
</span>
<span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>
</template>
</el-table-column>
<el-table-column
prop="xcxssrqgj"
@@ -300,9 +302,11 @@
align="center"
width="210px"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
</template>
<template slot-scope="scope">
<span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
</span>
<span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -851,7 +855,6 @@ export default {
}
},
created() {
this.selectLawsStands()
dicTypeData().then(res => {
// 责任部门数据字典
this.zrbmOptions = res.data.ZRBMCLASS
@@ -944,11 +947,13 @@ export default {
return true
},
moreSearch () {
this.selectLawsStands()
this.moreSearchShow = !this.moreSearchShow
this.moreSearchBtn = !this.moreSearchBtn
},
// 点击显示隐藏数据列表 按钮事件
isShowTable () {
this.selectLawsStands()
this.showTableFlag = !this.showTableFlag
this.selectedAccInfoSearchList = [] // 清空
},
@@ -1137,7 +1142,6 @@ export default {
return items.id == item.id
})
if(addList > -1){
this.$message.warning('请勿添加重复数据')
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
@@ -1148,6 +1152,7 @@ export default {
this.$refs.searchTable.clearSelection()
}
})
this.$message.warning('请勿添加重复数据')
this.selectedAccInfoSearchList = []
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
@@ -1258,25 +1263,31 @@ export default {
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj === null || this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist1.push(this.sarAccessInfoList[i].putTime)
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
if (this.sarAccessInfoList[i].putTime === null) {
rowlist1.push(this.sarAccessInfoList[i].putTime = '')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '')
}else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
if (this.sarAccessInfoList[i].zccssrqgj === null) {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '')
}else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
}
}
rowlist = rowlist.join(',')
rowlist1 = rowlist1.join(',')
rowlist2 = rowlist2.join(',')
rowlist3 = rowlist3.join(',')
let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
sarAccessEO.inforlist = JSON.stringify(rowlist)
sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
sarAccessEO.inforlist = rowlist
sarAccessEO.inforlist1 = rowlist1
sarAccessEO.inforlist2 = rowlist2
sarAccessEO.inforlist3 = rowlist3
// sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
// sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
// 判断是否有附件
@@ -1315,7 +1326,6 @@ export default {
loading: 'loadData'
}, res => {
if (res.ok) {
this.$message.success('编辑成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations'
@@ -1357,8 +1367,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1400,8 +1410,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1436,8 +1446,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1538,7 +1548,7 @@ export default {
for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id)
}
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
window.open(exportURL)
// window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
this.$message.success('导出信息成功')
@@ -1953,7 +1963,7 @@ export default {
}, {
_this: this
}, res => {
this.sarAccessInfoList = res.data
this.sarAccessInfoList = res.data.records
this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -1972,8 +1982,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+34 -24
View File
@@ -291,7 +291,9 @@
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span v-if="scope.row.zccssrqgj === null || scope.row.zccssrqgj === ''">
</span>
<span v-else>{{ scope.row.zccssrqgj.slice(0,10) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -301,7 +303,9 @@
width="210px"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
<span v-if="scope.row.xcxssrqgj === null || scope.row.xcxssrqgj === ''">
</span>
<span v-else>{{ scope.row.xcxssrqgj.slice(0,10) }}</span>
</template>
</el-table-column>
<el-table-column
@@ -851,7 +855,6 @@ export default {
}
},
created() {
this.selectLawsStands()
dicTypeData().then(res => {
// 责任部门数据字典
this.zrbmOptions = res.data.ZRBMCLASS
@@ -944,11 +947,13 @@ export default {
return true
},
moreSearch () {
this.selectLawsStands()
this.moreSearchShow = !this.moreSearchShow
this.moreSearchBtn = !this.moreSearchBtn
},
// 点击显示隐藏数据列表 按钮事件
isShowTable () {
this.selectLawsStands()
this.showTableFlag = !this.showTableFlag
this.selectedAccInfoSearchList = [] // 清空
},
@@ -1136,7 +1141,6 @@ export default {
return items.id == item.id
})
if(addList > -1){
this.$message.warning('请勿添加重复数据')
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
@@ -1147,6 +1151,7 @@ export default {
this.$refs.searchTable.clearSelection()
}
})
this.$message.warning('请勿添加重复数据')
this.selectedAccInfoSearchList = []
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
@@ -1257,25 +1262,31 @@ export default {
let rowlist3 = []
for (let i = 0; i < this.sarAccessInfoList.length; i++) {
rowlist.push(this.sarAccessInfoList[i].id)
if (this.sarAccessInfoList[i].putTime === null || this.sarAccessInfoList[i].zccssrqgj ===null || this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist1.push(this.sarAccessInfoList[i].putTime)
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj)
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj)
if (this.sarAccessInfoList[i].putTime === null) {
rowlist1.push(this.sarAccessInfoList[i].putTime = '')
}else {
rowlist1.push(this.sarAccessInfoList[i].putTime.toString())
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
}
if (this.sarAccessInfoList[i].xcxssrqgj === null) {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj = '')
}else {
rowlist3.push(this.sarAccessInfoList[i].xcxssrqgj.toString())
}
if (this.sarAccessInfoList[i].zccssrqgj === null) {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj = '')
}else {
rowlist2.push(this.sarAccessInfoList[i].zccssrqgj.toString())
}
}
rowlist = rowlist.join(',')
rowlist1 = rowlist1.join(',')
rowlist2 = rowlist2.join(',')
rowlist3 = rowlist3.join(',')
let sarAccessEO = JSON.parse(JSON.stringify(this.sarAccessEO))
sarAccessEO.inforlist = JSON.stringify(rowlist)
sarAccessEO.inforlist1 = JSON.stringify(rowlist1)
sarAccessEO.inforlist2 = JSON.stringify(rowlist2)
sarAccessEO.inforlist3 = JSON.stringify(rowlist3)
sarAccessEO.inforlist = rowlist
sarAccessEO.inforlist1 = rowlist1
sarAccessEO.inforlist2 = rowlist2
sarAccessEO.inforlist3 = rowlist3
// sarAccessEO.countryArea = sarAccessEO.countryArea.join(',')
// sarAccessEO.applicationScope = sarAccessEO.applicationScope.join(',')
// 判断是否有附件
@@ -1314,7 +1325,6 @@ export default {
loading: 'loadData'
}, res => {
if (res.ok) {
this.$message.success('编辑成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations'
@@ -1356,8 +1366,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1399,8 +1409,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1435,8 +1445,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
@@ -1537,7 +1547,7 @@ export default {
for (var accessInfo in exportList) {
accIdAndrestype.push(exportList[accessInfo].id)
}
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&id=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
const exportURL = interfaceUrl + 'sarLawsAttrDetailedList/sar-laws-attr-detailed-list/ExportLawsById?'+ '&exportType=apart'+ '&ids=' + accIdAndrestype.join(',')+ '&exportName=' + this.exportName
window.open(exportURL)
// window.location.href = '/api/lawss/sarSarAccessInfo/exportSarSarAccessInfo?idAndSartypeList=' + accIdAndrestype.join(',') + '&exportType=apart' + '&exportName=' + exportNames
this.$message.success('导出信息成功')
@@ -1954,7 +1964,7 @@ export default {
}, {
_this: this
}, res => {
this.sarAccessInfoList = res.data
this.sarAccessInfoList = res.data.records
this.sarAccessInfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + ' ' + item.standNumber
@@ -1975,8 +1985,8 @@ export default {
this.$set(item, 'kccvppsbm', '')
this.$set(item, 'kccvppscn', '')
}else {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQ)
this.$set(item, 'sycpx', item.attrInfoMap.SYCPX)
this.$set(item, 'typeApplicable', item.attrInfoMap.CLLX)
this.$set(item, 'nylx', item.attrInfoMap.NYLX)
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1 -1
View File
@@ -4,7 +4,7 @@
<div class="tree-content" :class="{ 'tree-closed': sideClose }">
<div class="tree">
<el-input
placeholder="输入国内标准法规"
placeholder="输入树状图体系"
v-model="filterText">
</el-input>
<el-tree
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+1 -1
View File
@@ -4,7 +4,7 @@
<div class="tree-content" :class="{ 'tree-closed': sideClose }">
<div class="tree">
<el-input
placeholder="输入海外标准法规"
placeholder="输入树状图体系"
v-model="filterText">
</el-input>
<el-tree
src/sysConfig/index.js
+1 -1
View File
@@ -6,7 +6,7 @@
// 服务器地址
// const devIp = '10.96.10.171'
// const devInterfacePORT = '9999'
const devIp = '192.168.1.145'
const devIp = '10.96.170.156'
const devInterfacePORT = '9999'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'