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

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
liang.chao 2024-02-27 14:07:57 +08:00
parent 32b1dc4932 df24c7e4bf
commit c82d744963
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sgzb-ui/src/views/claimAndRefund/receive/receiveApplyAdd.vue
View File

@ -526,11 +526,12 @@ 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
let res; let res;
if(this.taskId){ if(this.taskId){
this.leaseApplyInfoList.forEach(v => { // this.leaseApplyInfoList.forEach(v => {
v = Object.assign(v,this.queryParams.leaseApplyInfo) // v = Object.assign(v,this.queryParams.leaseApplyInfo)
this.$set(v,'leaseApplyDetails',this.queryParams.leaseApplyDetails) // this.$set(v,'leaseApplyDetails',this.queryParams.leaseApplyDetails)
}) // })
const params = { const params = {
...this.queryParams,taskId:this.taskId, ...this.queryParams,taskId:this.taskId,

10
sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
View File

@ -165,19 +165,19 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="退料单位名称" label="退料单位"
align="center" align="center"
prop="unitName" prop="unitName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="退料工程名称" label="退料工程"
align="center" align="center"
prop="lotName" prop="lotName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="退料工机具类型" label="退料机具"
align="center" align="center"
prop="typeName" prop="typeName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
@ -189,7 +189,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="退料人联系电话" label="联系方式"
align="center" align="center"
prop="phone" prop="phone"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
@ -207,7 +207,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="是否异常退料" label="异常退料"
align="center" align="center"
prop="dictName" prop="dictName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"

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

@ -167,19 +167,19 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="退料单位名称" label="退料单位"
align="center" align="center"
prop="unitName" prop="unitName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="退料工程名称" label="退料工程"
align="center" align="center"
prop="lotName" prop="lotName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="退料工机具类型" label="退料机具"
align="center" align="center"
prop="typeName" prop="typeName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
@ -191,7 +191,7 @@
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
/> />
<el-table-column <el-table-column
label="退料人联系电话" label="联系电话"
align="center" align="center"
prop="phone" prop="phone"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"