Skip to content

T
tianjin
Commit 39498e6e authored by 徐来柯's avatar 徐来柯
Browse files
Options

update

parent 2c0f7f82
Hide whitespace changes
Inline Side-by-side
Showing with 300 additions and 213 deletions
src/assets/sass/common.scss
View file @ 39498e6e
......@@ -138,6 +138,23 @@
}
}
.baseTable{
.el-table__header-wrapper{
background: #5A6C98;
}
.el-table th.is-leaf{
background: #5A6C98;
color:#fff;
}
.el-table td, .el-table th.is-leaf{
text-align: center;
}
.el-table--border th{
border:1px solid #EBEEF5;
}
}
.el-table .warning-row td {
background: #ff4949 !important;
color: #fff !important;
......
src/views/education/ProductHouseshow.vue
View file @ 39498e6e
......@@ -2,69 +2,7 @@
<div class="box-container">
<div class="wrap">
<search-form :formList="[1]" :searchList="searchList" :formData="formData" @searchData="searchData" />
<el-table
border
height="675"
ref="multipleTable"
:data="tableData"
class="table-style"
tooltip-effect="dark"
style="width: 100%"
>
<!-- <el-table-column
type="selection"
width="60">
</el-table-column> -->
<el-table-column
label="序号"
:show-overflow-tooltip="true"
width="80"
prop="NO">
</el-table-column>
<el-table-column
label="线体编号"
:show-overflow-tooltip="true"
prop="xtid"
>
</el-table-column>
<el-table-column
prop="linname"
label="线体名称"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
label="产品编号"
:show-overflow-tooltip="true"
prop="wlid"
>
</el-table-column>
<el-table-column
label="产品名称"
:show-overflow-tooltip="true"
prop="wlname"
>
</el-table-column>
<el-table-column
label="产品描述"
:show-overflow-tooltip="true"
prop="wlDesc"
>
</el-table-column>
<el-table-column
label="单位"
:show-overflow-tooltip="true"
prop="Company"
>
</el-table-column>
<el-table-column
label="库存数量"
:show-overflow-tooltip="true"
prop="MHNuber"
>
</el-table-column>
</el-table>
<baseTable :tableHead="tableHead" :tableData="tableData" />
<Pagination ref="page" :totalCount="totalCount" :totalPage="totalPage" @pageFun="pageFun" />
</div>
......@@ -76,14 +14,50 @@
import searchForm from './component/searchForm'
import deletePop from './component/deletePop'
import Pagination from './component/Pagination'
import baseTable from './component/baseTable'
export default {
components: { searchForm, deletePop, Pagination },
components: { searchForm, deletePop, baseTable, Pagination },
data () {
return {
tableData: [],
AllTableData: [],
checkList: [],
tableHead: [
{
prop: 'NO',
label: '序号',
width: "80"
},
{
prop: 'xtid',
label: '线体编号'
},
{
prop: 'linname',
label: '线体名称'
},
{
prop: 'wlid',
label: '产品编号'
},
{
prop: 'wlname',
label: '产品名称'
},
{
prop: 'wlDesc',
label: '产品描述'
},
{
prop: 'Company',
label: '单位'
},
{
prop: 'MHNuber',
label: '库存数量'
}
],
searchList: [
{
id: '不限',
......
src/views/education/component/baseTable.vue 0 → 100644
View file @ 39498e6e
<template>
<div class="baseTable">
<el-table
border
height="635"
class="conterFool_middle"
ref="multipleTable"
:data="tableData"
tooltip-effect="dark"
style="width: 100%"
:row-class-name="rowClassName"
@selection-change="handleSelectionChange">
<el-table-column
v-if="showSelection"
type="selection"
width="110">
</el-table-column>
<el-table-column
v-for="item in tableHead"
:key="item.prop"
:prop="item.prop"
:label="item.label"
:width="item.width"
:show-overflow-tooltip="true">
<template slot-scope="scope">
<slot :name="item.prop" :scope="scope">
<span>{{scope.row[item.prop]}}</span>
</slot>
</template>
</el-table-column>
<el-table-column
label="操作"
v-if="rowBtns.length !== 0"
show-overflow-tooltip>
<template slot-scope="scope">
<div class="table_edit" v-if="rowBtns.includes(1)" @click="editFun(scope.row)" >
<div class="edit_img"></div>
</div>
<div class="table_remove" v-if="rowBtns.includes(2)" @click="deleteFun(scope.row)">
<div class="remove_img"></div>
</div>
</template>
</el-table-column>
</el-table>
</div>
</template>
<script>
export default {
props: {
// 是否显示表格勾选框
showSelection: {
type: Boolean,
default () {
return false
}
},
rowClassName: {
type: Function,
default () {
return {}
}
},
// 操作内容 1 添加 2删除
rowBtns: {
type: Array,
default () {
return []
}
},
// 表头
tableHead: {
type: Array,
default () {
return []
}
},
tableData: {
type: Array,
default () {
return []
}
}
},
data () {
return {
}
},
methods: {
handleSelectionChange(val){
this.$emit('selectionChange', val)
},
editFun(val) {
this.$emit('editFun', val)
},
deleteFun(val) {
this.$emit('deleteFun',val)
}
}
}
</script>
<style lang="scss" scoped>
.table_remove,.table_edit{
width:60px;
height:30px;
background:rgba(255,255,255,1);
border:2px solid rgba(228,228,228,1);
border-radius:15px;
position: relative;
display: inline-block;
margin-left:8px;
cursor: pointer;
}
.remove_img{
position: absolute;
top:0;
left:0;
bottom:0;
right:0;
margin:auto;
width:20px;
height: 20px;
background: url('../../../assets/images/icon_dell.png');
background-size:cover ;
}
.edit_img{
position: absolute;
top:0;
left:0;
bottom:0;
right:0;
margin:auto;
width:18px;
height:20px;
background: url('../../../assets/images/icon_pensoil.png');
background-size:cover ;
}
</style>
\ No newline at end of file
src/views/education/materialinventory.vue
View file @ 39498e6e
......@@ -2,68 +2,7 @@
<div class="box-container">
<div class="wrap">
<search-form :formList="[1]" :searchList="searchList" :formData="formData" @searchData="searchData" />
<el-table
border
height="675"
ref="multipleTable"
:data="tableData"
class="table-style"
tooltip-effect="dark"
style="width: 100%">
<!-- <el-table-column
type="selection"
width="60">
</el-table-column> -->
<el-table-column
label="序号"
:show-overflow-tooltip="true"
width="80"
prop="NO">
</el-table-column>
<el-table-column
label="线体编号"
:show-overflow-tooltip="true"
prop="xtid"
>
</el-table-column>
<el-table-column
prop="linname"
label="线体名称"
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column
label="物料编号"
:show-overflow-tooltip="true"
prop="wlid"
>
</el-table-column>
<el-table-column
label="物料名称"
:show-overflow-tooltip="true"
prop="wlname"
>
</el-table-column>
<el-table-column
label="物料描述"
:show-overflow-tooltip="true"
prop="wlDesc"
>
</el-table-column>
<el-table-column
label="单位"
:show-overflow-tooltip="true"
prop="Company"
>
</el-table-column>
<el-table-column
label="库存数量"
:show-overflow-tooltip="true"
prop="MHNuber"
>
</el-table-column>
</el-table>
<baseTable :tableHead="tableHead" :tableData="tableData" />
<Pagination ref="page" :totalCount="totalCount" :totalPage="totalPage" @pageFun="pageFun" />
</div>
......@@ -75,9 +14,10 @@
import searchForm from './component/searchForm'
import deletePop from './component/deletePop'
import Pagination from './component/Pagination'
import baseTable from './component/baseTable'
export default {
components: { searchForm, deletePop, Pagination },
components: { searchForm, deletePop, baseTable, Pagination },
data () {
return {
tableData: [],
......@@ -110,6 +50,40 @@ export default {
name: '物料描述'
}
],
tableHead: [
{
prop: 'NO',
label: '序号'
},
{
prop: 'xtid',
label: '线体编号'
},
{
prop: 'linname',
label: '线体名称'
},
{
prop: 'wlid',
label: '物料编号'
},
{
prop: 'wlname',
label: '物料名称'
},
{
prop: 'wlDesc',
label: '物料描述'
},
{
prop: 'Company',
label: '单位'
},
{
prop: 'MHNuber',
label: '库存数量'
},
],
deletetext: '',
deleteShow: false,
typeV: '',
......
src/views/education/schedulingStatistics.vue
View file @ 39498e6e
......@@ -2,91 +2,7 @@
<div class="box-container">
<div class="wrap">
<search-form :formList="[1,2]" :searchList="searchList" :formData="formData" @searchData="searchData" />
<el-table
border
height="675"
ref="multipleTable"
:data="tableData"
class="table-style"
tooltip-effect="dark"
style="width: 100%"
:row-class-name="tableRowClassName"
>
<el-table-column
label="序号"
:show-overflow-tooltip="true"
width="80"
prop="NO">
</el-table-column>
<el-table-column
label="生产计划编号"
:show-overflow-tooltip="true"
prop="PlanID"
width="180">
</el-table-column>
<el-table-column
prop="ProductID"
label="产品编号"
:show-overflow-tooltip="true"
width="180">
</el-table-column>
<el-table-column
label="产品名称"
:show-overflow-tooltip="true"
prop="ProductName"
width="180">
</el-table-column>
<el-table-column
label="产品描述"
:show-overflow-tooltip="true"
prop="Prodescribe"
width="180">
</el-table-column>
<el-table-column
label="单位"
:show-overflow-tooltip="true"
prop="Prounit"
width="180">
</el-table-column>
<el-table-column
label="计划交货日期"
:show-overflow-tooltip="true"
prop="DeliveryDt"
width="210">
</el-table-column>
<el-table-column
label="计划数量"
:show-overflow-tooltip="true"
prop="PlanQuantity"
width="140">
</el-table-column>
<el-table-column
label="排程数量"
:show-overflow-tooltip="true"
prop="ScheduleQuantity"
width="180">
</el-table-column>
<el-table-column
label="完工数量"
:show-overflow-tooltip="true"
prop="FinishQuantity"
width="180">
</el-table-column>
<el-table-column
label="实际完工日期"
:show-overflow-tooltip="true"
prop="EndDt"
width="180"
>
</el-table-column>
<el-table-column
label="生产计划状态"
:show-overflow-tooltip="true"
prop="TextStatus"
width="180">
</el-table-column>
</el-table>
<baseTable :tableHead="tableHead" :tableData="tableData" :rowClassName="tableRowClassName" />
<Pagination ref="page" :totalCount="totalCount" :totalPage="totalPage" @pageFun="pageFun" />
</div>
......@@ -98,9 +14,10 @@
import searchForm from './component/searchForm'
import deletePop from './component/deletePop'
import Pagination from './component/Pagination.vue'
import baseTable from './component/baseTable'
export default {
components: { searchForm, Pagination },
components: { searchForm, baseTable, Pagination },
data () {
return {
tableData: [],
......@@ -142,6 +59,68 @@ export default {
name: '生产计划状态'
},
],
tableHead: [
{
prop: 'NO',
label: '序号',
width: 80,
},
{
prop: 'PlanID',
label: '生产计划编号',
width: 180,
},
{
prop: 'ProductID',
label: '产品编号',
width: 180,
},
{
prop: 'ProductName',
label: '产品名称',
width: 180,
},
{
prop: 'Prodescribe',
label: '产品描述',
width: 180,
},
{
prop: 'Prounit',
label: '单位',
width: 180,
},
{
prop: 'DeliveryDt',
label: '计划交货日期',
width: 210
},
{
prop: 'PlanQuantity',
label: '计划数量',
width: 140,
},
{
prop: 'ScheduleQuantity',
label: '排程数量',
width: 180,
},
{
prop: 'FinishQuantity',
label: '完工数量',
width: 180,
},
{
prop: 'EndDt',
label: '实际完工日期',
width: 180,
},
{
prop: 'TextStatus',
label: '生产计划状态',
width: 180,
},
],
deletetext: '',
deleteShow: false,
typeV: '',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment