页面高度调整

This commit is contained in:
shijing 2023-02-27 13:23:20 +08:00
parent 2c50371c51
commit 22f14f9634
44 changed files with 82 additions and 91 deletions

View File

@ -92,4 +92,8 @@ export default {
.ganttLeftMenu .el-table .el-table__row--level-0 .cell{
font-weight: bold!important;;
}
/* tabs阴影去除 */
.el-tabs--border-card{
box-shadow: none!important;;
}
</style>

View File

@ -44,7 +44,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="标题" prop="title">

View File

@ -44,7 +44,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="客户名称" prop="name" min-width="200" show-overflow-tooltip>

View File

@ -34,7 +34,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 45}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column label="序号" type="index" width="80"/>

View File

@ -44,7 +44,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="设备名称" prop="name" min-width="120" show-overflow-tooltip>

View File

@ -81,7 +81,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column label="序号" type="index" width="80"/>

View File

@ -43,7 +43,7 @@
fit
stripe
height="100"
v-el-height-adaptive-table="{ bottomOffset: 42 }"
v-el-height-adaptive-table="{ bottomOffset: 50 }"
>
<el-table-column type="index" width="50"/>
<el-table-column label="设备编号" width="100">

View File

@ -44,7 +44,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="设备名称">

View File

@ -60,7 +60,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{ bottomOffset: 42 }"
v-el-height-adaptive-table="{ bottomOffset: 50 }"
>
<el-table-column type="index" width="50"/>
<el-table-column label="记录编号" prop="number"></el-table-column>

View File

@ -33,7 +33,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 45}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="单号" prop="order">

View File

@ -35,7 +35,7 @@
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50" />
<el-table-column label="物料批次">

View File

@ -18,7 +18,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column type="index" width="50"/>

View File

@ -44,7 +44,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="仓库名称" prop="name">

View File

@ -11,7 +11,7 @@
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50" />
<el-table-column label="半成品编号">

View File

@ -32,7 +32,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column label="序号" type="index" width="80"/>
<el-table-column label="资料类别" prop="type" min-width="120">

View File

@ -28,7 +28,7 @@
</el-button>
</div>
</el-card>
<el-card style="margin-top: 2px">
<el-card>
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<!--<el-tab-pane label="成品" name="1"></el-tab-pane>
<el-tab-pane label="半成品" name="2"></el-tab-pane>-->
@ -43,7 +43,6 @@
border
fit
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
@ -308,9 +307,7 @@
},
};
},
computed: {},
watch: {},
created() {
mounted(){
this.getList();
this.getProcessList();
},

View File

@ -45,7 +45,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="成品编号">

View File

@ -4,9 +4,7 @@
<el-col :span="9">
<el-card>
<div slot="header" class="clearfix">
<span style="font-size: 16px;
font-weight: 700;
">产品列表</span>
<span style="font-size: 16px;font-weight: 700;">产品列表</span>
</div>
<el-table
v-loading="listLoading"
@ -17,7 +15,7 @@
height="100"
@current-change="handleCurrentChange"
highlight-current-row
v-el-height-adaptive-table="{bottomOffset: 10}"
v-el-height-adaptive-table="{bottomOffset: 20}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="产品编号">
@ -35,9 +33,7 @@
<el-col :span="15">
<el-card class="box-card" id="processCard">
<div slot="header" class="clearfix">
<span style="font-size: 16px;
font-weight: 700;
">工艺流程</span>
<span style="font-size: 16px;font-weight: 700;">工艺流程</span>
</div>
<el-steps :active="values" spac="400px" align-center="" style="padding-top: 20px;height:80px">
<el-step
@ -51,9 +47,7 @@
</el-card>
<el-card class="box-card">
<div slot="header" class="clearfix">
<span style="font-size: 16px;
font-weight: 700;
">流程分解</span>
<span style="font-size: 16px;font-weight: 700;">流程分解</span>
</div>
<el-button v-if="checkPermission(['subproduction_create'])" type="primary" icon="el-icon-plus"
@click="handlesubproducationCreate">
@ -147,7 +141,7 @@
</div>
</el-dialog>
</el-card>
<el-tabs type="border-card">
<el-tabs type="border-card" style="box-shadow: none;border-radius: 5px;">
<el-tab-pane label="输入物料">
<el-button
v-if="checkPermission(['subproduction_update'])"
@ -772,7 +766,7 @@
let that = this;
let hei = document.getElementsByClassName('app-main')[0].clientHeight;
let h = document.getElementById('processCard').clientHeight;
that.halfHeight = (hei - h - 176) / 2;
that.halfHeight = (hei - h - 200) / 2;
this.getmaterialList();//物料列表
},
methods: {

View File

@ -43,7 +43,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="半成品编号">

View File

@ -5,13 +5,13 @@
<el-tab-pane label="今日到岗">
<el-table
:data="userList.results"
style="width: 100%; margin-top: 6px"
style="width: 100%;"
highlight-current-row
row-key="id"
height="100"
stripe
border
v-el-height-adaptive-table="{ bottomOffset: 41 }"
v-el-height-adaptive-table="{ bottomOffset: 57 }"
>
<el-table-column type="index" width="50" label="序号"/>
<el-table-column align="center" prop="number" label="工号">

View File

@ -37,7 +37,7 @@
height="100"
stripe
border
v-el-height-adaptive-table="{bottomOffset: 41}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column align="center" label="工号" prop="number">

View File

@ -170,8 +170,6 @@
list.push(item)
}
});
// debugger;
// console.log(list);
list.forEach(item => {
if (!item.children || item.children.length < 1) {
let startTime = new Date(item.start_date).getTime();
@ -233,8 +231,6 @@
arr.push(obj);
}
that.proList = arr;
// debugger;
// console.log(arr)
});
} else {
that.$message.error(res.msg);
@ -252,7 +248,6 @@
let arr = [];
debugger;
list.forEach((item) => {
// if (!item.children || item.children.length < 1) {
let startTime = new Date(item.start_date).getTime();
let endTime = new Date(item.end_date).getTime();
let obj = new Object();
@ -268,7 +263,6 @@
obj.productNum = item.product_.specification;
obj.isShow = true;
arr.push(obj);
// }
that.proList = arr;
});
}
@ -283,7 +277,7 @@
mounted() {
let hei = document.getElementsByClassName('app-main')[0].clientHeight;//
// let h = document.getElementById('ganttCard').clientHeight;//
this.domHeight = hei - 460;
this.domHeight = hei - 470;
}
};
</script>

View File

@ -138,7 +138,9 @@
type="border-card"
v-model="activeName"
@tab-click="activeNameClick"
style="box-shadow: none;"
>
<el-tab-pane label="订单排产" name="订单排产">
<el-table
:data="orderList.results"
@ -523,7 +525,7 @@
},
mounted() {
let hei = document.getElementsByClassName('app-main')[0].clientHeight;//
let domHeight = this.domHeight = (hei - 205) / 2;
let domHeight = this.domHeight = (hei - 220) / 2;
document.getElementById('orderList').style.height = domHeight + 'px';
document.getElementById('productionPlan').style.height = domHeight + 'px';
}

View File

@ -21,7 +21,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{ bottomOffset: 44 }"
v-el-height-adaptive-table="{ bottomOffset: 50 }"
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column label="订单编号" width="110">
@ -77,7 +77,7 @@
/>
</el-card>
</el-col>
<el-col :span="12">
<el-col :span="12" style="padding-left: 5px;">
<el-row>
<el-col :span="24">
<el-card>
@ -370,7 +370,7 @@
},
mounted() {
let hei = document.getElementsByClassName('app-main')[0].clientHeight;//
let domHeight = this.domHeight = (hei - 116) / 2;
let domHeight = this.domHeight = (hei - 130) / 2;
document.getElementById('orderList').style.height = domHeight + 'px';
document.getElementById('productionPlan').style.height = domHeight + 'px';
}

View File

@ -44,7 +44,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{ bottomOffset: 43 }"
v-el-height-adaptive-table="{ bottomOffset: 50 }"
>
<el-table-column type="index" width="50"/>
<el-table-column label="采购订单编号" prop="number">

View File

@ -44,7 +44,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="供应商名" prop="name">

View File

@ -10,7 +10,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="物料批次">

View File

@ -9,7 +9,7 @@
fit
stripe
height="620"
v-el-height-adaptive-table="{ bottomOffset: 40 }"
v-el-height-adaptive-table="{ bottomOffset: 50 }"
>
<el-table-column type="index" width="50" />
<el-table-column label="任务编号" align="center">

View File

@ -9,7 +9,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="成品编号" prop="number">

View File

@ -8,7 +8,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" label="序号" width="50"/>
<el-table-column label="产品编号">

View File

@ -11,7 +11,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" label="序号" width="50"/>
<el-table-column label="产品编号">

View File

@ -21,7 +21,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="编号">

View File

@ -21,7 +21,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 20}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="排放口">

View File

@ -21,7 +21,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="事件种类" width="240" :show-overflow-tooltip="true">
@ -31,10 +31,10 @@
:key="item"
type="warning"
effect="plain"
>{{ item}}</el-tag
>
>{{ item}}
</el-tag>
</template>
</el-table-column>
</el-table-column>
<el-table-column label="发生区域" >
<template slot-scope="scope">{{ scope.row.areaName }}</template>
</el-table-column>

View File

@ -20,7 +20,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="区域">

View File

@ -44,27 +44,27 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="合同名称" prop="name" width="160" show-overflow-tooltip>
<el-table-column label="合同名称" prop="name" min-width="160" show-overflow-tooltip>
</el-table-column>
<el-table-column label="合同编号" prop="number" width="160" show-overflow-tooltip>
<el-table-column label="合同编号" prop="number" min-width="160" show-overflow-tooltip>
</el-table-column>
<el-table-column label="监管协议号" prop="watch_num" width="160" show-overflow-tooltip>
<el-table-column label="监管协议号" prop="watch_num" min-width="160" show-overflow-tooltip>
</el-table-column>
<el-table-column label="合同金额(元)" prop="amount" width="120">
<el-table-column label="合同金额(元)" prop="amount" min-width="120">
</el-table-column>
<el-table-column label="开票金额(元)" prop="invoice" width="120">
<el-table-column label="开票金额(元)" prop="invoice" min-width="120">
</el-table-column>
<el-table-column label="客户名称" width="130" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.customer_.name }}</template>
</el-table-column>
<el-table-column label="签订日期" prop="sign_date" width="120">
<el-table-column label="签订日期" prop="sign_date" min-width="120">
</el-table-column>
<el-table-column label="描述" prop="description" width="130" show-overflow-tooltip>
<el-table-column label="描述" prop="description" min-width="130" show-overflow-tooltip>
</el-table-column>
<el-table-column label="创建时间" prop="create_time" width="160">
<el-table-column label="创建时间" prop="create_time" min-width="160">
</el-table-column>
<el-table-column
align="center"

View File

@ -44,36 +44,36 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="订单编号" prop="number" width="160" show-overflow-tooltip>
<el-table-column label="订单编号" prop="number" min-width="160" show-overflow-tooltip>
</el-table-column>
<el-table-column label="客户" width="200" show-overflow-tooltip>
<el-table-column label="客户" min-width="200" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.customer_.name }}</template>
</el-table-column>
<el-table-column label="所属合同" width="200" show-overflow-tooltip>
<el-table-column label="所属合同" min-width="200" show-overflow-tooltip>
<template slot-scope="scope" v-if="scope.row.contract">{{ scope.row.contract_.name }}</template>
</el-table-column>
<el-table-column label="产品名称" width="200" show-overflow-tooltip>
<el-table-column label="产品名称" min-width="200" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.product_.name }}</template>
</el-table-column>
<el-table-column label="产品型号" width="120" show-overflow-tooltip>
<el-table-column label="产品型号" min-width="120" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.product_.specification }}</template>
</el-table-column>
<el-table-column label="产品数量" prop="count" width="90">
<el-table-column label="产品数量" prop="count" min-width="90">
</el-table-column>
<el-table-column label="交货日期" prop="delivery_date" width="150">
<el-table-column label="交货日期" prop="delivery_date" min-width="150">
</el-table-column>
<el-table-column label="已交货数量" prop="delivered_count" width="150">
<el-table-column label="已交货数量" prop="delivered_count" min-width="100">
</el-table-column>
<el-table-column label="是否需要军检" width="150">
<el-table-column label="是否需要军检" min-width="100">
<template slot-scope="scope">
<el-tag v-if="scope.row.need_mtest === false"></el-tag>
<el-tag v-else-if="scope.row.need_mtest === true"></el-tag>
</template>
</el-table-column>
<el-table-column label="创建时间" width="160">
<el-table-column label="创建时间" min-width="160">
<template slot-scope="scope">{{ scope.row.create_time }}</template>
</el-table-column>
<el-table-column

View File

@ -43,7 +43,7 @@
stripe
highlight-current-row
height="100"
v-el-height-adaptive-table="{ bottomOffset: 42 }"
v-el-height-adaptive-table="{ bottomOffset: 50 }"
>
<el-table-column type="index" width="50"/>
<el-table-column label="产品名称" show-overflow-tooltip>

View File

@ -37,7 +37,7 @@
pager-count="3"
style="border-top: 1px solid #f5f5f5;"
height="100"
v-el-height-adaptive-table="{bottomOffset: 20}"
v-el-height-adaptive-table="{bottomOffset: 30}"
>
<el-table-column label="序号" type="index">
</el-table-column>
@ -94,7 +94,7 @@
pager-count="3"
style="border-top: 1px solid #f5f5f5;"
height="100"
v-el-height-adaptive-table="{bottomOffset: 20}"
v-el-height-adaptive-table="{bottomOffset: 30}"
>
<el-table-column label="序号" type="index" width="50">
</el-table-column>
@ -132,7 +132,7 @@
pager-count="3"
style="border-top: 1px solid #f5f5f5;"
height="100"
v-el-height-adaptive-table="{bottomOffset: 20}"
v-el-height-adaptive-table="{bottomOffset: 30}"
>
<el-table-column label="序号" type="index">
</el-table-column>

View File

@ -35,7 +35,7 @@
height="100"
stripe
border
v-el-height-adaptive-table="{bottomOffset: 41}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50"/>
<el-table-column align="center" label="工号">

View File

@ -51,7 +51,7 @@
size="mini"
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50" />
<el-table-column label="订单编号" width="120" show-overflow-tooltip>
@ -91,7 +91,7 @@
size="mini"
highlight-current-row
height="100"
v-el-height-adaptive-table="{bottomOffset: 42}"
v-el-height-adaptive-table="{bottomOffset: 50}"
>
<el-table-column type="index" width="50" />
<el-table-column label="任务编号" prop="number" show-overflow-tooltip>

View File

@ -34,7 +34,7 @@
stripe
height="100"
highlight-current-row
v-el-height-adaptive-table="{bottomOffset: 50}"
v-el-height-adaptive-table="{bottomOffset: 60}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="半成品名称">

View File

@ -21,7 +21,7 @@
style="width: 100%"
height="100"
highlight-current-row
v-el-height-adaptive-table="{bottomOffset: 50}"
v-el-height-adaptive-table="{bottomOffset: 60}"
>
<el-table-column type="index" width="50"/>
<el-table-column label="任务编号">

View File

@ -1202,7 +1202,7 @@
},
mounted() {
let H = document.getElementsByClassName('app-main')[0].clientHeight;
let h = H/2-85;
let h = H/2-93;
this.tableHeight = h+'px';
this.secondTableHeight = h-36+'px';
}