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

Merge branch 'dev' into test-sso 

# Conflicts:
#	sgzb-ui/vue.config.js
This commit is contained in:
liang.chao 2024-01-29 17:15:36 +08:00
parent ce827c20ac 3b67f59f88
commit 9a47a636ab
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
View File

@ -638,7 +638,8 @@
bcd.back_num as backNum, bcd.back_num as backNum,
bcd.parent_id as parentId, bcd.parent_id as parentId,
bcd.create_by as createBy, bcd.create_by as createBy,
bcd.ma_id as maId bcd.ma_id as maId,
bai.company_id as companyId
FROM FROM
back_check_details bcd back_check_details bcd
LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id
@ -658,7 +659,8 @@
bcd.back_num as backNum, bcd.back_num as backNum,
bcd.parent_id as parentId, bcd.parent_id as parentId,
bcd.create_by as createBy, bcd.create_by as createBy,
bcd.ma_id as maId bcd.ma_id as maId,
bai.company_id as companyId
FROM FROM
back_check_details bcd back_check_details bcd
LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id
@ -677,7 +679,8 @@
bcd.back_num as backNum, bcd.back_num as backNum,
bcd.parent_id as parentId, bcd.parent_id as parentId,
bcd.create_by as createBy, bcd.create_by as createBy,
bcd.ma_id as maId bcd.ma_id as maId,
bai.company_id as companyId
FROM FROM
back_check_details bcd back_check_details bcd
LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id LEFT JOIN back_apply_info bai on bai.id=bcd.parent_id

12
sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
View File

@ -236,10 +236,20 @@
<el-button <el-button
type="text" type="text"
style="color: #67c23a" style="color: #67c23a"
v-else-if="scope.row.taskStatus == '38'" v-if="scope.row.taskStatus == '38'"
> >
已审核 已审核
</el-button> </el-button>
<el-button type="text" v-if="scope.row.taskStatus == '39'">
退料核查
</el-button>
<el-button
type="text"
style="color: #67c23a"
v-if="scope.row.taskStatus == '40'"
>
退料完成
</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column

4
sgzb-ui/src/views/repairTest/repair/index.vue
View File

@ -229,7 +229,7 @@
size="mini" size="mini"
type="warning" type="warning"
icon="el-icon-edit" icon="el-icon-edit"
:disabled="scope.row.repairStatusCode !== '43'" :disabled="scope.row.repairStatusCode == '44'"
@click="handleUpdate(scope.row, 'update')" @click="handleUpdate(scope.row, 'update')"
>维修</el-button >维修</el-button
> >
@ -256,7 +256,7 @@
<!-- 维修对话框 --> <!-- 维修对话框 -->
<el-dialog <el-dialog
:visible.sync="open" :visible.sync="open"
width="1600px" width="1650px"
append-to-body append-to-body
:before-close="onClose" :before-close="onClose"
> >

2
sgzb-ui/src/views/store/newBuy/newDevices/newDevicesWarehousing.vue
View File

@ -124,7 +124,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"