Compare commits
2 Commits
dfbe41061d
...
0b18a6f546
| Author | SHA1 | Date |
|---|---|---|
 xd
|
0b18a6f546 | |
|
xd
|
0009e18205 |
|
|
@ -84,7 +84,7 @@ public class storageLocationController extends BaseController
|
|||
@PostMapping("/checkStorageLocation")
|
||||
public AjaxResult checkStorageLocation(@RequestBody StorageLocation storageLocation)
|
||||
{
|
||||
String storageExpire = configService.selectConfigByKey("storage.expire");
|
||||
String storageExpire = configService.selectConfigByKey("storage.expire.zy");
|
||||
|
||||
String user_name = getLoginUser().getUsername();//当前登陆者
|
||||
String materialBh = storageLocation.getMaterialBh();
|
||||
|
|
@ -105,8 +105,6 @@ public class storageLocationController extends BaseController
|
|||
@PostMapping("/cancelStorageLocation")
|
||||
public AjaxResult cancelStorageLocation(@RequestBody StorageLocation storageLocation)
|
||||
{
|
||||
String storageExpire = configService.selectConfigByKey("storage.expire");
|
||||
|
||||
String user_name = getLoginUser().getUsername();//当前登陆者
|
||||
String materialBh = storageLocation.getMaterialBh();
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ public class StorageLocation extends BaseEntity
|
|||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private String materialBh;
|
||||
private String materialZlh;
|
||||
private String materialXingh;
|
||||
private String materialGuig;
|
||||
private String materialDiany;
|
||||
|
|
@ -27,6 +28,14 @@ public class StorageLocation extends BaseEntity
|
|||
this.materialBh = materialBh;
|
||||
}
|
||||
|
||||
public String getMaterialZlh() {
|
||||
return materialZlh;
|
||||
}
|
||||
|
||||
public void setMaterialZlh(String materialZlh) {
|
||||
this.materialZlh = materialZlh;
|
||||
}
|
||||
|
||||
public String getMaterialXingh() {
|
||||
return materialXingh;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
|
||||
<resultMap type="StorageLocation" id="StorageLocationResult">
|
||||
<result property="materialBh" column="materialBh" />
|
||||
<result property="materialZlh" column="materialZlh" />
|
||||
<result property="materialXingh" column="materialXingh" />
|
||||
<result property="materialGuig" column="materialGuig" />
|
||||
<result property="materialDiany" column="materialDiany" />
|
||||
|
|
@ -14,21 +15,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
|
||||
<select id="selectStorageLocationAList" parameterType="StorageLocation" resultMap="StorageLocationResult">
|
||||
select materialBh, materialXingh, materialGuig, materialDiany, materialMs, materialState
|
||||
select materialBh, materialZlh, materialXingh, materialGuig, materialDiany, materialMs, materialState
|
||||
from storageLocation where materialBh like 'A%'
|
||||
</select>
|
||||
<select id="selectStorageLocationBList" parameterType="StorageLocation" resultMap="StorageLocationResult">
|
||||
select materialBh, materialXingh, materialGuig, materialDiany, materialMs, materialState
|
||||
select materialBh, materialZlh, materialXingh, materialGuig, materialDiany, materialMs, materialState
|
||||
from storageLocation where materialBh like 'B%'
|
||||
</select>
|
||||
<select id="selectStorageLocationCList" parameterType="StorageLocation" resultMap="StorageLocationResult">
|
||||
select materialBh, materialXingh, materialGuig, materialDiany, materialMs, materialState
|
||||
select materialBh, materialZlh, materialXingh, materialGuig, materialDiany, materialMs, materialState
|
||||
from storageLocation where materialBh like 'C%'
|
||||
</select>
|
||||
|
||||
<update id="addStorageLocation" parameterType="StorageLocation">
|
||||
update storageLocation
|
||||
<trim prefix="SET" suffixOverrides=",">
|
||||
<if test="materialZlh != null and materialZlh != ''">materialZlh = #{materialZlh},</if>
|
||||
<if test="materialXingh != null and materialXingh != ''">materialXingh = #{materialXingh},</if>
|
||||
<if test="materialGuig != null and materialGuig != ''">materialGuig = #{materialGuig},</if>
|
||||
<if test="materialDiany != null and materialDiany != ''">materialDiany = #{materialDiany},</if>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
<template>
|
||||
<div style="margin-top: 5px;">
|
||||
<div style="margin-left: 5px; margin-right: 5px;">
|
||||
|
||||
<el-tabs v-model="activeName" @tab-click="handleClick" style="margin-left: 15px; margin-right: 15px;">
|
||||
<el-tab-pane label="库位查看" name="locationShow">
|
||||
<el-row :gutter="10" style="letter-spacing: 5px;">
|
||||
<el-col :span="8">
|
||||
<div class="grid-content bg-purpleA">黄色线芯A区(余{{countA}})</div>
|
||||
|
|
@ -16,42 +17,48 @@
|
|||
<el-col :span="8">
|
||||
<el-card class="box-card scrollable">
|
||||
<el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :15px'" v-for="(item,index) in materialDetailA" :key="item.materialBh">
|
||||
<el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
库位
|
||||
</template>
|
||||
<span class="kw">{{item.materialBh}}</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle="{'text-align': 'center'}">
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
状态
|
||||
</template>
|
||||
<span v-if = "item.materialState=='0'">
|
||||
<el-tag size="mini" type="success" @click="openDialog(item)">空闲</el-tag>
|
||||
<el-tag size="mini" type="success">空闲</el-tag>
|
||||
</span>
|
||||
<span v-if = "item.materialState=='1'">
|
||||
<el-tag size="mini" type="danger">占用</el-tag>
|
||||
<el-tag size="mini" type="danger" @click="selectLocation(item)">占用</el-tag>
|
||||
</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :span="2">
|
||||
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
指令号
|
||||
</template>
|
||||
{{item.materialZlh}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
型号
|
||||
</template>
|
||||
{{item.materialXingh}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :span="2">
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
规格
|
||||
</template>
|
||||
{{item.materialGuig}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
电压等级
|
||||
</template>
|
||||
{{item.materialDiany}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
米数
|
||||
</template>
|
||||
|
|
@ -63,42 +70,48 @@
|
|||
<el-col :span="8">
|
||||
<el-card class="box-card scrollable">
|
||||
<el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :12px'" v-for="(item,index) in materialDetailB" :key="item.materialBh">
|
||||
<el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
库位
|
||||
</template>
|
||||
<span class="kw">{{item.materialBh}}</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle="{'text-align': 'center'}">
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
状态
|
||||
</template>
|
||||
<span v-if = "item.materialState=='0'">
|
||||
<el-tag size="mini" type="success" @click="openDialog(item)">空闲</el-tag>
|
||||
<el-tag size="mini" type="success">空闲</el-tag>
|
||||
</span>
|
||||
<span v-if = "item.materialState=='1'">
|
||||
<el-tag size="mini" type="danger">占用</el-tag>
|
||||
</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :span="2">
|
||||
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
指令号
|
||||
</template>
|
||||
{{item.materialZlh}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
型号
|
||||
</template>
|
||||
{{item.materialXingh}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :span="2">
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
规格
|
||||
</template>
|
||||
{{item.materialGuig}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
电压等级
|
||||
</template>
|
||||
{{item.materialDiany}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
米数
|
||||
</template>
|
||||
|
|
@ -110,42 +123,48 @@
|
|||
<el-col :span="8">
|
||||
<el-card class="box-card scrollable">
|
||||
<el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :12px'" v-for="(item,index) in materialDetailC" :key="item.materialBh">
|
||||
<el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
库位
|
||||
</template>
|
||||
<span class="kw">{{item.materialBh}}</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle="{'text-align': 'center'}">
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
状态
|
||||
</template>
|
||||
<span v-if = "item.materialState=='0'">
|
||||
<el-tag size="mini" type="success" @click="openDialog(item)">空闲</el-tag>
|
||||
<el-tag size="mini" type="success">空闲</el-tag>
|
||||
</span>
|
||||
<span v-if = "item.materialState=='1'">
|
||||
<el-tag size="mini" type="danger">占用</el-tag>
|
||||
</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :span="2">
|
||||
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
指令号
|
||||
</template>
|
||||
{{item.materialZlh}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
型号
|
||||
</template>
|
||||
{{item.materialXingh}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :span="2">
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
规格
|
||||
</template>
|
||||
{{item.materialGuig}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
电压等级
|
||||
</template>
|
||||
{{item.materialDiany}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
米数
|
||||
</template>
|
||||
|
|
@ -155,14 +174,18 @@
|
|||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<!-- 添加或修改材料管理对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="库位" prop="materialBh">
|
||||
<el-input v-model="form.materialBh"/>
|
||||
<el-input v-model="form.materialBh" :disabled="true"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="指令号" prop="materialZlh">
|
||||
<el-input v-model="form.materialZlh"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -196,7 +219,22 @@
|
|||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="已选库位" name="locationSelected">
|
||||
<el-row :gutter="10" style="letter-spacing: 5px;">
|
||||
<el-col :span="8">
|
||||
<div class="grid-content bg-purpleA">黄色线芯A区(余{{countA}})</div>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<div class="grid-content bg-purpleB">绿色线芯B区(余{{countB}})</div>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<div class="grid-content bg-purpleC">红色线芯C区(余{{countC}})</div>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
|
||||
</template>
|
||||
<style>
|
||||
/*库位号样式*/
|
||||
|
|
@ -204,13 +242,18 @@
|
|||
font-size: 15px;color: black;font-weight: bold
|
||||
}
|
||||
|
||||
/* 修改标签本身的样式 */
|
||||
.el-tag:hover {
|
||||
cursor: pointer; /* 将鼠标形状改为指针形状 */
|
||||
}
|
||||
|
||||
/*卡片内容滚动条设置*/
|
||||
::-webkit-scrollbar {
|
||||
display: none; /* Chrome Safari */
|
||||
}
|
||||
.scrollable{
|
||||
overflow: auto; /* 自动开启滚动条 */
|
||||
max-height: 650px; /* 设置最大高度 */
|
||||
max-height: 580px; /* 设置最大高度 */
|
||||
}
|
||||
|
||||
/*最上方三大块样式*/
|
||||
|
|
@ -241,11 +284,22 @@
|
|||
import { listStorageLocation, addStorageLocation, checkStorageLocation,cancelStorageLocation } from "@/api/storageLocation/storageLocation";
|
||||
|
||||
export default {
|
||||
name: "locationConsuming",
|
||||
name: "locationConsuming.vue",
|
||||
data() {
|
||||
return {
|
||||
activeName: 'locationShow',
|
||||
|
||||
//内容样式
|
||||
contentStyle: {
|
||||
'text-align': 'center',
|
||||
'width': '150px'
|
||||
},
|
||||
//label样式
|
||||
labelStyle: { 'width': '80px' },
|
||||
|
||||
queryParams: {
|
||||
materialBh: null,
|
||||
materialZlh: null,
|
||||
materialXingh: null,
|
||||
materialGuig: null,
|
||||
materialDiany: null,
|
||||
|
|
@ -264,6 +318,9 @@
|
|||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
materialZlh: [
|
||||
{ required: true, message: "指令号不能为空", trigger: "blur" }
|
||||
],
|
||||
materialXingh: [
|
||||
{ required: true, message: "型号不能为空", trigger: "blur" }
|
||||
],
|
||||
|
|
@ -276,34 +333,7 @@
|
|||
materialMs: [
|
||||
{ required: true, message: "米数不能为空", trigger: "blur" }
|
||||
],
|
||||
},
|
||||
//线芯摆放库位信息
|
||||
/* materialDetailA: [{materialBh:'A-1', materialXingh: 'YJV', materialGuig: '1*10', materialDiany: '1kV', materialMs: '1.5', materialState:'0'},
|
||||
{materialBh:'A-2',materialXingh: 'YJV2', materialGuig: '2*10', materialDiany: '2kV', materialMs: '2.5', materialState:'0'},
|
||||
{materialBh:'A-3',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'1'},
|
||||
{materialBh:'A-4',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'0'},
|
||||
{materialBh:'A-5',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'1'},
|
||||
{materialBh:'A-6',materialXingh: 'YJV2', materialGuig: '2*10', materialDiany: '2kV', materialMs: '2.5', materialState:'0'},
|
||||
{materialBh:'A-7',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'1'},
|
||||
{materialBh:'A-8',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'0'}],
|
||||
|
||||
materialDetailB: [{materialBh:'B-1',materialXingh: 'YJV', materialGuig: '1*10', materialDiany: '1kV', materialMs: '1.5', materialState:'1'},
|
||||
{materialBh:'B-2',materialXingh: 'YJV2', materialGuig: '2*10', materialDiany: '2kV', materialMs: '2.5', materialState:'0'},
|
||||
{materialBh:'B-3',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'1'},
|
||||
{materialBh:'B-4',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'0'},
|
||||
{materialBh:'B-5',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'1'},
|
||||
{materialBh:'B-6',materialXingh: 'YJV2', materialGuig: '2*10', materialDiany: '2kV', materialMs: '2.5', materialState:'0'},
|
||||
{materialBh:'B-7',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'1'},
|
||||
{materialBh:'B-8',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'0'}],
|
||||
|
||||
materialDetailC: [{materialBh:'C-1',materialXingh: 'YJV', materialGuig: '1*10', materialDiany: '1kV', materialMs: '1.5', materialState:'0'},
|
||||
{materialBh:'C-2',materialXingh: 'YJV2', materialGuig: '2*10', materialDiany: '2kV', materialMs: '2.5', materialState:'1'},
|
||||
{materialBh:'C-3',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'0'},
|
||||
{materialBh:'C-4',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'1'},
|
||||
{materialBh:'C-5',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'0'},
|
||||
{materialBh:'C-6',materialXingh: 'YJV2', materialGuig: '2*10', materialDiany: '2kV', materialMs: '2.5', materialState:'1'},
|
||||
{materialBh:'C-7',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'0'},
|
||||
{materialBh:'C-8',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'1'}],*/
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -376,12 +406,34 @@
|
|||
reset() {
|
||||
this.form = {
|
||||
materialBh: null,
|
||||
materialZlh: null,
|
||||
materialXingh: null,
|
||||
materialGuig: null,
|
||||
materialDiany: null,
|
||||
materialMs: null
|
||||
};
|
||||
this.resetForm("form");
|
||||
},
|
||||
|
||||
/*===============================================领用操作==========================================*/
|
||||
// Tag标签页点击事件
|
||||
handleClick(tab, event) {
|
||||
console.log(tab, event);
|
||||
},
|
||||
|
||||
//选择领用库位
|
||||
selectLocation(item){
|
||||
this.$confirm("是否选择该 "+item.materialBh+" 库位?","提示",{
|
||||
iconClass: "el-icon-question",//自定义图标样式
|
||||
confirmButtonText: "确认",//确认按钮文字更换
|
||||
cancelButtonText: "取消",//取消按钮文字更换
|
||||
showClose: false,//是否显示右上角关闭按钮
|
||||
type: "warning",//提示类型 success/info/warning/error
|
||||
}).then(()=>{
|
||||
//校验库位是否被其他人领用
|
||||
}).catch(() => {
|
||||
//取消操作
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@
|
|||
<el-col :span="8">
|
||||
<el-card class="box-card scrollable">
|
||||
<el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :15px'" v-for="(item,index) in materialDetailA" :key="item.materialBh">
|
||||
<el-descriptions-item :labelStyle='labelStyle'>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
库位
|
||||
</template>
|
||||
<span class="kw">{{item.materialBh}}</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :labelStyle='labelStyle' :contentStyle="{'text-align': 'center'}">
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
状态
|
||||
</template>
|
||||
|
|
@ -33,25 +33,31 @@
|
|||
<el-tag size="mini" type="danger">占用</el-tag>
|
||||
</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :labelStyle='labelStyle'>
|
||||
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
指令号
|
||||
</template>
|
||||
{{item.materialZlh}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
型号
|
||||
</template>
|
||||
{{item.materialXingh}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :labelStyle='labelStyle'>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
规格
|
||||
</template>
|
||||
{{item.materialGuig}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :labelStyle='labelStyle'>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
电压等级
|
||||
</template>
|
||||
{{item.materialDiany}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :labelStyle='labelStyle'>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
米数
|
||||
</template>
|
||||
|
|
@ -63,13 +69,13 @@
|
|||
<el-col :span="8">
|
||||
<el-card class="box-card scrollable">
|
||||
<el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :12px'" v-for="(item,index) in materialDetailB" :key="item.materialBh">
|
||||
<el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
库位
|
||||
</template>
|
||||
<span class="kw">{{item.materialBh}}</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle="{'text-align': 'center'}">
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
状态
|
||||
</template>
|
||||
|
|
@ -80,25 +86,31 @@
|
|||
<el-tag size="mini" type="danger">占用</el-tag>
|
||||
</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :span="2">
|
||||
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
指令号
|
||||
</template>
|
||||
{{item.materialZlh}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
型号
|
||||
</template>
|
||||
{{item.materialXingh}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :span="2">
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
规格
|
||||
</template>
|
||||
{{item.materialGuig}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
电压等级
|
||||
</template>
|
||||
{{item.materialDiany}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
米数
|
||||
</template>
|
||||
|
|
@ -110,13 +122,13 @@
|
|||
<el-col :span="8">
|
||||
<el-card class="box-card scrollable">
|
||||
<el-descriptions border :column="2" size="small" :style="index==0?'': 'margin-top :12px'" v-for="(item,index) in materialDetailC" :key="item.materialBh">
|
||||
<el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
库位
|
||||
</template>
|
||||
<span class="kw">{{item.materialBh}}</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle="{'text-align': 'center'}">
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
状态
|
||||
</template>
|
||||
|
|
@ -127,25 +139,31 @@
|
|||
<el-tag size="mini" type="danger">占用</el-tag>
|
||||
</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :span="2">
|
||||
<el-descriptions-item :span="2" :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
指令号
|
||||
</template>
|
||||
{{item.materialZlh}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
型号
|
||||
</template>
|
||||
{{item.materialXingh}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item :span="2">
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
规格
|
||||
</template>
|
||||
{{item.materialGuig}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
电压等级
|
||||
</template>
|
||||
{{item.materialDiany}}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item>
|
||||
<el-descriptions-item :contentStyle='contentStyle' :labelStyle='labelStyle'>
|
||||
<template slot="label">
|
||||
米数
|
||||
</template>
|
||||
|
|
@ -162,7 +180,12 @@
|
|||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="库位" prop="materialBh">
|
||||
<el-input v-model="form.materialBh"/>
|
||||
<el-input v-model="form.materialBh" :disabled="true"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="指令号" prop="materialZlh">
|
||||
<el-input v-model="form.materialZlh"/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
|
@ -203,13 +226,14 @@
|
|||
.kw{
|
||||
font-size: 15px;color: black;font-weight: bold
|
||||
}
|
||||
|
||||
/*卡片内容滚动条设置*/
|
||||
::-webkit-scrollbar {
|
||||
display: none; /* Chrome Safari */
|
||||
}
|
||||
.scrollable{
|
||||
overflow: auto; /* 自动开启滚动条 */
|
||||
max-height: 650px; /* 设置最大高度 */
|
||||
max-height: 600px; /* 设置最大高度 */
|
||||
}
|
||||
|
||||
/*最上方三大块样式*/
|
||||
|
|
@ -243,12 +267,17 @@
|
|||
name: "locationSet",
|
||||
data() {
|
||||
return {
|
||||
|
||||
//内容样式
|
||||
contentStyle: {
|
||||
'text-align': 'center',
|
||||
'width': '150px'
|
||||
},
|
||||
//label样式
|
||||
labelStyle: { 'width': '100px' },
|
||||
labelStyle: { 'width': '80px' },
|
||||
|
||||
queryParams: {
|
||||
materialBh: null,
|
||||
materialZlh: null,
|
||||
materialXingh: null,
|
||||
materialGuig: null,
|
||||
materialDiany: null,
|
||||
|
|
@ -267,6 +296,9 @@
|
|||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
materialZlh: [
|
||||
{ required: true, message: "指令号不能为空", trigger: "blur" }
|
||||
],
|
||||
materialXingh: [
|
||||
{ required: true, message: "型号不能为空", trigger: "blur" }
|
||||
],
|
||||
|
|
@ -279,34 +311,7 @@
|
|||
materialMs: [
|
||||
{ required: true, message: "米数不能为空", trigger: "blur" }
|
||||
],
|
||||
},
|
||||
//线芯摆放库位信息
|
||||
/* materialDetailA: [{materialBh:'A-1', materialXingh: 'YJV', materialGuig: '1*10', materialDiany: '1kV', materialMs: '1.5', materialState:'0'},
|
||||
{materialBh:'A-2',materialXingh: 'YJV2', materialGuig: '2*10', materialDiany: '2kV', materialMs: '2.5', materialState:'0'},
|
||||
{materialBh:'A-3',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'1'},
|
||||
{materialBh:'A-4',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'0'},
|
||||
{materialBh:'A-5',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'1'},
|
||||
{materialBh:'A-6',materialXingh: 'YJV2', materialGuig: '2*10', materialDiany: '2kV', materialMs: '2.5', materialState:'0'},
|
||||
{materialBh:'A-7',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'1'},
|
||||
{materialBh:'A-8',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'0'}],
|
||||
|
||||
materialDetailB: [{materialBh:'B-1',materialXingh: 'YJV', materialGuig: '1*10', materialDiany: '1kV', materialMs: '1.5', materialState:'1'},
|
||||
{materialBh:'B-2',materialXingh: 'YJV2', materialGuig: '2*10', materialDiany: '2kV', materialMs: '2.5', materialState:'0'},
|
||||
{materialBh:'B-3',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'1'},
|
||||
{materialBh:'B-4',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'0'},
|
||||
{materialBh:'B-5',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'1'},
|
||||
{materialBh:'B-6',materialXingh: 'YJV2', materialGuig: '2*10', materialDiany: '2kV', materialMs: '2.5', materialState:'0'},
|
||||
{materialBh:'B-7',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'1'},
|
||||
{materialBh:'B-8',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'0'}],
|
||||
|
||||
materialDetailC: [{materialBh:'C-1',materialXingh: 'YJV', materialGuig: '1*10', materialDiany: '1kV', materialMs: '1.5', materialState:'0'},
|
||||
{materialBh:'C-2',materialXingh: 'YJV2', materialGuig: '2*10', materialDiany: '2kV', materialMs: '2.5', materialState:'1'},
|
||||
{materialBh:'C-3',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'0'},
|
||||
{materialBh:'C-4',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'1'},
|
||||
{materialBh:'C-5',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'0'},
|
||||
{materialBh:'C-6',materialXingh: 'YJV2', materialGuig: '2*10', materialDiany: '2kV', materialMs: '2.5', materialState:'1'},
|
||||
{materialBh:'C-7',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'0'},
|
||||
{materialBh:'C-8',materialXingh: 'YJV3', materialGuig: '3*10', materialDiany: '3kV', materialMs: '3.5', materialState:'1'}],*/
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
|
|
@ -379,6 +384,7 @@
|
|||
reset() {
|
||||
this.form = {
|
||||
materialBh: null,
|
||||
materialZlh: null,
|
||||
materialXingh: null,
|
||||
materialGuig: null,
|
||||
materialDiany: null,
|
||||
|
|
|
|||
Loading…
Reference in New Issue