|
@@ -2,102 +2,117 @@
|
|
|
<v-dialog
|
|
|
:title="title"
|
|
|
:close-on-click-modal="false"
|
|
|
- style="width:1200px;"
|
|
|
+ style="width:1100px;height: auto;max-height: 1000px ;margin-top: 85px;"
|
|
|
v-model="visible">
|
|
|
|
|
|
|
|
|
-
|
|
|
-
|
|
|
<div style="display: flex; flex-direction: row;">
|
|
|
- <fileCard :gwId="inputForm.id" style="width: 50%;" ></fileCard>
|
|
|
-
|
|
|
- <div style="display: flex; flex-direction:column;margin-left: 60px;">
|
|
|
-
|
|
|
-
|
|
|
- <view v-if="isoffice" class="titletab" >办公室拟办</view>
|
|
|
- <view v-if="isleader" class="titletab" >领导批示</view>
|
|
|
- <view v-if="isundertake" class="titletab" >承办科室</view>
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- <el-form v-if="isoffice" :model="auditForm" ref="auditForm" v-loading="loading" label-position="right" label-width="auto" style="max-width: 400px;margin-top: 40px;" >
|
|
|
- <el-row :gutter="15">
|
|
|
- <el-col :span="24" v-if="one">
|
|
|
- <el-form-item label="办公室拟办" prop="content"
|
|
|
- :rules="[
|
|
|
- ]">
|
|
|
- <el-input type="textarea" v-model="auditForm.content" placeholder="" ></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="24">
|
|
|
- <el-form-item label="转发领导" prop="nextLeadUser"
|
|
|
- :rules="[
|
|
|
- ]">
|
|
|
- <el-select v-model="auditForm.nextLeadUser" placeholder="请选择" style="width: 100%;">
|
|
|
- <el-option
|
|
|
- v-for="item in leaderList"
|
|
|
- :key="item.id"
|
|
|
- :label="item.name"
|
|
|
- :value="item.loginName">
|
|
|
- </el-option>
|
|
|
- </el-select>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="24" v-if="!one">
|
|
|
- <el-form-item label="科室承办" prop="nextDepUser"
|
|
|
- :rules="[
|
|
|
- ]">
|
|
|
- <user-select-Ks
|
|
|
- :limit="10"
|
|
|
- v-model="auditForm.nextDepUser"
|
|
|
- ></user-select-Ks>
|
|
|
-
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- <el-col :span="24" v-if="one">
|
|
|
- <el-form-item label="备注" prop="remark"
|
|
|
- :rules="[
|
|
|
- ]">
|
|
|
- <el-input type="textarea" v-model="auditForm.remark" placeholder="" ></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- </el-form>
|
|
|
-
|
|
|
-
|
|
|
- <el-form v-if="isleader" :model="auditForm" ref="auditForm" v-loading="loading" label-position="right" label-width="auto" style="max-width: 400px;margin-top: 40px;">
|
|
|
- <el-row :gutter="15">
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="领导批示" prop="content"
|
|
|
- :rules="[
|
|
|
- ]">
|
|
|
- <el-input type="textarea" v-model="auditForm.content" placeholder="" style="min-width: 300px;" ></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- </el-form>
|
|
|
-
|
|
|
-
|
|
|
- <el-form v-if="isundertake" :model="auditForm" ref="auditForm" v-loading="loading" label-position="right" label-width="auto" style="max-width: 400px;margin-top: 40px;">
|
|
|
- <el-row :gutter="15">
|
|
|
- <el-col :span="12">
|
|
|
- <el-form-item label="承办科室" prop="content"
|
|
|
- :rules="[
|
|
|
- ]">
|
|
|
- <el-input type="textarea" v-model="auditForm.content" placeholder="" style="min-width: 300px;" ></el-input>
|
|
|
- </el-form-item>
|
|
|
- </el-col>
|
|
|
- </el-row>
|
|
|
- </el-form>
|
|
|
- </div>
|
|
|
-
|
|
|
+ <fileCard :gwId="inputForm.id" ref="filecard" v-if="visible" style="width: 50%;" ></fileCard>
|
|
|
+
|
|
|
+ <div>
|
|
|
+
|
|
|
+
|
|
|
+ <div class="cll" :style="{height:heightpx }" >
|
|
|
+ <el-steps direction="vertical" :active="assignWorkOrderRecordDTOList.length" >
|
|
|
+ <el-step v-for="item in assignWorkOrderRecordDTOList" :title="item.which=='0'?'办公室拟办':item.which=='1'?'领导审批':item.which=='2'?'承办情况':item.which=='3'?'承办转发':'已归档'" :description="item.state==1?item.nextTruename :item.nextTruename +' - '+item.updateTime"/>
|
|
|
+ </el-steps>
|
|
|
+ </div>
|
|
|
+
|
|
|
+
|
|
|
+ <div style="display: flex; flex-direction:column;margin-left: 60px;margin-top:20px">
|
|
|
+
|
|
|
+
|
|
|
+ <view v-if="istransmit&&method=='edit'" class="titletab" >承办转发</view>
|
|
|
+ <view v-if="isoffice&&method=='edit'" class="titletab" >办公室拟办</view>
|
|
|
+ <view v-if="isleader&&method=='edit'" class="titletab" >领导批示</view>
|
|
|
+ <view v-if="isundertake&&method=='edit'" class="titletab" >承办科室</view>
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ <el-form v-if="istransmit&&method=='edit'" :model="auditForm" ref="auditForm" v-loading="loading" label-position="right" label-width="auto" style="max-width: 400px;margin-top: 40px;" >
|
|
|
+ <el-row :gutter="15">
|
|
|
+
|
|
|
+ <el-col :span="24">
|
|
|
+ <el-form-item label="转发领导" prop="nextLeadUser"
|
|
|
+ :rules="[
|
|
|
+ ]">
|
|
|
+ <el-select v-model="auditForm.nextLeadUser" placeholder="请选择" style="width: 100%;">
|
|
|
+ <el-option
|
|
|
+ v-for="item in leaderList"
|
|
|
+ :key="item.id"
|
|
|
+ :label="item.name"
|
|
|
+ :value="item.loginName">
|
|
|
+ </el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="24" v-if="!one">
|
|
|
+ <el-form-item label="科室承办" prop="nextDepUser"
|
|
|
+ :rules="[
|
|
|
+ ]">
|
|
|
+ <user-select-Ks
|
|
|
+ :limit="10"
|
|
|
+ v-model="auditForm.nextDepUser"
|
|
|
+ ></user-select-Ks>
|
|
|
+
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <!-- <el-col :span="24" v-if="one"> -->
|
|
|
+ <el-col :span="24">
|
|
|
+ <el-form-item label="备注" prop="remark"
|
|
|
+ :rules="[
|
|
|
+ ]">
|
|
|
+ <el-input type="textarea" v-model="auditForm.remark" placeholder="" ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-form>
|
|
|
+
|
|
|
+ <el-form v-if="isoffice&&method=='edit'" :model="auditForm" ref="auditForm" v-loading="loading" label-position="right" label-width="auto" style="max-width: 400px;margin-top: 40px;">
|
|
|
+ <el-row :gutter="15">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="办公室拟办" prop="content"
|
|
|
+ :rules="[
|
|
|
+ ]">
|
|
|
+ <el-input type="textarea" v-model="auditForm.content" placeholder="" style="min-width: 300px;" ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-form>
|
|
|
+
|
|
|
+ <el-form v-if="isleader&&method=='edit'" :model="auditForm" ref="auditForm" v-loading="loading" label-position="right" label-width="auto" style="max-width: 400px;margin-top: 40px;">
|
|
|
+ <el-row :gutter="15">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="领导批示" prop="content"
|
|
|
+ :rules="[
|
|
|
+ ]">
|
|
|
+ <el-input type="textarea" v-model="auditForm.content" placeholder="" style="min-width: 300px;" ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-form>
|
|
|
+
|
|
|
+
|
|
|
+ <el-form v-if="isundertake&&method=='edit'" :model="auditForm" ref="auditForm" v-loading="loading" label-position="right" label-width="auto" style="max-width: 400px;margin-top: 40px;">
|
|
|
+ <el-row :gutter="15">
|
|
|
+ <el-col :span="12">
|
|
|
+ <el-form-item label="承办科室" prop="content"
|
|
|
+ :rules="[
|
|
|
+ ]">
|
|
|
+ <el-input type="textarea" v-model="auditForm.content" placeholder="" style="min-width: 300px;" ></el-input>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
+ </el-form>
|
|
|
+ </div>
|
|
|
|
|
|
+ </div>
|
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
|
|
- <el-tabs v-model="assignWorkOrderTab" >
|
|
|
+ <!-- <el-tabs v-model="assignWorkOrderTab" >
|
|
|
<el-tab-pane label="流转记录">
|
|
|
<el-table size="large"
|
|
|
:data="assignWorkOrderRecordDTOList.filter(function(item){ return item.delFlag !== '1'})"
|
|
@@ -111,18 +126,15 @@
|
|
|
<el-table-column prop="createTime" header-align="center" align="center"
|
|
|
show-overflow-tooltip label="时间">
|
|
|
</el-table-column>
|
|
|
- <!-- <el-table-column prop="nextTruename" header-align="center" align="center" show-overflow-tooltip
|
|
|
- label="新待办人">
|
|
|
- </el-table-column> -->
|
|
|
</el-table>
|
|
|
</el-tab-pane>
|
|
|
- </el-tabs>
|
|
|
+ </el-tabs> -->
|
|
|
|
|
|
<template #footer>
|
|
|
<span class="dialog-footer">
|
|
|
<el-button @click="visible = false" icon="circle-close">关闭</el-button>
|
|
|
- <el-button v-if="(isundertake||isleader||one )&& !loading" type="primary" @click="doSubmit()" icon="circle-check" v-noMoreClick>确认签字</el-button>
|
|
|
- <el-button v-if="!(isundertake||isleader||one ) && !loading" type="primary" @click="doSubmit()" icon="circle-check" v-noMoreClick>提交</el-button>
|
|
|
+ <el-button v-if="((isundertake||isleader||isoffice )&& !loading)&&method=='edit'" type="primary" @click="doSubmit()" icon="circle-check" v-noMoreClick>确认签字</el-button>
|
|
|
+ <el-button v-if="(!(isundertake||isleader||isoffice ) && !loading)&&method=='edit'" type="primary" @click="doSubmit()" icon="circle-check" v-noMoreClick>提交</el-button>
|
|
|
<el-button type="primary" v-if="isAll" @click="formSubmit()" icon="circle-check" v-noMoreClick>归档</el-button>
|
|
|
</span>
|
|
|
</template>
|
|
@@ -142,9 +154,10 @@
|
|
|
isoffice: false,
|
|
|
isleader: false,
|
|
|
isundertake: false,
|
|
|
+ istransmit: false,
|
|
|
one: true,
|
|
|
isAll: false,
|
|
|
-
|
|
|
+ heightpx:'400px',
|
|
|
leaderList: [],
|
|
|
auditForm: {
|
|
|
id: '',
|
|
@@ -198,14 +211,11 @@
|
|
|
if (method === 'add') {
|
|
|
this.title = `新建盐都工信文件阅办卡`
|
|
|
} else if (method === 'edit') {
|
|
|
- this.title = '修改盐都工信文件阅办卡'
|
|
|
+ this.title = '文件阅办卡详情'
|
|
|
} else if (method === 'view') {
|
|
|
- this.title = '盐都工信文件阅办卡'
|
|
|
+ this.title = '文件阅办卡详情'
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
this.visible = true
|
|
|
this.loading = false
|
|
|
this.$nextTick(() => {
|
|
@@ -219,8 +229,8 @@
|
|
|
|
|
|
|
|
|
gwFlowService.queryByGwId(this.inputForm.id).then(data => {
|
|
|
-
|
|
|
- if (data.length > 1) this.one = false
|
|
|
+ let down = data.filter(item => item.state == 0)
|
|
|
+ if (down.length != 1) this.one = false
|
|
|
if(this.one) {
|
|
|
this.roleId = "1770353074553331713"
|
|
|
}else {
|
|
@@ -229,6 +239,7 @@
|
|
|
userService.leaderList(this.roleId).then(data => {
|
|
|
this.leaderList = data
|
|
|
if(this.one) this.auditForm.nextLeadUser =data[0].loginName
|
|
|
+ if (!this.auditForm.content) this.auditForm.content = '已阅'
|
|
|
})
|
|
|
|
|
|
// let user = $auth.getUserInfo()
|
|
@@ -240,34 +251,34 @@
|
|
|
let gw = data.filter(item => {
|
|
|
return item.nextUser == user.id && item.state == 1
|
|
|
})
|
|
|
- let down = data.filter(item => item.state == 0)
|
|
|
+
|
|
|
if (gw.length > 0) {
|
|
|
- if (gw[0].which == '3') this.isAll = true
|
|
|
this.auditForm = gw[0]
|
|
|
+ if (gw[0].which == '4') this.isAll = true
|
|
|
+ if (!this.auditForm.content) this.auditForm.content = '已阅'
|
|
|
}
|
|
|
- if (role == '办公室主任') {
|
|
|
- this.isoffice = true
|
|
|
-
|
|
|
- //这边改一下取最新待办一条
|
|
|
- // let gw1 = data.filter(item => {
|
|
|
- // return item.which == 0
|
|
|
- // })
|
|
|
- // gw1.sort((a, b) => b.createTime.localeCompare(a.createTime) || b.createTime.localeCompare(a
|
|
|
- // .createTime));
|
|
|
- let gw1 = data.filter(item => {
|
|
|
- return item.state == 1
|
|
|
- })
|
|
|
-
|
|
|
- this.auditForm = gw1[0]
|
|
|
+ if (role == '办公室管理员') {
|
|
|
+ this.istransmit = true
|
|
|
+ if (gw.length == 0) {
|
|
|
+ let gw1 = data.filter(item => {
|
|
|
+ return item.which == 3
|
|
|
+ })
|
|
|
+ gw1.sort((a, b) => b.createTime.localeCompare(a.createTime) || b.createTime.localeCompare(a
|
|
|
+ .createTime));
|
|
|
+ this.auditForm = gw1[0]
|
|
|
+ // if (!this.auditForm.content) this.auditForm.content = '已阅'
|
|
|
}
|
|
|
+ }
|
|
|
if (role == '局领导' && gw.length > 0) this.isleader = true
|
|
|
+ if (role == '办公室主任' && gw.length > 0) this.isoffice = true
|
|
|
if (role == '分管领导' && gw.length > 0) this.isleader = true
|
|
|
if (role == '科室负责人' && gw.length > 0) this.isundertake = true
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
- this.assignWorkOrderRecordDTOList=data
|
|
|
+ let a=data.length*60;
|
|
|
+ this.heightpx=a+"px";
|
|
|
+ this.assignWorkOrderRecordDTOList=data.reverse()
|
|
|
})
|
|
|
|
|
|
}
|
|
@@ -277,7 +288,10 @@
|
|
|
doSubmit () {
|
|
|
let inputForm = {};
|
|
|
this.loading = true
|
|
|
- if (this.isoffice) this.auditForm.next = '1'
|
|
|
+ if (this.istransmit) {
|
|
|
+ this.auditForm.next = '1'
|
|
|
+ if (!this.one) this.auditForm.which = '3'
|
|
|
+ }
|
|
|
this.auditForm.state = "0"
|
|
|
this.auditForm.gwId = this.inputForm.id
|
|
|
const date = this.moment().format('YYYY-MM-DD HH:mm:ss');
|
|
@@ -322,4 +336,7 @@
|
|
|
.titletab {
|
|
|
color:#36a7f3 ;border-bottom:1px solid #36a7f3; width: 90px;padding: 6px;
|
|
|
}
|
|
|
+ .cll{
|
|
|
+ width: 450px; margin-left: 50px;
|
|
|
+ }
|
|
|
</style>
|