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
+17 -8
View File
@@ -40,7 +40,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/> <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="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center"> <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -173,7 +173,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'" v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
@click="getTableByPage('')"> @click="getTableByPage">
查询 查询
</el-button> </el-button>
</el-form-item> </el-form-item>
@@ -328,6 +328,7 @@ import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import {startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel, processBack} from '@/api/process.js' import {startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel, processBack} from '@/api/process.js'
import {standUnqualified, dicTypeData} from '@/api/unqualProcess.js' import {standUnqualified, dicTypeData} from '@/api/unqualProcess.js'
export default { export default {
name: "wfhxzgStep1", name: "wfhxzgStep1",
data() { data() {
@@ -635,12 +636,10 @@ export default {
this.addList() this.addList()
}, },
// 清空 查询条件 // 清空 查询条件
clearAllSearch (search = true) { clearAllSearch() {
this.queryUnqualidiedData = { this.queryUnqualidiedData.standSerialNumber = ''
standSerialNumber: '', this.queryUnqualidiedData.productName = ''
productName: '', this.queryUnqualidiedData.responsibleUnit = ''
responsibleUnit: ''
}
this.getTableByPage() this.getTableByPage()
}, },
// 分页事件 // 分页事件
@@ -659,18 +658,22 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.wfhxzgStep1 { .wfhxzgStep1 {
/deep/ .el-table--scrollable-y .el-table__body-wrapper { /deep/ .el-table--scrollable-y .el-table__body-wrapper {
height: calc(100% - 57px) !important; height: calc(100% - 57px) !important;
} }
/deep/ .el-drawer__container { /deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
position: relative; position: relative;
height: 100%; height: 100%;
.headerTabs { .headerTabs {
height: 52px; height: 52px;
display: flex; display: flex;
@@ -678,6 +681,7 @@ export default {
position: absolute; position: absolute;
top: 0; top: 0;
right: 10px; right: 10px;
.headerTabsItem { .headerTabsItem {
border: 1px solid #c1c1c1; border: 1px solid #c1c1c1;
padding: 0 5px; padding: 0 5px;
@@ -685,21 +689,25 @@ export default {
line-height: 30px; line-height: 30px;
cursor: pointer; cursor: pointer;
} }
.active { .active {
border: 1px solid #E6A23C; border: 1px solid #E6A23C;
color: #fff; color: #fff;
background: #E6A23C; background: #E6A23C;
} }
} }
.content-center { .content-center {
padding: 10px 0px 10px 10px; padding: 10px 0px 10px 10px;
} }
.content { .content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
height: calc(~'100% - 103px'); height: calc(~'100% - 103px');
overflow: auto; overflow: auto;
.tableTitle { .tableTitle {
margin-bottom: 10px; margin-bottom: 10px;
height: 30px; height: 30px;
@@ -707,6 +715,7 @@ export default {
position: relative; position: relative;
font-size: 13px; font-size: 13px;
font-weight: bold; font-weight: bold;
.tableButton { .tableButton {
position: absolute; position: absolute;
right: 0; right: 0;
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+2 -2
View File
@@ -44,7 +44,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/> <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="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center"> <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -66,7 +66,7 @@
</el-table> </el-table>
</div> </div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="审批意见"> <el-collapse-item title="回执说明">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+1 -1
View File
@@ -44,7 +44,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/> <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="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center"> <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+1 -1
View File
@@ -32,7 +32,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/> <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="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center"> <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
+1 -1
View File
@@ -32,7 +32,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/> <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="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center"> <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+1 -1
View File
@@ -32,7 +32,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/> <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="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center"> <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/zcch/step1-1.vue
-9
View File
@@ -774,10 +774,6 @@
this.$refs['Form'].validate((valid) => { this.$refs['Form'].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
type: '18'
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.rhform, this.roleForm) var json = Object.assign(this.rhform, this.roleForm)
json.commentText = this.commentText json.commentText = this.commentText
json.data1 = this.data1 json.data1 = this.data1
@@ -796,11 +792,6 @@
this.isSubmit = false this.isSubmit = false
} }
}) })
} else {
this.$message.warning('流程启动失败')
this.isSubmit = false
}
})
} else { } else {
return this.$message.warning('请完善人员信息') return this.$message.warning('请完善人员信息')
} }
src/pages/processCenter/pages/creatProcess/zcrh/step1-1.vue
-9
View File
@@ -752,10 +752,6 @@
this.$refs['Form'].validate((valid) => { this.$refs['Form'].validate((valid) => {
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
this.$http.get('lawss/activiti/startProcess', {
type: '17'
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.rhform, this.roleForm) var json = Object.assign(this.rhform, this.roleForm)
json.commentText = this.commentText json.commentText = this.commentText
json.data1 = this.data1 json.data1 = this.data1
@@ -774,11 +770,6 @@
this.isSubmit = false this.isSubmit = false
} }
}) })
} else {
this.$message.warning('流程启动失败')
this.isSubmit = false
}
})
} else { } else {
return this.$message.warning('请完善人员信息') return this.$message.warning('请完善人员信息')
} }
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 === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div> </div>
<div class="content" v-show="active == '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto"> <div style="flex: auto; overflow: auto">
<process-title> <process-title>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
src/pages/processCenter/pages/processDetail/index.vue
+2 -2
View File
@@ -83,7 +83,7 @@
sortable="custom" sortable="custom"
align="center"> align="center">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -91,7 +91,7 @@
label="完成时间" label="完成时间"
align="center"> align="center">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column