优化首页查看跳转，领料驳回等bug问题
This commit is contained in:
BianLzhaoMin
parent
1655cdc492
commit
9e113d0ee0
|
|
@ -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({
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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 = '领料任务编辑'
|
||||
|
|
|
|||
|
|
@ -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
|
||||
>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -166,214 +173,214 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import {
|
||||
getAgreementList,
|
||||
getUnitList,
|
||||
getProjectList,
|
||||
} from '@/api/claimAndRefund/receive'
|
||||
import { getSltAgreementInfo } from '@/api/cost/cost'
|
||||
import {
|
||||
getAgreementList,
|
||||
getUnitList,
|
||||
getProjectList,
|
||||
} from '@/api/claimAndRefund/receive'
|
||||
import { getSltAgreementInfo } from '@/api/cost/cost'
|
||||
|
||||
export default {
|
||||
name: 'CostApplyList',
|
||||
dicts: ['sys_normal_disable'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 往来单位数据
|
||||
unitList: [],
|
||||
// 工程数据
|
||||
projectList: [],
|
||||
statusList: [
|
||||
{ id: '0', name: '请选择' },
|
||||
{ id: '1', name: '未结算' },
|
||||
{ id: '2', name: '已结算' },
|
||||
{ id: '3', name: '待审核' },
|
||||
], //集合
|
||||
// 表格数据
|
||||
agreementList: [],
|
||||
// 弹出层标题
|
||||
title: '',
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 日期范围
|
||||
dateRange: [],
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
keyWord: undefined,
|
||||
sltStatus: '0',
|
||||
unitId: '',
|
||||
projectId: '',
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
//图片上传
|
||||
uploadHeader: process.env.VUE_APP_BASE_API,
|
||||
imageUrl: '',
|
||||
imageName: '',
|
||||
fileList: [],
|
||||
field101fileList: [],
|
||||
dialogImageUrl: '',
|
||||
dialogVisible: false,
|
||||
//上传地址
|
||||
// uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
|
||||
// uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
|
||||
uploadUrl: process.env.VUE_APP_BASE_API + '/system', // 上传的图片服务器地址
|
||||
// 表单校验
|
||||
rules: {
|
||||
contractCode: [
|
||||
{
|
||||
required: true,
|
||||
message: '合同编号不能为空',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
signTime: [
|
||||
{
|
||||
required: true,
|
||||
message: '签订日期不能为空',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
unitName: [
|
||||
{
|
||||
required: true,
|
||||
message: '往来单位不能为空',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
projectName: [
|
||||
{
|
||||
required: true,
|
||||
message: '工程名称不能为空',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
},
|
||||
peopleOpen: false,
|
||||
noticeOpen: false,
|
||||
nform: {
|
||||
notice: '',
|
||||
},
|
||||
nrules: {
|
||||
notice: [
|
||||
{
|
||||
required: true,
|
||||
message: '通知内容不能为空',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
},
|
||||
deptName: undefined,
|
||||
}
|
||||
export default {
|
||||
name: 'CostApplyList',
|
||||
dicts: ['sys_normal_disable'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 往来单位数据
|
||||
unitList: [],
|
||||
// 工程数据
|
||||
projectList: [],
|
||||
statusList: [
|
||||
{ id: '0', name: '请选择' },
|
||||
{ id: '1', name: '未结算' },
|
||||
{ id: '2', name: '已结算' },
|
||||
{ id: '3', name: '待审核' },
|
||||
], //集合
|
||||
// 表格数据
|
||||
agreementList: [],
|
||||
// 弹出层标题
|
||||
title: '',
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 日期范围
|
||||
dateRange: [],
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
keyWord: undefined,
|
||||
sltStatus: '0',
|
||||
unitId: '',
|
||||
projectId: '',
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
//图片上传
|
||||
uploadHeader: process.env.VUE_APP_BASE_API,
|
||||
imageUrl: '',
|
||||
imageName: '',
|
||||
fileList: [],
|
||||
field101fileList: [],
|
||||
dialogImageUrl: '',
|
||||
dialogVisible: false,
|
||||
//上传地址
|
||||
// uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
|
||||
// uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
|
||||
uploadUrl: process.env.VUE_APP_BASE_API + '/system', // 上传的图片服务器地址
|
||||
// 表单校验
|
||||
rules: {
|
||||
contractCode: [
|
||||
{
|
||||
required: true,
|
||||
message: '合同编号不能为空',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
signTime: [
|
||||
{
|
||||
required: true,
|
||||
message: '签订日期不能为空',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
unitName: [
|
||||
{
|
||||
required: true,
|
||||
message: '往来单位不能为空',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
projectName: [
|
||||
{
|
||||
required: true,
|
||||
message: '工程名称不能为空',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
},
|
||||
peopleOpen: false,
|
||||
noticeOpen: false,
|
||||
nform: {
|
||||
notice: '',
|
||||
},
|
||||
nrules: {
|
||||
notice: [
|
||||
{
|
||||
required: true,
|
||||
message: '通知内容不能为空',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
},
|
||||
deptName: undefined,
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList()
|
||||
this.getUnitList()
|
||||
this.getProjectList()
|
||||
},
|
||||
methods: {
|
||||
//获取单位类型 ,getUnitList, getProjectList
|
||||
getUnitList() {
|
||||
getUnitList().then((response) => {
|
||||
this.unitList = response.data
|
||||
})
|
||||
},
|
||||
created() {
|
||||
getProjectList() {
|
||||
getProjectList().then((response) => {
|
||||
this.projectList = response.data
|
||||
})
|
||||
},
|
||||
|
||||
/** 查询字典类型列表 */
|
||||
getList() {
|
||||
this.loading = true
|
||||
getSltAgreementInfo(this.queryParams).then((response) => {
|
||||
this.agreementList = response.rows
|
||||
this.total = response.total
|
||||
this.loading = false
|
||||
})
|
||||
},
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1
|
||||
this.getList()
|
||||
this.getUnitList()
|
||||
this.getProjectList()
|
||||
},
|
||||
methods: {
|
||||
//获取单位类型 ,getUnitList, getProjectList
|
||||
getUnitList() {
|
||||
getUnitList().then((response) => {
|
||||
this.unitList = response.data
|
||||
})
|
||||
},
|
||||
getProjectList() {
|
||||
getProjectList().then((response) => {
|
||||
this.projectList = response.data
|
||||
})
|
||||
},
|
||||
|
||||
/** 查询字典类型列表 */
|
||||
getList() {
|
||||
this.loading = true
|
||||
getSltAgreementInfo(this.queryParams).then((response) => {
|
||||
this.agreementList = response.rows
|
||||
this.total = response.total
|
||||
this.loading = false
|
||||
})
|
||||
},
|
||||
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1
|
||||
this.getList()
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.dateRange = []
|
||||
this.resetForm('queryForm')
|
||||
this.handleQuery()
|
||||
},
|
||||
//结算申请
|
||||
handleApply(row) {
|
||||
let arr = [row]
|
||||
console.log(arr)
|
||||
console.log(this.ids)
|
||||
console.log(JSON.stringify(arr))
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.dateRange = []
|
||||
this.resetForm('queryForm')
|
||||
this.handleQuery()
|
||||
},
|
||||
//结算申请
|
||||
handleApply(row) {
|
||||
let arr = [row]
|
||||
console.log(arr)
|
||||
console.log(this.ids)
|
||||
console.log(JSON.stringify(arr))
|
||||
this.$tab.closeOpenPage({
|
||||
path: '/cost/cost/costApplyAdd',
|
||||
query: {
|
||||
rowData: JSON.stringify(arr),
|
||||
},
|
||||
})
|
||||
},
|
||||
handleApplyList() {
|
||||
if (this.ids.length > 0) {
|
||||
let arr = this.ids
|
||||
this.$tab.closeOpenPage({
|
||||
path: '/cost/cost/costApplyAdd',
|
||||
query: {
|
||||
rowData: JSON.stringify(arr),
|
||||
},
|
||||
})
|
||||
},
|
||||
handleApplyList() {
|
||||
if (this.ids.length > 0) {
|
||||
let arr = this.ids
|
||||
this.$tab.closeOpenPage({
|
||||
path: '/cost/cost/costApplyAdd',
|
||||
query: {
|
||||
rowData: JSON.stringify(arr),
|
||||
},
|
||||
})
|
||||
}
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map((item) => item)
|
||||
this.single = selection.length != 1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
// const agreementId = row.agreementId;
|
||||
// let param = {
|
||||
// agreementId:row.agreementId+''
|
||||
// }
|
||||
// this.$modal.confirm('是否确认删除该数据项？').then(function() {
|
||||
// return removeAgreement(param);
|
||||
// }).then(() => {
|
||||
// this.getList();
|
||||
// this.$modal.msgSuccess("删除成功");
|
||||
// }).catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
// this.download('material/agreementInfo/export', {
|
||||
// ...this.queryParams
|
||||
// }, `协议_${new Date().getTime()}.xlsx`)
|
||||
},
|
||||
}
|
||||
},
|
||||
}
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map((item) => item)
|
||||
this.single = selection.length != 1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
// const agreementId = row.agreementId;
|
||||
// let param = {
|
||||
// agreementId:row.agreementId+''
|
||||
// }
|
||||
// this.$modal.confirm('是否确认删除该数据项？').then(function() {
|
||||
// return removeAgreement(param);
|
||||
// }).then(() => {
|
||||
// this.getList();
|
||||
// this.$modal.msgSuccess("删除成功");
|
||||
// }).catch(() => {});
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
// this.download('material/agreementInfo/export', {
|
||||
// ...this.queryParams
|
||||
// }, `协议_${new Date().getTime()}.xlsx`)
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
<style lang="scss" scoped>
|
||||
::v-deep.el-table .fixed-width .el-button--mini {
|
||||
width: 80px !important;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
::v-deep.el-table .fixed-width .el-button--mini {
|
||||
width: 80px !important;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
},
|
||||
],
|
||||
|
||||
|
|
|
|||
|
|
@ -296,7 +296,7 @@
|
|||
width="80"
|
||||
type="index"
|
||||
>
|
||||
<template scope="scope">
|
||||
<template slot-scope="scope">
|
||||
<span>{{
|
||||
(queryParams.pageNum - 1) * 10 +
|
||||
scope.$index +
|
||||
|
|
|
|||
|
|
@ -283,7 +283,7 @@
|
|||
width="80"
|
||||
type="index"
|
||||
>
|
||||
<template scope="scope">
|
||||
<template slot-scope="scope">
|
||||
<span>{{
|
||||
(query.pageNum - 1) * 10 + scope.$index + 1
|
||||
}}</span>
|
||||
|
|
|
|||
|
|
@ -380,7 +380,7 @@
|
|||
width="80"
|
||||
type="index"
|
||||
>
|
||||
<template scope="scope">
|
||||
<template slot-scope="scope">
|
||||
<span>{{
|
||||
(query.pageNum - 1) * 10 + scope.$index + 1
|
||||
}}</span>
|
||||
|
|
|
|||
Loading…
Reference in New Issue