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

测试领料流程

This commit is contained in:
BianLzhaoMin 2024-06-06 11:47:52 +08:00
parent 791fc7ae3e
commit fa74b08c76
3 changed files with 33 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,6 +333,7 @@ export default {
agreementCode: null, //协议code agreementCode: null, //协议code
companyId: '', //登录信息中取 companyId: '', //登录信息中取
createBy: '', //用户名 createBy: '', //用户名
userId: '',
taskType: 29, taskType: 29,
taskStatus: 30, taskStatus: 30,
//领料人信息 //领料人信息
@ -678,6 +679,7 @@ export default {
} }
this.queryParams.createBy = this.user.userName this.queryParams.createBy = this.user.userName
this.queryParams.companyId = this.user.companyId this.queryParams.companyId = this.user.companyId
this.queryParams.userId = this.user.userId
let res let res
if (this.taskId) { if (this.taskId) {
@ -698,7 +700,11 @@ export default {
taskId: this.taskId, taskId: this.taskId,
leaseApplyInfoList: this.leaseApplyInfoList, leaseApplyInfoList: this.leaseApplyInfoList,
} }
console.log(
'驳回提交--------------保存',
params,
'参数----------',
)
res = await editLeaseApply(params) res = await editLeaseApply(params)
} else { } else {
// console.log(this.queryParams) // console.log(this.queryParams)
@ -711,6 +717,11 @@ export default {
return return
} }
res = await submitLeaseApply(this.queryParams) res = await submitLeaseApply(this.queryParams)
console.log(
'正常申请提交--------------保存',
this.queryParams,
'参数--------------',
)
} }
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({

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

@ -209,7 +209,8 @@
scope.row.taskStatus == 98 scope.row.taskStatus == 98
" "
>{{ >{{
scope.row.leaseApplyInfoList[0].companyAuditRemark scope.row.leaseApplyInfoList[0]
.companyAuditRemark || ''
}} }}
</span> </span>
<span <span
@ -217,14 +218,20 @@
scope.row.taskStatus == 32 || scope.row.taskStatus == 32 ||
scope.row.taskStatus == 99 scope.row.taskStatus == 99
" "
>{{ scope.row.leaseApplyInfoList[0].deptAuditRemark }} >{{
scope.row.leaseApplyInfoList[0].deptAuditRemark ||
''
}}
</span> </span>
<span <span
v-if=" v-if="
scope.row.taskStatus == 33 || scope.row.taskStatus == 33 ||
scope.row.taskStatus == 100 scope.row.taskStatus == 100
" "
>{{ scope.row.leaseApplyInfoList[0].directAuditRemark }} >{{
scope.row.leaseApplyInfoList[0].directAuditRemark ||
''
}}
</span> </span>
<span <span
v-if=" v-if="
@ -232,11 +239,12 @@
scope.row.taskStatus < 98 scope.row.taskStatus < 98
" "
>{{ >{{
scope.row.leaseApplyInfoList[0].directAuditRemark scope.row.leaseApplyInfoList[0].directAuditRemark ||
''
}}</span }}</span
> >
<span v-if="scope.row.taskStatus > 100">{{ <span v-if="scope.row.taskStatus > 100">{{
scope.row.leaseApplyInfoList[0].directAuditRemark scope.row.leaseApplyInfoList[0].directAuditRemark || ''
}}</span> }}</span>
<!-- <span v-else>{{ scope.row.leaseApplyInfoList[0].directAuditRemark }}</span> --> <!-- <span v-else>{{ scope.row.leaseApplyInfoList[0].directAuditRemark }}</span> -->
</template> </template>

11
sgzb-ui/src/views/warehouseManage/warehousing/newTools/index.vue
View File

@ -279,7 +279,6 @@
<el-table <el-table
v-loading="loading" v-loading="loading"
:data="detailTableList" :data="detailTableList"
height="600"
@selection-change="handleSelectionChange" @selection-change="handleSelectionChange"
border border
> >
@ -363,14 +362,20 @@
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
v-if="scope.row.status == '0' && scope.row.userIds.includes(userId)" v-if="
scope.row.status == '0' &&
scope.row.userIds.includes(userId)
"
@click="pass(scope.row)" @click="pass(scope.row)"
>通过</el-button >通过</el-button
> >
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
v-if="scope.row.status == '0' && scope.row.userIds.includes(userId)" v-if="
scope.row.status == '0' &&
scope.row.userIds.includes(userId)
"
@click="refused(scope.row)" @click="refused(scope.row)"
>不通过</el-button >不通过</el-button
> >