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

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

Browse Source
This commit is contained in:
zhutianqi
2021-12-22 10:14:20 +08:00
parent 9547f5a992 6fd9053bde
commit 88b552dfa0
66 changed files with 2184 additions and 1462 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+1 -1
View File
@@ -562,7 +562,7 @@
this.$refs['Form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
this.$http.post('lawss/activiti/startProcessRollBack', {
type: '2'
}, {}, res => {
if (res.ok) {
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+1 -1
View File
@@ -559,7 +559,7 @@ export default {
this.$refs['Form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcessRollBack', {
this.$http.post('lawss/activiti/startProcessRollBack', {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+27 -2
View File
@@ -197,7 +197,8 @@
align="center"
label="联络人">
<template slot-scope="scope">
<el-input v-model="scope.row.tel_name" placeholder="请填写联络人"/>
<el-input v-model="scope.row.tel_nameId" style="display: none" placeholder="请填写联络人"/>
<el-input v-model="scope.row.tel_name" readonly @click.native="choiceTel('tel_nameId', '选择联络人', scope.row)" placeholder="请填写联络人"/>
</template>
</el-table-column>
<el-table-column
@@ -407,6 +408,13 @@
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
<Role-tree
check-box
is-title="选择联络人"
:is-visible.sync="telShowflag"
:nodeList="nodeListTel"
@checkedRole="drawerCheckTel"
/>
</div>
</template>
@@ -517,8 +525,10 @@ export default {
},
roleShowflag: false,
roleShowflagOne: false,
telShowflag: false,
nodeList: [],
nodeListOne: [],
nodeListTel: [],
isSubmit: false,
saveLoading: false,
@@ -724,6 +734,21 @@ export default {
this.deleteDataList = val
},
// 列表选人
choiceTel(type, title, val,id) {
this.choiceTelList = val
this.nodeListTel = []
this.nodeListTel.push(id)
this.type = type
this.telShowflag = true
},
drawerCheckTel(data) {
if(data.length > 0) {
this.choiceTelList.tel_nameId = data[0].id
this.choiceTelList.tel_name = data[0].name
}
this.telShowflag = false
},
// 流程阶段负责人选择
choiceZRR(type, title, id) {
this.nodeList = []
@@ -774,7 +799,7 @@ export default {
} else if (this.type === 'engineerUser') {
this.roleForm.engineerUser = data[0].name
this.roleForm.engineerUserId = data[0].id
} else {
}else {
this.roleForm.directorUserName = data[0].name
this.roleForm.directorUserId = data[0].id
}
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step2.vue
+3 -2
View File
@@ -112,10 +112,11 @@
<template slot="title">选择人员</template>
</ProcessTitle>
<el-form-item class="add-form-item" label="入会人员:">
<el-input v-model="rh_pageData.comityOpRoleId" style="display: none;"></el-input>
<el-input
placeholder="请选择入会成员"
style="width: 50%"
@click.native="choiceRole"
@click.native="choiceRole('','请选择入会成员',rh_pageData.comityOpRoleId,)"
v-model="rh_pageData.comityOpRole"
/>
</el-form-item>
@@ -380,7 +381,7 @@ export default {
},
/** 选择入会人员 */
choiceRole(id) {
choiceRole(type,title,id) {
this.nodeList = []
this.nodeList.push(id)
this.roleShowflag = true
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step3.vue
+1 -1
View File
@@ -431,7 +431,7 @@ export default {
this.rh_pageData.fillDept = this.$store.getters.userInfo.institutionName
this.rh_pageData.fillUnit = this.$store.getters.userInfo.upDeptName
this.rh_pageData.fillTel = this.$store.getters.userInfo.phone
this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName
this.rh_pageData.fillPeople = this.$store.getters.userInfo.userName + '(' + this.$store.getters.userInfo.userId + ')'
if (this.rh_pageData.fillFile !== undefined) {
this.fillFileList = this.rh_pageData.fillFile
}
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step5.vue
+291 -23
View File
@@ -22,7 +22,7 @@
v-for="item in rh_pageData.comityOptionsOne"
:key="item.id"
v-if="item.id === rh_pageData.comityName">
{{ item.name || '-'}}
{{ item.name || '-' }}
</span>
</el-form-item>
</el-col>
@@ -74,7 +74,7 @@
<span v-if="infoSourcesLength === 0">{{ '-' }}</span>
<div v-for="item in rh_pageData.infoSources" :key="item.id" style="color: #409EFF;">
<a v-if="item.name.length > 30" style="cursor: pointer" @click="fileLook(item)">
{{ item.name.slice(0,30) + '...' }} {{ ';' }}
{{ item.name.slice(0, 30) + '...' }} {{ ';' }}
</a>
<a v-else style="cursor: pointer" @click="fileLook(item)">
{{ item.name }} {{ ';' }}
@@ -138,11 +138,16 @@
</el-form-item>
<el-form-item class="add-form-item" label="我司参与人员:" style="margin-top: 10px">
<div class="myPart_btn">
<el-button
type="primary"
size="small"
@click="add_partForm">
新增
</el-button>
<el-button
type="danger"
size="small"
icon="el-icon-delete"
@click="del_paryForm">
@click="del_partForm">
批量删除
</el-button>
</div>
@@ -156,18 +161,51 @@
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '20px'}">
<el-table-column type="selection" width="55"/>
<el-table-column prop="fillPeople" align="center" label="参与人"/>
<el-table-column prop="fillUnit" align="center" label="单位"/>
<el-table-column prop="fillDept" align="center" label="部门"/>
<el-table-column prop="fillPost" align="center" label="身份"/>
<el-table-column prop="fillTel" align="center" label="电话"/>
<el-table-column prop="fillMail" align="center" label="邮箱"/>
<el-table-column prop="fillFile" align="center" label="资料">
<el-table-column prop="fillPeople" align="center" label="参与人">
<template slot-scope="scope">
<span v-if="scope.row.fillFile.length === 0">{{ '-' }}</span>
<span v-for="item in scope.row.fillFile" :key="item.id" style="color: #409EFF;" @click="previews(item.id)">
{{ item.name }} {{ ';' }}
</span>
{{ scope.row.fillPeople || '' }}
</template>
</el-table-column>
<el-table-column prop="fillUnit" align="center" label="单位">
<template slot-scope="scope">
{{ scope.row.fillUnit || '' }}
</template>
</el-table-column>
<el-table-column prop="fillDept" align="center" label="部门">
<template slot-scope="scope">
{{ scope.row.fillDept || '' }}
</template>
</el-table-column>
<el-table-column prop="fillPost" align="center" label="身份">
<template slot-scope="scope">
{{ scope.row.fillPost || '' }}
</template>
</el-table-column>
<el-table-column prop="fillTel" align="center" label="电话">
<template slot-scope="scope">
{{ scope.row.fillTel || '' }}
</template>
</el-table-column>
<el-table-column prop="fillMail" align="center" label="邮箱">
<template slot-scope="scope">
{{ scope.row.fillMail || '' }}
</template>
</el-table-column>
<el-table-column prop="fillFile" width="120" align="center" label="资料">
<template slot-scope="scope">
<el-button v-if="scope.row.fillFile.length === 0" type="primary" plain size="mini" @click="fillFile_up(scope.row)">
点击上传
</el-button>
<el-button v-else size="mini" plain type="primary" @click="fillFile_up(scope.row)">查看附件</el-button>
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
align="center"
width="100">
<template slot-scope="scope">
<el-button type="primary" plain size="mini" @click="edit_partForm(scope.row)">编辑</el-button>
</template>
</el-table-column>
</el-table>
@@ -256,6 +294,88 @@
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<el-drawer
title="编辑人员信息"
:visible.sync="editFlag"
size="500px"
>
<div class="content_form" style="height: 100%">
<el-form class="label-input-form" ref="editForm" :model="editForm" label-width="80px">
<el-form-item class="add-form-item" label="参与人员:">
<el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
<el-input
placeholder="请选择参与人员"
style="width: 50%"
@click.native="choiceRole('fillPeopleId','请选择入会成员',editForm.fillPeopleId,)"
v-model="editForm.fillPeople"
/>
</el-form-item>
<el-form-item class="add-form-item" label="单位:">
<el-input v-model="editForm.fillUnit" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="部门:">
<el-input v-model="editForm.fillDept" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="身份:">
<el-input v-model="editForm.fillPost" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="电话:">
<el-input v-model="editForm.fillTel" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="邮箱:">
<el-input v-model="editForm.fillMail" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="资料:">
<el-upload
:disabled="acceptShow"
multiple
ref="uploadFile"
:action="actionPath"
name="file"
:file-list="reData"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:before-upload="handleBeforeUpload"
:before-remove="handleBeforeRemove"
:on-success="handleOnsuccess"
>
<el-button type="primary" size="small">
上传文件
</el-button>
</el-upload>
</el-form-item>
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="falseDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="OkDrawer">确认</el-button>
</div>
</el-drawer>
<!-- 标准号table上传弹框 -->
<el-dialog
:visible.sync="upDialog"
width='400px'
:before-close="handleClose">
<el-upload
:disabled="acceptShow"
multiple
class="upload-demo"
ref="uploadFile"
:action="actionPath"
name="file"
drag
:file-list="reData"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:before-upload="handleBeforeUpload"
:before-remove="handleBeforeRemove"
:on-success="handleOnsuccess"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
<p>点击或拖拽上传文件</p>
</div>
</el-upload>
</el-dialog>
<ProcessFooter
show-submit
show-save
@@ -265,6 +385,13 @@
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
check-box
is-title="选择入会人员"
:is-visible.sync="roleShowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -333,7 +460,26 @@ export default {
deleteDataList: [],
infoSourcesLength: '',
commentText: ''
commentText: '',
editFlag: false,
editForm: {
fillPeople: '',
fillUnit: '',
fillDept: '',
fillPost: '',
fillTel: '',
fillMail: '',
fillFile: [],
},
// 上传文件储存
reData: [],
upDialog: false,
actionPath: 'api/att/attFile/upload',
acceptShow: false,
roleShowflag: false,
nodeList: [],
}
},
computed: {
@@ -382,8 +528,130 @@ export default {
// this.rh_pageData.comityFileNum = this.fileTextList
})
},
/** 我司参与人员新增 */
add_partForm() {
var list = {
fillPeople: this.fillPeople,
fillUnit: this.fillUnit,
fillDept: this.fillDept,
fillPost: this.fillPost,
fillTel: this.fillTel,
fillMail: this.fillMail,
fillFile: this.fillFile = []
}
this.rh_pageData.myPartRole.push(list)
},
fillFile_up(row) {
this.fileListData = row
this.reData = this.fileListData.fillFile
this.upDialog = true
},
// 文件上传成功
handleOnsuccess(res, file, fileList) {
if (res.ok) {
if (this.reData !== undefined) {
this.newDataList = this.reData
this.newDataList.push({
id: res.data.attId,
name: res.data.name
})
} else {
this.newDataList.push({
id: res.data.attId,
name: res.data.name
})
}
this.fileListData.fillFile = this.newDataList
this.$message({
showClose: true,
message: res.message,
type: 'success'
})
this.newDataList = []
this.fileMadel = false
}
},
// 文件上传限制条件
handleBeforeUpload(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 === '.ZIP' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
return true
} else {
this.spinShow = false
this.$message.error('文件' + file.name + '格式不正确，请上传ZIP/DOCX/PDF或XLS文件')
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
},
// 移除上传的文件
handleBeforeRemove(file, fileList) {
this.reData.forEach((item, index) => {
if (item.name === file.name || item.id === file.id) {
this.reData.splice(index, 1)
}
})
this.fileListData.fillFile = this.reData
},
handleClose() {
this.upDialog = false
},
// 编辑按钮
edit_partForm(row) {
// 用来储存取消时原来的数据，防止取消时修改
localStorage.setItem('obj', JSON.stringify(row))
this.fileListData = row
this.reData = this.fileListData.fillFile
this.editForm = row
this.editFlag = true
},
// 编辑框确认按钮
OkDrawer() {
this.editFlag = false
},
falseDrawer() {
let Item = JSON.parse(localStorage.getItem('obj'))
this.editForm.fillPeopleId = Item.fillPeopleId
this.editForm.fillPeople = Item.fillPeople
this.editForm.fillUnit = Item.fillUnit
this.editForm.fillDept = Item.fillDept
this.editForm.fillPost = Item.fillPost
this.editForm.fillTel = Item.fillTel
this.editForm.fillMail = Item.fillMail
this.editForm.fillFile = Item.fillFile
this.editFlag = false
},
// 编辑框选人
choiceRole(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.roleShowflag = true
},
drawerCheck(data) {
if (data.length > 0) {
this.fileListData.fillPeopleId = data[0].id
this.fileListData.fillPeople = data[0].name
}
this.roleShowflag = false
},
/** 批量删除 */
del_paryForm() {
del_partForm() {
if (this.deleteDataList.length < 1) {
this.$message.warning("请选择一条数据进行删除");
} else {
@@ -477,16 +745,16 @@ export default {
const attId = file.id
this.getBusStandFileByAttId(attId)
.then(res => {
if(res){
if (res) {
const editFileInfo = res
if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
}else if(editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF'){
if (editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG') {
window.open('book://ssreader/e0?url=' + editFileInfo.downLoadUrl)
} else if (editFileInfo.fileSuffix === 'pdf' || editFileInfo.fileSuffix === 'PDF') {
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
}else {
} else {
const nowTime = new Date().getTime()
// window.open('http://127.0.0.1:8012/onlinePreview?url='+encodeURIComponent(Base64.encode(editFileInfo.downLoadUrl)));
window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
window.open('/static/onlyOffice/onlinePreview.html?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime + '&filePath=' + editFileInfo.filePath + '&fileName=' + editFileInfo.fileName)
}
// window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + editFileInfo.id))
}
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+5 -2
View File
@@ -283,7 +283,7 @@
</el-timeline-item>
<el-timeline-item timestamp="批准" placement="top" :color="roleForm.startUser ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="totalLeader" style="margin-bottom: 0">
<el-form-item prop="directorUserName" style="margin-bottom: 0">
<h4>技术委员会主任</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.directorUserId" style="display: none;"></el-input>
@@ -392,7 +392,9 @@ export default {
fillFile: '',
associaOptionsOne: [],
associaOptionsTwo: [],
associaOptionsTree: []
associaOptionsTree: [],
meetingInRole: '',
meetingInRoleId: ''
},
feeKindOptions: [
@@ -429,6 +431,7 @@ export default {
leaderUser: [{required: true, message: "请选择标准法规部主管中心主任", trigger: ['blur', 'change']}],
feeUser: [{required: true, message: "请选择管理推荐部", trigger: ['blur', 'change']}],
engineerUser: [{required: true, message: "请选择技术委员会常务副主任/总院院长", trigger: ['blur', 'change']}],
directorUserName: [{required: true, message: "请选择技术委员会主任", trigger: ['blur', 'change']}],
},
deleteDataList: [],
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step2.vue
+34 -5
View File
@@ -107,11 +107,12 @@
<ProcessTitle>
<template slot="title">选择人员</template>
</ProcessTitle>
<el-form-item class="add-form-item" label="入会人员:">
<el-form-item class="add-form-item" label="参会人员:">
<el-input v-model="ch_pageData.meetingInRoleId" style="display: none;"></el-input>
<el-input
:disabled="true"
style="width: 30%"
placeholder="请选择入会人员"
placeholder="请选择参会人员"
style="width: 50%"
@click.native="choiceRole('meetingInRoleId','选择参会人员',ch_pageData.meetingInRoleId,)"
v-model="ch_pageData.meetingInRole"
/>
</el-form-item>
@@ -209,6 +210,13 @@
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
is-title="选择入会人员"
:is-visible.sync="roleShowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -293,10 +301,31 @@ export default {
this.$nextTick(() => {
this.ch_pageData = JSON.parse(JSON.stringify(item)).ch_pageData
this.uploadFileLength = this.ch_pageData.fileTextList.length
this.ch_pageData.meetingInRole = this.$store.getters.userInfo.userName
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
})
},
/** 选择入会人员 */
choiceRole(type,title,id) {
this.nodeList = []
this.nodeList.push(id)
this.roleShowflag = true
},
drawerCheck(data) {
var idList = ''
var nameList = ''
data.forEach(item => {
if (nameList.length > 0) {
nameList += ','
idList += ','
}
idList += item.id;
nameList += item.name;
})
this.ch_pageData.meetingInRole = nameList
this.ch_pageData.meetingInRoleId = idList
this.roleShowflag = false
},
// 退回按钮
handleSubmitNo() {
if (this.commentText === '') {
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step3.vue
+1 -1
View File
@@ -372,7 +372,7 @@ export default {
this.ch_pageData.fillUnit = this.$store.getters.userInfo.upDeptName
this.ch_pageData.fillTel = this.$store.getters.userInfo.phone
this.ch_pageData.fillPeopleId = this.$store.getters.userInfo.userId
this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName
this.ch_pageData.fillPeople = this.$store.getters.userInfo.userName + '(' + this.$store.getters.userInfo.userId + ')'
this.roleForm = JSON.parse(JSON.stringify(item)).roleList
// this.rh_pageData.comityFileNum = this.fileTextList
})
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step5.vue
+143 -10
View File
@@ -113,11 +113,15 @@
</el-form-item>
<el-form-item class="add-form-item" label="入会人员:">
<div class="myPart_btn">
<el-button
type="primary"
size="small"
@click="add_partForm">
新增</el-button>
<el-button
type="danger"
size="small"
icon="el-icon-delete"
@click="del_paryForm">
@click="del_partForm">
批量删除
</el-button>
</div>
@@ -132,11 +136,40 @@
fontWeight: 'bold', height: '20px'}">
<el-table-column type="selection" width="55"/>
<el-table-column type="index" width="50" align="center"/>
<el-table-column prop="fillPeople" align="center" label="人员"/>
<el-table-column prop="fillUnit" align="center" label="单位"/>
<el-table-column prop="fillDept" align="center" label="部门"/>
<el-table-column prop="fillTel" align="center" label="电话"/>
<el-table-column prop="fillMail" align="center" label="邮箱"/>
<el-table-column prop="fillPeople" align="center" label="人员">
<template slot-scope="scope">
{{ scope.row.fillPeople || '' }}
</template>
</el-table-column>
<el-table-column prop="fillUnit" align="center" label="单位">
<template slot-scope="scope">
{{ scope.row.fillUnit || '' }}
</template>
</el-table-column>
<el-table-column prop="fillDept" align="center" label="部门">
<template slot-scope="scope">
{{ scope.row.fillDept || '' }}
</template>
</el-table-column>
<el-table-column prop="fillTel" align="center" label="电话">
<template slot-scope="scope">
{{ scope.row.fillTel || '' }}
</template>
</el-table-column>
<el-table-column prop="fillMail" align="center" label="邮箱">
<template slot-scope="scope">
{{ scope.row.fillMail || '' }}
</template>
</el-table-column>
<el-table-column
fixed="right"
label="操作"
align="center"
width="100">
<template slot-scope="scope">
<el-button type="primary" plain size="mini" @click="edit_partForm(scope.row)">编辑</el-button>
</template>
</el-table-column>
</el-table>
</el-form-item>
</el-form>
@@ -223,6 +256,42 @@
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<el-drawer
title="编辑人员信息"
:visible.sync="editFlag"
size="500px"
custom-class="demo-drawer"
>
<div class="content_form" style="height: 100%">
<el-form class="label-input-form" ref="editForm" :model="editForm" label-width="80px">
<el-form-item class="add-form-item" label="参与人员:">
<el-input v-model="editForm.fillPeopleId" style="display: none;"></el-input>
<el-input
placeholder="请选择参与人员"
style="width: 50%"
@click.native="choiceRole('fillPeopleId','请选择入会成员',editForm.fillPeopleId,)"
v-model="editForm.fillPeople"
/>
</el-form-item>
<el-form-item class="add-form-item" label="单位:">
<el-input v-model="editForm.fillUnit" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="部门:">
<el-input v-model="editForm.fillDept" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="电话:">
<el-input v-model="editForm.fillTel" placeholder=""></el-input>
</el-form-item>
<el-form-item class="add-form-item" label="邮箱:">
<el-input v-model="editForm.fillMail" placeholder=""></el-input>
</el-form-item>
</el-form>
</div>
<div class="demo-drawer-footer">
<el-button size="mini" @click="falseDrawer">取消</el-button>
<el-button type="primary" size="mini" @click="OkDrawer">确认</el-button>
</div>
</el-drawer>
<ProcessFooter
show-save
show-submit
@@ -232,6 +301,13 @@
@submit="handleSubmit"
>
</ProcessFooter>
<Role-tree
check-box
is-title="选择入会人员"
:is-visible.sync="roleShowflag"
:nodeList="nodeList"
@checkedRole="drawerCheck"
/>
</div>
</template>
@@ -269,7 +345,18 @@ export default {
pId: this.$route.query.prcId,
uploadFileLength: '',
commentText: ''
commentText: '',
roleShowflag: false,
nodeList: [],
// 人员编辑
editFlag: false,
editForm: {
fillPeople: '',
fillUnit: '',
fillDept: '',
fillTel: '',
fillMail: '',
}
}
},
computed: {
@@ -318,9 +405,55 @@ export default {
// this.ch_pageData.comityFileNum = this.fileTextList
})
},
/** 我司参与人员新增 */
add_partForm() {
var list = {
fillPeople: this.fillPeople,
fillUnit: this.fillUnit,
fillDept: this.fillDept,
fillTel: this.fillTel,
fillMail: this.fillMail,
}
this.ch_pageData.myPartRole.push(list)
},
// 编辑框确认按钮
OkDrawer() {
this.editFlag = false
},
falseDrawer() {
let Item = JSON.parse(localStorage.getItem('obj'))
this.editForm.fillPeopleId = Item.fillPeopleId
this.editForm.fillPeople = Item.fillPeople
this.editForm.fillUnit = Item.fillUnit
this.editForm.fillDept = Item.fillDept
this.editForm.fillTel = Item.fillTel
this.editForm.fillMail = Item.fillMail
this.editFlag = false
},
/** 入会人员编辑 */
edit_partForm(row) {
// 用来储存取消时原来的数据，防止取消时修改
localStorage.setItem('obj', JSON.stringify(row))
this.fileListData = row
this.editForm = row
this.editFlag = true
},
// 编辑框选人
choiceRole(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.roleShowflag = true
},
drawerCheck(data) {
if (data.length > 0) {
this.fileListData.fillPeopleId = data[0].id
this.fileListData.fillPeople = data[0].name
}
this.roleShowflag = false
},
/** 批量删除 */
del_paryForm() {
del_partForm() {
if (this.deleteDataList.length < 1) {
this.$message.warning("请选择一条数据进行删除");
} else {
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+1 -1
View File
@@ -1181,7 +1181,7 @@
this.$message.warning('请选择责任人')
} else {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
this.$http.post('lawss/activiti/startProcessRollBack', {
type: '9'
}, {}, res => {
if (res.ok) {
src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue
+133 -20
View File
@@ -37,18 +37,19 @@
clearable
></el-input>
</el-form-item>
<el-form-item label="附件" prop="modelName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="listForm.model">
<p> {{ listForm.modelName }}
<el-form-item label="附件" prop="fileName" class="add-form-item form-item-disabled">
<div class="file-box" v-if="fileList.length > 0">
<p v-for="item in fileList"
:key="item.id"> {{ item.name }}
<i
title="下载"
@click="downloadFile(listForm.model)"
@click="downloadFile(item.id)"
class="icon-download"
v-btn-permission="''"
/>
<i
title="下载带水印"
@click="downloadFileByWater(listForm.model,listForm.modelName)"
@click="downloadFileByWater(item.id, item.name)"
class="icon-download2"
v-btn-permission="''"
/>
@@ -204,6 +205,15 @@
<loading :loading="loading">流程列表加载中</loading>
</div>
</div>
<!-- 福田全公司选人解决方案 -->
<Role-tree
check-box
:is-title="drawerTitle"
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
:nodeList="nodeList"
></Role-tree>
</div>
</template>
@@ -211,7 +221,8 @@
import ProcessHeader from "../../components/ProcessHeader";
import ProcessFooter from "../../components/ProcessFooter";
import ProcessTitle from "../../components/ProcessTitle";
import { inboundLiaisonDetail } from "api/process";
import { changeAssigneeNew, inboundLiaisonDetail } from "api/process";
export default {
name: "bzqdfbStep1-4",
components: {
@@ -221,6 +232,11 @@ export default {
},
data() {
return {
nodeList:[],
isTransfer: false,
drawerTitle:'',
// 调整处理人抽屉状态
drawerModal: false,
detailData: [],
// 当前流程类型(1待办/2已办)
processType: 1,
@@ -236,10 +252,12 @@ export default {
selectList: [], //选择标准的选择框
bringData: [],
commentText: "", //填写会签意见
fileList:[],
page: 1,
total: 0,
pageSize: this.$store.getters.userInfo.configContent,
listForm: {
fileIds: '',
listType: "", //区分是哪个清单
listName: "", //清单名称
descriptionList: "", //清单说明
@@ -274,6 +292,47 @@ export default {
};
},
methods: {
//确认转办
checkedRole (data) {
this.assigneeNewLoading = true
changeAssigneeNew({
taskId: this.$route.query.taskIds, // 任务id
assignee: data[0].id, // 被委托人
userId: this.$store.getters.userInfo.userId, // 委托人
pId: this.$route.query.prcId // 流程实例
}).then(res => {
this.isTransfer = false
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
this.$router.push("/processCenter");
this.processNum()
} else {
this.$message.warning(res.message)
}
})
},
// 请求转换流程图
processNum (row) {
axios.request({
url: '/api/lawss/activiti/getImg?_t=' + new Date().getTime(),
responseType: 'blob',
method: 'get',
params: {
prcNum: this.$route.query.prcNum
}
}).then(res => {
// let blob = new Blob([res.data], {type: 'image/jpg'})
// let url = window.URL.createObjectURL(res.data)
this.processStep = window.URL.createObjectURL(res.data)
})
},
//转办事件
handleTransfer(){
this.drawerModal = true
this.drawerTitle = '转办处理人'
this.selectPeople = row
},
processTable() {
this.$http.get("lawss/activiti/get_list_by_instance", {
prcNum: this.$route.query.prcNum,
@@ -337,6 +396,15 @@ export default {
this.listForm.applyUpdUserId = item.applyUpdUserId;
this.listForm.jlUserId = item.jlUserId;
this.listForm.zrUserId = item.zrUserId;
let filesId = []
item.fileName.forEach(itemIds =>{
filesId.push(itemIds.id)
})
this.listForm.fileId = filesId.join(',')
item.fileName.forEach(itemId => {
this.fileIds = itemId.id
this.getFileInfo();
})
});
},
// 请求上传的文件信息
@@ -346,11 +414,15 @@ export default {
}, {
_this: this
}, res => {
console.log(res);
this.$nextTick(() => {
res.data.map(item => {
this.listForm.modelName = item.oldFileName;
this.listForm.model = item.id;
// 赋值要回显的上传文件内容
this.fileList.push({
name: item.oldFileName,
uid: item.uid,
status: item.status,
id: item.id
});
});
});
}, e => {
@@ -378,18 +450,13 @@ export default {
}
}
},
//驳回事件
// 驳回事件
beforeBack() {
if (this.commentText === null || this.commentText === undefined || this.commentText === "") {
this.$message.warning("请填写审批意见");
} else {
if(!this.commentText){
this.$message.warning('请填写审批意见')
}else{
this.listForm.approvalOpinion = "1";
this.handleSubmit();
}
},
//提交事件
handleSubmit() {
this.isSubmit = true
this.saveLoading = true
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
@@ -403,8 +470,29 @@ export default {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
this.saveLoading = false
});
}/**/
},
//提交事件
handleSubmit() {
this.isSubmit = true;
this.listForm.approvalOpinion = "2";
this.listForm.commentText = this.commentText;
const json = JSON.stringify(this.listForm);
this.$http.post("lawss/activiti/completeTask", {
taskIds: this.taskIds,
userId: this.userId,
json: json
}, {
_this: this
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
}
this.isSubmit = false
});
},
//选择标准取消事件
closeDrawer() {
@@ -465,6 +553,31 @@ export default {
padding: 0 20px 0;
}
}
p {
& > a {
cursor: pointer;
}
& > i {
display: inline-block;
margin-left: 3px;
width: 18px;
height: 16px;
background-repeat: no-repeat;
background-size: 100% 100%;
background-position: center center;
vertical-align: sub;
cursor: pointer;
}
.icon-download {
background-image: url("~assets/images/shangqi/img/download.png");
}
.icon-download2 {
background-image: url("~assets/images/shangqi/img/download2.png");
}
}
.choiceBtn {
.el-button--primary {
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+8 -8
View File
@@ -1159,19 +1159,19 @@
:maxlength="100"></el-input>
</el-form-item>
</el-row>
<el-form-item label="中文名称" prop="standName" class="search-item" >
<el-form-item label="标准名称" prop="standName" class="search-item" >
<el-input v-model="standardSearchForm.standName"
placeholder="请输入标准名称"
clearable
:maxlength="500"></el-input>
</el-form-item>
<el-form-item label="英文名称" prop="standEnName" class="search-item">
<el-input
v-model="standardSearchForm.standEnName"
maxlength="1000"
placeholder="请输入英文名称"
clearable></el-input>
</el-form-item>
<!-- <el-form-item label="英文名称" prop="standEnName" class="search-item">-->
<!-- <el-input-->
<!-- v-model="standardSearchForm.standEnName"-->
<!-- maxlength="1000"-->
<!-- placeholder="请输入英文名称"-->
<!-- clearable></el-input>-->
<!-- </el-form-item>-->
<el-form-item>
<el-button
type="primary"
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+1 -1
View File
@@ -813,7 +813,7 @@ export default {
this.$refs['Form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
this.$http.post('lawss/activiti/startProcessRollBack', {
type: '3'
}, {}, res => {
if (res.ok) {
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+1 -1
View File
@@ -829,7 +829,7 @@ export default {
this.$refs['Form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
this.$http.post('lawss/activiti/startProcessRollBack', {
id: this.bpnId || '',
createUser: this.$store.getters.userInfo.userId,
createUserName: this.$store.getters.userInfo.userName,
src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue
+1 -1
View File
@@ -159,7 +159,7 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/qbfz/step2.vue
+1 -1
View File
@@ -115,7 +115,7 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/qbfz/step3.vue
+1 -1
View File
@@ -124,7 +124,7 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/qbfz/step4.vue
+1 -1
View File
@@ -159,7 +159,7 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/qbfz/step5.vue
+1 -1
View File
@@ -159,7 +159,7 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/qbfz/step6.vue
+1 -1
View File
@@ -159,7 +159,7 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/qbfz/step7.vue
+1 -1
View File
@@ -159,7 +159,7 @@
</div>
</div>
<div class="content" v-show="active === '3'">
<div class="flow-list">
<div class="flow-list" style="height: 100%">
<el-table
height="100%"
ref="selection"
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue
+7 -7
View File
@@ -96,12 +96,12 @@
placeholder="请选择标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
<div v-if="qbfsForm.unit">
<el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
<el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
<div v-if="qbfsForm.unitName">
<el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
<el-input
readonly
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
clearable
></el-input>
@@ -110,7 +110,7 @@
<div v-else>
<el-input
readonly
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
clearable
></el-input>
@@ -233,7 +233,7 @@
</el-table-column>
<el-table-column
align="center"
prop="unit"
prop="unitName"
label="起草责任单位">
</el-table-column>
</el-table>
@@ -370,7 +370,7 @@ export default {
this.qbfsForm.releaseTime = this.selectList[0].releaseTime
this.qbfsForm.resPersonName = this.selectList[0].resPersonName
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定')
this.qbfsForm.unit = this.selectList[0].unit
this.qbfsForm.unitName = this.selectList[0].unitName
this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
this.ListModel = false
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue
+7 -7
View File
@@ -104,12 +104,12 @@
placeholder="请选择标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
<div v-if="qbfsForm.unit">
<el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
<el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
<div v-if="qbfsForm.unitName">
<el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
<el-input
readonly
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
clearable
></el-input>
@@ -118,7 +118,7 @@
<div v-else>
<el-input
readonly
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
clearable
></el-input>
@@ -249,7 +249,7 @@
</el-table-column>
<el-table-column
align="center"
prop="unit"
prop="unitName"
label="起草责任单位">
</el-table-column>
</el-table>
@@ -391,7 +391,7 @@ export default {
this.qbfsForm.releaseTime = this.selectList[0].releaseTime
this.qbfsForm.resPersonName = this.selectList[0].resPersonName
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定')
this.qbfsForm.unit = this.selectList[0].unit
this.qbfsForm.unitName = this.selectList[0].unitName
this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
this.ListModel = false
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue
+7 -7
View File
@@ -64,10 +64,10 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-input v-model="qbfsForm.unitId" style="display: none;"></el-input>
<el-input v-model="qbfsForm.unit" placeholder="请选择起草责任单位"
@click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unitId)">
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
<el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
@click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
</el-input>
</el-form-item>
<el-form-item label="新增原因" style="width: 100%; margin-right:10px" prop="newReason" class="add-form-item form-item-disabled">
@@ -133,7 +133,7 @@ export default {
qbfsForm: {
type: '5',
unit: '', // 单位
unitId: '',
unitName: '',
esName: '', // 企标名称
planStatus: '', // 计划状态
reviseStatus: '', // 制修订状态
@@ -222,8 +222,8 @@ export default {
idList += item.id
nameList += item.name
})
this.$set(this.qbfsForm, 'unitId', idList)
this.$set(this.qbfsForm, 'unit', nameList)
this.$set(this.qbfsForm, 'unit', idList)
this.$set(this.qbfsForm, 'unitName', nameList)
if(this.qbfsForm.unit){
this.$refs.qbfsForm.validateField('unit')
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue
+8 -8
View File
@@ -81,10 +81,10 @@
placeholder="请选择初稿完成时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-input v-model="qbfsForm.unitId" style="display: none;"></el-input>
<el-input v-model="qbfsForm.unit" placeholder="请选择起草责任单位"
@click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unitId)">
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
<el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
@click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
</el-input>
<!-- <el-select v-model="qbfsForm.unit" filterable multiple clearable>-->
<!-- <el-option-->
@@ -249,7 +249,7 @@
</el-table-column>
<el-table-column
align="center"
prop="unit"
prop="unitName"
label="起草责任单位">
</el-table-column>
</el-table>
@@ -330,7 +330,7 @@ export default {
esName2: [
{required: true, message: '请选择合并计划企标名称', trigger: 'blur'},
],
unit: [
unitName: [
{required: true, message: '请选择起草单位', trigger: 'change'},
],
esName: [
@@ -444,8 +444,8 @@ export default {
idList += item.id
nameList += item.name
})
this.$set(this.qbfsForm, 'unitId', idList)
this.$set(this.qbfsForm, 'unit', nameList)
this.$set(this.qbfsForm, 'unit', idList)
this.$set(this.qbfsForm, 'unitName', nameList)
if(this.qbfsForm.unit){
this.$refs.qbfsForm.validateField('unit')
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue
+7 -7
View File
@@ -95,12 +95,12 @@
placeholder="请选择标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" prop="unit" class="add-form-item form-item-disabled">
<div v-if="qbfsForm.unit">
<el-tooltip class="item" effect="dark" :content="qbfsForm.unit" placement="top-start">
<el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
<div v-if="qbfsForm.unitName">
<el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
<el-input
readonly
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
clearable
></el-input>
@@ -109,7 +109,7 @@
<div v-else>
<el-input
readonly
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
clearable
></el-input>
@@ -240,7 +240,7 @@
</el-table-column>
<el-table-column
align="center"
prop="unit"
prop="unitName"
label="起草责任单位">
</el-table-column>
</el-table>
@@ -379,7 +379,7 @@ export default {
this.qbfsForm.releaseTime = this.selectList[0].releaseTime
this.qbfsForm.resPersonName = this.selectList[0].resPersonName
this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus === '0'? '制定完成' : (this.selectList[0].reviseStatus === '1'? '制定中' : '未制定')
this.qbfsForm.unit = this.selectList[0].unit
this.qbfsForm.unitName = this.selectList[0].unitName
this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName
this.ListModel = false
}
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue
+2 -2
View File
@@ -75,10 +75,10 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step2.vue
+2 -2
View File
@@ -75,10 +75,10 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step3.vue
+2 -2
View File
@@ -75,10 +75,10 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step4.vue
+2 -2
View File
@@ -75,10 +75,10 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step5.vue
+2 -2
View File
@@ -75,10 +75,10 @@
placeholder="请选择计划标准发布时间">
</el-date-picker>
</el-form-item>
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unit" class="add-form-item form-item-disabled">
<el-form-item label="起草责任单位" style="width: 100%; margin-right:10px" prop="unitName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="qbfsForm.unit"
v-model="qbfsForm.unitName"
placeholder="请输入起草责任单位"
:maxlength="500"/>
</el-form-item>
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+1 -1
View File
@@ -53,7 +53,7 @@
</el-table-column>
<el-table-column prop="responsibleUnit" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineer" width="150" label="责任工程师" align="center"/>
<el-table-column label="选择分发责任人" prop="dutyPeopleInfo" align="center">
<el-table-column label="选择分发责任人" width="150" prop="dutyPeopleInfo" align="center">
<template slot-scope="scope">
<el-input
@click.native="clickOpen(scope.row)"
src/pages/processCenter/pages/creatProcess/xmpg/step1-1.vue
+62 -61
View File
@@ -10,7 +10,7 @@
<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">
<div style=" overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
@@ -149,76 +149,77 @@
</el-col>
</el-row>
</el-form>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<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="deleteList">批量删除</el-button>
</div>
</div>
<el-table
:data="dataList"
border
ref="selection"
height="49%"
style="width: 100%;"
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
label="产品线">
</el-table-column>
<el-table-column
prop="uname"
label="产品线责任人">
</el-table-column>
<el-table-column
prop="distributePerson"
label="分发责任人">
<template slot-scope="scope">
<el-input
v-model="scope.row.distributePerson"
placeholder="请选择分发负责人"
readonly
@click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"
></el-input>
<!-- <span v-else>{{ scope.row.distributePerson }}</span>-->
</template>
<!-- <template slot-scope="scope,text" v-if="showColumn">-->
<!-- <div>-->
<!-- <div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">-->
<!-- {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson-->
<!-- }}-->
<!-- </div>-->
<!-- </div>-->
<!-- </template>-->
</el-table-column>
</el-table>
</div>
</div>
<div>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<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="deleteList">批量删除</el-button>
</div>
</div>
<el-table
:data="dataList"
border
ref="selection"
height="100%"
style="width: 100%;"
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
label="产品线">
</el-table-column>
<el-table-column
prop="uname"
label="产品线责任人">
</el-table-column>
<el-table-column
prop="distributePerson"
label="分发责任人">
<template slot-scope="scope">
<el-input
v-model="scope.row.distributePerson"
placeholder="请选择分发负责人"
readonly
@click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)"
></el-input>
<!-- <span v-else>{{ scope.row.distributePerson }}</span>-->
</template>
<!-- <template slot-scope="scope,text" v-if="showColumn">-->
<!-- <div>-->
<!-- <div @click="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)">-->
<!-- {{ listForm.dataList[scope.$index].distributePerson == null ? "请选择分发负责人" : listForm.dataList[scope.$index].distributePerson-->
<!-- }}-->
<!-- </div>-->
<!-- </div>-->
<!-- </template>-->
</el-table-column>
</el-table>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div>
</div>
<div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;">
<el-timeline>
src/pages/processCenter/pages/creatProcess/xmpg/step1-7.vue
+136 -136
View File
@@ -11,7 +11,7 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<div style="overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
@@ -132,143 +132,143 @@
</el-col>
</el-row>
</el-form>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
</div>
<el-table
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
border
@selection-change="selectStandChange"
height="52%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
align="center"
width="200"
label="产品线">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
width="200"
label="项目编号">
</el-table-column>
<el-table-column
prop="projectName"
align="center"
width="200"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="technicalRequir"
align="center"
width="250"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
width="250"
align="center"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="implementer"
label="落实人">
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="distributePerson"
label="责任人">
</el-table-column>
</el-table>
</div>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
</div>
<el-table
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
border
@selection-change="selectStandChange"
height="52%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
align="center"
width="200"
label="产品线">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
width="200"
label="项目编号">
</el-table-column>
<el-table-column
prop="projectName"
align="center"
width="200"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="technicalRequir"
align="center"
width="250"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
width="250"
align="center"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="implementer"
label="落实人">
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="distributePerson"
label="责任人">
</el-table-column>
</el-table>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
<div>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+45 -44
View File
@@ -10,7 +10,7 @@
<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">
<div style=" overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
@@ -163,50 +163,49 @@
</el-col>
</el-row>
</el-form>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<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="deleteList">批量删除</el-button>
</div>
</div>
<el-table
:data="dataList"
border
ref="selection"
height="49%"
style="width: 100%;"
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
label="产品线">
</el-table-column>
<el-table-column
prop="uname"
label="产品线责任人">
</el-table-column>
<el-table-column
prop="distributePerson"
label="分发责任人">
<template slot-scope="scope">
<el-input v-model="scope.row.distributePersonId" style="display: none;" />
<el-input v-model="scope.row.distributePerson" placeholder="请选择责任人"
@click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)" />
</template>
</el-table-column>
</el-table>
</div>
</div>
<div>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<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="deleteList">批量删除</el-button>
</div>
</div>
<el-table
:data="dataList"
border
ref="selection"
height="100%"
style="width: 100%;"
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
label="产品线">
</el-table-column>
<el-table-column
prop="uname"
label="产品线责任人">
</el-table-column>
<el-table-column
prop="distributePerson"
label="分发责任人">
<template slot-scope="scope">
<el-input v-model="scope.row.distributePersonId" style="display: none;" />
<el-input v-model="scope.row.distributePerson" placeholder="请选择责任人"
@click.native="choiceZRR(scope,'distributePerson', '选择分发责任人', roleForm.distributePerson)" />
</template>
</el-table-column>
</el-table>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<div style="margin: 10px 0;">
@@ -221,6 +220,8 @@
</el-collapse-item>
</el-collapse>
</div>
<div>
</div>
<div class="content" v-show="active === '2'">
<div class="block" style="padding-top: 20px;">
<el-timeline>
src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+48 -48
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<div style="overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
@@ -131,55 +131,55 @@
</el-col>
</el-row>
</el-form>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<el-table
:data="dataList"
border
ref="selection"
height="49%"
style="width: 100%;"
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
label="产品线">
</el-table-column>
<el-table-column
prop="productLine"
label="项目名称">
</el-table-column>
<el-table-column
prop="uname"
label="产品线责任人">
</el-table-column>
<el-table-column
prop="distributePerson"
label="分发责任人">
</el-table-column>
</el-table>
</div>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<el-table
:data="dataList"
border
ref="selection"
height="100%"
style="width: 100%;"
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
label="产品线">
</el-table-column>
<el-table-column
prop="productLine"
label="项目名称">
</el-table-column>
<el-table-column
prop="uname"
label="产品线责任人">
</el-table-column>
<el-table-column
prop="distributePerson"
label="分发责任人">
</el-table-column>
</el-table>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
<div>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+116 -109
View File
@@ -15,7 +15,7 @@
<template slot="title">基础信息</template>
</process-title>
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === false">
<div v-if="foldFormFlag === false">
<el-form
:model="listForm"
class="label-input-form prc-content-border"
@@ -132,108 +132,7 @@
</el-col>
</el-row>
</el-form>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button class="common-button-primary" plain size="mini" @click="addProject">添加
</el-button>
<el-button plain class="common-button-primary" type="primary" size="mini" @click="deleteList">批量删除
</el-button>
<el-button plain class="common-button-primary" type="primary" size="mini" @click="choiceZRRS('', 2, '')">
批量分发落实人
</el-button>
</div>
</div>
<el-table
ref="multipleTable"
:data="breakdownList"
style="width: 100%; border: 1px solid #cccccc;height: 400px"
height="48%"
border
highlight-current-row
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
align="center"
width="150"
label="产品线">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
width="160px"
label="项目编号">
</el-table-column>
<el-table-column
prop="projectName"
align="center"
min-width="300"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="100px"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
align="center"
width="160px"
label="条款名称">
</el-table-column>
<el-table-column
prop="technicalRequir"
align="center"
width="160px"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
align="center"
width="160px"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xcxssrq"
align="center"
width="120px"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zccssrq"
align="center"
width="120px"
label="在产车实施日期">
</el-table-column>
<el-table-column
label="落实人"
width="210"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.implementerId" style="display: none;" />
<el-input v-model="scope.row.implementer" placeholder="请选择落实人"
@click.native="choiceZRRS(scope.row, 1, scope.$index)" />
</template>
</el-table-column>
</el-table>
<!-- <el-pagination-->
<!-- layout="total,sizes, prev, pager, next"-->
<!-- background-->
<!-- :page-sizes="[20, 40, 60]"-->
<!-- :total="total"-->
<!-- @size-change="handleSizeChange"-->
<!-- @current-change="handleCurrentChange"-->
<!-- />-->
<!-- 选择责任人-->
<Role-tree
is-title="选择落实人"
@@ -242,6 +141,108 @@
:nodeList="nodeList"
></Role-tree>
</div>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button class="common-button-primary" plain size="mini" @click="addProject">添加
</el-button>
<el-button plain class="common-button-primary" type="primary" size="mini" @click="deleteList">批量删除
</el-button>
<el-button plain class="common-button-primary" type="primary" size="mini" @click="choiceZRRS('', 2, '')">
批量分发落实人
</el-button>
</div>
</div>
<el-table
ref="multipleTable"
:data="breakdownList"
style="width: 100%; border: 1px solid #cccccc;height: 400px"
height="100%"
border
highlight-current-row
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold', height: '48px'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
align="center"
width="150"
label="产品线">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
width="160px"
label="项目编号">
</el-table-column>
<el-table-column
prop="projectName"
align="center"
min-width="300"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="100px"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
align="center"
width="160px"
label="条款名称">
</el-table-column>
<el-table-column
prop="technicalRequir"
align="center"
width="160px"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
align="center"
width="160px"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xcxssrq"
align="center"
width="120px"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zccssrq"
align="center"
width="120px"
label="在产车实施日期">
</el-table-column>
<el-table-column
label="落实人"
width="210"
align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.implementerId" style="display: none;" />
<el-input v-model="scope.row.implementer" placeholder="请选择落实人"
@click.native="choiceZRRS(scope.row, 1, scope.$index)" />
</template>
</el-table-column>
</el-table>
<!-- <el-pagination-->
<!-- layout="total,sizes, prev, pager, next"-->
<!-- background-->
<!-- :page-sizes="[20, 40, 60]"-->
<!-- :total="total"-->
<!-- @size-change="handleSizeChange"-->
<!-- @current-change="handleCurrentChange"-->
<!-- />-->
</div>
<div class="content" v-show="active === '3'">
@@ -341,7 +342,7 @@
type="primary"
class="common-button-primary"
size="small"
@click="getProject">
@click="getProjectBtn">
查询
</el-button>
</el-form-item>
@@ -360,7 +361,7 @@
style="width: 100%"
border
ref="table"
height="100%"
class="table-height"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectThree"
@@ -679,6 +680,10 @@ export default {
}
},
getProjectBtn(){
this.pageNo = 1,
this.getProject()
},
getProject() {
this.$http.get("sarStandProjectLibrary/queryProjectUnderLine", {
productLine: this.projectLineId,
@@ -967,16 +972,14 @@ export default {
padding: 0 20px 0;
}
}
position: relative;
height: 100%;
.choiceBtn {
.el-button--primary {
width: 150px;
}
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
@@ -1035,6 +1038,10 @@ export default {
.demo-drawer-content {
margin-top: 10px;
}
.table-height{
height: calc(~'100% - 65px');
overflow: auto;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+190 -190
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<div style="overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
@@ -131,201 +131,201 @@
</el-col>
</el-row>
</el-form>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button :disabled="acceptShow" class="common-button-primary add-button" type="primary" size="mini"
@click="batchEdit">批量编辑
</el-button>
</div>
</div>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
<div class="tableButton">
<el-button :disabled="acceptShow" class="common-button-primary add-button" type="primary" size="mini"
@click="batchEdit">批量编辑
</el-button>
</div>
<el-table
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
border
@selection-change="selectStandChange"
height="48%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
</div>
<el-table
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
border
@selection-change="selectStandChange"
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
align="center"
width="200"
label="产品线">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
width="200"
label="项目编号">
</el-table-column>
<el-table-column
prop="projectName"
align="center"
width="200"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="technicalRequir"
align="center"
width="250"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
width="250"
align="center"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="researchCompliance"
align="center"
width="160"
label="合规">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].noCompliance && dataList[scope.$index].noCompliance.length>0
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
align="center"
width="200"
label="产品线">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
width="200"
label="项目编号">
</el-table-column>
<el-table-column
prop="projectName"
align="center"
width="200"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="technicalRequir"
align="center"
width="250"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
width="250"
align="center"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="researchCompliance"
align="center"
width="160"
label="合规">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].noCompliance && dataList[scope.$index].noCompliance.length>0
|| dataList[scope.$index].countermeasures && dataList[scope.$index].countermeasures.length>0
|| dataList[scope.$index].completionTime && dataList[scope.$index].completionTime !== null"
disabled
v-model="dataList[scope.$index].complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
<el-input
v-else
:disabled="acceptShow"
clearable
v-model="dataList[scope.$index].complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
</template>
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="researchNonCompliance"
align="center"
width="170"
label="不合规项目">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
disabled
v-model="dataList[scope.$index].noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="dataList[scope.$index].noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="researchCountermeasures"
align="center"
width="160"
label="应对措施">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
disabled
v-model="dataList[scope.$index].countermeasures"
placeholder="请输入应对措施"
>
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="dataList[scope.$index].countermeasures"
placeholder="请输入应对措施"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="researchCompletionTime"
align="center"
width="140"
label="完成时间">
<template slot-scope="scope">
<el-date-picker
v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
disabled
v-model="dataList[scope.$index].completionTime"
type="date"
placeholder="请选择日期">
</el-date-picker>
<el-date-picker
v-else
:disabled="acceptShow"
class="datePickLen"
clearable
value-format="yyyy-MM-dd HH:mm:ss"
v-model="dataList[scope.$index].completionTime"
type="date"
placeholder="请选择日期">
</el-date-picker>
</template>
</el-table-column>
</el-table-column>
</el-table>
</div>
<div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<div style="margin: 10px 0;">
disabled
v-model="dataList[scope.$index].complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
<el-input
v-else
:disabled="acceptShow"
clearable
v-model="dataList[scope.$index].complianceReasons"
placeholder="请输入合规原因"
>
</el-input>
</template>
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="researchNonCompliance"
align="center"
width="170"
label="不合规项目">
<template slot-scope="scope">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
disabled
v-model="dataList[scope.$index].noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
</div>
</el-collapse-item>
</el-collapse>
<el-input
v-else
:disabled="acceptShow"
v-model="dataList[scope.$index].noCompliance"
placeholder="请输入不合规项目"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="researchCountermeasures"
align="center"
width="160"
label="应对措施">
<template slot-scope="scope">
<el-input
v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
disabled
v-model="dataList[scope.$index].countermeasures"
placeholder="请输入应对措施"
>
</el-input>
<el-input
v-else
:disabled="acceptShow"
v-model="dataList[scope.$index].countermeasures"
placeholder="请输入应对措施"
>
</el-input>
</template>
</el-table-column>
<el-table-column
prop="researchCompletionTime"
align="center"
width="140"
label="完成时间">
<template slot-scope="scope">
<el-date-picker
v-if="dataList[scope.$index].complianceReasons && dataList[scope.$index].complianceReasons.length>0"
disabled
v-model="dataList[scope.$index].completionTime"
type="date"
placeholder="请选择日期">
</el-date-picker>
<el-date-picker
v-else
:disabled="acceptShow"
class="datePickLen"
clearable
value-format="yyyy-MM-dd HH:mm:ss"
v-model="dataList[scope.$index].completionTime"
type="date"
placeholder="请选择日期">
</el-date-picker>
</template>
</el-table-column>
</el-table-column>
</el-table>
<el-collapse accordion>
<el-collapse-item title="回执说明">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
<div>
</div>
</div>
src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+136 -136
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<div style="overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
@@ -131,143 +131,143 @@
</el-col>
</el-row>
</el-form>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
</div>
<el-table
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
border
@selection-change="selectStandChange"
height="55%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
align="center"
width="200"
label="产品线">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
width="200"
label="项目编号">
</el-table-column>
<el-table-column
prop="projectName"
align="center"
width="200"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="technicalRequir"
align="center"
width="250"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
width="250"
align="center"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="implementer"
label="落实人">
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="distributePerson"
label="责任人">
</el-table-column>
</el-table>
</div>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
</div>
<el-table
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
border
@selection-change="selectStandChange"
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
align="center"
width="200"
label="产品线">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
width="200"
label="项目编号">
</el-table-column>
<el-table-column
prop="projectName"
align="center"
width="200"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="technicalRequir"
align="center"
width="250"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
width="250"
align="center"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="implementer"
label="落实人">
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="distributePerson"
label="责任人">
</el-table-column>
</el-table>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model.trim="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
<div>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model.trim="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+136 -136
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<div style="overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
@@ -131,143 +131,143 @@
</el-col>
</el-row>
</el-form>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
</div>
<el-table
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
border
@selection-change="selectStandChange"
height="55%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
align="center"
width="200"
label="产品线">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
width="200"
label="项目编号">
</el-table-column>
<el-table-column
prop="projectName"
align="center"
width="200"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="technicalRequir"
align="center"
width="250"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
width="250"
align="center"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="implementer"
label="落实人">
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="distributePerson"
label="责任人">
</el-table-column>
</el-table>
</div>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
</div>
<el-table
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
border
@selection-change="selectStandChange"
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
align="center"
width="200"
label="产品线">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
width="200"
label="项目编号">
</el-table-column>
<el-table-column
prop="projectName"
align="center"
width="200"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="technicalRequir"
align="center"
width="250"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
width="250"
align="center"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="implementer"
label="落实人">
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="distributePerson"
label="责任人">
</el-table-column>
</el-table>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
<div>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+136 -136
View File
@@ -10,7 +10,7 @@
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<div style="overflow: auto">
<process-title>
<template slot="title">基础信息</template>
</process-title>
@@ -131,143 +131,143 @@
</el-col>
</el-row>
</el-form>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
</div>
<el-table
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
border
@selection-change="selectStandChange"
height="52%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
align="center"
width="200"
label="产品线">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
width="200"
label="项目编号">
</el-table-column>
<el-table-column
prop="projectName"
align="center"
width="200"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="technicalRequir"
align="center"
width="250"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
width="250"
align="center"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="implementer"
label="落实人">
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="distributePerson"
label="责任人">
</el-table-column>
</el-table>
</div>
<process-title>
<template slot="title">填写信息</template>
</process-title>
<div class="tableTitle">
</div>
<el-table
ref="multipleTable"
:data="dataList"
tooltip-effect="dark"
style="width: 100%"
border
@selection-change="selectStandChange"
height="100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="productLine"
align="center"
width="200"
label="产品线">
</el-table-column>
<el-table-column
prop="projectNumber"
align="center"
width="200"
label="项目编号">
</el-table-column>
<el-table-column
prop="projectName"
align="center"
width="200"
label="项目名称">
</el-table-column>
<el-table-column
prop="itemNum"
align="center"
width="200"
label="条款号">
</el-table-column>
<el-table-column
prop="itemsName"
width="200"
align="center"
label="条款名称">
</el-table-column>
<el-table-column
prop="technicalRequir"
align="center"
width="250"
label="核心技术要求/变化点">
</el-table-column>
<el-table-column
prop="changePoint"
width="250"
align="center"
label="基于上一版本差异">
</el-table-column>
<el-table-column
prop="xCXSSRQ"
width="200"
align="center"
label="新车型实施日期">
</el-table-column>
<el-table-column
prop="zCCSSRQ"
width="200"
align="center"
label="在产车实施日期">
</el-table-column>
<el-table-column
prop="complianceReasons"
align="center"
width="160"
label="合规">
</el-table-column>
<el-table-column
align="center"
width="160"
prop="researchNonCompliance"
label="不合规">
<el-table-column
prop="noCompliance"
align="center"
width="170"
label="不合规项目">
</el-table-column>
<el-table-column
prop="countermeasures"
align="center"
width="160"
label="应对措施">
</el-table-column>
<el-table-column
prop="completionTime"
align="center"
width="120"
label="完成时间">
<template slot-scope="scope">
<span>{{ scope.row.completionTime ? $moment(scope.row.completionTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="implementer"
label="落实人">
</el-table-column>
<el-table-column
fixed="right"
align="center"
width="150"
prop="distributePerson"
label="责任人">
</el-table-column>
</el-table>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
<div>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
</div>
src/pages/processCenter/pages/creatProcess/xmqdqr/step1-1.vue
+5 -2
View File
@@ -191,7 +191,7 @@
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
class="table-height"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectProjectChange"
@@ -499,7 +499,6 @@ export default {
}, res => {
this.ProjectDatas = res.data.total.records;
this.total = res.data.total.total;
this.page = 1;
}, e => {
});
@@ -840,6 +839,10 @@ export default {
}
}
}
.table-height{
height: calc(~'100% - 65px');
overflow: auto;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmqdqr/step1.vue
+11 -2
View File
@@ -59,6 +59,7 @@
<el-button size="mini" type="primary" style="margin-top: 1%;" @click="choiceList">选择清单</el-button>
<el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker
:picker-options="pickerOptions"
v-model="qdform.endTime"
type="date"
placeholder="请选择截止日期"
@@ -198,7 +199,7 @@
tooltip-effect="dark"
style="width: 100%"
border
height="100%"
class="table-height"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"
@selection-change="selectProjectChange"
@@ -398,6 +399,11 @@ export default {
},
data() {
return {
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;
},
},
multipleSelection: [],
active: "1", //默认显示
commentText: "",
@@ -503,7 +509,6 @@ export default {
}, res => {
this.ProjectDatas = res.data.total.records;
this.total = res.data.total.total;
this.page = 1;
}, e => {
});
@@ -834,6 +839,10 @@ export default {
}
}
}
.table-height{
height: calc(~'100% - 65px');
overflow: auto;
}
}
</style>
src/pages/processCenter/pages/creatProcess/xmqdqr/step5.vue
+1 -1
View File
@@ -137,7 +137,7 @@
</div>
<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/zcrk/step1.vue
+100 -97
View File
@@ -266,28 +266,21 @@
v-model="form.ZCWBLAWSName"
clearable
></el-input>
<div v-if="ZCWBLAWSFileList.length>0">
<!-- {{ form.fbgbjbdName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('ZCWBLAWS')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('ZCWBLAWS')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in ZCWBLAWSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('ZCWBLAWS')"
style="margin-left: 10px; margin-top: 11px; float: right;">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<el-form-item label="解读文件" prop="JDWJLAWSName" class="add-form-item form-item-disabled">
<el-input
@@ -296,28 +289,21 @@
v-model="form.JDWJLAWSName"
clearable
></el-input>
<div v-if="JDWJLAWSFileList.length>0">
<!-- {{ form.caName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('JDWJLAWS')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('JDWJLAWS')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
</div>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in JDWJLAWSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('JDWJLAWS')"
style="margin-left: 10px; margin-top: 11px; float: right;">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -328,27 +314,20 @@
v-model="form.GCWBLAWSName"
clearable
></el-input>
<div v-if="GCWBLAWSFileList.length>0">
<!-- {{ form.ssgName }}-->
<el-button
type="primary"
class="common-button-primary"
size="mini"
style="margin-left: 10px"
@click="fileUpload('GCWBLAWS')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传的文件
</el-button>
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('GCWBLAWS')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in GCWBLAWSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('GCWBLAWS')"
style="margin-left: 10px; margin-top: 11px; float: right;">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
</el-col>
@@ -475,27 +454,20 @@
v-model="form.GLWJLAWSName"
clearable
></el-input>
<div v-if="GLWJLAWSFileList.length>0">
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('GLWJLAWS')">
<i class="el-icon-upload el-icon--right"></i>
查看已上传文件
</el-button>
<!-- {{ form.glwjName }}-->
</div>
<div v-else>
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('GLWJLAWS')">
<i class="el-icon-upload el-icon--right"></i>
点击上传
</el-button>
<div style="display: flex;justify-content: space-between">
<div style="width: 80%;">
<div v-for="(item,index) in GLWJLAWSFileList" :key="index" @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" class="fileClass">{{ item.name }}</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
class="common-button-primary"
size="mini"
@click="fileUpload('GLWJLAWS')"
style="margin-left: 10px; margin-top: 11px; float: right;">
<i class="el-icon-upload el-icon--right"></i>
</el-button>
</div>
</div>
</el-form-item>
<!-- <el-form-item label="相关流程" prop="xglc" class="add-form-item form-item-disabled">-->
@@ -827,17 +799,19 @@
</el-formItem>
<el-form-item>
<el-button
icon="el-icon-search"
type="primary"
class="common-button-primary"
@click="handleSearchStandard"
round>
size="mini"
style="margin-left: 5px"
@click="handleSearchStandard">
查询
</el-button>
<el-button
class="common-button-default"
icon="el-icon-refresh-left"
@click="handleResetSearch"
round></el-button>
size="mini"
@click="handleResetSearch">
清空
</el-button>
</el-form-item>
</el-form>
</div>
@@ -933,6 +907,7 @@
</template>
<script>
import { onlyOfficeUrl } from '@/sysConfig'
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
@@ -1664,11 +1639,11 @@
this.standardCheckedList = data
},
handleResetSearch() {
this.standardSearchForm.standType = 'INLAND'
this.standardSearchForm.standNumber = ''
this.standardSearchForm.standSort = ''
this.standardSearchForm.standName = ''
this.standardSearchForm.standEnName = ''
// this.standardSearchForm.standType = 'INLAND'
this.standardSearchForm.lawsNumber = ''
this.standardSearchForm.lawsName = ''
this.standardSearchForm.lawsEnName = ''
this.standardSearchForm.lawsTextState = ''
setTimeout(() => {
this.handleSearchStandard()
}, 100)
@@ -2022,6 +1997,34 @@
})
}
},
// 文件预览及下载
handleFilePreview(file) {
const attId = file.response.data.id
if (this.preview) {
if (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
} else {
this.$message.warning('文件不存在,下载失败')
}
} else {
this.getBusStandFileByAttId(attId)
.then(res => {
if(res){
const editFileInfo = res
if(editFileInfo.fileSuffix === 'pdg' || editFileInfo.fileSuffix === 'PDG'){
window.open('book://ssreader/e0?url='+editFileInfo.downLoadUrl)
}else {
const nowTime = new Date().getTime()
window.open(onlyOfficeUrl+'/onlyOffice?oldFileName=' + editFileInfo.oldFileName + '&fileType=' + editFileInfo.fileSuffix + '&attId=' + editFileInfo.id + '&fileUrl=' + editFileInfo.downLoadUrl + '&key=' + editFileInfo.id + nowTime+'&filePath='+editFileInfo.filePath+'&fileName='+editFileInfo.fileName)
}
}
}).catch(e => {
console.log(e)
this.$message.warning('文件不存在,预览失败')
})
}
},
fileUpload (type) {
this.fileType = '';
// this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表
src/pages/processCenter/pages/phone/bzqdfb/step4.vue
+3 -12
View File
@@ -69,7 +69,7 @@
:data="dataList"
border
tooltip-effect="dark"
height="60%"
height="50%"
style="width: 100%"
@selection-change="selectStandChange"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
@@ -109,18 +109,12 @@
min-width="130"
align="center"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? $moment(scope.row.XCXSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
prop="ZCCSSRQ"
min-width="130"
align="center"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? $moment(scope.row.ZCCSSRQ).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
show-overflow-tooltip
@@ -128,9 +122,6 @@
width="100px"
align="center"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
@@ -154,7 +145,7 @@
<el-table
height="100%"
ref="selection"
:data="histortData"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
@@ -509,7 +500,7 @@ export default {
}, res => {
if (res.success) {
this.$message.success(res.message);
this.$router.push("/processCenter");
window.history.back()
}
this.isSubmit = false
});
src/pages/processCenter/pages/phone/wbsm/step3.vue
+1 -1
View File
@@ -77,7 +77,7 @@
<el-table
height="100%"
ref="selection"
:data="histortData"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
src/pages/processCenter/pages/phone/wbsm/step4.vue
+1 -1
View File
@@ -77,7 +77,7 @@
<el-table
height="100%"
ref="selection"
:data="histortData"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border
src/pages/processCenter/pages/phone/wbsm/step5.vue
+1 -1
View File
@@ -77,7 +77,7 @@
<el-table
height="100%"
ref="selection"
:data="histortData"
:data="detailData"
tooltip-effect="dark"
style="width: 100%"
border