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

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-06-05 16:35:10 +08:00
parent 2c994c2bd4 75e5a4d3f1
commit 791fc7ae3e
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sgzb-ui/src/views/claimAndreturn/picking/outbound/index.vue
View File

@ -309,7 +309,7 @@
v-if="scope.row.status != 2" v-if="scope.row.status != 2"
@click="manualOperation(scope.row)" @click="manualOperation(scope.row)"
> >
出库结单 完成出库
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -752,14 +752,14 @@ export default {
// 手动操作 // 手动操作
manualOperation(row) { manualOperation(row) {
// 弹框确认 // 弹框确认
this.$confirm('是否确认出库结单？', '提示', { this.$confirm('是否确认完成出库？', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
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()
}) })
@ -767,7 +767,7 @@ export default {
.catch(() => { .catch(() => {
this.$message({ this.$message({
type: 'info', type: 'info',
message: '已取消出库结单', message: '已取消完成出库',
}) })
}) })
}, },

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

@ -363,14 +363,14 @@
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
v-if="scope.row.status == '0'" 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'" v-if="scope.row.status == '0' && scope.row.userIds.includes(userId)"
@click="refused(scope.row)" @click="refused(scope.row)"
>不通过</el-button >不通过</el-button
> >
@ -605,6 +605,7 @@ export default {
}, },
], ],
}, },
userId: sessionStorage.getItem('userId'),
} }
}, },
created() { created() {

5
sgzb-ui/src/views/warehouseManage/warehousing/repair/index.vue
View File

@ -410,13 +410,13 @@
size="mini" size="mini"
type="text" type="text"
@click="pass(scope.row)" @click="pass(scope.row)"
v-if="scope.row.status == '进行中'" v-if="scope.row.status == '进行中' && scope.row.userIds.includes(userId)"
>通过</el-button >通过</el-button
> >
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
v-if="scope.row.status == '进行中'" v-if="scope.row.status == '进行中' && scope.row.userIds.includes(userId)"
@click="refused(scope.row)" @click="refused(scope.row)"
>不通过</el-button >不通过</el-button
> >
@ -534,6 +534,7 @@ export default {
], ],
}, },
equipmentTypeList: [], equipmentTypeList: [],
userId: sessionStorage.getItem('userId'),
} }
}, },
created() { created() {