fix:长期领料已完成确认，但是页面图标未变成“√”修改
This commit is contained in:
parent
646456b1c6
commit
7ddb70360e
|
|
@ -6,53 +6,26 @@
|
|||
</el-row>
|
||||
<el-row :gutter="24" class="mb8">
|
||||
<el-col :span="24">
|
||||
<el-form
|
||||
:model="queryParams"
|
||||
ref="queryForm"
|
||||
size="small"
|
||||
:inline="true"
|
||||
v-show="showSearch"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
|
||||
label-width="100px">
|
||||
<el-form-item label="领料类型" prop="leaseTypeName">
|
||||
<el-input
|
||||
v-model="queryParams.leaseTypeName"
|
||||
placeholder="请输入领料类型"
|
||||
disabled
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
<el-input v-model="queryParams.leaseTypeName" placeholder="请输入领料类型" disabled
|
||||
@keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="领料工程" prop="proName">
|
||||
<el-input
|
||||
v-model="queryParams.proName"
|
||||
placeholder="请输入领料工程"
|
||||
disabled
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
<el-input v-model="queryParams.proName" placeholder="请输入领料工程" disabled @keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="领料人" prop="leasePerson">
|
||||
<el-input
|
||||
v-model="queryParams.leaseApplyInfo.leasePerson"
|
||||
placeholder="请输入领料人"
|
||||
disabled
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
<el-input v-model="queryParams.leaseApplyInfo.leasePerson" placeholder="请输入领料人" disabled
|
||||
@keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="联系电话" prop="phone">
|
||||
<el-input
|
||||
v-model="queryParams.leaseApplyInfo.phone"
|
||||
placeholder="请输入联系电话"
|
||||
disabled
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
<el-input v-model="queryParams.leaseApplyInfo.phone" placeholder="请输入联系电话" disabled
|
||||
@keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
<el-form-item label="预计领料时间" prop="estimateLeaseTime">
|
||||
<el-input
|
||||
v-model="queryParams.estimateLeaseTime"
|
||||
placeholder="预计领料时间"
|
||||
disabled
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
<el-input v-model="queryParams.estimateLeaseTime" placeholder="预计领料时间" disabled
|
||||
@keyup.enter.native="handleQuery" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-row :gutter="10" class="mb8">
|
||||
|
|
@ -64,85 +37,31 @@
|
|||
</el-row>
|
||||
<el-row :gutter="24" class="mb8">
|
||||
<el-col :span="18">
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="queryParams.leaseApplyDetails"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table v-loading="loading" :data="queryParams.leaseApplyDetails" @selection-change="handleSelectionChange">
|
||||
<!-- <el-table-column type="selection" width="55" align="center" />-->
|
||||
<el-table-column label="序号" align="center" type="index" />
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
|
||||
<el-table-column type="expand">
|
||||
<template slot-scope="scope">
|
||||
<div class="nested-table-container">
|
||||
<el-table :data="scope.row.maTypeDetails" style="width: 100%">
|
||||
<!-- 子表格的列 -->
|
||||
<el-table-column label="序号" align="center" type="index" />
|
||||
<el-table-column
|
||||
label="类型名称"
|
||||
align="center"
|
||||
prop="typeName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
align="center"
|
||||
prop="typeModelName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="单位"
|
||||
align="center"
|
||||
prop="unitName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="预领数量"
|
||||
align="center"
|
||||
prop="partNum"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="预领数量" align="center" prop="partNum" :show-overflow-tooltip="true" />
|
||||
</el-table>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="规格型号"
|
||||
align="center"
|
||||
prop="typeModelName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="计量单位"
|
||||
align="center"
|
||||
prop="unitName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="当前库存" align="center" prop="num" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="预领数量" align="center" prop="preNum" :show-overflow-tooltip="true" />
|
||||
<el-table-column
|
||||
label="申请人"
|
||||
align="center"
|
||||
prop="applyFor"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="申请时间"
|
||||
align="center"
|
||||
prop="updateTimes"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="任务状态"
|
||||
align="center"
|
||||
prop="taskName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="申请时间" align="center" prop="updateTimes" :show-overflow-tooltip="true" />
|
||||
<el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" />
|
||||
<!-- <el-table-column label="审批结果 " align="center" prop="dictName" :show-overflow-tooltip="true" />-->
|
||||
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
|
||||
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
|
||||
|
|
@ -175,7 +94,8 @@
|
|||
<p class="time">申请时间：{{ queryParams.updateTimes }}</p>
|
||||
</el-card>
|
||||
</el-timeline-item>
|
||||
<el-timeline-item v-for="(v,i) in flowPath" :type="v.type" :color="v.color" :icon="v.icon" :key="i" placement="top">
|
||||
<el-timeline-item v-for="(v, i) in flowPath" :type="v.type" :color="v.color" :icon="v.icon" :key="i"
|
||||
placement="top">
|
||||
<el-card>
|
||||
<p class="title">{{ v.name }}</p>
|
||||
<p class="author" v-if="queryParams[v.authorKey]">审核人：{{ queryParams[v.authorKey] }}</p>
|
||||
|
|
@ -187,82 +107,38 @@
|
|||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<div
|
||||
slot="footer"
|
||||
class="dialog-footer"
|
||||
style="text-align: right;margin-right: 200px;"
|
||||
v-if="queryParams.taskStatus<33&&!this.isView"
|
||||
>
|
||||
<div slot="footer" class="dialog-footer" style="text-align: right;margin-right: 200px;"
|
||||
v-if="queryParams.taskStatus < 33 && !this.isView">
|
||||
<el-button type="primary" @click="agree">同意</el-button>
|
||||
<el-button @click="refuse">驳回</el-button>
|
||||
</div>
|
||||
<div
|
||||
slot="footer"
|
||||
class="dialog-footer"
|
||||
style="text-align: right;margin-right: 200px;"
|
||||
v-if="queryParams.taskStatus==117&&!this.isView"
|
||||
>
|
||||
<div slot="footer" class="dialog-footer" style="text-align: right;margin-right: 200px;"
|
||||
v-if="queryParams.taskStatus == 117 && !this.isView">
|
||||
<el-button type="primary" @click="confirm">确认</el-button>
|
||||
</div>
|
||||
|
||||
<!-- 同意 -->
|
||||
<el-dialog
|
||||
title="审核意见"
|
||||
:visible.sync="examineVisible"
|
||||
width="600px"
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
<el-input
|
||||
placeholder="请输入审核意见"
|
||||
type="textarea"
|
||||
maxlength="100"
|
||||
:autosize="{ minRows: 4, maxRows: 6}"
|
||||
v-model="queryParams.companyAuditRemarks"
|
||||
></el-input>
|
||||
<el-dialog title="审核意见" :visible.sync="examineVisible" width="600px" :close-on-click-modal="false">
|
||||
<el-input placeholder="请输入审核意见" type="textarea" maxlength="100" :autosize="{ minRows: 4, maxRows: 6 }"
|
||||
v-model="queryParams.companyAuditRemarks"></el-input>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="examineVisible = false">取 消</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="subAuditLeaseByCompany(9)"
|
||||
v-if="queryParams.taskStatus==31"
|
||||
v-hasPermi="['receive:examine:fgs']"
|
||||
>确 定</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="subAuditLeaseByCompany(1)"
|
||||
v-if="queryParams.taskStatus==32"
|
||||
v-hasPermi="['receive:examine:nbs']"
|
||||
>确 定</el-button>
|
||||
<el-button type="primary" @click="subAuditLeaseByCompany(9)" v-if="queryParams.taskStatus == 31"
|
||||
v-hasPermi="['receive:examine:fgs']">确 定</el-button>
|
||||
<el-button type="primary" @click="subAuditLeaseByCompany(1)" v-if="queryParams.taskStatus == 32"
|
||||
v-hasPermi="['receive:examine:nbs']">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
<!-- 驳回 -->
|
||||
<el-dialog
|
||||
title="审核意见"
|
||||
:visible.sync="refuseVisible"
|
||||
width="600px"
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
<el-input
|
||||
placeholder="请输入审核意见"
|
||||
type="textarea"
|
||||
maxlength="100"
|
||||
:autosize="{ minRows: 4, maxRows: 6}"
|
||||
v-model="queryParams.companyAuditRemarks"
|
||||
></el-input>
|
||||
<el-dialog title="审核意见" :visible.sync="refuseVisible" width="600px" :close-on-click-modal="false">
|
||||
<el-input placeholder="请输入审核意见" type="textarea" maxlength="100" :autosize="{ minRows: 4, maxRows: 6 }"
|
||||
v-model="queryParams.companyAuditRemarks"></el-input>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button @click="refuseVisible = false">取 消</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="refuseAuditLeaseByCompany(10)"
|
||||
v-if="queryParams.taskStatus==31"
|
||||
v-hasPermi="['receive:examine:fgs']"
|
||||
>确 定</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="refuseAuditLeaseByCompany(2)"
|
||||
v-if="queryParams.taskStatus==32"
|
||||
v-hasPermi="['receive:examine:nbs']"
|
||||
>确 定</el-button>
|
||||
<el-button type="primary" @click="refuseAuditLeaseByCompany(10)" v-if="queryParams.taskStatus == 31"
|
||||
v-hasPermi="['receive:examine:fgs']">确 定</el-button>
|
||||
<el-button type="primary" @click="refuseAuditLeaseByCompany(2)" v-if="queryParams.taskStatus == 32"
|
||||
v-hasPermi="['receive:examine:nbs']">确 定</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
|
@ -431,7 +307,10 @@ export default {
|
|||
updateLeaseTaskStatusConfirmByCq(param).then(response => {
|
||||
this.$modal.msgSuccess('操作成功')
|
||||
this.getData(taskData.taskId)
|
||||
})
|
||||
}).finally(() => {
|
||||
// 刷新页面
|
||||
window.location.reload();
|
||||
});
|
||||
},
|
||||
//审核 驳回
|
||||
refuse() {
|
||||
|
|
@ -654,20 +533,25 @@ export default {
|
|||
<style lang="scss" scoped>
|
||||
::v-deep .el-card__body {
|
||||
padding: 10px !important;
|
||||
|
||||
p {
|
||||
margin: 0 !important;
|
||||
}
|
||||
|
||||
.title {
|
||||
color: #848484;
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
.author {
|
||||
font-size: 13px;
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.time {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.remark {
|
||||
margin-top: 10px;
|
||||
word-break: break-all;
|
||||
|
|
|
|||
Loading…
Reference in New Issue