Browse Source

Merge remote-tracking branch 'origin/master'

master
ligaode 3 months ago
parent
commit
55a5f1e27b
  1. 9
      anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js
  2. 9
      anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatewithholding.js
  3. 9
      anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js
  4. 10
      anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatewithholding.js
  5. 139
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
  6. 121
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
  7. 117
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue
  8. 101
      anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue
  9. 117
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue
  10. 117
      anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue

9
anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js

@ -140,6 +140,15 @@ export default {
data: params
})
},
// 流程审批(加签)
delegate: function(params) {
return request({
url: '/scm/v1/scmvehrebatecheckapply/delegate',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 代办任务驳回任务
reject: function(params) {
return request({

9
anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatewithholding.js

@ -93,6 +93,15 @@ export default {
data: params
})
},
// 流程审批(加签)
delegate: function(params) {
return request({
url: '/scm/v1/scmvehrebatewithapply/delegate',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 代办任务驳回任务
reject: function(params) {
return request({

9
anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatecheck.js

@ -140,6 +140,15 @@ export default {
data: params
})
},
// 流程审批(加签)
delegate: function(params) {
return request({
url: '/scm/v1/scmspecialrebatecheckapply/delegate',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 代办任务驳回任务
reject: function(params) {
return request({

10
anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatewithholding.js

@ -93,6 +93,16 @@ export default {
data: params
})
},
// 流程审批(加签)
delegate: function(params) {
return request({
url: '/scm/v1/scmspecialrebatewithapply/delegate',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
//
// 代办任务驳回任务
reject: function(params) {
return request({

139
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue

@ -58,8 +58,14 @@
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
<el-table-column fixed type="selection" align="center" width="50"/>
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80"/>
<el-table-column label="操作" align="center" width="180">
<template slot-scope="scope">
<el-button type="primary" v-if="scope.row.onceCheckState == '0'" size="mini" @click="toSave(scope.row)">修改</el-button>
<el-button type="primary" v-else size="mini" @click="toAdjust(scope.row)">调整</el-button>
</template>
</el-table-column>
<el-table-column label="上传状态" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.uploadState == '0' ? '未上传' : scope.row.uploadState == '1' ? '已上传' : ''}}</span>
@ -93,12 +99,6 @@
<el-table-column prop="isAdjustment" label="是否调整" align="center" width="120" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="120" />
<el-table-column prop="adjustmentRemarks" label="调整说明" align="center" min-width="300" />
<el-table-column label="操作" align="center" width="180px">
<template slot-scope="scope">
<el-button type="primary" v-if="scope.row.onceCheckState == '0'" size="mini" @click="toSave(scope.row)">修改</el-button>
<el-button type="primary" v-else size="mini" @click="toAdjust(scope.row)">调整</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">
@ -126,8 +126,129 @@
</div>
</div>
<el-form title="返利调整" ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.createOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">品牌</div>
<el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购系统</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseSystemName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16">
<div class="span-sty">车型</div>
<el-form-item><span class="addinputInfo">{{ formobj.vehModelName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">车架号</div>
<el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">车辆入库价</div>
<el-form-item><span class="addinputInfo">{{ formobj.manufactorSettlementPrice }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">运费</div>
<el-form-item><span class="addinputInfo">{{ formobj.freight }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">上装</div>
<el-form-item><span class="addinputInfo">{{ formobj.topAmount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">返利类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.rebateTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">返利名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.rebateName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">所属年月</div>
<el-form-item><span class="addinputInfo">{{ formobj.palceGenDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">计算方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.calculationModeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">计算标准</div>
<el-form-item><span class="addinputInfo">{{ formobj.calculationStandard }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.state == '0' ? '未计提' : formobj.state == '1' ? '计提中' : formobj.state == '2' ? '待核对' : formobj.state == '3' ? '核对中' : formobj.state == '4' ? '已核对' : '' }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">预提返利</div>
<el-form-item><span class="addinputInfo">{{ formobj.estimateRebate }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其中待支付费用</div>
<el-form-item><span class="addinputInfo">{{ formobj.expectTreatCost }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其中抵顶费用</div>
<el-form-item><span class="addinputInfo">{{ formobj.expectSuppCost }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">抵顶费用说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.expectSuppRemark }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">一次上传</div>
<el-row>
<el-col :span="8">
<div class="span-sty">上传日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.uploadDate }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">上传金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.uploadMoney }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其中待确定金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.stayDetermineMoney }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">其中待支付费用</div>
<el-form-item><span class="addinputInfo">{{ formobj.onceTreatCost }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其中抵顶费用</div>
<el-form-item><span class="addinputInfo">{{ formobj.onceSuppCost }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">抵顶费用说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.onceSuppRemark }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">待确定金额分配</div>
<el-row style="border-top: 1px solid #E0E3EB">
<el-row>
<el-col :span="24">
<div class="span-sty">待确定金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.stayDetermineMoneyNew }}</span></el-form-item>

121
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue

@ -57,8 +57,14 @@
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50px"/>
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80px"/>
<el-table-column fixed type="selection" align="center" width="50"/>
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80"/>
<el-table-column label="操作" align="center" width="180">
<template slot-scope="scope">
<el-button type="primary" v-if="scope.row.onceCheckState == '0'" size="mini" @click="toSave(scope.row)">修改</el-button>
<el-button type="primary" v-else size="mini" @click="toAdjust(scope.row)">调整</el-button>
</template>
</el-table-column>
<el-table-column label="上传状态" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.uploadState == '0' ? '未上传' : scope.row.uploadState == '1' ? '已上传' : ''}}</span>
@ -88,12 +94,6 @@
<el-table-column prop="isAdjustment" label="是否调整" align="center" width="120" />
<el-table-column prop="adjustmentMoney" label="调整金额" align="center" width="120" />
<el-table-column prop="adjustmentRemarks" label="调整说明" align="center" min-width="300" />
<el-table-column label="操作" align="center" width="180px">
<template slot-scope="scope">
<el-button type="primary" v-if="scope.row.onceCheckState == '0'" size="mini" @click="toSave(scope.row)">修改</el-button>
<el-button type="primary" v-else size="mini" @click="toAdjust(scope.row)">调整</el-button>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">
@ -121,8 +121,111 @@
</div>
</div>
<el-form title="返利调整" ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="8">
<div class="span-sty">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">采购系统</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseSystemName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">品牌</div>
<el-form-item><span class="addinputInfo">{{ formobj.brandName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">返利类型</div>
<el-form-item><span class="addinputInfo">{{ formobj.rebateTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">返利名称</div>
<el-form-item><span class="addinputInfo">{{ formobj.rebateName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">所属年月</div>
<el-form-item><span class="addinputInfo">{{ formobj.palceGenDate }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">预计返利</div>
<el-form-item><span class="addinputInfo">{{ formobj.estimateRebate }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">预提日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.withholdingDate }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.state == '0' ? '未计提' : formobj.state == '1' ? '计提中' : formobj.state == '2' ? '待核对' : formobj.state == '3' ? '核对中' : formobj.state == '4' ? '已核对' : formobj.state == '5' ? '分配中' : formobj.state == '6' ? '已分配' : '' }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">其中支出费用</div>
<el-form-item><span class="addinputInfo">{{ formobj.expectItureCost }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其中待支付费用</div>
<el-form-item><span class="addinputInfo">{{ formobj.expectTreatCost }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其中抵顶费用</div>
<el-form-item><span class="addinputInfo">{{ formobj.expectSuppCost }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">抵顶费用说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.expectSuppRemark }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">一次上传</div>
<el-row>
<el-col :span="8">
<div class="span-sty">上传日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.uploadDate }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">上传金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.uploadMoney }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其中待确定金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.stayDetermineMoney }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">其中支出费用</div>
<el-form-item><span class="addinputInfo">{{ formobj.onceItureCost }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其中待支付费用</div>
<el-form-item><span class="addinputInfo">{{ formobj.onceTreatCost }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">其中抵顶费用</div>
<el-form-item><span class="addinputInfo">{{ formobj.onceSuppCost }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">抵顶费用说明</div>
<el-form-item><span class="addinputInfo">{{ formobj.onceSuppRemark }}</span></el-form-item>
</el-col>
</el-row>
<div class="title">待确定金额分配</div>
<el-row style="border-top: 1px solid #E0E3EB">
<el-row>
<el-col :span="24">
<div class="span-sty">待确定金额</div>
<el-form-item><span class="addinputInfo">{{ formobj.stayDetermineMoneyNew }}</span></el-form-item>

117
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue

@ -7,6 +7,7 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" @click="openCountersign('加签')"> </el-button>
<el-button type="primary" size="small" @click="openAgree('同意')"> </el-button>
<el-button type="danger" size="small" @click="openReject('驳回')"> </el-button>
<el-button type="danger" size="small" @click="openStop('终止')"> </el-button>
@ -94,8 +95,19 @@
<bicyclerebatetobecheckedInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formaddcopy02" >
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-form class="formaddcopy02">
<el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="24">
<span class="span-sty icon">*</span>加签人员:
<el-form-item>
<el-select class="addinputInfo" v-model="countersign.assignee" placeholder="请选择" filterable>
<el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="currentLink">
<el-col :span="24">
<div class="span-sty"><span>当前环节:</span></div>
<el-form-item><span class="addinputInfo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
@ -104,7 +116,9 @@
<el-row :class="{ rowClass:!currentLink }">
<el-col :span="24">
<div class="span-sty"><span>意见:</span></div>
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputInfo" clearable></el-input></el-form-item>
<el-form-item>
<el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputInfo" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable />
</el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
@ -119,6 +133,7 @@
<script>
import req from '@/api/bikerebate/bicyclerebatecheck'
import bicyclerebatetobecheckedInfo from './relation/bicyclerebatetobecheckedInfo'
import { selectStaffListss } from '@/api/Common/dictcommons'
export default {
name: 'DanCheFanLiHeDuiDaiBanInfo',
@ -132,18 +147,6 @@ export default {
tableKey: 0,
lastVehrebateKey: 1,
viewState: 1,
operation: '', //
dialogList: {
comment: ''
},
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
//
formobj: {
sid: '',
@ -168,6 +171,20 @@ export default {
},
rules: {},
submitdisabled: false,
options: [],
operation: '', //
dialogList: {
comment: ''
},
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
countersignLink: false,
//
linkByParameter: {
businessSid: '',
@ -177,6 +194,14 @@ export default {
orgSidPath: '',
taskDefKey: '',
userSid: ''
},
//
countersign: {
taskId: '',
assignee: '',
userSid: '',
instanceId: '',
views: ''
}
}
},
@ -191,10 +216,14 @@ export default {
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
// this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.countersign.taskId = obj.taskId
this.countersign.userSid = window.sessionStorage.getItem('userSid')
this.countersign.instanceId = obj.instanceId
//
this.showInfo(obj.businessSid)
},
@ -222,6 +251,11 @@ export default {
}).catch((e) => {
this.formobj = {}
})
selectStaffListss().then((res) => {
if (res.success) {
this.options = res.data
}
})
},
handleLook(row) {
this.viewState = 2
@ -254,10 +288,26 @@ export default {
})
return sums
},
//
openCountersign(val) {
this.operation = val
this.currentLink = true
this.countersignLink = true
this.dialogList.comment = ''
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
@ -272,6 +322,7 @@ export default {
openReject(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = ''
req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
@ -286,6 +337,7 @@ export default {
openStop(val) {
this.operation = val
this.currentLink = false
this.countersignLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
@ -304,7 +356,40 @@ export default {
} else {
this.handleStop()
}
} else if (this.operation === '加签') {
this.handleCountersign()
}
},
/** 加签 */
handleCountersign() {
if (this.countersign.assignee === '') {
this.$message({ showClose: true, type: 'error', message: '请选择加签人员' })
return
}
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
return
}
this.countersign.views = this.dialogList.comment
req.delegate(this.countersign).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 同意任务 */
handleAgree() {

101
anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue

@ -7,6 +7,7 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" @click="openCountersign('加签')"> </el-button>
<el-button type="primary" size="small" @click="openAgree('同意')"> </el-button>
<el-button type="danger" size="small" @click="openReject('驳回')"> </el-button>
<el-button type="danger" size="small" @click="openStop('终止')"> </el-button>
@ -74,8 +75,19 @@
<danchefanliInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formaddcopy02" >
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-form class="formaddcopy02">
<el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="24">
<span class="span-sty icon">*</span>加签人员:
<el-form-item>
<el-select class="addinputInfo" v-model="countersign.assignee" placeholder="请选择" filterable>
<el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="currentLink">
<el-col :span="24">
<div class="span-sty"><span>当前环节:</span></div>
<el-form-item><span class="addinputInfo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
@ -84,7 +96,9 @@
<el-row :class="{ rowClass:!currentLink }">
<el-col :span="24">
<div class="span-sty"><span>意见:</span></div>
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputInfo addinputw" clearable ></el-input></el-form-item>
<el-form-item>
<el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputInfo" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable />
</el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
@ -99,6 +113,7 @@
<script>
import req from '@/api/bikerebate/bicyclerebatewithholding'
import danchefanliInfo from './relation/danchefanliInfo'
import { selectStaffListss } from '@/api/Common/dictcommons'
export default {
name: 'DanCheFanLiYuTiDaiBanInfo',
@ -111,6 +126,11 @@ export default {
index: 0,
tableKey: 0,
viewState: 1,
//
formobj: {},
rules: {},
submitdisabled: false,
options: [],
operation: '', //
dialogList: {
comment: ''
@ -123,10 +143,7 @@ export default {
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
//
formobj: {},
rules: {},
submitdisabled: false,
countersignLink: false,
//
linkByParameter: {
businessSid: '',
@ -136,6 +153,14 @@ export default {
orgSidPath: '',
taskDefKey: '',
userSid: ''
},
//
countersign: {
taskId: '',
assignee: '',
userSid: '',
instanceId: '',
views: ''
}
}
},
@ -150,10 +175,14 @@ export default {
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
// this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.countersign.taskId = obj.taskId
this.countersign.userSid = window.sessionStorage.getItem('userSid')
this.countersign.instanceId = obj.instanceId
//
this.showInfo(obj.businessSid)
},
@ -181,6 +210,11 @@ export default {
}).catch((e) => {
this.formobj = {}
})
selectStaffListss().then((res) => {
if (res.success) {
this.options = res.data
}
})
},
handleLook(row) {
this.viewState = 2
@ -189,10 +223,26 @@ export default {
resetState() {
this.viewState = 1
},
//
openCountersign(val) {
this.operation = val
this.currentLink = true
this.countersignLink = true
this.dialogList.comment = ''
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
@ -207,6 +257,7 @@ export default {
openReject(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = ''
req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
@ -221,6 +272,7 @@ export default {
openStop(val) {
this.operation = val
this.currentLink = false
this.countersignLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
@ -239,7 +291,40 @@ export default {
} else {
this.handleStop()
}
} else if (this.operation === '加签') {
this.handleCountersign()
}
},
/** 加签 */
handleCountersign() {
if (this.countersign.assignee === '') {
this.$message({ showClose: true, type: 'error', message: '请选择加签人员' })
return
}
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
return
}
this.countersign.views = this.dialogList.comment
req.delegate(this.countersign).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 同意任务 */
handleAgree() {

117
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliheduiFlow/zhuanxiangfanliheduiDaiBanInfo.vue

@ -7,6 +7,7 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" @click="openCountersign('加签')"> </el-button>
<el-button type="primary" size="small" @click="openAgree('同意')"> </el-button>
<el-button type="danger" size="small" @click="openReject('驳回')"> </el-button>
<el-button type="danger" size="small" @click="openStop('终止')"> </el-button>
@ -94,8 +95,19 @@
<specialrebatetobecheckedInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formaddcopy02" >
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-form class="formaddcopy02">
<el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="24">
<span class="span-sty icon">*</span>加签人员:
<el-form-item>
<el-select class="addinputInfo" v-model="countersign.assignee" placeholder="请选择" filterable>
<el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="currentLink">
<el-col :span="24">
<div class="span-sty"><span>当前环节:</span></div>
<el-form-item><span class="addinputInfo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
@ -104,7 +116,9 @@
<el-row :class="{ rowClass:!currentLink }">
<el-col :span="24">
<div class="span-sty"><span>意见:</span></div>
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputInfo addinputw" clearable ></el-input></el-form-item>
<el-form-item>
<el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputInfo" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable />
</el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
@ -119,6 +133,7 @@
<script>
import req from '@/api/specialrebate/specialrebatecheck'
import specialrebatetobecheckedInfo from './relation/specialrebatetobecheckedInfo'
import { selectStaffListss } from '@/api/Common/dictcommons'
export default {
name: 'ZhuanXiangFanLiHeDuiDaiBanInfo',
@ -132,18 +147,6 @@ export default {
tableKey: 0,
lastSpecialrebateKey: 1,
viewState: 1,
operation: '', //
dialogList: {
comment: ''
},
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
//
formobj: {
sid: '',
@ -167,6 +170,20 @@ export default {
},
rules: {},
submitdisabled: false,
options: [],
operation: '', //
dialogList: {
comment: ''
},
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
countersignLink: false,
//
linkByParameter: {
businessSid: '',
@ -176,6 +193,14 @@ export default {
orgSidPath: '',
taskDefKey: '',
userSid: ''
},
//
countersign: {
taskId: '',
assignee: '',
userSid: '',
instanceId: '',
views: ''
}
}
},
@ -190,10 +215,14 @@ export default {
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
// this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.countersign.taskId = obj.taskId
this.countersign.userSid = window.sessionStorage.getItem('userSid')
this.countersign.instanceId = obj.instanceId
//
this.showInfo(obj.businessSid)
},
@ -221,6 +250,11 @@ export default {
}).catch((e) => {
this.formobj = {}
})
selectStaffListss().then((res) => {
if (res.success) {
this.options = res.data
}
})
},
handleLook(row) {
this.viewState = 2
@ -253,10 +287,26 @@ export default {
})
return sums
},
//
openCountersign(val) {
this.operation = val
this.currentLink = true
this.countersignLink = true
this.dialogList.comment = ''
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
@ -271,6 +321,7 @@ export default {
openReject(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = ''
req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
@ -285,6 +336,7 @@ export default {
openStop(val) {
this.operation = val
this.currentLink = false
this.countersignLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
@ -303,7 +355,40 @@ export default {
} else {
this.handleStop()
}
} else if (this.operation === '加签') {
this.handleCountersign()
}
},
/** 加签 */
handleCountersign() {
if (this.countersign.assignee === '') {
this.$message({ showClose: true, type: 'error', message: '请选择加签人员' })
return
}
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
return
}
this.countersign.views = this.dialogList.comment
req.delegate(this.countersign).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 同意任务 */
handleAgree() {

117
anrui-scm/anrui-scm-ui/src/views/workFlow/zhuanxiangfanliyutiFlow/zhuanxiangfanliyutiDaiBanInfo.vue

@ -7,6 +7,7 @@
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" @click="openCountersign('加签')"> </el-button>
<el-button type="primary" size="small" @click="openAgree('同意')"> </el-button>
<el-button type="danger" size="small" @click="openReject('驳回')"> </el-button>
<el-button type="danger" size="small" @click="openStop('终止')"> </el-button>
@ -74,8 +75,19 @@
<zhuanxiangfanliyutiInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formaddcopy02" >
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-form class="formaddcopy02">
<el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="24">
<span class="span-sty icon">*</span>加签人员:
<el-form-item>
<el-select class="addinputInfo" v-model="countersign.assignee" placeholder="请选择" filterable>
<el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="currentLink">
<el-col :span="24">
<div class="span-sty"><span>当前环节:</span></div>
<el-form-item><span class="addinputInfo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
@ -84,7 +96,9 @@
<el-row :class="{ rowClass:!currentLink }">
<el-col :span="24">
<div class="span-sty"><span>意见:</span></div>
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputInfo addinputw" clearable ></el-input></el-form-item>
<el-form-item>
<el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputInfo" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable />
</el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
@ -99,6 +113,7 @@
<script>
import req from '@/api/specialrebate/specialrebatewithholding'
import zhuanxiangfanliyutiInfo from './relation/zhuanxiangfanliyutiInfo'
import { selectStaffListss } from '@/api/Common/dictcommons'
export default {
name: 'ZhuanXiangFanLiYuTiDaiBanInfo',
@ -111,18 +126,6 @@ export default {
index: 0,
tableKey: 0,
viewState: 1,
operation: '', //
dialogList: {
comment: ''
},
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
//
formobj: {
sid: '',
@ -145,6 +148,20 @@ export default {
},
rules: {},
submitdisabled: false,
options: [],
operation: '', //
dialogList: {
comment: ''
},
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
countersignLink: false,
//
linkByParameter: {
businessSid: '',
@ -154,6 +171,14 @@ export default {
orgSidPath: '',
taskDefKey: '',
userSid: ''
},
//
countersign: {
taskId: '',
assignee: '',
userSid: '',
instanceId: '',
views: ''
}
}
},
@ -168,10 +193,14 @@ export default {
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
// this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.countersign.taskId = obj.taskId
this.countersign.userSid = window.sessionStorage.getItem('userSid')
this.countersign.instanceId = obj.instanceId
//
this.showInfo(obj.businessSid)
},
@ -199,6 +228,11 @@ export default {
}).catch((e) => {
this.formobj = {}
})
selectStaffListss().then((res) => {
if (res.success) {
this.options = res.data
}
})
},
handleLook(row) {
this.viewState = 2
@ -261,10 +295,26 @@ export default {
})
return sums
},
//
openCountersign(val) {
this.operation = val
this.currentLink = true
this.countersignLink = true
this.dialogList.comment = ''
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
@ -279,6 +329,7 @@ export default {
openReject(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = ''
req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
@ -293,6 +344,7 @@ export default {
openStop(val) {
this.operation = val
this.currentLink = false
this.countersignLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
@ -311,7 +363,40 @@ export default {
} else {
this.handleStop()
}
} else if (this.operation === '加签') {
this.handleCountersign()
}
},
/** 加签 */
handleCountersign() {
if (this.countersign.assignee === '') {
this.$message({ showClose: true, type: 'error', message: '请选择加签人员' })
return
}
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
return
}
this.countersign.views = this.dialogList.comment
req.delegate(this.countersign).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 同意任务 */
handleAgree() {

Loading…
Cancel
Save