This commit is contained in:
BianLzhaoMin
parent
8e9208a438
commit
66bb59f362
|
|
@ -68,12 +68,7 @@
|
|||
v-model="queryParams.wholeTypeName"
|
||||
ref="WholeTypeRef"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in holdingPoleSelList"
|
||||
:key="item.id"
|
||||
:label="item.wholeTypeName"
|
||||
:value="item.id"
|
||||
/>
|
||||
<el-option v-for="item in holdingPoleSelList" :key="item.id" :label="item.wholeTypeName" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="类型名称" prop="status">
|
||||
|
|
@ -101,12 +96,7 @@
|
|||
placeholder="请选择规格型号"
|
||||
@change="changeType"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in typeListDev"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
></el-option>
|
||||
<el-option v-for="item in typeListDev" :key="item.id" :label="item.name" :value="item.id"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="预计领料时间" prop="estimateLeaseTime">
|
||||
|
|
@ -226,13 +216,10 @@
|
|||
<el-table-column label="序号" type="index" width="80" />
|
||||
<el-table-column type="expand">
|
||||
<template slot-scope="props">
|
||||
<el-table
|
||||
:data="props.row.childrenList"
|
||||
v-if="props.row.childrenList && props.row.childrenList.length > 0"
|
||||
>
|
||||
<el-table :data="props.row.childrenList" v-if="props.row.childrenList && props.row.childrenList.length > 0">
|
||||
<!-- <el-table-column align="center" prop="typeName" label="设备名称" /> -->
|
||||
<el-table-column align="center" label="规格型号" prop="deviceType" />
|
||||
<el-table-column prop="deviceType" align="center" label="是否管理库存">
|
||||
<el-table-column align="center" label="是否管理库存">
|
||||
<template slot-scope="{ row }">
|
||||
<el-tag size="mini" type="primary" v-if="row.isStorage == 1">是</el-tag>
|
||||
<el-tag size="mini" type="warning" v-if="row.isStorage == 0">否</el-tag>
|
||||
|
|
@ -251,6 +238,7 @@
|
|||
<el-table-column label="预领数量" align="center">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
v-if="!scope.row.childrenList"
|
||||
v-model.number="scope.row.preNum"
|
||||
placeholder="请输入预领数量"
|
||||
type="number"
|
||||
|
|
@ -262,22 +250,10 @@
|
|||
</el-table-column>
|
||||
<el-table-column label="备注" align="center" prop="createTime">
|
||||
<template slot-scope="scope">
|
||||
<el-input
|
||||
maxlength="100"
|
||||
v-model="scope.row.remark"
|
||||
placeholder="请输入备注"
|
||||
clearable
|
||||
style="width: 100%"
|
||||
/>
|
||||
<el-input maxlength="100" v-model="scope.row.remark" placeholder="请输入备注" clearable style="width: 100%" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
fixed="right"
|
||||
class-name="small-padding fixed-width"
|
||||
v-if="isView"
|
||||
>
|
||||
<el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" v-if="isView">
|
||||
<template slot-scope="scope">
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
|
|
@ -737,6 +713,41 @@ export default {
|
|||
this.leaseApplyDetails = data.leaseApplyDetails.map((item) => {
|
||||
return this.handelEchoData(item)
|
||||
})
|
||||
|
||||
// guigeCn: j.deviceType,
|
||||
// typeCn: j.typeName,
|
||||
// createBy: this.user.name,
|
||||
// typeId: j.deviceTypeId,
|
||||
// preNum: j.deviceNum,
|
||||
// num: j.num,
|
||||
// isCt: 0,
|
||||
// ctParentId: e.ctParentId,
|
||||
|
||||
if (data.ctLeaseApplyDetails) {
|
||||
for (let key in data.ctLeaseApplyDetails) {
|
||||
const childrenList = data.ctLeaseApplyDetails[key].map((e) => {
|
||||
return {
|
||||
typeName: e.typeModelName,
|
||||
typeId: e.typeId,
|
||||
preNum: e.preNum,
|
||||
num: e.num,
|
||||
ctParentId: e.ctParentId,
|
||||
deviceType: e.typeModelName,
|
||||
deviceNum: e.preNum,
|
||||
isStorage: e.isStorage,
|
||||
}
|
||||
})
|
||||
|
||||
console.log('childrenList', childrenList)
|
||||
this.leaseApplyDetails.push({
|
||||
wholeTypeName: key,
|
||||
childrenList,
|
||||
ctParentId: data.ctLeaseApplyDetails[key][0].ctParentId,
|
||||
})
|
||||
}
|
||||
|
||||
console.log(' this.leaseApplyDetails', this.leaseApplyDetails)
|
||||
}
|
||||
},
|
||||
// 驳回提交 任务详情数据
|
||||
async GetTaskDetail2(taskId) {
|
||||
|
|
@ -888,9 +899,7 @@ export default {
|
|||
}
|
||||
})
|
||||
|
||||
this.queryParams.leaseApplyDetails = this.queryParams.leaseApplyDetails.filter(
|
||||
(e) => !e.childrenList,
|
||||
)
|
||||
this.queryParams.leaseApplyDetails = this.queryParams.leaseApplyDetails.filter((e) => !e.childrenList)
|
||||
// if (this.wholeTypeNameList.length > 0) {
|
||||
// const wholeTypeList = []
|
||||
// this.wholeTypeNameList.forEach((i) => {
|
||||
|
|
|
|||
Loading…
Reference in New Issue