领料单，出库单成套明细，编码结算合并
This commit is contained in:
parent
ce8a8a4129
commit
1b9d4bd906
|
|
@ -182,6 +182,15 @@ export function getLeaseListAllCq(params = {}) {
|
|||
})
|
||||
}
|
||||
|
||||
|
||||
export function getLeaseListAllCqTwo(params = {}) {
|
||||
return request({
|
||||
url: '/material/base/tm_task/getLeaseListAllCqTwo',
|
||||
method: 'get',
|
||||
params: params,
|
||||
})
|
||||
}
|
||||
|
||||
// 领料审核 同意
|
||||
export function auditLeaseByCompany(params = {}) {
|
||||
return request({
|
||||
|
|
|
|||
|
|
@ -237,9 +237,33 @@
|
|||
{{ leaseApplyData.code }}
|
||||
</div>
|
||||
</div>
|
||||
<el-table :data="leaseApplyDetails" class="table" border style="margin-top: 20px; padding: 1px">
|
||||
<el-table :data="leaseApplyDetails" class="table" border style="margin-top: 20px; padding: 1px" :row-class-name="setRowClassName">
|
||||
<!-- <el-table-column type="selection" width="55" align="center" />-->
|
||||
<el-table-column label="序号" align="center" type="index" />
|
||||
<el-table-column
|
||||
type="expand"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-table v-if="scope.row && scope.row.ctList" :data="scope.row.ctList">
|
||||
<el-table-column label="类型名称" align="center" prop="typeName" />
|
||||
<el-table-column label="规格型号" align="center" prop="typeModelName" />
|
||||
<el-table-column label="计量单位" align="center" prop="unitName" />
|
||||
<el-table-column label="预领数量" align="center" prop="preNum" />
|
||||
<el-table-column label="备注" align="center" prop="remark">
|
||||
<template slot-scope="scope">
|
||||
<span>{{
|
||||
scope.row.remark && scope.row.maModel
|
||||
? scope.row.remark + ', 以大代小'
|
||||
: scope.row.maModel
|
||||
? '以大代小'
|
||||
: scope.row.remark
|
||||
}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="出库方式" align="center" prop="manageTypeName" />
|
||||
</el-table>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="类型名称" align="center" prop="typeName" />
|
||||
<el-table-column label="规格型号" align="center" prop="typeModelName" />
|
||||
<el-table-column label="计量单位" align="center" prop="unitName" />
|
||||
|
|
@ -288,7 +312,7 @@ import {
|
|||
getLeaseManageListAllCq,
|
||||
getUnitData,
|
||||
getProData,
|
||||
getLeaseListAllCq,
|
||||
getLeaseListAllCqTwo,
|
||||
getMaTypeKeepList,
|
||||
} from '@/api/claimAndRefund/receive'
|
||||
import { getInfo } from '@/api/login'
|
||||
|
|
@ -399,6 +423,13 @@ export default {
|
|||
},
|
||||
components: { vueEasyPrint },
|
||||
methods: {
|
||||
setRowClassName({ row }) {
|
||||
// 如果 maWholeVos 为空，则添加一个 class 来隐藏展开箭头
|
||||
if (!row.ctList) {
|
||||
return "no-expand-row";
|
||||
}
|
||||
return "";
|
||||
},
|
||||
// 获取用户信息
|
||||
async GetUserInfo() {
|
||||
const res = await getInfo()
|
||||
|
|
@ -538,9 +569,13 @@ export default {
|
|||
this.getMaTypeList(row)
|
||||
},
|
||||
async getLeaseListAllCq() {
|
||||
const res = await getLeaseListAllCq({ taskId: this.taskId, maTypeUserId: this.maTypeUserId })
|
||||
const res = await getLeaseListAllCqTwo({ taskId: this.taskId, maTypeUserId: this.maTypeUserId })
|
||||
|
||||
this.leaseApplyDetails = res.rows[0].leaseApplyDetails
|
||||
console.log("yyyyyyyyyyyyyy")
|
||||
if(res.rows[0].ctList){
|
||||
this.leaseApplyDetails = this.leaseApplyDetails.concat(res.rows[0].ctList)
|
||||
}
|
||||
this.leaseApplyData = res.rows[0]
|
||||
|
||||
console.log('this.leaseApplyData ============', this.leaseApplyData)
|
||||
|
|
@ -673,4 +708,8 @@ export default {
|
|||
width: 60px !important;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
/* 隐藏不可展开行的箭头 */
|
||||
::v-deep .no-expand-row .el-table__expand-icon {
|
||||
visibility: hidden;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -460,9 +460,20 @@
|
|||
<span>编号：</span>{{ leaseOutData.code }}
|
||||
</div> -->
|
||||
</div>
|
||||
<el-table :data="leaseOutDetailRecord" class="table" border style="margin-top: 20px; padding: 1px">
|
||||
<!-- <el-table-column type="selection" width="55" align="center" />-->
|
||||
<el-table :data="leaseOutDetailRecord" class="table" border style="margin-top: 20px; padding: 1px" :row-class-name="setRowClassName">
|
||||
<el-table-column label="序号" align="center" type="index" />
|
||||
<el-table-column
|
||||
type="expand"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<el-table v-if="scope.row && scope.row.maWholeVos" :data="scope.row.maWholeVos">
|
||||
<el-table-column align="center" label="机具名称" prop="typeName" />
|
||||
<el-table-column align="center" label="规格型号" prop="deviceType" />
|
||||
<el-table-column align="center" label="预领数量" prop="applyNum" />
|
||||
<el-table-column align="center" label="库存数量" prop="num" />
|
||||
</el-table>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="类型名称" align="center" prop="typeName" />
|
||||
<el-table-column label="规格型号" align="center" prop="typeModelName" />
|
||||
<el-table-column label="单位" align="center" prop="unitNames" />
|
||||
|
|
@ -644,6 +655,13 @@ export default {
|
|||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
setRowClassName({ row }) {
|
||||
// 如果 maWholeVos 为空，则添加一个 class 来隐藏展开箭头
|
||||
if (!row.maWholeVos) {
|
||||
return "no-expand-row";
|
||||
}
|
||||
return "";
|
||||
},
|
||||
//获取单位
|
||||
getUnitList() {
|
||||
getUnitData().then((response) => {
|
||||
|
|
@ -899,7 +917,6 @@ export default {
|
|||
this.leaseOutDetailRecord = res.data.leaseOutDetailRecord
|
||||
this.leaseOutData = res.data
|
||||
this.leaseOutData.outTime = res.data.outTime ? new Date(res.data.outTime) : ''
|
||||
console.log('this.leaseApplyData ============', this.leaseApplyData)
|
||||
},
|
||||
// 领料单 打印
|
||||
print() {
|
||||
|
|
@ -1047,4 +1064,8 @@ export default {
|
|||
color: #02a7f0;
|
||||
cursor: pointer;
|
||||
}
|
||||
/* 隐藏不可展开行的箭头 */
|
||||
::v-deep .no-expand-row .el-table__expand-icon {
|
||||
visibility: hidden;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -157,7 +157,7 @@ export default {
|
|||
{ t_prop: 'nuitName', t_label: '计量单位' },
|
||||
{ t_prop: 'num', t_label: '数量' },
|
||||
{ t_prop: 'leasePrice', t_label: '台班费单价（元/天）' },
|
||||
{ t_prop: 'startTime', t_label: '起租日期',t_slot: 't_date' },
|
||||
{ t_prop: 'startTime', t_label: '起租日期',t_slot: 't_date_start' },
|
||||
{ t_prop: 'endTime', t_label: '终止日期', t_slot: 't_date' },
|
||||
{ t_prop: 'leaseDays', t_label: '应结算天数' },
|
||||
{ t_prop: 'costs', t_label: '应结算金额（元）' },
|
||||
|
|
|
|||
|
|
@ -92,11 +92,11 @@
|
|||
v-for="(t, index) in tableColumns"
|
||||
:key="index"
|
||||
:label="t.t_label"
|
||||
:width="t.t_slot === 't_date' ? '130' : ''"
|
||||
:width="t.t_slot === 't_date' || t.t_slot === 't_date_start' ? '130' : ''"
|
||||
show-overflow-tooltip
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
<template v-if="t.t_slot && isEdit">
|
||||
<template v-if="t.t_slot && t.t_slot!='t_date_start' && isEdit">
|
||||
<!-- 调整天数时的输入框 -->
|
||||
<el-input
|
||||
v-if="t.t_slot === 't_ipt'"
|
||||
|
|
@ -114,8 +114,8 @@
|
|||
v-model="scope.row[t.t_prop]"
|
||||
type="date"
|
||||
placeholder="选择日期"
|
||||
v-if="t.t_slot === 't_date'"
|
||||
value-format="yyyy-MM-dd HH:mm:ss"
|
||||
v-if="t.t_slot === 't_date' "
|
||||
value-format="yyyy-MM-dd"
|
||||
:ref="`editTime_${scope.$index}`"
|
||||
:class="{
|
||||
active: activeIndexTime === scope.$index,
|
||||
|
|
@ -285,6 +285,9 @@ export default {
|
|||
trimDay: e.trimDay, // 调整的天数
|
||||
maId: e.maId || '',
|
||||
endTime: e.endTime, // 终结时间
|
||||
startTime: e.startTime, // 开始时间
|
||||
costBearingParty: `0${this.constBear}`, // 费用承担方
|
||||
endTimeTemp: e.endTimeTemp, // 临时终结时间
|
||||
}
|
||||
|
||||
saveParams.push(item)
|
||||
|
|
|
|||
Loading…
Reference in New Issue