测试问题修改
This commit is contained in:
parent
9e113d0ee0
commit
e1928139b7
|
|
@ -117,6 +117,7 @@ const user = {
|
||||||
/* 存储当前登录用户的userId */
|
/* 存储当前登录用户的userId */
|
||||||
sessionStorage.setItem('userId', user.userId)
|
sessionStorage.setItem('userId', user.userId)
|
||||||
sessionStorage.setItem('deptId', user.deptId)
|
sessionStorage.setItem('deptId', user.deptId)
|
||||||
|
sessionStorage.setItem('userName', user.userName)
|
||||||
const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : user.avatar;
|
const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : user.avatar;
|
||||||
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
|
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
|
||||||
commit('SET_ROLES', res.roles)
|
commit('SET_ROLES', res.roles)
|
||||||
|
|
|
||||||
|
|
@ -281,9 +281,10 @@
|
||||||
size="mini"
|
size="mini"
|
||||||
type="text"
|
type="text"
|
||||||
v-if="
|
v-if="
|
||||||
scope.row.taskStatus == 98 ||
|
(scope.row.taskStatus == 98 ||
|
||||||
scope.row.taskStatus == 99 ||
|
scope.row.taskStatus == 99 ||
|
||||||
scope.row.taskStatus == 100
|
scope.row.taskStatus == 100) &&
|
||||||
|
scope.row.createBy === currentUserName
|
||||||
"
|
"
|
||||||
@click="handleUpdate2(scope.row)"
|
@click="handleUpdate2(scope.row)"
|
||||||
v-hasPermi="['picking:apply:reject:submit']"
|
v-hasPermi="['picking:apply:reject:submit']"
|
||||||
|
|
@ -367,6 +368,7 @@ export default {
|
||||||
},
|
},
|
||||||
unitList: [], //来往单位集合
|
unitList: [], //来往单位集合
|
||||||
proList: [], //工程集合
|
proList: [], //工程集合
|
||||||
|
currentUserName: sessionStorage.getItem('userName'),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
|
|
|
||||||
|
|
@ -286,7 +286,7 @@
|
||||||
@click="codeOut(scope.row)"
|
@click="codeOut(scope.row)"
|
||||||
v-if="
|
v-if="
|
||||||
scope.row.manageType == 0 &&
|
scope.row.manageType == 0 &&
|
||||||
scope.row.status != 0
|
scope.row.status != 2
|
||||||
"
|
"
|
||||||
>
|
>
|
||||||
编码出库
|
编码出库
|
||||||
|
|
@ -758,7 +758,10 @@ export default {
|
||||||
type: 'warning',
|
type: 'warning',
|
||||||
})
|
})
|
||||||
.then(() => {
|
.then(() => {
|
||||||
outboundCompleted({ id: this.dialogQuery.id, typeId: row.typeId }).then((response) => {
|
outboundCompleted({
|
||||||
|
id: this.dialogQuery.id,
|
||||||
|
typeId: row.typeId,
|
||||||
|
}).then((response) => {
|
||||||
this.$modal.msgSuccess('完成出库成功')
|
this.$modal.msgSuccess('完成出库成功')
|
||||||
this.handleDialogQuery()
|
this.handleDialogQuery()
|
||||||
this.handleQuery()
|
this.handleQuery()
|
||||||
|
|
|
||||||
|
|
@ -805,7 +805,7 @@ export default {
|
||||||
if (response.code == 200) {
|
if (response.code == 200) {
|
||||||
this.$modal.msgSuccess('操作成功')
|
this.$modal.msgSuccess('操作成功')
|
||||||
// this.back()
|
// this.back()
|
||||||
this.$$emit('goBackPage')
|
this.$emit('goBackPage')
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -261,6 +261,7 @@ export default {
|
||||||
this.$message.success('审核通过!')
|
this.$message.success('审核通过!')
|
||||||
this.dialogConfig.outerVisible = false
|
this.dialogConfig.outerVisible = false
|
||||||
this.$refs.tbRef.getList()
|
this.$refs.tbRef.getList()
|
||||||
|
this.auditingParams.scrapDetailList = []
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
/* 审核驳回 */
|
/* 审核驳回 */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue