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:
zhaokaiyao@91isoft.com
2021-08-17 16:16:16 +08:00
parent 9b9b60e449 2cc9004f7a
commit 3a303eaa45
12 changed files with 334 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue
+38 -43
View File
@@ -1064,6 +1064,7 @@ export default {
//保存事件 //保存事件
handleSave() { handleSave() {
this.saveLoading = true; this.saveLoading = true;
this.listForm.fileName = this.fileInfoList
let _formData = new FormData(); let _formData = new FormData();
_formData.append("id", this.bpnId || ""); _formData.append("id", this.bpnId || "");
_formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUser", this.$store.getters.userInfo.userId);
@@ -1089,6 +1090,7 @@ export default {
this.$message.warning("标准不能为空"); this.$message.warning("标准不能为空");
} else { } else {
this.listForm.commentText = this.commentText this.listForm.commentText = this.commentText
this.listForm.fileName = this.fileInfoList
var json = Object.assign(this.listForm, this.roleForm); var json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => { this.$refs["qdfbForm"].validate((valid) => {
if (valid) { if (valid) {
@@ -1126,14 +1128,11 @@ export default {
}, },
// 删除上传的文件 // 删除上传的文件
delFileInfo(file, fileList) { delFileInfo(file, fileList) {
let middle = []; this.fileInfoList.forEach((item, index) => {
let files = []; if (item.name === file.name || item.id === file.id ) {
fileList.forEach(item => { this.fileInfoList.splice(index,1)
middle.push(item.name); }
files.push(item.response.data.id); })
});
this.fileListName = middle;
this.fileIds = files;
}, },
fileUpload() { fileUpload() {
this.fileMadel = true; this.fileMadel = true;
@@ -1141,24 +1140,7 @@ export default {
// 上传文件成功回调 // 上传文件成功回调
uploadBackSuccess(res, file, fileList) { uploadBackSuccess(res, file, fileList) {
if (res.ok) { if (res.ok) {
let middle = []; this.fileInfoList.push(res.data)
fileList.forEach(item => {
middle.push(item.name);
});
this.fileListName = middle;
this.fileIds.push(file.response.data.id);
// 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("上传成功"); this.$message.success("上传成功");
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
@@ -1290,26 +1272,39 @@ export default {
//选择清单确定事件 //选择清单确定事件
OkDrawer() { OkDrawer() {
if (this.selectedList.length === 1) { if (this.selectedList.length === 1) {
let deposit = new Map(); this.listForm.standId = this.selectedList[0].id;
this.sarAccessListDatas.forEach(item => { this.listForm.listName = this.selectedList[0].detailedListName;
deposit.set(item.id, item); this.listForm.descriptionList = this.selectedList[0].remark;
}); // 将查询出的文件名字和id组合成数组
let bringData = []; if(this.selectedList[0].fileName !== null) {
for (let i = 0; i < this.selectedList.length; i++) { let textName = this.selectedList[0].fileName.split(',').map(item => {
bringData.push(deposit.get(this.selectedList[i])); return {
name: item
}
})
let textId = this.selectedList[0].fileIds.split(',').map(item => {
return {
id: item
}
})
textName.forEach(item => {
this.$set(item, 'id', '')
})
for (let i = 0; i< textName.length; i++) {
textName[i].id = textId[i].id
}
this.fileInfoList = textName
} else {
this.fileInfoList = []
} }
this.listForm.standId = bringData[0].id;
this.listForm.listName = bringData[0].detailedListName;
this.listForm.descriptionList = bringData[0].remark;
this.listForm.fileId = bringData[0].fileIds;
this.listForm.fileName = bringData[0].fileName;
this.ListModel = false; this.ListModel = false;
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
{ id: bringData[0].id, page: this.page, Size: this.pageSize }, { { id: this.selectedList[0].id, page: this.page, Size: this.pageSize }, {
_this: this _this: this
}, res => { }, res => {
if (res.data.records == null) { if (res.data === null) {
res.data.records = []; this.dataList = [];
} }
this.dataList = res.data.records; this.dataList = res.data.records;
this.dataList.forEach(item => { this.dataList.forEach(item => {
@@ -1321,7 +1316,7 @@ export default {
this.$set(item, "ZCCSSRQ", item.zccssrqgj); this.$set(item, "ZCCSSRQ", item.zccssrqgj);
} }
}) })
this.listForm.dataList = res.data; this.listForm.dataList = res.data.records;
let formId = []; let formId = [];
this.dataList.map(item => { this.dataList.map(item => {
formId.push(item.id); formId.push(item.id);
@@ -1339,7 +1334,7 @@ export default {
selectListChange(data) { selectListChange(data) {
this.selectedList = []; this.selectedList = [];
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
this.selectedList.push(data[i].id); this.selectedList.push(data[0]);
} }
}, },
//标准表格选择框改变 //标准表格选择框改变
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue
+54 -26
View File
@@ -37,26 +37,21 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0"> <el-upload
<p v-for="item in fileList" :action="uploadFileListPath"
:key="item.id"> {{ item.name }} show-file-list
<i :file-list="fileInfoList"
title="下载" name="file"
@click="downloadFile(item.id)" accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
class="icon-download" :on-remove="delFileInfo"
v-btn-permission="''" :on-success="uploadBackSuccess"
/> :before-upload="beforeUpload"
<i :on-preview="handleOnPreview"
title="下载带水印" >
@click="downloadFileByWater(item.id, item.name)" <el-button class="common-button-default" size="mini">
class="icon-download2" 点击上传
v-btn-permission="''" </el-button>
/> </el-upload>
</p>
</div>
<div v-else>
暂无数据
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -479,7 +474,7 @@ export default {
this.dataList = mes.form.dataList; this.dataList = mes.form.dataList;
this.commentText = mes.commentText; this.commentText = mes.commentText;
this.prcNum = mes.prcNum this.prcNum = mes.prcNum
this.fileIds = mes.form.fileId; this.fileInfoList = mes.form.fileName;
this.getFileInfo(); this.getFileInfo();
this.processTable(); this.processTable();
}); });
@@ -652,13 +647,16 @@ export default {
}, },
// 删除上传的文件 // 删除上传的文件
delFileInfo (file, fileList) { delFileInfo (file, fileList) {
this.fileInfoList = fileList this.fileInfoList.forEach((item, index) => {
if (item.name === file.name || item.id === file.id ) {
this.fileInfoList.splice(index,1)
}
})
}, },
// 上传文件成功回调 // 上传文件成功回调
uploadBackSuccess (res, file, fileList) { uploadBackSuccess (res, file, fileList) {
if (res.ok) { if (res.ok) {
this.fileInfoList = fileList this.fileInfoList.push(res.data)
this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
this.$message.success('上传成功') this.$message.success('上传成功')
} else { } else {
this.$message.error(res.message) this.$message.error(res.message)
@@ -666,8 +664,38 @@ export default {
} }
}, },
//上传之前的钩子 //上传之前的钩子
beforeUpload () { //上传之前的钩子
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);
//把后缀转大写
if (fileSuffix !== undefined && fileSuffix !== null) {
fileSuffix = fileSuffix.toUpperCase();
}
// 判断上传文件格式
if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
|| fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
|| fileSuffix === ".PNG" || fileSuffix === ".JPG" || fileSuffix === ".JPEG") {
return true;
} else {
this.$message.error("文件" + file.name + "格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件");
return false;
}
// 判断文件上传大小
if (file.size / 1024 / 1024 > 300) {
this.$message.warning("文件" + file.name + "大小不能超过300M");
return false;
}
return true;
},
handleOnPreview(file) {
let attId = file.id
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
}, },
//保存事件 //保存事件
handleSave() { handleSave() {
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+99 -104
View File
@@ -50,23 +50,20 @@
</el-form-item> </el-form-item>
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div> <div>
<p> <el-upload
{{ listForm.fileName }} :action="uploadFileListPath"
<el-upload show-file-list
:action="uploadFileListPath" :file-list="fileInfoList"
show-file-list name="file"
:file-list="fileInfoList" accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
name="file" :on-remove="delFileInfo"
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png" :on-success="uploadBackSuccess"
:on-remove="delFileInfo" :before-upload="beforeUpload"
:on-success="uploadBackSuccess" >
:before-upload="beforeUpload" <el-button class="common-button-default" size="mini">
> 点击上传
<el-button class="common-button-default" size="mini"> </el-button>
点击上传 </el-upload>
</el-button>
</el-upload>
</p>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled"> <el-form-item label="会签" prop="sign" class="add-form-item form-item-disabled">
@@ -108,7 +105,8 @@
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" <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> }}-{{ 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> {{ scope.row.standNumber }}</a>
@@ -211,20 +209,20 @@
</el-form-item> </el-form-item>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
<!-- <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"--> <!-- <el-timeline-item timestamp="选择会签责任人,填写意见" placement="top"-->
<!-- :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">--> <!-- :color="roleForm.dockUser ? '#66b1ff' : ''" v-if="signFlag === '2'">-->
<!-- <el-card>--> <!-- <el-card>-->
<!-- <el-form-item prop="dockUserName2" style="margin-bottom: 0">--> <!-- <el-form-item prop="dockUserName2" style="margin-bottom: 0">-->
<!-- <h4>会签人</h4>--> <!-- <h4>会签人</h4>-->
<!-- <div style="margin-top: 10px;width: 300px;">--> <!-- <div style="margin-top: 10px;width: 300px;">-->
<!-- <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>--> <!-- <el-input v-model="roleForm.dockUser" style="display: none;"></el-input>-->
<!-- <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"--> <!-- <el-input v-model="roleForm.dockUserName" placeholder="选择会签责任人"-->
<!-- @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">--> <!-- @click.native="choiceZRR('dockUser', '选择责任人', roleForm.dockUser)">-->
<!-- </el-input>--> <!-- </el-input>-->
<!-- </div>--> <!-- </div>-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!-- </el-card>--> <!-- </el-card>-->
<!-- </el-timeline-item>--> <!-- </el-timeline-item>-->
<el-timeline-item timestamp="根据会签意见修订" placement="top" <el-timeline-item timestamp="根据会签意见修订" placement="top"
:color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'"> :color="roleForm.ministerUser ? '#66b1ff' : ''" v-if="signFlag === '1'">
<el-card> <el-card>
@@ -324,7 +322,8 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click.stop="showTable(scope.row)">{{ <a class="table-jump" @click.stop="showTable(scope.row)">{{
scope.row.detailedListName }}</a> scope.row.detailedListName
}}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -343,7 +342,8 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
scope.row.detailedListVision
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -391,7 +391,8 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click.stop="showTable(scope.row)">{{ <a class="table-jump" @click.stop="showTable(scope.row)">{{
scope.row.detailedListName }}</a> scope.row.detailedListName
}}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -410,7 +411,8 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
scope.row.detailedListVision
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -419,9 +421,9 @@
label="更新时间" label="更新时间"
sortable sortable
align="center"> align="center">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="updatePeople" prop="updatePeople"
@@ -458,7 +460,8 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click.stop="showTable(scope.row)">{{ <a class="table-jump" @click.stop="showTable(scope.row)">{{
scope.row.detailedListName }}</a> scope.row.detailedListName
}}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -477,7 +480,8 @@
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span <span
v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{
scope.row.detailedListVision
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
@@ -593,7 +597,8 @@
scope.row.standNumber scope.row.standNumber
}}-{{ scope.row.standYear }}</a> }}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ <a v-else @click="handlePreview(scope.row)" class="table-jump">{{
scope.row.standSortShow }} scope.row.standSortShow
}}
{{ scope.row.standNumber }}</a> {{ scope.row.standNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
@@ -705,7 +710,7 @@
import ProcessHeader from "../../components/ProcessHeader"; import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter"; import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle"; import ProcessTitle from "../../components/ProcessTitle";
import { saveTaskFirst } from "api/process"; import {saveTaskFirst} from "api/process";
import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis"; import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis";
export default { export default {
@@ -755,21 +760,21 @@ export default {
}, },
formRules: { formRules: {
listType: [ listType: [
{ required: true, message: "请选择清单类型", trigger: "change" } {required: true, message: "请选择清单类型", trigger: "change"}
], ],
listName: [ listName: [
{ required: true, message: "请填写清单名称", trigger: "change" } {required: true, message: "请填写清单名称", trigger: "change"}
] ]
}, },
roleFormRules: { roleFormRules: {
dockUserName: [ dockUserName: [
{ required: true, message: "请选择会签责任人", trigger: "change" } {required: true, message: "请选择会签责任人", trigger: "change"}
], ],
ministerUserName: [ ministerUserName: [
{ required: true, message: "请选择修订责任人", trigger: "change" } {required: true, message: "请选择修订责任人", trigger: "change"}
], ],
directorUserName: [ directorUserName: [
{ required: true, message: "请选择审批责任人", trigger: "change" } {required: true, message: "请选择审批责任人", trigger: "change"}
] ]
}, },
dataList: [],//清单里的标准数据 dataList: [],//清单里的标准数据
@@ -913,14 +918,14 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.sarAccessListDatas = res.data.records; this.sarAccessListDatas = res.data.records;
this.sarAccessListDatas.forEach(item =>{ this.sarAccessListDatas.forEach(item => {
// 适用车型转换 // 适用车型转换
if (item.carType !== null) { if (item.carType !== null) {
let k = (item.carType || "").split(',') let k = (item.carType || "").split(',')
for (let i in this.energyKindOptions) { for (let i in this.energyKindOptions) {
for (let m = 0; m< k.length; m++) { for (let m = 0; m < k.length; m++) {
if (this.energyKindOptions[i].value === k[m]) { if (this.energyKindOptions[i].value === k[m]) {
k[m] = this.energyKindOptions[i].label k[m] = this.energyKindOptions[i].label
} }
item.carType = k.join(',') item.carType = k.join(',')
} }
@@ -984,12 +989,12 @@ export default {
}, res => { }, res => {
this.standardData = res.data.list; this.standardData = res.data.list;
this.standardData.forEach(item => { this.standardData.forEach(item => {
if(item.attrInfoMap === null){ if (item.attrInfoMap === null) {
this.$set(item, "ZCCSSRQ", ''); this.$set(item, "ZCCSSRQ", '');
this.$set(item, "XCXSSRQ", ''); this.$set(item, "XCXSSRQ", '');
}else{ } else {
this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ); this.$set(item, "ZCCSSRQ", item.attrInfoMap.ZCCSSRQ);
this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ); this.$set(item, "XCXSSRQ", item.attrInfoMap.XCXSSRQ);
} }
}) })
this.totalNo = res.data.count; this.totalNo = res.data.count;
@@ -1036,6 +1041,7 @@ export default {
//保存事件 //保存事件
handleSave() { handleSave() {
this.saveLoading = true; this.saveLoading = true;
this.listForm.fileName = this.fileInfoList
let _formData = new FormData(); let _formData = new FormData();
_formData.append("id", this.bpnId || ""); _formData.append("id", this.bpnId || "");
_formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUser", this.$store.getters.userInfo.userId);
@@ -1061,13 +1067,14 @@ export default {
this.$message.warning("标准不能为空"); this.$message.warning("标准不能为空");
} else { } else {
this.listForm.commentText = this.commentText this.listForm.commentText = this.commentText
this.listForm.fileName = this.fileInfoList
var json = Object.assign(this.listForm, this.roleForm); var json = Object.assign(this.listForm, this.roleForm);
this.$refs["qdfbForm"].validate((valid) => { this.$refs["qdfbForm"].validate((valid) => {
if (valid) { if (valid) {
this.$refs["Form"].validate((valid) => { this.$refs["Form"].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
this.$http.get("lawss/activiti/startProcess", { type: "4" }, { this.$http.get("lawss/activiti/startProcess", {type: "4"}, {
_this: this _this: this
}, res => { }, res => {
if (res.ok) { if (res.ok) {
@@ -1098,14 +1105,11 @@ export default {
}, },
// 删除上传的文件 // 删除上传的文件
delFileInfo(file, fileList) { delFileInfo(file, fileList) {
let middle = []; this.fileInfoList.forEach((item, index) => {
let files = []; if (item.name === file.name || item.id === file.id ) {
fileList.forEach(item => { this.fileInfoList.splice(index,1)
middle.push(item.name); }
files.push(item.response.data.id); })
});
this.fileListName = middle;
this.fileIds = files;
}, },
fileUpload() { fileUpload() {
this.fileMadel = true; this.fileMadel = true;
@@ -1113,24 +1117,7 @@ export default {
// 上传文件成功回调 // 上传文件成功回调
uploadBackSuccess(res, file, fileList) { uploadBackSuccess(res, file, fileList) {
if (res.ok) { if (res.ok) {
let middle = []; this.fileInfoList.push(res.data)
fileList.forEach(item => {
middle.push(item.name);
});
this.fileListName = middle;
this.fileIds.push(file.response.data.id);
// 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.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.fileName === '') {
this.listForm.fileId = this.fileIds.join(",");
} else {
this.listForm.fileId = this.listForm.fileId + "," + this.fileIds.join(",");
}
this.$message.success("上传成功"); this.$message.success("上传成功");
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
@@ -1262,30 +1249,39 @@ export default {
//选择清单确定事件 //选择清单确定事件
OkDrawer() { OkDrawer() {
if (this.selectedList.length === 1) { if (this.selectedList.length === 1) {
let deposit = new Map(); this.listForm.standId = this.selectedList[0].id;
this.sarAccessListDatas.forEach(item => { this.listForm.listName = this.selectedList[0].detailedListName;
deposit.set(item.id, item); this.listForm.descriptionList = this.selectedList[0].remark;
}); // 将查询出的文件名字和id组合成数组
let bringData = []; if(this.selectedList[0].fileName !== null) {
for (let i = 0; i < this.selectedList.length; i++) { let textName = this.selectedList[0].fileName.split(',').map(item => {
bringData.push(deposit.get(this.selectedList[i])); return {
} name: item
this.listForm.standId = bringData[0].id; }
this.listForm.listName = bringData[0].detailedListName; })
this.listForm.descriptionList = bringData[0].remark; let textId = this.selectedList[0].fileIds.split(',').map(item => {
this.listForm.fileId = bringData[0].fileIds; return {
if(bringData[0].fileName === null ){ id: item
this.listForm.fileName = '' }
})
textName.forEach(item => {
this.$set(item, 'id', '')
})
for (let i = 0; i< textName.length; i++) {
textName[i].id = textId[i].id
}
this.fileInfoList = textName
} else { } else {
this.listForm.fileName = bringData[0].fileName; this.fileInfoList = []
} }
this.ListModel = false; this.ListModel = false;
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById",
{ id: bringData[0].id, page: this.page, Size: this.pageSize }, { { id: this.selectedList[0].id, page: this.page, Size: this.pageSize }, {
_this: this _this: this
}, res => { }, res => {
if (res.data.records == null) { if (res.data === null) {
res.data.records = []; this.dataList = [];
} }
this.dataList = res.data.records; this.dataList = res.data.records;
this.dataList.forEach(item => { this.dataList.forEach(item => {
@@ -1315,7 +1311,7 @@ export default {
selectListChange(data) { selectListChange(data) {
this.selectedList = []; this.selectedList = [];
for (let i = 0; i < data.length; i++) { for (let i = 0; i < data.length; i++) {
this.selectedList.push(data[i].id); this.selectedList.push(data[0]);
} }
}, },
//标准表格选择框改变 //标准表格选择框改变
@@ -1349,7 +1345,6 @@ export default {
}); });
}, },
pageChange(page) { pageChange(page) {
console.log(page);
this.page = page; this.page = page;
this.selectionList(); this.selectionList();
}, },
src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+4 -4
View File
@@ -315,7 +315,6 @@ export default {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
console.log(res.mesg);
if (res) { if (res) {
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm); this.getFormFieldList(processForm);
@@ -330,15 +329,16 @@ export default {
getFormFieldList(item) { getFormFieldList(item) {
this.$nextTick(() => { this.$nextTick(() => {
this.listForm = JSON.parse(JSON.stringify(item)); this.listForm = JSON.parse(JSON.stringify(item));
console.log(this.listForm.fileName);
this.listForm.prcNum = this.prcNum; this.listForm.prcNum = this.prcNum;
this.listForm.prcName = this.prcName; this.listForm.prcName = this.prcName;
this.listForm["id"] = item.id; this.listForm["id"] = item.id;
this.dataList = item.dataList; this.dataList = item.dataList;
this.listForm.jlUserId = item.jlUserId; this.listForm.jlUserId = item.jlUserId;
this.listForm.zrUserId = item.zrUserId; this.listForm.zrUserId = item.zrUserId;
this.fileIds = item.fileId; item.fileName.forEach(itemId => {
this.getFileInfo(); this.fileIds = itemId.id
this.getFileInfo();
});
}); });
}, },
// 请求上传的文件信息 // 请求上传的文件信息
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+56 -31
View File
@@ -52,26 +52,21 @@
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0"> <el-upload
<p v-for="item in fileList" :action="uploadFileListPath"
:key="item.id"> {{ item.name }} show-file-list
<i :file-list="fileInfoList"
title="下载" name="file"
@click="downloadFile(item.id)" accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
class="icon-download" :on-remove="delFileInfo"
v-btn-permission="''" :on-success="uploadBackSuccess"
/> :before-upload="beforeUpload"
<i :on-preview="handleOnPreview"
title="下载带水印" >
@click="downloadFileByWater(item.id, item.name)" <el-button class="common-button-default" size="mini">
class="icon-download2" 点击上传
v-btn-permission="''" </el-button>
/> </el-upload>
</p>
</div>
<div v-else>
暂无数据
</div>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
@@ -611,7 +606,7 @@ export default {
} }
}, },
// 请求上传的文件信息 // 请求上传的文件信息
getFileInfo() { /* getFileInfo() {
this.$http.get("att/attFile/getMultiFileInfos", { this.$http.get("att/attFile/getMultiFileInfos", {
fileIds: this.fileIds fileIds: this.fileIds
}, { }, {
@@ -630,7 +625,7 @@ export default {
}); });
}, e => { }, e => {
}); });
}, },*/
/** /**
* @Description: 点击下载 * @Description: 点击下载
*/ */
@@ -655,13 +650,16 @@ export default {
}, },
// 删除上传的文件 // 删除上传的文件
delFileInfo (file, fileList) { delFileInfo (file, fileList) {
this.fileInfoList = fileList this.fileInfoList.forEach((item, index) => {
if (item.name === file.name || item.id === file.id ) {
this.fileInfoList.splice(index,1)
}
})
}, },
// 上传文件成功回调 // 上传文件成功回调
uploadBackSuccess (res, file, fileList) { uploadBackSuccess (res, file, fileList) {
if (res.ok) { if (res.ok) {
this.fileInfoList = fileList this.fileInfoList.push(res.data)
this.fileInfoList[this.fileInfoList.length - 1].id = res.data.id
this.$message.success('上传成功') this.$message.success('上传成功')
} else { } else {
this.$message.error(res.message) this.$message.error(res.message)
@@ -669,8 +667,37 @@ export default {
} }
}, },
//上传之前的钩子 //上传之前的钩子
beforeUpload () { 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);
//把后缀转大写
if (fileSuffix !== undefined && fileSuffix !== null) {
fileSuffix = fileSuffix.toUpperCase();
}
// 判断上传文件格式
if (fileSuffix === ".PDF" || fileSuffix === ".DOC" || fileSuffix === ".DOCX" || fileSuffix === ".PPT"
|| fileSuffix === ".PPTX" || fileSuffix === ".XLS" || fileSuffix === ".XLSX"
|| fileSuffix === ".PNG" || fileSuffix === ".JPG" || fileSuffix === ".JPEG") {
return true;
} else {
this.$message.error("文件" + file.name + "格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件");
return false;
}
// 判断文件上传大小
if (file.size / 1024 / 1024 > 300) {
this.$message.warning("文件" + file.name + "大小不能超过300M");
return false;
}
return true;
},
handleOnPreview(file) {
let attId = file.id
if (attId != null && attId !== "") {
window.location.href = "/api/att/attFile/downloadFileForSar?fileId=" + attId;
}
}, },
getData() { getData() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
@@ -701,14 +728,12 @@ export default {
this.listForm.applyUpdUserId = item.applyUpdUserId this.listForm.applyUpdUserId = item.applyUpdUserId
this.listForm.jlUserId = item.jlUserId this.listForm.jlUserId = item.jlUserId
this.listForm.zrUserId = item.zrUserId this.listForm.zrUserId = item.zrUserId
this.fileIds = item.fileId; this.fileInfoList = item.fileName
this.getFileInfo();
} else { } else {
this.listForm = item.form this.listForm = item.form
this.dataList = item.form.dataList this.dataList = item.form.dataList
this.listForm.dataList = item.form.dataList this.listForm.dataList = item.form.dataList
this.fileIds = item.form.fileId; this.fileInfoList = item.form.fileName
this.getFileInfo();
} }
}) })
}, },
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+5 -25
View File
@@ -37,27 +37,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </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 }}-->
<!-- <i-->
<!-- title="下载"-->
<!-- @click="downloadFile(listForm.model)"-->
<!-- class="icon-download"-->
<!-- v-btn-permission="''"-->
<!-- />-->
<!-- <i-->
<!-- title="下载带水印"-->
<!-- @click="downloadFileByWater(listForm.model,listForm.modelName)"-->
<!-- class="icon-download2"-->
<!-- v-btn-permission="''"-->
<!-- />-->
<!-- </p>-->
<!-- </div>-->
<!-- <div v-else>-->
<!-- 暂无数据-->
<!-- </div>-->
<!-- </el-form-item>-->
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0"> <div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList" <p v-for="item in fileList"
@@ -379,9 +358,10 @@ export default {
this.listForm.applyUpdUserId = item.applyUpdUserId; this.listForm.applyUpdUserId = item.applyUpdUserId;
this.listForm.jlUserId = item.jlUserId; this.listForm.jlUserId = item.jlUserId;
this.listForm.zrUserId = item.zrUserId; this.listForm.zrUserId = item.zrUserId;
this.fileIds = item.fileId; item.fileName.forEach(itemId => {
console.log(this.fileIds); this.fileIds = itemId.id
this.getFileInfo(); this.getFileInfo();
})
}); });
}, },
// 请求上传的文件信息 // 请求上传的文件信息
@@ -427,7 +407,7 @@ export default {
} }
} }
}, },
//驳回事件 // 驳回事件
beforeBack() { beforeBack() {
if(!this.commentText){ if(!this.commentText){
this.$message.warning('请填写审批意见') this.$message.warning('请填写审批意见')
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
-1
View File
@@ -385,7 +385,6 @@ export default {
this.fileData = fileList this.fileData = fileList
this.fileTextList.forEach((item, index) => { this.fileTextList.forEach((item, index) => {
if (item.name === file.name || item.id === file.id ) { if (item.name === file.name || item.id === file.id ) {
console.log()
this.fileTextList.splice(index,1) this.fileTextList.splice(index,1)
} }
}) })
src/pages/processCenter/pages/creatProcess/xmpg2/step1-1.vue
+1
View File
@@ -480,6 +480,7 @@ export default {
this.projectId = this.selectedList[0].id; this.projectId = this.selectedList[0].id;
this.listForm.projectNumber = this.selectedList[0].projectNumber; this.listForm.projectNumber = this.selectedList[0].projectNumber;
this.listForm.projectName = this.selectedList[0].projectName; this.listForm.projectName = this.selectedList[0].projectName;
this.listForm.productLine = this.selectedList[0].productLine;
this.getStandData(); this.getStandData();
this.projectModel = false; this.projectModel = false;
} }
src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue
+1
View File
@@ -478,6 +478,7 @@ export default {
this.projectId = this.selectedList[0].id; this.projectId = this.selectedList[0].id;
this.listForm.projectNumber = this.selectedList[0].projectNumber; this.listForm.projectNumber = this.selectedList[0].projectNumber;
this.listForm.projectName = this.selectedList[0].projectName; this.listForm.projectName = this.selectedList[0].projectName;
this.listForm.productLine = this.selectedList[0].productLine;
this.getStandData(); this.getStandData();
this.projectModel = false; this.projectModel = false;
} }
src/pages/processCenter/pages/creatProcess/xmpg2/step4.vue
+1 -1
View File
@@ -335,7 +335,6 @@ export default {
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
console.log(res.mesg);
if (res) { if (res) {
const processForm = JSON.parse(res.mesg); const processForm = JSON.parse(res.mesg);
this.getFormFieldList(processForm); this.getFormFieldList(processForm);
@@ -394,6 +393,7 @@ export default {
this.isSubmit = true; this.isSubmit = true;
this.listForm.commentText = this.commentText; this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm); const json = JSON.stringify(this.listForm);
console.log(json);
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds, taskIds: this.taskIds,
userId: this.userId, userId: this.userId,
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+1 -1
View File
@@ -349,7 +349,7 @@ export default {
let aa = { let aa = {
key: item.standId, key: item.standId,
id: item.id, id: item.id,
standId: item.itemsNum, standId: item.id,
itemsNum: item.itemsNum, itemsNum: item.itemsNum,
itemsName: item.itemsName, itemsName: item.itemsName,
workPeople: "请选择责任人" workPeople: "请选择责任人"
src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+74 -50
View File
@@ -76,10 +76,14 @@
width="260px" width="260px"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<span <span v-if="scope.row.standSortShow === undefined"
style="margin-left: 10px">{{ style="margin-left: 10px">{{
scope.row.standSort + ' ' + scope.row.standNumber + '-' + scope.row.standYear scope.row.standSort + ' ' + scope.row.standNumber + '-' + scope.row.standYear
}}</span> }}</span>
<span v-else
style="margin-left: 10px">{{
scope.row.standSortShow + ' ' + scope.row.standNumber + '-' + scope.row.standYear
}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -222,7 +226,7 @@
<el-table <el-table
:data="sarAccessListDatas" :data="sarAccessListDatas"
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%; padding: 0 3px"
border border
height="100%" height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
@@ -230,11 +234,6 @@
@selection-change="selectOne" @selection-change="selectOne"
ref="selection" ref="selection"
> >
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column <el-table-column
prop="carType" prop="carType"
label="车型类别" label="车型类别"
@@ -701,50 +700,67 @@ export default {
this.standModel = false; this.standModel = false;
}, },
//添加标准确定事件 //添加标准确定事件
okStand() { okStand(){
let _this = this; if(this.standList.length > 0){
if (this.standList.length < 1) { this.standList.forEach(item => {
_this.$message.warning("请选择标准"); let addIndex
} else { addIndex = this.dataList.findIndex(items => {
for (let i = 0; i < this.dataList.length; i++) { return items.standId === item.id
let newStand = false; })
for (let j = 0; j < this.standList.length; j++) { if(addIndex > -1){
if (this.standList[j].id == this.dataList[i].standId) { this.$message.warning('请勿重复添加数据')
newStand = true; }else{
this.standList.splice(j, 1) this.dataList.push(item)
j-- }
} })
} }else{
if (newStand) { this.$message.warning('请至少选择一条数据进行添加')
_this.$message.warning("请勿重复添加数据"); }
} else {
// _this.dataList.push(item);
}
}
this.standardData = []
_this.standModel = false;
for (var i = 0; i < this.standList.length; i++) {
this.standList1.push({
standId: this.standList[i].id,
projectId: this.localProEO.id
})
}
if (this.standList1 != '') {
this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
_this: this
}, res => {
if (res.ok) {
// this.$message.success(res.message)
this.getDataList()
}
}, e => {
});
}
this.standList = []
this.standList1 = []
_this.standModel = false;
}
}, },
// okStand() {
// let _this = this;
// if (this.standList.length < 1) {
// _this.$message.warning("请选择标准");
// } else {
// for (let i = 0; i < this.dataList.length; i++) {
// let newStand = false;
// for (let j = 0; j < this.standList.length; j++) {
// if (this.standList[j].id == this.dataList[i].standId) {
// newStand = true;
// this.standList.splice(j, 1)
// j--
// }
// }
// if (newStand) {
// _this.$message.warning("请勿重复添加数据");
// } else {
// // _this.dataList.push(item);
// }
// }
// this.standardData = []
// _this.standModel = false;
// for (var i = 0; i < this.standList.length; i++) {
// this.standList1.push({
// standId: this.standList[i].id,
// projectId: this.localProEO.id
// })
// }
// if (this.standList1 != '') {
// this.$http.postData("sarStandProjectLibrary/batchInsert", this.standList1, {
// _this: this
// }, res => {
// if (res.ok) {
// // this.$message.success(res.message)
// this.getDataList()
// }
// }, e => {
// });
// }
// this.standList = []
// this.standList1 = []
// _this.standModel = false;
// }
// },
//获取标准 //获取标准
getStandrd(data){ getStandrd(data){
this.detailedId = data.id this.detailedId = data.id
@@ -763,6 +779,14 @@ export default {
this.standModel = true; this.standModel = true;
} }
this.standardData = res.data.records this.standardData = res.data.records
this.standardData.forEach(item => {
if(item.zccssrqgj === '-'){
item.zccssrqgj = ''
}
if(item.xcxssrqgj === '-'){
item.xcxssrq = ''
}
})
this.totalDo = res.data.total this.totalDo = res.data.total
this.standModel = true; this.standModel = true;
}) })