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:
yanyizhou
2021-12-24 15:12:25 +08:00
parent 276ae69671 c1a8193935
commit bb472a72f4
10 changed files with 113 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+80 -71
View File
@@ -10,46 +10,46 @@
</div>
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;">
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="tableTitle">
<div class="tableButton">
<el-button size="mini" type="primary" @click="addList">添加</el-button>
<el-button size="mini" type="danger" @click="deleteList">批量删除</el-button>
</div>
<ProcessTitle>
<template slot="title">基础信息</template>
</ProcessTitle>
<div class="tableTitle">
<div class="tableButton">
<el-button size="mini" type="primary" @click="addList">添加</el-button>
<el-button size="mini" type="danger" @click="deleteList">批量删除</el-button>
</div>
<el-table
:data="dataList"
border
ref="entryTable"
height="80%"
@selection-change="selectedDelete"
style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
</div>
<el-table
:data="dataList"
border
ref="entryTable"
height="80%"
@selection-change="selectedDelete"
style="width: 100%"
: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 prop="standSerialNumber" width="150" label="标准号" show-overflow-tooltip align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" width="250" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
<el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope">
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="responsibleUnit" width="150" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineerName" width="150" label="责任工程师" align="center"/>
</el-table>
<el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standSerialNumber" width="150" label="标准号" show-overflow-tooltip align="center">
<template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template>
</el-table-column>
<el-table-column prop="standName" width="250" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope">
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span>
</template>
</el-table-column>
<el-table-column prop="responsibleUnit" width="150" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineerName" width="150" label="责任工程师" align="center"/>
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="回执说明">
@@ -173,7 +173,7 @@
class="common-button-primary"
size="mini"
v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
@click="getTableByPage('')">
@click="getTableByPage">
查询
</el-button>
</el-form-item>
@@ -326,8 +326,9 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel,processBack } from '@/api/process.js'
import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js'
import {startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel, processBack} from '@/api/process.js'
import {standUnqualified, dicTypeData} from '@/api/unqualProcess.js'
export default {
name: "wfhxzgStep1",
data() {
@@ -365,7 +366,7 @@ export default {
},
deleteDataList: [],
roleFormRules: {
dockUserName: [{ required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
},
nodeList: [],
drawerTitle: '', //drawer标题
@@ -419,23 +420,23 @@ export default {
if (item.responsibleUnit !== null || item.responsibleUnit !== "") {
let k = (item.responsibleUnit || "").split(',')
for (let i in this.zrbmOptions) {
for (let m = 0; m< k.length; m++) {
for (let m = 0; m < k.length; m++) {
if (this.zrbmOptions[i].value === k[m]) {
k[m] = this.zrbmOptions[i].label
k[m] = this.zrbmOptions[i].label
}
item.responsibleUnit = k.join(',')
}
}
}
this.$set(item,'engineer','')
this.$set(item,'engineerId','')
this.$set(item,'dutyPeopleInfo','')
this.$set(item,'dutyPeople','')
this.$set(item,'dutyPeopleInfoId','')
this.$set(item,'dutyPeopleId','')
this.$set(item,'fileText',[])
this.$set(item,'fileTextId',[])
this.$set(item,'fileTextPath',[])
this.$set(item, 'engineer', '')
this.$set(item, 'engineerId', '')
this.$set(item, 'dutyPeopleInfo', '')
this.$set(item, 'dutyPeople', '')
this.$set(item, 'dutyPeopleInfoId', '')
this.$set(item, 'dutyPeopleId', '')
this.$set(item, 'fileText', [])
this.$set(item, 'fileTextId', [])
this.$set(item, 'fileTextPath', [])
})
this.total = res.data.total
this.loading = false
@@ -478,7 +479,7 @@ export default {
}
},
// 点击查看
handlePreview (item) {
handlePreview(item) {
let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails',
params: {
@@ -506,12 +507,12 @@ export default {
addList = this.dataList.findIndex(items => {
return items.id === item.id
})
if(addList > -1){
if (addList > -1) {
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection()
this.$message.warning('请勿添加重复数据')
} else{
} else {
this.dataList.push(item)
// this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection()
@@ -557,7 +558,7 @@ export default {
},
// 提交按钮
handleSubmit() {
this.dataList.forEach(item =>{
this.dataList.forEach(item => {
item.standId = item.standSerialNumber
})
let json = {
@@ -593,13 +594,13 @@ export default {
params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskIds', this.taskID)
completeTask(params).then(res => {
if(res.success === true) {
if (res.success === true) {
this.$message.success('提交成功')
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
taskDel(taskId).then(res => {
return res
})
}
@@ -614,14 +615,14 @@ export default {
}
},
// 流程阶段负责人选择
choiceZRR (type, title, id) {
choiceZRR(type, title, id) {
this.nodeList = []
this.nodeList.push(id)
this.type = type
this.drawerTitle = title
this.modalshowflag = true
},
drawerCheck (data) {
drawerCheck(data) {
this.unqualidiedData.forEach(item => {
item.engineer = data[0].name
item.engineerId = data[0].id
@@ -635,20 +636,18 @@ export default {
this.addList()
},
// 清空 查询条件
clearAllSearch (search = true) {
this.queryUnqualidiedData = {
standSerialNumber: '',
productName: '',
responsibleUnit: ''
}
clearAllSearch() {
this.queryUnqualidiedData.standSerialNumber = ''
this.queryUnqualidiedData.productName = ''
this.queryUnqualidiedData.responsibleUnit = ''
this.getTableByPage()
},
// 分页事件
pageChange (page) {
pageChange(page) {
this.pageNo = page
this.getTableByPage()
},
pageSizeChange (pageSize) {
pageSizeChange(pageSize) {
this.size = pageSize
this.getTableByPage(pageSize)
},
@@ -659,18 +658,22 @@ export default {
<style lang="less" scoped>
@import '~@/assets/styles/style';
.wfhxzgStep1 {
/deep/.el-table--scrollable-y .el-table__body-wrapper {
/deep/ .el-table--scrollable-y .el-table__body-wrapper {
height: calc(100% - 57px) !important;
}
/deep/.el-drawer__container {
/deep/ .el-drawer__container {
.prc-content-border {
border: none;
padding: 0 20px 0;
}
}
position: relative;
height: 100%;
.headerTabs {
height: 52px;
display: flex;
@@ -678,6 +681,7 @@ export default {
position: absolute;
top: 0;
right: 10px;
.headerTabsItem {
border: 1px solid #c1c1c1;
padding: 0 5px;
@@ -685,21 +689,25 @@ export default {
line-height: 30px;
cursor: pointer;
}
.active {
border: 1px solid #E6A23C;
color: #fff;
background: #E6A23C;
}
}
.content-center {
padding: 10px 0px 10px 10px;
}
.content {
display: flex;
flex-direction: column;
justify-content: space-between;
height: calc(~'100% - 103px');
overflow: auto;
.tableTitle {
margin-bottom: 10px;
height: 30px;
@@ -707,6 +715,7 @@ export default {
position: relative;
font-size: 13px;
font-weight: bold;
.tableButton {
position: absolute;
right: 0;
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+2 -2
View File
@@ -44,7 +44,7 @@
</template>
</el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
<el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope">
@@ -66,7 +66,7 @@
</el-table>
</div>
<el-collapse accordion>
<el-collapse-item title="审批意见">
<el-collapse-item title="回执说明">
<div style="margin: 10px 0;">
<el-input
type="textarea"
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+1 -1
View File
@@ -44,7 +44,7 @@
</template>
</el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
<el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+1 -1
View File
@@ -32,7 +32,7 @@
</template>
</el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
<el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
+1 -1
View File
@@ -32,7 +32,7 @@
</template>
</el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
<el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+1 -1
View File
@@ -32,7 +32,7 @@
</template>
</el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" width="80" label="条款号" align="center"/>
<el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue
+12 -21
View File
@@ -774,28 +774,19 @@
this.$refs['Form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
type: '18'
var json = Object.assign(this.rhform, this.roleForm)
json.commentText = this.commentText
json.data1 = this.data1
json.data2 = this.data2
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: res.data,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.rhform, this.roleForm)
json.commentText = this.commentText
json.data1 = this.data1
json.data2 = this.data2
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: res.data,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('流程发起成功')
this.$router.push('/processCenter')
this.isSubmit = false
} else {
this.$message.warning('流程启动失败')
this.isSubmit = false
}
})
if (res.success) {
this.$message.success('流程发起成功')
this.$router.push('/processCenter')
this.isSubmit = false
} else {
this.$message.warning('流程启动失败')
this.isSubmit = false
src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue
+12 -21
View File
@@ -752,28 +752,19 @@
this.$refs['Form'].validate((valid) => {
if (valid) {
this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
type: '17'
var json = Object.assign(this.rhform, this.roleForm)
json.commentText = this.commentText
json.data1 = this.data1
json.data2 = this.data2
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: res.data,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.rhform, this.roleForm)
json.commentText = this.commentText
json.data1 = this.data1
json.data2 = this.data2
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: res.data,
userId: this.$store.getters.userInfo.userId
}, {}, res => {
if (res.success) {
this.$message.success('流程发起成功')
this.$router.push('/processCenter')
this.isSubmit = false
} else {
this.$message.warning('流程启动失败')
this.isSubmit = false
}
})
if (res.success) {
this.$message.success('流程发起成功')
this.$router.push('/processCenter')
this.isSubmit = false
} else {
this.$message.warning('流程启动失败')
this.isSubmit = false
src/pages/processCenter/pages/phone/bzqdfb/step4.vue
+1 -1
View File
@@ -9,7 +9,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div>
<div class="content" v-show="active == '1'">
<div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto">
<process-title>
<template slot="title">基础信息</template>
src/pages/processCenter/pages/processDetail/index.vue
+2 -2
View File
@@ -83,7 +83,7 @@
sortable="custom"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
@@ -91,7 +91,7 @@
label="完成时间"
align="center">
<template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column