bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化领料审核页面缓存问题

This commit is contained in:
BianLzhaoMin 2024-06-18 10:37:15 +08:00
parent a538a5eb84
commit 84272fee42
4 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sgzb-ui/src/views/claimAndreturn/picking/auditing/component/auditingPage.vue
View File

@ -2,7 +2,10 @@
<!-- 领料审核页面 --> <!-- 领料审核页面 -->
<div id="ReceiveExamine"> <div id="ReceiveExamine">
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<h3>{{ queryParams.applyFor }}提交的领料申请</h3> <h3
><span class="apply-user">{{ queryParams.applyFor }}</span>
提交的领料申请</h3
>
<div>领料单号：{{ queryParams.code }}</div> <div>领料单号：{{ queryParams.code }}</div>
</el-row> </el-row>
<el-row :gutter="24" class="mb8"> <el-row :gutter="24" class="mb8">
@ -99,7 +102,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="申请人" label="领料申请人"
align="center" align="center"
prop="applyFor" prop="applyFor"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
@ -215,35 +218,35 @@
<el-button <el-button
type="primary" type="primary"
@click="subAuditLeaseByCompany(9)" @click="subAuditLeaseByCompany(9)"
v-if="queryParams.taskStatus == 30" v-show="queryParams.taskStatus == 30"
v-hasPermi="['picking:auditing:fgs']" v-hasPermi="['picking:auditing:fgs']"
>确 定</el-button >确 定</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="subAuditLeaseByCompany(5)" @click="subAuditLeaseByCompany(5)"
v-if="queryParams.taskStatus == 31" v-show="queryParams.taskStatus == 31"
v-hasPermi="['picking:auditing:sgb']" v-hasPermi="['picking:auditing:sgb']"
>确 定</el-button >确 定</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="subAuditLeaseByCompany(7)" @click="subAuditLeaseByCompany(7)"
v-if="queryParams.taskStatus == 31" v-show="queryParams.taskStatus == 31"
v-hasPermi="['receive:examine:ajb']" v-hasPermi="['receive:examine:ajb']"
>确 定</el-button >确 定</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="subAuditLeaseByCompany(1)" @click="subAuditLeaseByCompany(1)"
v-if="queryParams.taskStatus == 32" v-show="queryParams.taskStatus == 32"
v-hasPermi="['picking:auditing:jjnb']" v-hasPermi="['picking:auditing:jjnb']"
>确 定</el-button >确 定</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="subAuditLeaseByCompany(3)" @click="subAuditLeaseByCompany(3)"
v-if="queryParams.taskStatus == 32" v-show="queryParams.taskStatus == 32"
v-hasPermi="['picking:auditing:tsnb']" v-hasPermi="['picking:auditing:tsnb']"
>确 定</el-button >确 定</el-button
> >
@ -268,35 +271,35 @@
<el-button <el-button
type="primary" type="primary"
@click="refuseAuditLeaseByCompany(10)" @click="refuseAuditLeaseByCompany(10)"
v-if="queryParams.taskStatus == 30" v-show="queryParams.taskStatus == 30"
v-hasPermi="['picking:auditing:fgs']" v-hasPermi="['picking:auditing:fgs']"
>确 定</el-button >确 定</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="refuseAuditLeaseByCompany(6)" @click="refuseAuditLeaseByCompany(6)"
v-if="queryParams.taskStatus == 31" v-show="queryParams.taskStatus == 31"
v-hasPermi="['picking:auditing:sgb']" v-hasPermi="['picking:auditing:sgb']"
>确 定</el-button >确 定</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="refuseAuditLeaseByCompany(8)" @click="refuseAuditLeaseByCompany(8)"
v-if="queryParams.taskStatus == 31" v-show="queryParams.taskStatus == 31"
v-hasPermi="['receive:examine:ajb']" v-hasPermi="['receive:examine:ajb']"
>确 定</el-button >确 定</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="refuseAuditLeaseByCompany(2)" @click="refuseAuditLeaseByCompany(2)"
v-if="queryParams.taskStatus == 32" v-show="queryParams.taskStatus == 32"
v-hasPermi="['picking:auditing:jjnb']" v-hasPermi="['picking:auditing:jjnb']"
>确 定</el-button >确 定</el-button
> >
<el-button <el-button
type="primary" type="primary"
@click="refuseAuditLeaseByCompany(4)" @click="refuseAuditLeaseByCompany(4)"
v-if="queryParams.taskStatus == 32" v-show="queryParams.taskStatus == 32"
v-hasPermi="['picking:auditing:tsnb']" v-hasPermi="['picking:auditing:tsnb']"
>确 定</el-button >确 定</el-button
> >
@ -784,4 +787,9 @@ export default {
font-size: 13px; font-size: 13px;
} }
} }
.apply-user {
margin-right: 2px;
letter-spacing: 1px;
}
</style> </style>

27
sgzb-ui/src/views/claimAndreturn/picking/auditing/component/home1.vue
View File

@ -234,7 +234,7 @@
type="text" type="text"
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['picking:auditing:fgs']" v-hasPermi="['picking:auditing:fgs']"
v-if=" v-show="
Number(scope.row.examineStatusId) == 30 && Number(scope.row.examineStatusId) == 30 &&
scope.row.deptId == currentDeptId scope.row.deptId == currentDeptId
" "
@ -245,7 +245,7 @@
type="text" type="text"
@click="handleExamine(scope.row)" @click="handleExamine(scope.row)"
v-hasPermi="['picking:auditing:sgb']" v-hasPermi="['picking:auditing:sgb']"
v-if=" v-show="
Number(scope.row.examineStatusId) == 31 && Number(scope.row.examineStatusId) == 31 &&
(scope.row.leaseApplyInfoList[0].status == '0' || (scope.row.leaseApplyInfoList[0].status == '0' ||
scope.row.leaseApplyInfoList[0].status == '7' || scope.row.leaseApplyInfoList[0].status == '7' ||
@ -273,7 +273,7 @@
type="text" type="text"
@click="handleExamine(scope.row, 'jjfgs')" @click="handleExamine(scope.row, 'jjfgs')"
v-hasPermi="['picking:auditing:jjnb']" v-hasPermi="['picking:auditing:jjnb']"
v-if=" v-show="
Number(scope.row.examineStatusId) == 32 && Number(scope.row.examineStatusId) == 32 &&
(scope.row.leaseApplyInfoList[0].status == '5' || (scope.row.leaseApplyInfoList[0].status == '5' ||
scope.row.leaseApplyInfoList[0].status == '7' || scope.row.leaseApplyInfoList[0].status == '7' ||
@ -288,7 +288,7 @@
type="text" type="text"
@click="handleExamine(scope.row, 'sbfgs')" @click="handleExamine(scope.row, 'sbfgs')"
v-hasPermi="['picking:auditing:tsnb']" v-hasPermi="['picking:auditing:tsnb']"
v-if=" v-show="
Number(scope.row.examineStatusId) == 32 && Number(scope.row.examineStatusId) == 32 &&
(scope.row.leaseApplyInfoList[0].status == '5' || (scope.row.leaseApplyInfoList[0].status == '5' ||
scope.row.leaseApplyInfoList[0].status == '7' || scope.row.leaseApplyInfoList[0].status == '7' ||
@ -475,6 +475,12 @@ import { getInfo } from '@/api/login'
import vueEasyPrint from 'vue-easy-print' import vueEasyPrint from 'vue-easy-print'
export default { export default {
// name: "ReceiveManage", // name: "ReceiveManage",
props: {
isRefresh: {
type: Boolean,
default: () => false,
},
},
data() { data() {
return { return {
// 遮罩层 // 遮罩层
@ -588,11 +594,6 @@ export default {
// console.log(this.user) // console.log(this.user)
this.getList() this.getList()
}, },
/* 刷新列表 */
refreshList() {
this.getList()
},
/** 查询列表 */ /** 查询列表 */
async getList() { async getList() {
this.loading = true this.loading = true
@ -611,7 +612,7 @@ export default {
const res = await getLeaseManageListAll(params) const res = await getLeaseManageListAll(params)
this.loading = false this.loading = false
console.log('getList ============', res) console.log('getList ============', res, '列表查询')
this.leaseAuditList = res.data.rows this.leaseAuditList = res.data.rows
// this.leaseAuditList.forEach((item,index)=>{ // this.leaseAuditList.forEach((item,index)=>{
// console.log(item.leaseApplyInfoList) // console.log(item.leaseApplyInfoList)
@ -786,6 +787,12 @@ export default {
}) })
}, },
}, },
activated() {
if (this.isRefresh) {
this.getList()
}
},
} }
</script> </script>

13
sgzb-ui/src/views/claimAndreturn/picking/auditing/index.vue
View File

@ -7,11 +7,12 @@
@goBack="goBack" @goBack="goBack"
/> />
<!-- 6.17 新增组件缓存 因客户需要查询或审核后返回列表时保留页面状态 --> <!-- 6.17 新增组件缓存 因客户需要查询或审核后返回列表时保留页面状态 -->
<keep-alive> <keep-alive include="Home">
<component <component
ref="componentRef" ref="componentRef"
:is="isShowComponent" :is="isShowComponent"
:isView="isView" :isView="isView"
:isRefresh="isRefresh"
:auditingTaskId="auditingTaskId" :auditingTaskId="auditingTaskId"
@pickingView="pickingView" @pickingView="pickingView"
@pickingAuditing="pickingAuditing" @pickingAuditing="pickingAuditing"
@ -37,7 +38,7 @@ export default {
pageContent: '', pageContent: '',
auditingTaskId: '', auditingTaskId: '',
isView: false, isView: false,
includeCom: '', isRefresh: false,
} }
}, },
methods: { methods: {
@ -56,13 +57,11 @@ export default {
this.isShowComponent = 'AuditingPage' this.isShowComponent = 'AuditingPage'
}, },
goBack(val) { goBack(val) {
this.isRefresh = false
this.isShowComponent = 'Home' this.isShowComponent = 'Home'
// 判断 val 为1时 表示领料单审核完毕 返回主列表时 需刷新列表 更新审批状态 // 判断 val 为1时 表示领料单审核完毕 返回主列表时 需刷新列表 更新审批状态
if (val === 1) { if (val == 1) {
this.$nextTick(() => { this.isRefresh = true
this.$refs.componentRef.refreshList()
})
} }
}, },
}, },

6
sgzb-ui/vue.config.js
View File

@ -43,11 +43,11 @@ module.exports = {
// target: `https://test-cc.zhgkxt.com`,//线上环境-南网 // target: `https://test-cc.zhgkxt.com`,//线上环境-南网
// target: `https://z.csgmall.com.cn`, // target: `https://z.csgmall.com.cn`,
// target: `http://10.40.92.51:28080`, //超 // target: `http://10.40.92.60:28080`, //超
// target: `http://10.40.92.81:8080`, //韩/ // target: `http://10.40.92.81:8080`, //韩/
// target: `http://10.40.92.74:8080`,//旭/ // target: `http://10.40.92.74:8080`,//旭/
target: `http://10.40.92.140:28080`, //帅 // target: `http://10.40.92.140:28080`, //帅
// target: `http://10.40.92.253:28080`, //福 target: `http://10.40.92.253:28080`, //福
//******** 注意事项 ********* */ //******** 注意事项 ********* */
//1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target; //1.全局替换qrUrl二维码扫码提供的网址-发布服务器的地址target;