fix:长期领料已完成确认,但是页面图标未变成“√”修改

This commit is contained in:
jackal 2024-04-25 13:40:11 +08:00
parent 646456b1c6
commit 7ddb70360e
1 changed files with 65 additions and 181 deletions

View File

@ -6,53 +6,26 @@
</el-row> </el-row>
<el-row :gutter="24" class="mb8"> <el-row :gutter="24" class="mb8">
<el-col :span="24"> <el-col :span="24">
<el-form <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
:model="queryParams" label-width="100px">
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="100px"
>
<el-form-item label="领料类型" prop="leaseTypeName"> <el-form-item label="领料类型" prop="leaseTypeName">
<el-input <el-input v-model="queryParams.leaseTypeName" placeholder="请输入领料类型" disabled
v-model="queryParams.leaseTypeName" @keyup.enter.native="handleQuery" />
placeholder="请输入领料类型"
disabled
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="领料工程" prop="proName"> <el-form-item label="领料工程" prop="proName">
<el-input <el-input v-model="queryParams.proName" placeholder="请输入领料工程" disabled @keyup.enter.native="handleQuery" />
v-model="queryParams.proName"
placeholder="请输入领料工程"
disabled
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="领料人" prop="leasePerson"> <el-form-item label="领料人" prop="leasePerson">
<el-input <el-input v-model="queryParams.leaseApplyInfo.leasePerson" placeholder="请输入领料人" disabled
v-model="queryParams.leaseApplyInfo.leasePerson" @keyup.enter.native="handleQuery" />
placeholder="请输入领料人"
disabled
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="联系电话" prop="phone"> <el-form-item label="联系电话" prop="phone">
<el-input <el-input v-model="queryParams.leaseApplyInfo.phone" placeholder="请输入联系电话" disabled
v-model="queryParams.leaseApplyInfo.phone" @keyup.enter.native="handleQuery" />
placeholder="请输入联系电话"
disabled
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
<el-form-item label="预计领料时间" prop="estimateLeaseTime"> <el-form-item label="预计领料时间" prop="estimateLeaseTime">
<el-input <el-input v-model="queryParams.estimateLeaseTime" placeholder="预计领料时间" disabled
v-model="queryParams.estimateLeaseTime" @keyup.enter.native="handleQuery" />
placeholder="预计领料时间"
disabled
@keyup.enter.native="handleQuery"
/>
</el-form-item> </el-form-item>
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
@ -64,85 +37,31 @@
</el-row> </el-row>
<el-row :gutter="24" class="mb8"> <el-row :gutter="24" class="mb8">
<el-col :span="18"> <el-col :span="18">
<el-table <el-table v-loading="loading" :data="queryParams.leaseApplyDetails" @selection-change="handleSelectionChange">
v-loading="loading"
:data="queryParams.leaseApplyDetails"
@selection-change="handleSelectionChange"
>
<!-- <el-table-column type="selection" width="55" align="center" />--> <!-- <el-table-column type="selection" width="55" align="center" />-->
<el-table-column label="序号" align="center" type="index" /> <el-table-column label="序号" align="center" type="index" />
<el-table-column <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
label="类型名称"
align="center"
prop="typeName"
:show-overflow-tooltip="true"
/>
<el-table-column type="expand"> <el-table-column type="expand">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="nested-table-container"> <div class="nested-table-container">
<el-table :data="scope.row.maTypeDetails" style="width: 100%"> <el-table :data="scope.row.maTypeDetails" style="width: 100%">
<!-- 子表格的列 --> <!-- 子表格的列 -->
<el-table-column label="序号" align="center" type="index" /> <el-table-column label="序号" align="center" type="index" />
<el-table-column <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
label="类型名称" <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
align="center" <el-table-column label="单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
prop="typeName" <el-table-column label="预领数量" align="center" prop="partNum" :show-overflow-tooltip="true" />
: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> </el-table>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="规格型号" align="center" prop="typeModelName" :show-overflow-tooltip="true" />
label="规格型号" <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
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="num" :show-overflow-tooltip="true" />
<el-table-column label="预领数量" align="center" prop="preNum" :show-overflow-tooltip="true" /> <el-table-column label="预领数量" align="center" prop="preNum" :show-overflow-tooltip="true" />
<el-table-column <el-table-column label="申请人" align="center" prop="applyFor" :show-overflow-tooltip="true" />
label="申请人" <el-table-column label="申请时间" align="center" prop="updateTimes" :show-overflow-tooltip="true" />
align="center" <el-table-column label="任务状态" align="center" prop="taskName" :show-overflow-tooltip="true" />
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="dictName" :show-overflow-tooltip="true" />-->
<el-table-column label="备注" align="center" prop="remark" :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">--> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
@ -171,15 +90,16 @@
<el-timeline-item color="#0bbd87" icon="el-icon-check" placement="top"> <el-timeline-item color="#0bbd87" icon="el-icon-check" placement="top">
<el-card> <el-card>
<p class="title">提交审批</p> <p class="title">提交审批</p>
<p class="author">申请人{{queryParams.applyFor}}</p> <p class="author">申请人{{ queryParams.applyFor }}</p>
<p class="time">申请时间{{queryParams.updateTimes}}</p> <p class="time">申请时间{{ queryParams.updateTimes }}</p>
</el-card> </el-card>
</el-timeline-item> </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> <el-card>
<p class="title">{{v.name}}</p> <p class="title">{{ v.name }}</p>
<p class="author" v-if="queryParams[v.authorKey]">审核人{{queryParams[v.authorKey]}}</p> <p class="author" v-if="queryParams[v.authorKey]">审核人{{ queryParams[v.authorKey] }}</p>
<p class="time" v-if="queryParams[v.timeKey]">审核时间{{queryParams[v.timeKey]}}</p> <p class="time" v-if="queryParams[v.timeKey]">审核时间{{ queryParams[v.timeKey] }}</p>
<p class="remark" v-if="queryParams[v.remarkKey]">审核意见{{ queryParams[v.remarkKey] }}</p> <p class="remark" v-if="queryParams[v.remarkKey]">审核意见{{ queryParams[v.remarkKey] }}</p>
</el-card> </el-card>
</el-timeline-item> </el-timeline-item>
@ -187,82 +107,38 @@
</el-col> </el-col>
</el-row> </el-row>
<div <div slot="footer" class="dialog-footer" style="text-align: right;margin-right: 200px;"
slot="footer" v-if="queryParams.taskStatus < 33 && !this.isView">
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 type="primary" @click="agree">同意</el-button>
<el-button @click="refuse">驳回</el-button> <el-button @click="refuse">驳回</el-button>
</div> </div>
<div <div slot="footer" class="dialog-footer" style="text-align: right;margin-right: 200px;"
slot="footer" v-if="queryParams.taskStatus == 117 && !this.isView">
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> <el-button type="primary" @click="confirm">确认</el-button>
</div> </div>
<!-- 同意 --> <!-- 同意 -->
<el-dialog <el-dialog title="审核意见" :visible.sync="examineVisible" width="600px" :close-on-click-modal="false">
title="审核意见" <el-input placeholder="请输入审核意见" type="textarea" maxlength="100" :autosize="{ minRows: 4, maxRows: 6 }"
:visible.sync="examineVisible" v-model="queryParams.companyAuditRemarks"></el-input>
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"> <div slot="footer" class="dialog-footer">
<el-button @click="examineVisible=false"> </el-button> <el-button @click="examineVisible = false"> </el-button>
<el-button <el-button type="primary" @click="subAuditLeaseByCompany(9)" v-if="queryParams.taskStatus == 31"
type="primary" v-hasPermi="['receive:examine:fgs']"> </el-button>
@click="subAuditLeaseByCompany(9)" <el-button type="primary" @click="subAuditLeaseByCompany(1)" v-if="queryParams.taskStatus == 32"
v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:nbs']"> </el-button>
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> </div>
</el-dialog> </el-dialog>
<!-- 驳回 --> <!-- 驳回 -->
<el-dialog <el-dialog title="审核意见" :visible.sync="refuseVisible" width="600px" :close-on-click-modal="false">
title="审核意见" <el-input placeholder="请输入审核意见" type="textarea" maxlength="100" :autosize="{ minRows: 4, maxRows: 6 }"
:visible.sync="refuseVisible" v-model="queryParams.companyAuditRemarks"></el-input>
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"> <div slot="footer" class="dialog-footer">
<el-button @click="refuseVisible=false"> </el-button> <el-button @click="refuseVisible = false"> </el-button>
<el-button <el-button type="primary" @click="refuseAuditLeaseByCompany(10)" v-if="queryParams.taskStatus == 31"
type="primary" v-hasPermi="['receive:examine:fgs']"> </el-button>
@click="refuseAuditLeaseByCompany(10)" <el-button type="primary" @click="refuseAuditLeaseByCompany(2)" v-if="queryParams.taskStatus == 32"
v-if="queryParams.taskStatus==31" v-hasPermi="['receive:examine:nbs']"> </el-button>
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> </div>
</el-dialog> </el-dialog>
</div> </div>
@ -431,7 +307,10 @@ export default {
updateLeaseTaskStatusConfirmByCq(param).then(response => { updateLeaseTaskStatusConfirmByCq(param).then(response => {
this.$modal.msgSuccess('操作成功') this.$modal.msgSuccess('操作成功')
this.getData(taskData.taskId) this.getData(taskData.taskId)
}) }).finally(() => {
//
window.location.reload();
});
}, },
// //
refuse() { refuse() {
@ -475,9 +354,9 @@ export default {
}, },
/** 查询 */ /** 查询 */
async getData(taskId) { async getData(taskId) {
this.loading=true; this.loading = true;
const res = await getLeaseListAllCq({ taskId }) const res = await getLeaseListAllCq({ taskId })
this.loading=false; this.loading = false;
this.queryParams = { ...this.queryParams, ...res.rows[0] } this.queryParams = { ...this.queryParams, ...res.rows[0] }
this.$set(this.queryParams, 'leaseApplyInfo', this.queryParams.leaseApplyInfoList[0]) this.$set(this.queryParams, 'leaseApplyInfo', this.queryParams.leaseApplyInfoList[0])
this.queryParams.leaseApplyDetails.forEach(v => { this.queryParams.leaseApplyDetails.forEach(v => {
@ -535,9 +414,9 @@ export default {
// this.flowPath[2].icon = 'el-icon-close' // this.flowPath[2].icon = 'el-icon-close'
// } // }
if(this.queryParams.leaseType=='1'){ if (this.queryParams.leaseType == '1') {
this.flowPath = [this.flowPath[2]] this.flowPath = [this.flowPath[2]]
}else{ } else {
this.flowPath = this.flowPath this.flowPath = this.flowPath
} }
@ -597,7 +476,7 @@ export default {
}) })
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm: function() { submitForm: function () {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
if (this.form.dictId != undefined) { if (this.form.dictId != undefined) {
@ -621,14 +500,14 @@ export default {
const dictIds = row.dictId || this.ids const dictIds = row.dictId || this.ids
this.$modal this.$modal
.confirm('是否确认删除所选择的数据项?') .confirm('是否确认删除所选择的数据项?')
.then(function() { .then(function () {
return delType(dictIds) return delType(dictIds)
}) })
.then(() => { .then(() => {
this.getList() this.getList()
this.$modal.msgSuccess('删除成功') this.$modal.msgSuccess('删除成功')
}) })
.catch(() => {}) .catch(() => { })
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
@ -654,20 +533,25 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .el-card__body { ::v-deep .el-card__body {
padding: 10px !important; padding: 10px !important;
p { p {
margin: 0 !important; margin: 0 !important;
} }
.title { .title {
color: #848484; color: #848484;
font-weight: 700; font-weight: 700;
} }
.author { .author {
font-size: 13px; font-size: 13px;
margin-top: 5px; margin-top: 5px;
} }
.time { .time {
font-size: 12px; font-size: 12px;
} }
.remark { .remark {
margin-top: 10px; margin-top: 10px;
word-break: break-all; word-break: break-all;