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

修复bug

Browse Source
This commit is contained in:
宋伟佳
2021-07-26 18:05:14 +08:00
parent 2202ec4ce5
commit ed3ccd21f1
7 changed files with 197 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+120 -112
View File
@@ -48,27 +48,27 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="附件" prop="fileId" class="add-form-item form-item-disabled"> <el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<el-upload <div class="file-box" v-if="listForm.fileName">
v-if="listForm.fileId == null || this.listForm.fileId== 'undefined' || this.listForm.fileId == '' " <p>{{listForm.fileName}}
:action="uploadFileListPath" </p>
show-file-list </div>
:file-list="fileInfoList" <div v-else>
name="file" <el-upload
accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png" :action="uploadFileListPath"
:on-remove="delFileInfo" show-file-list
:on-success="uploadBackSuccess" :file-list="fileInfoList"
:before-upload="beforeUpload" name="file"
> accept=".PDF, .pdf, .doc, .DOC, .docx, .DOCX, .xls, .xlsx, .ppt, .pptx, .PPT, .PPTX, .JPG, .JPEG, .PNG, .jpg, .jpeg, .png"
<el-button class="common-button-default" size="mini"> :on-remove="delFileInfo"
点击上传 :on-success="uploadBackSuccess"
</el-button> :before-upload="beforeUpload"
</el-upload> >
<el-input <el-button class="common-button-default" size="mini">
v-else 点击上传
v-model="listForm.fileId" </el-button>
placeholder="" </el-upload>
></el-input> </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">
<el-radio-group v-model="signFlag" @change="selectSign"> <el-radio-group v-model="signFlag" @change="selectSign">
@@ -128,15 +128,21 @@
label="发布日期"> label="发布日期">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrqgj"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="zccssrq" prop="zccssrqgj"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -318,26 +324,13 @@
}}</span> }}</span>
</template> </template>
</el-table-column> </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 <el-table-column
prop="updateTime" prop="updateTime"
label="更新时间" label="更新时间"
sortable sortable
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div> <span>{{ scope.row.updateTime ? $moment(scope.row.updateTime).format('YYYY-MM-DD') : '' }}</span>
{{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
}}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -617,17 +610,26 @@
prop="issueTime" prop="issueTime"
align="center" align="center"
label="发布日期"> 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>
<el-table-column <el-table-column
prop="xcxssrq" prop="xcxssrqgj"
align="center" align="center"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
prop="zccssrq" prop="zccssrqgj"
align="center" align="center"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
show-overflow-tooltip show-overflow-tooltip
@@ -718,7 +720,7 @@ export default {
// 查询选择清单相关参数 // 查询选择清单相关参数
sarSarAccessEOSearch: { sarSarAccessEOSearch: {
countryArea: "", countryArea: "",
detailedListName: "", detailedListName: ""
}, },
//查询添加标准相关数据 //查询添加标准相关数据
standardSearch: { standardSearch: {
@@ -809,8 +811,8 @@ export default {
code: "", //标准号 code: "", //标准号
standName: "", //标准名称 standName: "", //标准名称
issueTime: "", //发布日期 issueTime: "", //发布日期
xcxssrq: "", //新车型实施日期 xcxssrqgj: "", //新车型实施日期
zccssrq: "", //在产车实施日期 zccssrqgj: "", //在产车实施日期
textStatus: "", //文本状态 textStatus: "", //文本状态
id: "" id: ""
}] }]
@@ -895,9 +897,9 @@ export default {
this.listForm.signFlag = 2; this.listForm.signFlag = 2;
} }
}, },
queryDetailsData(){ queryDetailsData() {
this.page = 1 this.page = 1;
this.selectionList() this.selectionList();
}, },
// //判断当前选中的是哪个清单 // //判断当前选中的是哪个清单
selectionList(type) { selectionList(type) {
@@ -950,7 +952,7 @@ export default {
}; };
this.selectionList(); this.selectionList();
}, },
clearStandSearch(){ clearStandSearch() {
this.standardSearch = { this.standardSearch = {
standType: "", standType: "",
standNumber: "" standNumber: ""
@@ -968,6 +970,10 @@ export default {
_this: this _this: this
}, res => { }, res => {
this.standardData = res.data.list; this.standardData = res.data.list;
this.standardData.forEach(item => {
this.$set(item, 'zccssrqgj', item.attrInfoMap.ZCCSSRQGJ)
this.$set(item, 'xcxssrqgj', item.attrInfoMap.XCXSSRQGJ)
})
this.totalNo = res.data.count; this.totalNo = res.data.count;
}, e => { }, e => {
}); });
@@ -1002,30 +1008,30 @@ export default {
}, },
//保存事件 //保存事件
handleSave() { handleSave() {
this.saveLoading = true this.saveLoading = true;
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);
_formData.append('createUserName', this.$store.getters.userInfo.userName) _formData.append("createUserName", this.$store.getters.userInfo.userName);
_formData.append('prcType', '4') _formData.append("prcType", "4");
_formData.append('json', JSON.stringify({ _formData.append("json", JSON.stringify({
form: this.listForm, form: this.listForm,
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.commentText commentText: this.commentText
})) }));
saveTaskFirst(_formData).then(res => { saveTaskFirst(_formData).then(res => {
this.saveLoading = false this.saveLoading = false;
this.$message.success('保存成功') this.$message.success("保存成功");
this.bpnId = res.result this.bpnId = res.result;
}).catch(e => { }).catch(e => {
this.saveLoading = false this.saveLoading = false;
}) });
}, },
//提交事件 //提交事件
handleSubmit() { handleSubmit() {
if(this.dataList.length < 1){ if (this.dataList.length < 1) {
this.$message.warning('标准不能为空') this.$message.warning("标准不能为空");
}else{ } else {
let json = this.listForm; let json = this.listForm;
this.listForm.fileId = this.fileIds.join(","); this.listForm.fileId = this.fileIds.join(",");
this.listForm.fileName = this.fileListName.join(","); this.listForm.fileName = this.fileListName.join(",");
@@ -1094,7 +1100,7 @@ export default {
}); });
this.fileListName = middle; this.fileListName = middle;
this.fileIds.push(file.response.data.id); this.fileIds.push(file.response.data.id);
this.$message.success('上传成功') this.$message.success("上传成功");
} else { } else {
this.$message.error(res.message); this.$message.error(res.message);
fileList.pop(); fileList.pop();
@@ -1180,33 +1186,6 @@ export default {
} }
return true; return true;
}, },
// beginImportFile (file) {
// var filename = file.name
// 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'
// || fileSuffix === '.PNG'|| fileSuffix === '.JPG'|| fileSuffix === '.JPEG') {
// return true
// } else {
// this.spinShow = false
// this.$message.error('文件' + file.name + '格式不正确，请上传pdf、doc、docx、ppt、pptx、xls、xlsx、png、jpg、jpeg等文件')
// return false
// }
// // 判断文件上传大小
// // eslint-disable-next-line no-unreachable
// if (file.size / 1024 / 1024 <= 200) {
// return true
// } else {
// this.$message.error('文件' + file.name + '大小不超过200M')
// return false
// }
// return true
// },
//选择清单取消事件 //选择清单取消事件
closeDrawer() { closeDrawer() {
this.ListModel = false; this.ListModel = false;
@@ -1220,26 +1199,25 @@ export default {
}, },
//添加标准确定事件 //添加标准确定事件
okStand() { okStand() {
let _this = this;
if (this.standList.length < 1) { if (this.standList.length < 1) {
_this.$message.warning("请选择需要添加进清单的数据"); this.$message.warning("请选择需要添加进清单的数据");
} else { } else {
_this.standList.map(item => { this.standList.map(item => {
let newStand = false; let newStand = false;
for (let itemKey of _this.dataList) { for (let itemKey of this.dataList) {
if (item.id == itemKey.id) { if (item.id == itemKey.id) {
newStand = true; newStand = true;
break; break;
} }
} }
if (newStand) { if (newStand) {
_this.$message.warning("请勿重复添加数据"); this.$message.warning("请勿重复添加数据");
} else { } else {
_this.dataList.push(item); this.dataList.push(item);
} }
}); });
this.standardData = []; this.standardData = [];
_this.standModel = false; this.standModel = false;
} }
}, },
//选择清单确定事件 //选择清单确定事件
@@ -1257,23 +1235,24 @@ export default {
this.listForm.listName = bringData[0].detailedListName; this.listForm.listName = bringData[0].detailedListName;
this.listForm.descriptionList = bringData[0].remark; this.listForm.descriptionList = bringData[0].remark;
this.listForm.fileId = bringData[0].fileIds; 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: bringData[0].id, page: this.page, Size: this.pageSize }, {
_this: this _this: this
}, res => { }, res => {
if (res.data == null) { if (res.data == null) {
res.data = []; res.data = [];
} }
this.dataList = res.data; this.dataList = res.data;
this.listForm.dataList = res.data; this.listForm.dataList = res.data;
let formId = []; let formId = [];
this.dataList.map(item => { this.dataList.map(item => {
formId.push(item.id); formId.push(item.id);
});
this.listForm.inforlist = formId.join(",");
}, e => {
}); });
this.listForm.inforlist = formId.join(",");
}, e => {
});
} else if (this.selectedList.length > 1) { } else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行带入"); this.$message.warning("只能选择一条数据进行带入");
} else { } else {
@@ -1365,7 +1344,36 @@ export default {
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
.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 { .choiceBtn {
.el-button--primary { .el-button--primary {
width: 150px; width: 150px;
src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+2 -2
View File
@@ -104,8 +104,8 @@
width="180px" width="180px"
label="标准号"> label="标准号">
<template slot-scope="scope"> <template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a> <p v-if="scope.row.standYear" >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</p>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a> <p v-else >{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</p>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+4
View File
@@ -77,6 +77,10 @@
fixed="left" fixed="left"
width="180px" width="180px"
label="标准号"> 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>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="standName" prop="standName"
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+38 -10
View File
@@ -64,7 +64,7 @@
</process-title> </process-title>
<div class="tableTitle"> <div class="tableTitle">
<div class="tableButton"> <div class="tableButton">
<el-button plain class="common-button-primary" size="mini" @click="addList">新增</el-button> <el-button plain class="common-button-primary" size="mini" @click="addList">添加</el-button>
<el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button> <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
</div> </div>
</div> </div>
@@ -226,7 +226,6 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="code" prop="code"
fixed="left"
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"
@@ -290,7 +289,7 @@
tooltip-effect="dark" tooltip-effect="dark"
style="width: 100%" style="width: 100%"
border border
ref="table" ref="projectTable"
height="100%" height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@@ -540,9 +539,10 @@ export default {
leading() { leading() {
}, },
//点击新增事件 //点击添加事件
addList() { addList() {
this.standModel = true; this.standModel = true;
this.$refs.projectTable.clearSelection()
}, },
// 点击批量删除事件 // 点击批量删除事件
deleteList() { deleteList() {
@@ -575,13 +575,30 @@ export default {
}, },
//确认添加事件 //确认添加事件
okStand() { okStand() {
if (this.standList.length >= 1) { let proData = [];
this.dataList = this.standList; if(this.dataList.length >= 1){
this.roleForm.directorUser = this.dataList[0].uname; this.dataList.forEach(item => {
this.listForm.dataList = this.standList; if(proData.length === 0){
proData.push(item.productLine)
}else if(!proData.includes(item.productLine)){
proData.push(item.productLine)
}
})
this.standList.forEach(items => {
if(!proData.includes(items.productLine)){
this.dataList.push(items)
}
})
this.standModel = false; this.standModel = false;
} else { }else{
this.$message.warning("请选择一条数据进行添加"); if (this.standList.length >= 1) {
this.dataList = this.standList;
this.roleForm.directorUser = this.dataList[0].uname;
this.listForm.dataList = this.standList;
this.standModel = false;
} else {
this.$message.warning("请选择一条数据进行添加");
}
} }
}, },
//保存事件 //保存事件
@@ -656,6 +673,17 @@ export default {
closeDrawer() { closeDrawer() {
this.ListModel = false; this.ListModel = false;
}, },
// 点击查看
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: "OtherStandardDetails",
params: {
id: item.id,
pageType: "INLAND_STAND"
}
});
window.open(routeUrl.href, "_blank");
},
//选择拆分标准确定事件 //选择拆分标准确定事件
OkDrawer() { OkDrawer() {
src/pages/processCenter/pages/creatProcess/xmpg2/step5.vue
+20 -16
View File
@@ -51,6 +51,7 @@
row-key="standId" row-key="standId"
height="70%" height="70%"
border border
ref="myTable"
@selection-change="selectStandChange" @selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@@ -82,12 +83,7 @@
</el-table-column> </el-table-column>
<el-table-column label="责任人" prop="workPeople" align="center"> <el-table-column label="责任人" prop="workPeople" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.workPeople == undefined"> <div :class="{'fileClass': !scope.row.workPeople}">{{ scope.row.workPeople ? scope.row.workPeople: '请选择责任人' }}</div>
{{ "请选择责任人" }}
</div>
<div v-else class="fileClass">
{{ scope.row.workPeople || "-" }}
</div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -358,39 +354,47 @@ export default {
} }
}, },
checkedRole(data) { checkedRole(data) {
console.log(data[0].name)
// 选取负责人时的操作 // 选取负责人时的操作
let deposit = new Map(); let deposit = new Map();
let mis2 = new Map(); let mis2 = new Map();
this.selectList.forEach(item => { this.selectList.forEach(item => {
item.workPeople = data[0].name; item.workPeople = data[0].name;
item.workPeopleId = data[0].id; item.workPeopleId = data[0].id;
if (item.children !== undefined) { if (item.children) {
item.children.forEach(items => { item.children.forEach(items => {
deposit.set(items.standId, items); deposit.set(items.standId, items);
}); });
} }
mis2.set(item.standId, item); mis2.set(item.standId, item);
}); });
this.dataList.forEach((item, index) => {
this.dataList.forEach(item => { if (mis2.get(item.standId)) {
if (undefined !== mis2.get(item.standId)) { if (item.children) {
if (undefined !== item.children) {
item.children.forEach(i => { item.children.forEach(i => {
i.workPeopleId = undefined; i.workPeopleId = undefined;
i.workPeople = undefined; i.workPeople = undefined;
}); });
} else {
const newItem = JSON.parse(JSON.stringify(item))
newItem.workPeopleId = data[0].id
newItem.workPeople = data[0].name
this.$set(this.dataList, index, newItem)
} }
} else { } else {
if (item.children !== undefined) { if (item.children) {
item.children.forEach(items => { item.children.forEach((items, childIndex) => {
if (undefined !== deposit.get(items.standId)) { if (deposit.get(items.standId)) {
items = deposit.get(items.standId); const childItems = JSON.parse(JSON.stringify(items))
childItems.workPeopleId = deposit.get(items.standId).workPeopleId;
childItems.workPeople = deposit.get(items.standId).workPeople;
this.$set(this.dataList[index].children, childIndex, childItems)
} }
}); });
} }
} }
}); });
this.$refs.selection.clearSelection(); this.$refs.myTable.clearSelection();
this.modalshowflag = false; this.modalshowflag = false;
}, },
cancleUserInfo() { cancleUserInfo() {
src/pages/processCenter/pages/processDetail/index.vue
+9
View File
@@ -200,6 +200,15 @@ export default {
if (prcType === '1') { if (prcType === '1') {
// 标准入库流程数据 // 标准入库流程数据
this.toProcessDetail('bzrkStep5',row) this.toProcessDetail('bzrkStep5',row)
}else if(prcType === '4'){
//标准清单发布流程数据
this.toProcessDetail('bzqdfbStep4',row)
}else if (prcType === '5'){
//标准项目合规评估 标准维度
this.toProcessDetail('xmpgStep7',row)
}else if(prcType === '6'){
//标准项目合规评估 项目维度
this.toProcessDetail('xmpg2Step12',row)
} }
} else { } else {
this.$message.warning('当前流程未全部办理完成，无法查看') this.$message.warning('当前流程未全部办理完成，无法查看')
src/sysConfig/index.js
+4 -2
View File
@@ -7,8 +7,10 @@
// const devIp = '39.98.140.126' // const devIp = '39.98.140.126'
// const devInterfacePORT = '10005' // const devInterfacePORT = '10005'
// const devIp = '192.168.10.248' // const devIp = '192.168.10.248'
const devIp = '101.36.227.25' // const devIp = '101.36.227.25'
const devInterfacePORT = '8038' // const devInterfacePORT = '8038'
const devIp = '10.96.170.156'
const devInterfacePORT = '9999'
// 云端端口号 // 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777' const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
const simpleFilePath = 'att/attFile/upload' const simpleFilePath = 'att/attFile/upload'