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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2021-12-23 18:06:01 +08:00
parent 25c0a92f97 bcec759522
commit 56d4001250
44 changed files with 780 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standCalendar/index.vue
+26 -15
View File
@@ -32,9 +32,11 @@
<el-tag style="background-color: unset;border-color: unset;border-width: 0"/>
</span>
<!-- 获取当前登录人的会议并表示出来-->
<span v-for="item in dealMyDate(data.day)" :value="item.fillPeopleId">
<span v-for="(item,index) in dealMyDate(data.day)" :value="index">
<el-tag v-if="userId === item.fillPeopleId" class="tagTwo"/>
<el-tag v-else class="tagOne"/>
</span>
<span v-if="dealMyDate(data.day).length > 0">
<el-tag class="tagOne"/>
</span>
</span>
</div>
@@ -59,7 +61,9 @@
<el-card class="card_info" v-else v-for="(item, index) in todayData" :value="item" :key="index">
<span v-for="res in item.attend" :key="res.fillPeopleId">
<el-tag v-if="userId === res.fillPeopleId" type="success" size="mini">会议</el-tag>
<el-tag v-else type="warning" size="mini">会议</el-tag>
</span>
<span>
<el-tag type="warning" size="mini">会议</el-tag>
</span>
<span style="float: right;padding-right: 5px">
<el-button type="primary" size="mini" plain @click="edit_meeting(item)">编辑会议内容</el-button>
@@ -69,7 +73,7 @@
<div class="content_text">
<span>会议时间 : {{ $moment(item.date).format('YYYY-MM-DD HH:mm:ss') }} </span>
</div>
<div class="content_text">
<div class="content_text2">
<span>参与人 : {{ item.partPeople.join('、') }} </span>
</div>
<div class="content_text2">
@@ -101,6 +105,7 @@
<el-drawer
title="编辑人员信息"
:visible.sync="meetFlag"
:before-close="falseDrawer"
size="600px"
>
<div class="content_form" style="height: calc(100% - 20px);overflow-y: auto">
@@ -128,7 +133,6 @@
border
ref="entryTable"
@selection-change="selectedDelete"
height="49%"
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '20px'}">
@@ -334,7 +338,7 @@ export default {
},
// 议题选中时储存数组
deleteTable: [],
loading: false
loading: false,
}
},
mounted() {
@@ -446,14 +450,25 @@ export default {
* 并在日历上显示出标记*/
dealMyDate(v) {
let len = this.resDate.length
let res = ''
let res = []
for (let i = 0; i < len; i++) {
if (this.resDate[i].date.slice(0, 10) === v) {
res = this.resDate[i].attend
break
res = res.concat(this.resDate[i].attend)
}
}
return res
// 去除当天重复的人员
let map = new Map();
let array = new Array(); // 数组用于返回结果
for (let i = 0; i < res.length; i++) {
if(map.has(res[i].fillPeopleId)) { // 如果有该key值
map.set(res[i].fillPeopleId, true);
} else {
map.set(res[i].fillPeopleId, false); // 如果没有该key值
array.push(res[i]);
}
}
return array
},
// 头部时间改变事件
handleDate() {
@@ -502,13 +517,11 @@ export default {
/** 每个会议对应的编辑按钮 */
edit_meeting(item) {
this.editMeetForm.contents = []
console.log(item)
localStorage.setItem('objs', JSON.stringify(item))
this.fileListData = item
this.reData = item.files
console.log(item)
this.editMeetForm = item
this.editMeetForm.contents
this.editMeetForm.contents = []
if (this.editMeetForm.content !== '') {
this.editMeetForm.content.split(';').forEach(item => {
@@ -863,8 +876,6 @@ export default {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 4;
line-clamp: 4;
-webkit-box-orient: vertical;
line-height: normal;
margin-top: 10px;
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+3 -3
View File
@@ -470,9 +470,9 @@
this.form.modelList = data.modelList || data.form.modelList
this.form.responUserList = data.form.responUserList
this.form.responUserListName = data.form.responUserListName
this.form.fileName = data.form.fileName || data.fileName || ''
this.form.fileId = data.form.fileId || data.fileId || ''
this.form.dyhz = data.form.dyhz || data.dyhz || ''
this.form.fileName = data.form? data.form.fileName : ''
this.form.fileId = data.form ? data.form.fileId : ''
this.form.dyhz = data.form ? data.form.dyhz : ''
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+5 -5
View File
@@ -374,14 +374,14 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.dyhz = data.dyhz || data.form.dyhz
this.form.dyhz = data.form ? data.form.dyhz : ''
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.file = data.fileId || data.form.fileId
this.form.fileName = data.fileName || data.form.fileName
this.form.fileId = data.fileId || data.form.fileId
this.form.modelList = data.modelList || data.form.modelList
this.form.file = data.form ? data.form.fileId : ''
this.form.fileName = data.form ? data.form.fileName : ''
this.form.fileId = data.form ? data.form.fileId : ''
this.form.modelList = data.form ? data.form.modelList : []
this.form.fjList = data.fjList || data.form.fjList
}).catch(e => {
})
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+1 -1
View File
@@ -112,7 +112,7 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="流程信息">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+4
View File
@@ -520,6 +520,7 @@
<!--适用车型-->
<template>
<custom-select-array
style="margin-left: -12px"
:key="applyArcticOptions.options"
:config="applyArcticOptions"
v-model="form['cllx']"
@@ -528,6 +529,7 @@
<!--能源类型-->
<template>
<custom-select-array
style="margin-left: -12px"
:key="categoryOptions.options"
:config="categoryOptions"
v-model="form['nylx']"
@@ -643,6 +645,7 @@
<template>
<custom-select-array
:key="sycpxOptions.options"
style="margin-left: -12px"
:config="sycpxOptions"
v-model="form['sycpx']"
></custom-select-array>
@@ -662,6 +665,7 @@
<template>
<custom-select-array
:key="applyAuthOptions.options"
style="margin-left: -12px;"
:config="applyAuthOptions"
v-model="form['syrz']"
></custom-select-array>
src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+4
View File
@@ -726,6 +726,7 @@
<!--适用车型-->
<template>
<custom-select-array
style="margin-left: -12px"
:key="applyArcticOptions.options"
:config="applyArcticOptions"
v-model="form['cllx']"
@@ -734,6 +735,7 @@
<!--能源类型-->
<template>
<custom-select-array
style="margin-left: -12px"
:key="categoryOptions.options"
:config="categoryOptions"
v-model="form['nylx']"
@@ -844,6 +846,7 @@
<template>
<custom-select-array
:key="sycpxOptions.options"
style="margin-left: -12px"
:config="sycpxOptions"
v-model="form['sycpx']"
></custom-select-array>
@@ -863,6 +866,7 @@
<template>
<custom-select-array
:key="applyAuthOptions.options"
style="margin-left: -12px"
:config="applyAuthOptions"
v-model="form['syrz']"
></custom-select-array>
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+104 -38
View File
@@ -47,8 +47,8 @@
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineer" width="150" label="责任工程师" align="center"/>
<el-table-column prop="responsibleUnit" width="150" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineerName" width="150" label="责任工程师" align="center"/>
</el-table>
</div>
<el-collapse accordion>
@@ -59,7 +59,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="textarea">
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
@@ -161,20 +161,11 @@
:maxlength="100"></el-input>
</el-form-item>
<el-form-item label="责任部门" class="search-item">
<el-select
class="showBox"
<el-input
v-model="queryUnqualidiedData.responsibleUnit"
placeholder="请选择"
filterable
size="small"
placeholder="请输入"
>
<el-option
v-for="item in zrbmOptions"
:value="item.value"
:key="item.value"
:label="item.label"
/>
</el-select>
</el-input>
</el-form-item>
<el-form-item class="search-item btn-box">
<el-button
@@ -198,39 +189,108 @@
</el-form>
</div>
</div>
<loading :loading="loading">数据获取中....</loading>
<el-table
class="table_info"
ref="searchTable"
:data="unqualidiedData"
tooltip-effect="dark"
style="width: 100%"
border
height="150%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
:data="unqualidiedData"
tooltip-effect="dark"
height="100%"
border
ref="searchTable"
max-height="100%"
@selection-change="selectedChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectedChange"
>
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standSerialNumber" align="center" show-overflow-tooltip label="标准号">
>
<el-table-column
type="selection"
width="55"
fixed="left"
align="center">
</el-table-column>
<el-table-column
prop="standSerialNumber"
fixed="left"
min-width="180"
label="标准号">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" align="center" show-overflow-tooltip label="标准名称">
<el-table-column
prop="standName"
fixed="left"
min-width="300"
show-overflow-tooltip
label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" align="center" show-overflow-tooltip label="项目名称"/>
<el-table-column prop="itemsNum" align="center" label="条款号"/>
<el-table-column prop="itemsName" align="center" label="条款名称"/>
<el-table-column prop="planCloseTime" align="center" label="整改完成时间">
<el-table-column
prop="itemsNum"
min-width="100"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
min-width="300"
show-overflow-tooltip
label="条款名称">
</el-table-column>
<el-table-column
prop="productType"
width="100"
label="产品类型">
</el-table-column>
<el-table-column
prop="productLine"
width="180"
label="产品线">
</el-table-column>
<el-table-column
prop="productName"
min-width="300"
show-overflow-tooltip
label="项目名称">
</el-table-column>
<el-table-column
prop="reason"
width="180"
label="不合规项目">
</el-table-column>
<el-table-column
prop="responsibleUnit"
width="180"
show-overflow-tooltip
label="责任部门">
</el-table-column>
<el-table-column
prop="dutyEngineerName"
width="100"
label="责任工程师">
</el-table-column>
<el-table-column
prop="authEngineer"
width="150"
show-overflow-tooltip
label="认证工程师">
</el-table-column>
<el-table-column
prop="qaEngineer"
width="150"
show-overflow-tooltip
label="质量工程师">
</el-table-column>
<el-table-column
prop="planCloseTime"
width="150"
sortable="custom"
label="计划关闭时间">
<template slot-scope="scope">
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format("YYYY-MM-DD") : "" }}</span>
{{ (scope.row.planCloseTime ? scope.row.planCloseTime.substring(0, 11) : "") }}
</template>
</el-table-column>
<el-table-column prop="responsibleUnit" align="center" label="责任部门"/>
<el-table-column prop="dutyEngineer" align="center" label="责任工程师"/>
</el-table>
<pagination
style="position: relative;"
@@ -238,7 +298,6 @@
:total="total"
@pageChange="pageChange"
@pageSizeChange="pageSizeChange"/>
<loading :loading="loading">数据获取中</loading>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="OkDrawer">确认</el-button>
@@ -274,7 +333,7 @@ export default {
data() {
return {
loading: false,
textarea: '', // 意见
commentText: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
@@ -432,6 +491,9 @@ export default {
},
//选择标准取消事件
closeDrawer() {
this.queryUnqualidiedData.standSerialNumber = ''
this.queryUnqualidiedData.responsibleUnit = ''
this.queryUnqualidiedData.productName = ''
this.standModel = false
},
//未符合项整合确定事件
@@ -456,6 +518,9 @@ export default {
this.$refs.searchTable.clearSelection()
}
})
this.queryUnqualidiedData.standSerialNumber = ''
this.queryUnqualidiedData.responsibleUnit = ''
this.queryUnqualidiedData.productName = ''
this.standModel = false;
} else {
this.$message.warning("请选择至少一条数据进行带入");
@@ -500,6 +565,7 @@ export default {
prcCreateUserName: this.$store.getters.userInfo.userName,
engineer: this.roleForm.dockUser,
standardInfoList: this.dataList,
commentText: this.commentText
}
if (this.dataList[0].standId === '') {
this.$message.warning('请选择基础信息进行添加')
@@ -595,7 +661,7 @@ export default {
@import '~@/assets/styles/style';
.wfhxzgStep1 {
/deep/.el-table--scrollable-y .el-table__body-wrapper {
height: calc(100% - 80px) !important;
height: calc(100% - 57px) !important;
}
/deep/.el-drawer__container {
.prc-content-border {
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+8 -7
View File
@@ -51,8 +51,8 @@
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineer" width="150" label="责任工程师" align="center"/>
<el-table-column prop="responsibleUnit" width="150" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineerName" width="150" label="责任工程师" align="center"/>
<el-table-column label="选择分发责任人" width="150" prop="dutyPeopleInfo" align="center">
<template slot-scope="scope">
<el-input
@@ -66,14 +66,14 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="textarea">
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
@@ -182,7 +182,7 @@ export default {
passInfo: 0,
detailData: [],
loading: false,
textarea: '', // 意见
commentText: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
taskIds: this.$route.query.taskIds,
@@ -282,7 +282,7 @@ export default {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
}
this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
this.textarea = JSON.parse(JSON.stringify(item)).commentText
this.commentText = JSON.parse(JSON.stringify(item)).commentText
})
},
// 批量选择分发责任人
@@ -358,7 +358,8 @@ export default {
}
let json = {
dockUserList: list,
passInfo: this.passInfo
passInfo: this.passInfo,
commentText: this.commentText
}
let flag=false
this.dataList.forEach(item => {
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+3 -4
View File
@@ -51,8 +51,8 @@
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineer" width="150" label="责任工程师" align="center"/>
<el-table-column prop="responsibleUnit" width="150" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineerName" width="150" label="责任工程师" align="center"/>
<el-table-column label="选择责任人" prop="dutyPeople" width="200" align="center">
<template slot-scope="scope">
<div style="display: inline;">
@@ -70,7 +70,7 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
@@ -86,7 +86,6 @@
<div class="content" v-show="active === '3'">
<div class="flow-list">
<el-table
height="100%"
ref="selection"
:data="detailData"
tooltip-effect="dark"
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+4 -3
View File
@@ -39,7 +39,8 @@
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
<el-table-column prop="responsibleUnit" width="150" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineerName" width="150" label="责任工程师" align="center"/>
<el-table-column prop="dutyPeople" width="150" label="负责人" align="center"/>
<el-table-column label="佐证材料" align="center" width="150">
<template slot-scope="scope">
@@ -76,7 +77,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="textarea">
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
@@ -188,7 +189,7 @@ export default {
modalshowflag: false, // drawer开关
detailData: [],
loading: false,
textarea: '', // 意见
commentText: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
nonSearch: {
src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
+2 -1
View File
@@ -39,7 +39,8 @@
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
<el-table-column prop="responsibleUnit" width="150" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineerName" width="150" label="责任工程师" align="center"/>
<el-table-column prop="dutyPeople" width="200" label="负责人" align="center"/>
<el-table-column prop="fileText" width="200" label="佐证材料" align="center">
<template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+2 -1
View File
@@ -39,7 +39,8 @@
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
<el-table-column prop="responsibleUnit" width="150" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineerName" width="150" label="责任工程师" align="center"/>
<el-table-column prop="dutyPeople" width="200" label="负责人" align="center"/>
<el-table-column prop="fileText" label="佐证材料" align="center">
<template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/xmpg2/step1-12.vue
+15 -9
View File
@@ -365,15 +365,21 @@ export default {
let dataChildren = []
let dataListChildren = []
this.listForm.dataList.forEach(item => {
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
}
})
if(item.workPeople !== ''){
this.dataList.push(item)
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
}
})
}
})
this.listForm.dataList.forEach(item => {
dataChildren.push(item.children)
src/pages/processCenter/pages/creatProcess/xmpg2/step10.vue
+3 -1
View File
@@ -476,7 +476,9 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
this.dataList.push(item)
if(item.workPeople !== ''){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
src/pages/processCenter/pages/creatProcess/xmpg2/step11.vue
+3 -1
View File
@@ -474,7 +474,9 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
this.dataList.push(item)
if(item.workPeople !== ''){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
src/pages/processCenter/pages/creatProcess/xmpg2/step12.vue
+3 -1
View File
@@ -476,7 +476,9 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
this.dataList.push(item)
if(item.workPeople !== ''){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue
+5
View File
@@ -799,6 +799,11 @@ export default {
this.$message.warning('请填写完整的不符合项信息')
this.comFlag = 0
}else{
this.listForm.dataList.forEach(item => {
if(item.workPeople === '请选择责任人'){
item.workPeople = ''
}
})
this.isSubmit = true;
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
src/pages/processCenter/pages/creatProcess/xmpg2/step7.vue
+3 -1
View File
@@ -435,7 +435,9 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
this.dataList.push(item)
if(item.workPeople !== ''){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
src/pages/processCenter/pages/creatProcess/xmpg2/step8.vue
+3 -1
View File
@@ -474,7 +474,9 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
this.dataList.push(item)
if(item.workPeople !== ''){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
src/pages/processCenter/pages/creatProcess/xmpg2/step9.vue
+3 -1
View File
@@ -476,7 +476,9 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
this.dataList.push(item)
if(item.workPeople !== ''){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
src/pages/processCenter/pages/creatProcess/zcch/step2.vue
+70 -1
View File
@@ -5,7 +5,8 @@
<template slot="proNode">法规部部长审批</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem active">基础信息</div>
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
@@ -209,6 +210,65 @@
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="流程信息"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
show-back
@@ -237,6 +297,7 @@
},
data() {
return {
histortData: [],
commentText: '',
isSubmit: false,
saveLoading: false,
@@ -268,6 +329,13 @@
}
},
methods: {
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
}, e => {})
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -368,6 +436,7 @@
},
mounted() {
this.getData()
this.getHistoryData()
}
};
</script>
src/pages/processCenter/pages/creatProcess/zcch/step3.vue
+70 -1
View File
@@ -5,7 +5,8 @@
<template slot="proNode">公司副总审批</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem active">基础信息</div>
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
@@ -209,6 +210,65 @@
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="流程信息"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
show-back
@@ -237,6 +297,7 @@
},
data() {
return {
histortData: [],
commentText: '',
isSubmit: false,
saveLoading: false,
@@ -268,6 +329,13 @@
}
},
methods: {
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
}, e => {})
},
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -342,6 +410,7 @@
},
},
mounted() {
this.getHistoryData()
this.getData()
}
};
src/pages/processCenter/pages/creatProcess/zchh/step2.vue
+70 -1
View File
@@ -5,7 +5,8 @@
<template slot="proNode">发起流程</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem active" >基础信息</div>
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
@@ -246,6 +247,65 @@
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="流程信息"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
show-back
@@ -274,6 +334,7 @@
},
data() {
return {
histortData: [],
commentText: '',
isSubmit: false,
saveLoading: false,
@@ -327,6 +388,13 @@
}
},
methods: {
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
}, e => {})
},
updataFj (item) {
window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
@@ -405,6 +473,7 @@
},
},
mounted() {
this.getHistoryData()
this.getData()
}
};
src/pages/processCenter/pages/creatProcess/zcrh/step2.vue
+70 -1
View File
@@ -5,7 +5,8 @@
<template slot="proNode">法规部部长审批</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem active">基础信息</div>
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
@@ -184,6 +185,65 @@
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="流程信息"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
show-back
@@ -207,6 +267,7 @@
name: "zcrhStep2",
data() {
return {
histortData: [],
json: {},
isSubmit: false,
foldFormFlag: true,
@@ -231,6 +292,13 @@
ProcessTitle
},
methods: {
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
}, e => {})
},
handleSubmit() {
this.isSubmit = true
var json = this.json
@@ -300,6 +368,7 @@
},
},
mounted () {
this.getHistoryData()
this.getData()
}
}
src/pages/processCenter/pages/creatProcess/zcrh/step3.vue
+70 -1
View File
@@ -5,7 +5,8 @@
<template slot="proNode">法规认证部副总监审批</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem active">基础信息</div>
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
@@ -184,6 +185,65 @@
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="流程信息"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
show-back
@@ -207,6 +267,7 @@
name: "zcrhStep3",
data() {
return {
histortData: [],
json: {},
isSubmit: false,
foldFormFlag: true,
@@ -231,6 +292,13 @@
ProcessTitle
},
methods: {
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
}, e => {})
},
handleSubmit() {
this.isSubmit = true
var json = this.json
@@ -300,6 +368,7 @@
},
},
mounted () {
this.getHistoryData()
this.getData()
}
}
src/pages/processCenter/pages/creatProcess/zcrh/step4.vue
+70 -1
View File
@@ -5,7 +5,8 @@
<template slot="proNode">公司副总审批</template>
</ProcessHeader>
<div class="headerTabs">
<div class="headerTabsItem active">基础信息</div>
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '2' ? 'active' : ''" @click="handleTabs('2')">人员信息</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
@@ -184,6 +185,65 @@
</el-collapse>
</div>
</div>
<div class="content" v-show="active === '2'">
<el-table
height="100%"
ref="selection"
:data="histortData"
tooltip-effect="dark"
style="width: 100%"
border
row-key="id"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column
prop="name"
label="任务步骤"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="assignee"
label="任务受理人"
align="center"
sortable="custom"
>
</el-table-column>
<el-table-column
prop="createTime"
label="创建时间"
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="endTime"
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
prop="comment"
label="流程信息"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.commentText }}</span>
</template>
</el-table-column>
<el-table-column
prop="completeFlag"
label="状态"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
</template>
</el-table-column>
</el-table>
</div>
<ProcessFooter
show-submit
show-back
@@ -207,6 +267,7 @@
name: "zcrhStep4",
data() {
return {
histortData: [],
json: {},
isSubmit: false,
foldFormFlag: true,
@@ -231,6 +292,13 @@
ProcessTitle
},
methods: {
getHistoryData () {
this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum,
}, {}, res => {
this.histortData = res
}, e => {})
},
handleSubmit() {
this.isSubmit = true
var json = this.json
@@ -300,6 +368,7 @@
},
},
mounted () {
this.getHistoryData()
this.getData()
}
}
src/pages/processCenter/pages/phone/bzdy/step4.vue
+5 -5
View File
@@ -315,14 +315,14 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.dyhz = data.dyhz || data.form.dyhz
this.form.dyhz = data.form ? data.form.dyhz : ''
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.file = data.fileId || data.form.fileId
this.form.fileName = data.fileName || data.form.fileName
this.form.fileId = data.fileId || data.form.fileId
this.form.modelList = data.modelList || data.form.modelList
this.form.file = data.form ? data.form.fileId : ''
this.form.fileName = data.form ? data.form.fileName : ''
this.form.fileId = data.form ? data.form.fileId : ''
this.form.modelList = data.form ? data.form.modelList : []
this.form.fjList = data.fjList || data.form.fjList
}).catch(e => {
})
src/pages/processCenter/pages/phone/bzhHd-ch/step2.vue
+3 -3
View File
@@ -317,7 +317,7 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
/*.headerTabs {
height: 52px;
display: flex;
align-items: center;
@@ -336,14 +336,14 @@ export default {
color: #fff;
background: #E6A23C;
}
}
}*/
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
src/pages/processCenter/pages/phone/bzhHd-ch/step4.vue
+3 -3
View File
@@ -288,7 +288,7 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
/*.headerTabs {
height: 52px;
display: flex;
align-items: center;
@@ -307,14 +307,14 @@ export default {
color: #fff;
background: #E6A23C;
}
}
}*/
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
src/pages/processCenter/pages/phone/bzhHd-ch/step6.vue
+3 -3
View File
@@ -351,7 +351,7 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
/*.headerTabs {
height: 52px;
display: flex;
align-items: center;
@@ -370,14 +370,14 @@ export default {
color: #fff;
background: #E6A23C;
}
}
}*/
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
src/pages/processCenter/pages/phone/bzhHd-hh/step2.vue
+3 -3
View File
@@ -328,7 +328,7 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
/*.headerTabs {
height: 52px;
display: flex;
align-items: center;
@@ -347,14 +347,14 @@ export default {
color: #fff;
background: #E6A23C;
}
}
}*/
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
/* height: calc(~'100% - 155px');*/
overflow: auto;
.tableTitle {
margin-bottom: 10px;
src/pages/processCenter/pages/phone/bzhHd-rh/step2.vue
+3 -3
View File
@@ -327,7 +327,7 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
/*.headerTabs {
height: 52px;
display: flex;
align-items: center;
@@ -346,14 +346,14 @@ export default {
color: #fff;
background: #E6A23C;
}
}
}*/
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
src/pages/processCenter/pages/phone/bzhHd-rh/step4.vue
+3 -3
View File
@@ -330,7 +330,7 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
/*.headerTabs {
height: 52px;
display: flex;
align-items: center;
@@ -349,14 +349,14 @@ export default {
color: #fff;
background: #E6A23C;
}
}
}*/
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
src/pages/processCenter/pages/phone/bzhHd-rh/step6.vue
+3 -3
View File
@@ -343,7 +343,7 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
/*.headerTabs {
height: 52px;
display: flex;
align-items: center;
@@ -362,14 +362,14 @@ export default {
color: #fff;
background: #E6A23C;
}
}
}*/
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
src/pages/processCenter/pages/phone/wfhxzg/step2.vue
+9 -9
View File
@@ -51,8 +51,8 @@
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineer" width="150" label="责任工程师" align="center"/>
<el-table-column prop="responsibleUnit" width="150" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineerName" width="150" label="责任工程师" align="center"/>
<el-table-column label="选择分发责任人" prop="dutyPeopleInfo" align="center">
<template slot-scope="scope">
<el-input
@@ -70,14 +70,14 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="textarea">
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
@@ -120,7 +120,7 @@ export default {
return {
passInfo: 0,
loading: false,
textarea: '', // 意见
commentText: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
taskIds: this.$route.query.taskIds,
@@ -208,7 +208,7 @@ export default {
this.passInfo = JSON.parse(JSON.stringify(item)).passInfo
}
this.dataList = JSON.parse(JSON.stringify(item)).standardInfoList
this.textarea = JSON.parse(JSON.stringify(item)).commentText
this.commentText = JSON.parse(JSON.stringify(item)).commentText
})
},
// 批量选择分发责任人
@@ -396,7 +396,7 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
/*.headerTabs {
height: 52px;
display: flex;
align-items: center;
@@ -415,14 +415,14 @@ export default {
color: #fff;
background: #E6A23C;
}
}
}*/
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
src/pages/processCenter/pages/phone/wfhxzg/step3.vue
+5 -5
View File
@@ -51,8 +51,8 @@
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineer" label="责任工程师" align="center"/>
<el-table-column prop="responsibleUnit" width="150" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineerName" width="150" label="责任工程师" align="center"/>
<el-table-column label="选择责任人" prop="dutyPeople" width="200" align="center">
<template slot-scope="scope">
<div style="display: inline;">
@@ -458,7 +458,7 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
/*.headerTabs {
height: 52px;
display: flex;
align-items: center;
@@ -477,14 +477,14 @@ export default {
color: #fff;
background: #E6A23C;
}
}
}*/
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
src/pages/processCenter/pages/phone/wfhxzg/step5.vue
+5 -4
View File
@@ -39,7 +39,8 @@
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
<el-table-column prop="responsibleUnit" width="150" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineerName" width="150" label="责任工程师" align="center"/>
<el-table-column prop="dutyPeople" label="负责人" align="center"/>
<el-table-column prop="fileText" label="佐证材料" align="center">
<template slot-scope="scope">
@@ -343,7 +344,7 @@ export default {
/deep/.prc-content-border .el-form-item__content {
width: 270px;
}
.headerTabs {
/* .headerTabs {
height: 52px;
display: flex;
align-items: center;
@@ -362,14 +363,14 @@ export default {
color: #fff;
background: #E6A23C;
}
}
}*/
.content {
border-top: 1px solid #DCDFE6;
display: flex;
flex-direction: column;
justify-content: space-between;
margin-top: 52px;
height: calc(~'100% - 155px');
//height: calc(~'100% - 155px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
src/pages/processCenter/pages/phone/xmpg2/step10.vue
+3 -1
View File
@@ -423,7 +423,9 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
this.dataList.push(item)
if(item.workPeople !== ''){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
src/pages/processCenter/pages/phone/xmpg2/step11.vue
+3 -1
View File
@@ -421,7 +421,9 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
this.dataList.push(item)
if(item.workPeople !== ''){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
src/pages/processCenter/pages/phone/xmpg2/step12.vue
+3 -1
View File
@@ -423,7 +423,9 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
this.dataList.push(item)
if(item.workPeople !== ''){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
src/pages/processCenter/pages/phone/xmpg2/step7.vue
+4 -1
View File
@@ -424,7 +424,7 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
if(item.children.length < 1 && item.workPeopleId === this.$store.getters.userInfo.userId ){
if(item.workPeople !== ''){
this.dataList.push(item)
}
item.children.forEach(items=> {
@@ -434,6 +434,9 @@ export default {
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
}
})
})
src/pages/processCenter/pages/phone/xmpg2/step8.vue
+15 -13
View File
@@ -423,19 +423,21 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
this.dataList.push(item)
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
}
})
if(item.workPeople !== ''){
this.dataList.push(item)
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
this.$set(items, "standEnName", item.standEnName);
this.$set(items, "standYear", item.standYear);
this.$set(items, "standSort", item.standSort);
this.$set(items, "standNumber", item.standNumber);
this.$set(items, "zccssrq", item.zccssrq);
this.$set(items, "xcxssrq", item.xcxssrq);
this.$set(items, "ssrq", item.ssrq);
}
})
}
})
this.listForm.dataList.forEach(item => {
dataChildren.push(item.children)
src/pages/processCenter/pages/phone/xmpg2/step9.vue
+3 -1
View File
@@ -422,7 +422,9 @@ export default {
this.listForm["id"] = item.id;
this.listForm.dataList = item.dataList;
this.listForm.dataList.forEach(item => {
this.dataList.push(item)
if(item.workPeople !== ''){
this.dataList.push(item)
}
item.children.forEach(items=> {
if(items.key === item.standId){
this.$set(items, "standName", item.standName);
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+80 -32
View File
@@ -50,7 +50,12 @@
<div class="search-area">
<div class="left">
<el-form ref="standardForm" :model="standardForm" inline>
<el-form-item label="标准号/标准名称" class="search-item">
<el-form-item label="标准号" class="search-item">
<el-input v-model="standardForm.standNumber"
placeholder="请输入"
clearable></el-input>
</el-form-item>
<el-form-item label="标准名称" class="search-item">
<el-input v-model="standardForm.standName"
placeholder="请输入"
clearable></el-input>
@@ -97,6 +102,7 @@
</div>
<div class="container" style="position:relative;">
<div style="position: absolute;top: 0;left: 0;bottom: 0;right: 0;">
<loading :loading="standInfoTableLoading">数据获取中</loading>
<el-table
:data="standinfoList"
style="width: 100%"
@@ -360,6 +366,7 @@ export default {
zrbmMap: {},
sycpxMap: {},
countryAreaMap: {},
standInfoTableLoading:false,
standinfoList: [],
// 适用车型
applyArcticOptions: [],
@@ -459,39 +466,79 @@ export default {
},
// 根据准入id查询标准法规详情
selectInfobyAccid() {
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
...this.standardFormList,
...this.standardForm,
id: this.pageId
}, {
_this: this
}, res => {
console.log(res.data.records);
res.data.records.forEach(item => {
if (item.nylx === "[]") {
item.nylx = null;
}
if (item.typeApplicable === "[]") {
item.typeApplicable = null;
}
if (item.sycpx === "[]") {
item.sycpx = null;
}
if(item.zrbm === "[]"){
item.zrbm = null
}
this.standInfoTableLoading = true
if(this.sarAccessEO.sortKey === '1'){
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
...this.standardFormList,
...this.standardForm,
id: this.pageId,
types: '1',
}, {
_this: this
}, res => {
res.data.records.forEach(item => {
if (item.nylx === "[]") {
item.nylx = null;
}
if (item.typeApplicable === "[]") {
item.typeApplicable = null;
}
if (item.sycpx === "[]") {
item.sycpx = null;
}
if(item.zrbm === "[]"){
item.zrbm = null
}
});
this.standinfoList = res.data.records;
this.standardFormTotal = res.data.total;
this.standinfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + " " + item.standNumber;
} else {
item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
}
});
this.standInfoTableLoading = false
}, e => {
this.standInfoTableLoading = false
});
this.standinfoList = res.data.records;
this.standardFormTotal = res.data.total;
this.standinfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + " " + item.standNumber;
} else {
item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
}
}else{
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
...this.standardFormList,
...this.standardForm,
id: this.pageId
}, {
_this: this
}, res => {
res.data.records.forEach(item => {
if (item.nylx === "[]") {
item.nylx = null;
}
if (item.typeApplicable === "[]") {
item.typeApplicable = null;
}
if (item.sycpx === "[]") {
item.sycpx = null;
}
if(item.zrbm === "[]"){
item.zrbm = null
}
});
this.standinfoList = res.data.records;
this.standardFormTotal = res.data.total;
this.standinfoList.forEach(item => {
if (item.standYear === null) {
item.standNumber = item.standSortShow + " " + item.standNumber;
} else {
item.standNumber = item.standSortShow + " " + item.standNumber + "-" + item.standYear;
}
});
this.standInfoTableLoading = false
}, e => {
this.standInfoTableLoading = false
});
}, e => {
});
}
},
selectInfoMore() {
this.$http.get("sarLawsAttrDetailedList/sar-laws-attr-detailed-list/selectLawsById", {
@@ -542,6 +589,7 @@ export default {
resetSelect() {
this.standardForm.zrbm = "";
this.standardForm.standName = "";
this.standardForm.standNumber = "";
this.standardForm.responseUnit = "";
this.selectInfobyAccid();
this.selectInfoMore();