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

优化首页查看跳转，领料驳回等bug问题

This commit is contained in:
BianLzhaoMin 2024-06-06 14:20:07 +08:00
parent 1655cdc492
commit 9e113d0ee0
9 changed files with 248 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sgzb-ui/src/views/claimAndreturn/picking/apply/component/AddPicking.vue
View File

@ -254,6 +254,12 @@ export default {
viewTaskId: {
type: [String, Number],
},
rejectTaskStatus: {
type: [String, Number],
default: () => {
return null
},
},
},
data() {
const validatePhone = (rule, value, callback) => {
@ -694,17 +700,16 @@ export default {
this.queryParams.leaseApplyDetails,
)
})
// 当领料任务被驳回后重新提交时，判断当前状态，如为100 则表示为内部驳回 需要增加参数 souceByRefuse为1
if (this.rejectTaskStatus == 100) {
this.queryParams.souceByRefuse = 1
}
const params = {
...this.queryParams,
taskId: this.taskId,
leaseApplyInfoList: this.leaseApplyInfoList,
}
console.log(
'驳回提交--------------保存',
params,
'参数----------',
)
res = await editLeaseApply(params)
} else {
// console.log(this.queryParams)
@ -717,11 +722,6 @@ export default {
return
}
res = await submitLeaseApply(this.queryParams)
console.log(
'正常申请提交--------------保存',
this.queryParams,
'参数--------------',
)
}
if (res.code == 200) {
this.$message({

13
sgzb-ui/src/views/claimAndreturn/picking/apply/component/home.vue
View File

@ -496,7 +496,7 @@ export default {
// isBack: true,
// },
// })
this.$emit('editPicking', row.taskId)
this.$emit('editPicking', row.taskId, row.taskStatus)
},
/** 删除按钮操作 */
async handleDelete(row) {
@ -534,6 +534,17 @@ export default {
})
},
},
watch: {
$route: {
handler(to) {
if (to.query.keyWord) {
this.queryParams.keyWord = to.query.keyWord
}
},
deep: true,
immediate: true,
},
},
}
</script>
<style lang="scss" scoped>

5
sgzb-ui/src/views/claimAndreturn/picking/apply/index.vue
View File

@ -11,6 +11,7 @@
:viewTaskId="viewTaskId"
:isView="isView"
:isEdit="isEdit"
:rejectTaskStatus="rejectTaskStatus"
@addPicking="addPicking"
@viewPicking="viewPicking"
@editPicking="editPicking"
@ -34,6 +35,7 @@ export default {
isShowComponent: 'Home',
pageContent: '新增领料任务',
viewTaskId: '',
rejectTaskStatus: '',
isView: false,
isEdit: false,
}
@ -55,8 +57,9 @@ export default {
this.isShowComponent = 'AddPicking'
},
/* 编辑和驳回提交 */
editPicking(taskId) {
editPicking(taskId, taskStatus) {
this.viewTaskId = taskId
this.rejectTaskStatus = taskStatus || null
this.isView = true
this.isEdit = true
this.pageContent = '领料任务编辑'

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

@ -259,7 +259,8 @@
(scope.row.leaseApplyInfoList[0].status == '5' ||
scope.row.leaseApplyInfoList[0].status == '7' ||
scope.row.leaseApplyInfoList[0].status == '4' ||
scope.row.leaseApplyInfoList[0].status == '2')
scope.row.leaseApplyInfoList[0].status == '2' ||
scope.row.leaseApplyInfoList[0].status == '0')
"
>审批</el-button
>
@ -274,7 +275,8 @@
scope.row.leaseApplyInfoList[0].status == '7' ||
scope.row.leaseApplyInfoList[0].status == '4' ||
scope.row.leaseApplyInfoList[0].status == '2' ||
scope.row.leaseApplyInfoList[0].status == '9')
scope.row.leaseApplyInfoList[0].status == '9' ||
scope.row.leaseApplyInfoList[0].status == '0')
"
>审批</el-button
>

13
sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue
View File

@ -83,9 +83,16 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" width="80" type="index">
<template scope="scope">
<span>{{ (queryParams.pageNum - 1) * 10 + scope.$index + 1 }}</span>
<el-table-column
label="序号"
align="center"
width="80"
type="index"
>
<template slot-scope="scope">
<span>{{
(queryParams.pageNum - 1) * 10 + scope.$index + 1
}}</span>
</template>
</el-table-column>
<el-table-column

16
sgzb-ui/src/views/index.vue
View File

@ -306,17 +306,17 @@ export default {
/* 新购任务 */
{
taskTypeId: 23,
routerPath: 'store/newBuy/newDevicesList',
routerPath: 'store/newPurchase/tools',
},
/* 领料任务 */
{
taskTypeId: 29,
routerPath: 'claimAndRefund/receive/receiveManage',
routerPath: 'claimAndRefund/picking/apply',
},
/* 退料任务 */
{
taskTypeId: 36,
routerPath: 'claimAndRefund/return/returnApply',
routerPath: 'claimAndRefund/return/apply',
},
/* 维修任务 */
{
@ -326,22 +326,22 @@ export default {
/* 维修审核 */
{
taskTypeId: 45,
routerPath: 'repairTest/repair/repair',
routerPath: 'repairTest/testExamine/testExamine',
},
/* 修试入库任务 */
{
taskTypeId: 50,
routerPath: 'store/warehousing/repairWarehousing',
routerPath: 'store/warehousing/repair',
},
/* 修试入库任务 */
/* 报废任务 */
{
taskTypeId: 57,
routerPath: 'scrap/manage/scrapAuditing',
},
/* 修试入库任务 */
/* 新购配件任务 */
{
taskTypeId: 67,
routerPath: 'store/newBuy/newAccessoryList',
routerPath: 'store/warehousing/newParts',
},
],

2
sgzb-ui/src/views/warehouseManage/newPurchase/partsAcceptance/component/home.vue
View File

@ -296,7 +296,7 @@
width="80"
type="index"
>
<template scope="scope">
<template slot-scope="scope">
<span>{{
(queryParams.pageNum - 1) * 10 +
scope.$index +

2
sgzb-ui/src/views/warehouseManage/newPurchase/serviceCenter/index.vue
View File

@ -283,7 +283,7 @@
width="80"
type="index"
>
<template scope="scope">
<template slot-scope="scope">
<span>{{
(query.pageNum - 1) * 10 + scope.$index + 1
}}</span>

2
sgzb-ui/src/views/warehouseManage/warehousing/newParts/index.vue
View File

@ -380,7 +380,7 @@
width="80"
type="index"
>
<template scope="scope">
<template slot-scope="scope">
<span>{{
(query.pageNum - 1) * 10 + scope.$index + 1
}}</span>