'123'
This commit is contained in:
parent
015543ee5f
commit
c029f7709e
|
|
@ -221,170 +221,172 @@
|
||||||
</el-dialog>
|
</el-dialog>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane label="已选库位" name="locationSelected">
|
<el-tab-pane label="已选库位" name="locationSelected">
|
||||||
<el-container>
|
<el-row :gutter="10" style="letter-spacing: 5px;">
|
||||||
<el-main>
|
<el-col :span="8">
|
||||||
<el-row :gutter="10" style="letter-spacing: 5px;">
|
<div class="grid-content bg-purpleA">黄色线芯A区(已选{{countSelA}})</div>
|
||||||
<el-col :span="8">
|
</el-col>
|
||||||
<div class="grid-content bg-purpleA">黄色线芯A区</div>
|
<el-col :span="8">
|
||||||
</el-col>
|
<div class="grid-content bg-purpleB">绿色线芯B区(已选{{countSelB}})</div>
|
||||||
<el-col :span="8">
|
</el-col>
|
||||||
<div class="grid-content bg-purpleB">绿色线芯B区</div>
|
<el-col :span="8">
|
||||||
</el-col>
|
<div class="grid-content bg-purpleC">红色线芯C区(已选{{countSelC}})</div>
|
||||||
<el-col :span="8">
|
</el-col>
|
||||||
<div class="grid-content bg-purpleC">红色线芯C区</div>
|
</el-row>
|
||||||
</el-col>
|
<el-row :gutter="10">
|
||||||
</el-row>
|
<el-col :span="8">
|
||||||
<el-row :gutter="10">
|
<el-card class="box-card scrollable">
|
||||||
<el-col :span="8">
|
<el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :15px'" v-for="(item,index) in selMaterialDetailA" :key="item.materialBh">
|
||||||
<el-card class="box-card scrollable">
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
<el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :15px'" v-for="(item,index) in selMaterialDetailA" :key="item.materialBh">
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
库位
|
||||||
<template slot="label">
|
</template>
|
||||||
库位
|
<span class="kw">{{item.materialBh}}</span>
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
<span class="kw">{{item.materialBh}}</span>
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
操作
|
||||||
<template slot="label">
|
</template>
|
||||||
操作
|
<el-button type="danger" icon="el-icon-delete" size="mini" circle @click="del(item)"></el-button>
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
<el-button type="danger" icon="el-icon-delete" size="mini" circle @click="del(item)"></el-button>
|
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
指令号
|
||||||
<template slot="label">
|
</template>
|
||||||
指令号
|
{{item.materialZlh}}
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
{{item.materialZlh}}
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
型号
|
||||||
<template slot="label">
|
</template>
|
||||||
型号
|
{{item.materialXingh}}
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
{{item.materialXingh}}
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
规格
|
||||||
<template slot="label">
|
</template>
|
||||||
规格
|
{{item.materialGuig}}
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
{{item.materialGuig}}
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
电压等级
|
||||||
<template slot="label">
|
</template>
|
||||||
电压等级
|
{{item.materialDiany}}
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
{{item.materialDiany}}
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
米数
|
||||||
<template slot="label">
|
</template>
|
||||||
米数
|
{{item.materialMs}}
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
{{item.materialMs}}
|
</el-descriptions>
|
||||||
</el-descriptions-item>
|
</el-card>
|
||||||
</el-descriptions>
|
</el-col>
|
||||||
</el-card>
|
<el-col :span="8">
|
||||||
</el-col>
|
<el-card class="box-card scrollable">
|
||||||
<el-col :span="8">
|
<el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :12px'" v-for="(item,index) in selMaterialDetailB" :key="item.materialBh">
|
||||||
<el-card class="box-card scrollable">
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
<el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :12px'" v-for="(item,index) in selMaterialDetailB" :key="item.materialBh">
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
库位
|
||||||
<template slot="label">
|
</template>
|
||||||
库位
|
<span class="kw">{{item.materialBh}}</span>
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
<span class="kw">{{item.materialBh}}</span>
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
操作
|
||||||
<template slot="label">
|
</template>
|
||||||
操作
|
<el-button type="danger" icon="el-icon-delete" size="mini" circle @click="del(item)"></el-button>
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
<el-button type="danger" icon="el-icon-delete" size="mini" circle @click="del(item)"></el-button>
|
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
指令号
|
||||||
<template slot="label">
|
</template>
|
||||||
指令号
|
{{item.materialZlh}}
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
{{item.materialZlh}}
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
型号
|
||||||
<template slot="label">
|
</template>
|
||||||
型号
|
{{item.materialXingh}}
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
{{item.materialXingh}}
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
规格
|
||||||
<template slot="label">
|
</template>
|
||||||
规格
|
{{item.materialGuig}}
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
{{item.materialGuig}}
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
电压等级
|
||||||
<template slot="label">
|
</template>
|
||||||
电压等级
|
{{item.materialDiany}}
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
{{item.materialDiany}}
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
米数
|
||||||
<template slot="label">
|
</template>
|
||||||
米数
|
{{item.materialMs}}
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
{{item.materialMs}}
|
</el-descriptions>
|
||||||
</el-descriptions-item>
|
</el-card>
|
||||||
</el-descriptions>
|
</el-col>
|
||||||
</el-card>
|
<el-col :span="8">
|
||||||
</el-col>
|
<el-card class="box-card scrollable">
|
||||||
<el-col :span="8">
|
<el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :12px'" v-for="(item,index) in selMaterialDetailC" :key="item.materialBh">
|
||||||
<el-card class="box-card scrollable">
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
<el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :12px'" v-for="(item,index) in selMaterialDetailC" :key="item.materialBh">
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
库位
|
||||||
<template slot="label">
|
</template>
|
||||||
库位
|
<span class="kw">{{item.materialBh}}</span>
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
<span class="kw">{{item.materialBh}}</span>
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
操作
|
||||||
<template slot="label">
|
</template>
|
||||||
操作
|
<el-button type="danger" icon="el-icon-delete" size="mini" circle @click="del(item)"></el-button>
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
<el-button type="danger" icon="el-icon-delete" size="mini" circle @click="del(item)"></el-button>
|
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
指令号
|
||||||
<template slot="label">
|
</template>
|
||||||
指令号
|
{{item.materialZlh}}
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
{{item.materialZlh}}
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
型号
|
||||||
<template slot="label">
|
</template>
|
||||||
型号
|
{{item.materialXingh}}
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
{{item.materialXingh}}
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
规格
|
||||||
<template slot="label">
|
</template>
|
||||||
规格
|
{{item.materialGuig}}
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
{{item.materialGuig}}
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
电压等级
|
||||||
<template slot="label">
|
</template>
|
||||||
电压等级
|
{{item.materialDiany}}
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
{{item.materialDiany}}
|
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||||
</el-descriptions-item>
|
<template slot="label">
|
||||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
米数
|
||||||
<template slot="label">
|
</template>
|
||||||
米数
|
{{item.materialMs}}
|
||||||
</template>
|
</el-descriptions-item>
|
||||||
{{item.materialMs}}
|
</el-descriptions>
|
||||||
</el-descriptions-item>
|
</el-card>
|
||||||
</el-descriptions>
|
</el-col>
|
||||||
</el-card>
|
</el-row>
|
||||||
</el-col>
|
<el-footer style="margin:0 auto;">
|
||||||
</el-row>
|
<el-row type="flex" justify="center">
|
||||||
</el-main>
|
<el-col :span="6">
|
||||||
<el-footer style="margin:0 auto;">
|
<div class="grid-content mt20">
|
||||||
<el-button type="primary" @click="confirm()">确认</el-button>
|
<el-button type="primary" @click="confirm()">确认</el-button>
|
||||||
</el-footer>
|
</div>
|
||||||
</el-container>
|
</el-col>
|
||||||
|
</el-row>
|
||||||
|
</el-footer>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
<!-- 操作详情对话框 -->
|
<!-- 操作详情对话框 -->
|
||||||
|
|
@ -410,7 +412,7 @@
|
||||||
}
|
}
|
||||||
.scrollable{
|
.scrollable{
|
||||||
overflow: auto; /* 自动开启滚动条 */
|
overflow: auto; /* 自动开启滚动条 */
|
||||||
max-height: 580px; /* 设置最大高度 */
|
max-height: 500px; /* 设置最大高度 */
|
||||||
}
|
}
|
||||||
|
|
||||||
/*最上方三大块样式*/
|
/*最上方三大块样式*/
|
||||||
|
|
@ -524,6 +526,16 @@
|
||||||
countC(){
|
countC(){
|
||||||
// 使用 find 方法找到第一个符合条件的对象
|
// 使用 find 方法找到第一个符合条件的对象
|
||||||
return this.materialDetailC.filter(task => task.materialState === '1').length;
|
return this.materialDetailC.filter(task => task.materialState === '1').length;
|
||||||
|
},
|
||||||
|
|
||||||
|
countSelA(){
|
||||||
|
return this.selMaterialDetailA.length;
|
||||||
|
},
|
||||||
|
countSelB(){
|
||||||
|
return this.selMaterialDetailB.length;
|
||||||
|
},
|
||||||
|
countSelC(){
|
||||||
|
return this.selMaterialDetailC.length;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue