|
@@ -62,6 +62,9 @@
|
|
</a-select-option>
|
|
</a-select-option>
|
|
</a-select>
|
|
</a-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
|
|
+ <a-form-item class="grid-form-item" label="人员名称:" :colon="false">
|
|
|
|
+ <a-input v-model="configForm.userName" placeholder="请输入人员名称" allow-clear />
|
|
|
|
+ </a-form-item>
|
|
<a-form-item class="grid-form-item" label="媒体:" :colon="false">
|
|
<a-form-item class="grid-form-item" label="媒体:" :colon="false">
|
|
<a-select
|
|
<a-select
|
|
v-model="configForm.media"
|
|
v-model="configForm.media"
|
|
@@ -76,6 +79,12 @@
|
|
<a-select-option value="磁力金牛"> 磁力金牛 </a-select-option>
|
|
<a-select-option value="磁力金牛"> 磁力金牛 </a-select-option>
|
|
<a-select-option value="头条"> 头条 </a-select-option>
|
|
<a-select-option value="头条"> 头条 </a-select-option>
|
|
<a-select-option value="头条千川"> 头条千川 </a-select-option>
|
|
<a-select-option value="头条千川"> 头条千川 </a-select-option>
|
|
|
|
+ <a-select-option value="公共费用"> 公共费用 </a-select-option>
|
|
|
|
+
|
|
|
|
+ <a-select-option value="快手服务商"> 快手服务商 </a-select-option>
|
|
|
|
+ <a-select-option value="货盘"> 货盘 </a-select-option>
|
|
|
|
+ <a-select-option value="素造"> 素造 </a-select-option>
|
|
|
|
+ <a-select-option value="管理职能"> 管理职能 </a-select-option>
|
|
</a-select>
|
|
</a-select>
|
|
</a-form-item>
|
|
</a-form-item>
|
|
<a-form-item class="grid-form-item" label="部门:" :colon="false">
|
|
<a-form-item class="grid-form-item" label="部门:" :colon="false">
|
|
@@ -137,6 +146,24 @@
|
|
:pagination="false"
|
|
:pagination="false"
|
|
:loading="controlLoading"
|
|
:loading="controlLoading"
|
|
>
|
|
>
|
|
|
|
+ <span slot="status" slot-scope="text, records">
|
|
|
|
+ <a @click="showLog(records)">{{
|
|
|
|
+ text === '1'
|
|
|
|
+ ? '待审核'
|
|
|
|
+ : text === '2'
|
|
|
|
+ ? '审核通过'
|
|
|
|
+ : text === '3'
|
|
|
|
+ ? '审核拒绝'
|
|
|
|
+ : text === '4'
|
|
|
|
+ ? '审核中'
|
|
|
|
+ : text === '5'
|
|
|
|
+ ? '部分拒绝'
|
|
|
|
+ : '-'
|
|
|
|
+ }}</a>
|
|
|
|
+ </span>
|
|
|
|
+ <span slot="amount" slot-scope="text,record">
|
|
|
|
+ {{(+text).toFixed(2)}}
|
|
|
|
+ </span>
|
|
<span slot="lookImage" slot-scope="text, record">
|
|
<span slot="lookImage" slot-scope="text, record">
|
|
<a @click="lookImageClick(record)">查看</a>
|
|
<a @click="lookImageClick(record)">查看</a>
|
|
</span>
|
|
</span>
|
|
@@ -144,25 +171,20 @@
|
|
<a @click="handleSubmitReview(record)">查看</a>
|
|
<a @click="handleSubmitReview(record)">查看</a>
|
|
<a-divider
|
|
<a-divider
|
|
type="vertical"
|
|
type="vertical"
|
|
- v-if="
|
|
|
|
- record.userId == userInfo().id &&
|
|
|
|
- (record.status == '1' || record.status == '3' || record.status == '5')
|
|
|
|
- "
|
|
|
|
|
|
+ v-if="record.userId == userInfo().id && (record.status == '3' || record.status == '5')"
|
|
/>
|
|
/>
|
|
|
|
+ <!-- record.status == '1' || -->
|
|
<a
|
|
<a
|
|
@click="handleSubmitEdit(record)"
|
|
@click="handleSubmitEdit(record)"
|
|
- v-if="
|
|
|
|
- record.userId == userInfo().id &&
|
|
|
|
- (record.status == '1' || record.status == '3' || record.status == '5')
|
|
|
|
- "
|
|
|
|
|
|
+ v-if="record.userId == userInfo().id && (record.status == '3' || record.status == '5')"
|
|
>编辑</a
|
|
>编辑</a
|
|
>
|
|
>
|
|
- <a-divider type="vertical" v-if="record.userId == userInfo().id && record.status == '1'" />
|
|
|
|
|
|
+ <!-- <a-divider type="vertical" v-if="record.userId == userInfo().id && record.status == '1'" />
|
|
<a
|
|
<a
|
|
@click="handleSubmitEditStatus(record)"
|
|
@click="handleSubmitEditStatus(record)"
|
|
v-if="record.userId == userInfo().id && record.status == '1'"
|
|
v-if="record.userId == userInfo().id && record.status == '1'"
|
|
>提交审核</a
|
|
>提交审核</a
|
|
- >
|
|
|
|
|
|
+ > -->
|
|
</span>
|
|
</span>
|
|
</a-table>
|
|
</a-table>
|
|
<a-pagination
|
|
<a-pagination
|
|
@@ -180,14 +202,41 @@
|
|
|
|
|
|
<a-modal
|
|
<a-modal
|
|
v-if="lookImageVisible"
|
|
v-if="lookImageVisible"
|
|
- title="查看附件"
|
|
|
|
|
|
+ title="查看图片"
|
|
:visible="lookImageVisible"
|
|
:visible="lookImageVisible"
|
|
:footer="null"
|
|
:footer="null"
|
|
@cancel="lookImageVisible = false"
|
|
@cancel="lookImageVisible = false"
|
|
>
|
|
>
|
|
- <div v-if="lookImageData">
|
|
|
|
- <img :src="item" v-for="(item, index) in lookImageData" alt="" style="width: 150px" />
|
|
|
|
- </div>
|
|
|
|
|
|
+ <a-carousel arrows v-if="lookImageData">
|
|
|
|
+ <div v-for="(item, index) in lookImageData" :key="index" class="content">
|
|
|
|
+ <div style="display: flex !important; justify-content: space-around">
|
|
|
|
+ <div style="display: flex; flex-direction: column; align-items: center; width: 500px">
|
|
|
|
+ <img :src="item" style="width: 100%" />
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
|
|
+ <a-icon
|
|
|
|
+ type="left-circle"
|
|
|
|
+ slot="prevArrow"
|
|
|
|
+ slot-scope
|
|
|
|
+ style="left: 10px; z-index: 100; font-size: 30px; color: black"
|
|
|
|
+ />
|
|
|
|
+ <a-icon
|
|
|
|
+ type="right-circle"
|
|
|
|
+ slot="nextArrow"
|
|
|
|
+ slot-scope
|
|
|
|
+ style="right: 10px; z-index: 100; font-size: 30px; color: black"
|
|
|
|
+ />
|
|
|
|
+ </a-carousel>
|
|
|
|
+ <!-- <div v-if="lookImageData">
|
|
|
|
+ <img
|
|
|
|
+ :src="item"
|
|
|
|
+ v-for="(item, index) in lookImageData"
|
|
|
|
+ @click="lookBig(item)"
|
|
|
|
+ alt=""
|
|
|
|
+ style="width: 150px"
|
|
|
|
+ />
|
|
|
|
+ </div> -->
|
|
</a-modal>
|
|
</a-modal>
|
|
|
|
|
|
<!-- 被拒理由 -->
|
|
<!-- 被拒理由 -->
|
|
@@ -738,7 +787,7 @@
|
|
>
|
|
>
|
|
<div slot="statDate" slot-scope="text, records">
|
|
<div slot="statDate" slot-scope="text, records">
|
|
<span v-if="!records.edit">{{ text }}</span>
|
|
<span v-if="!records.edit">{{ text }}</span>
|
|
- <a-date-picker v-model:value="records.statDates" v-else format="YYYY-MM-DD"/>
|
|
|
|
|
|
+ <a-date-picker v-model:value="records.statDates" v-else format="YYYY-MM-DD" />
|
|
</div>
|
|
</div>
|
|
<div slot="expressNumber" slot-scope="text, records">
|
|
<div slot="expressNumber" slot-scope="text, records">
|
|
<span v-if="!records.edit">{{ text }}</span>
|
|
<span v-if="!records.edit">{{ text }}</span>
|
|
@@ -788,9 +837,21 @@
|
|
<a-steps progress-dot direction="vertical" v-model="logActive" style="width: 100%" disbaled>
|
|
<a-steps progress-dot direction="vertical" v-model="logActive" style="width: 100%" disbaled>
|
|
<a-step
|
|
<a-step
|
|
:title="`${item.roleName}(${item.userName})${
|
|
:title="`${item.roleName}(${item.userName})${
|
|
- item.approvalStatus == 1 ? '审核拒绝' : item.approvalContent
|
|
|
|
|
|
+ item.state == '0'
|
|
|
|
+ ? '创建'
|
|
|
|
+ : item.state == '1'
|
|
|
|
+ ? '通过'
|
|
|
|
+ : item.state == '2'
|
|
|
|
+ ? '拒绝'
|
|
|
|
+ : item.state == '3'
|
|
|
|
+ ? '待审核'
|
|
|
|
+ : item.state == '4'
|
|
|
|
+ ? '未审核'
|
|
|
|
+ : item.state == '5'
|
|
|
|
+ ? '修改'
|
|
|
|
+ : '-'
|
|
}`"
|
|
}`"
|
|
- :description="`${item.createTime}`"
|
|
|
|
|
|
+ :description="`${item.statTime}`"
|
|
v-for="(item, index) in logList"
|
|
v-for="(item, index) in logList"
|
|
:key="index"
|
|
:key="index"
|
|
disabled
|
|
disabled
|
|
@@ -1079,19 +1140,7 @@ export default {
|
|
title: '状态',
|
|
title: '状态',
|
|
dataIndex: 'status',
|
|
dataIndex: 'status',
|
|
align: 'center',
|
|
align: 'center',
|
|
- customRender: function (text) {
|
|
|
|
- if (text === '1') {
|
|
|
|
- return '待审核'
|
|
|
|
- } else if (text === '2') {
|
|
|
|
- return '审核通过'
|
|
|
|
- } else if (text === '3') {
|
|
|
|
- return '审核拒绝'
|
|
|
|
- } else if (text === '4') {
|
|
|
|
- return '审核中'
|
|
|
|
- } else if (text === '5') {
|
|
|
|
- return '部分拒绝'
|
|
|
|
- }
|
|
|
|
- },
|
|
|
|
|
|
+ scopedSlots: { customRender: 'status' },
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '附件',
|
|
title: '附件',
|
|
@@ -1118,6 +1167,7 @@ export default {
|
|
],
|
|
],
|
|
configForm: {
|
|
configForm: {
|
|
companyId: undefined,
|
|
companyId: undefined,
|
|
|
|
+ userName: undefined,
|
|
media: undefined,
|
|
media: undefined,
|
|
departId: undefined,
|
|
departId: undefined,
|
|
time: [],
|
|
time: [],
|
|
@@ -1300,6 +1350,7 @@ export default {
|
|
const paramsData = {
|
|
const paramsData = {
|
|
userId: this.userInfo().id,
|
|
userId: this.userInfo().id,
|
|
companyId: this.configForm.companyId,
|
|
companyId: this.configForm.companyId,
|
|
|
|
+ userName: this.configForm.userName,
|
|
media: this.configForm.media,
|
|
media: this.configForm.media,
|
|
departId: this.configForm.departId,
|
|
departId: this.configForm.departId,
|
|
status: this.configForm.status,
|
|
status: this.configForm.status,
|
|
@@ -1605,9 +1656,9 @@ export default {
|
|
showLog(item) {
|
|
showLog(item) {
|
|
this.logVisible = true
|
|
this.logVisible = true
|
|
this.logStatus = item.approvedStatus
|
|
this.logStatus = item.approvedStatus
|
|
- getAction(urlAcount + '/finance/cwjsPolicyInfo/getPolicyApprovalLogByPolicyId', { policyId: item.id })
|
|
|
|
|
|
+ getAction('/reimburse/apply/queryProcess', { id: item.id })
|
|
.then((result) => {
|
|
.then((result) => {
|
|
- if (result.code === 0) {
|
|
|
|
|
|
+ if (result.code === 200) {
|
|
this.logList = result.result
|
|
this.logList = result.result
|
|
this.logActive = this.logList.length - 1
|
|
this.logActive = this.logList.length - 1
|
|
} else {
|
|
} else {
|
|
@@ -1626,6 +1677,7 @@ export default {
|
|
userId: this.userInfo().id,
|
|
userId: this.userInfo().id,
|
|
userId: this.userInfo().id,
|
|
userId: this.userInfo().id,
|
|
companyId: this.configForm.companyId,
|
|
companyId: this.configForm.companyId,
|
|
|
|
+ userName: this.configForm.userName,
|
|
media: this.configForm.media,
|
|
media: this.configForm.media,
|
|
departId: this.configForm.departId,
|
|
departId: this.configForm.departId,
|
|
status: this.configForm.status,
|
|
status: this.configForm.status,
|
|
@@ -2029,7 +2081,13 @@ export default {
|
|
// 提交审核弹窗
|
|
// 提交审核弹窗
|
|
handleSubmitReview(list) {
|
|
handleSubmitReview(list) {
|
|
this.$router.replace({
|
|
this.$router.replace({
|
|
- path: '/policy-management/reimbursementAdd?type=look&person=' + list.flag + '&id=' + list.id,
|
|
|
|
|
|
+ path:
|
|
|
|
+ '/policy-management/reimbursementAdd?type=look&person=' +
|
|
|
|
+ list.flag +
|
|
|
|
+ '&id=' +
|
|
|
|
+ list.id +
|
|
|
|
+ '&status=' +
|
|
|
|
+ list.status,
|
|
})
|
|
})
|
|
},
|
|
},
|
|
handleSubmitEdit(list) {
|
|
handleSubmitEdit(list) {
|
|
@@ -2077,6 +2135,7 @@ export default {
|
|
handleResetList() {
|
|
handleResetList() {
|
|
this.configForm = {
|
|
this.configForm = {
|
|
companyId: undefined,
|
|
companyId: undefined,
|
|
|
|
+ userName: undefined,
|
|
media: undefined,
|
|
media: undefined,
|
|
departId: undefined,
|
|
departId: undefined,
|
|
time: [],
|
|
time: [],
|