Browse Source

重新提交

master
wenkuan.shi 2 years ago
parent
commit
5a59e38db1
  1. 52
      src/views/modules/material/seekByNum.vue
  2. 126
      src/views/modules/material/seekByTrans.vue

52
src/views/modules/material/seekByNum.vue

@ -75,32 +75,32 @@
</el-table>
<el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">
<el-tab-pane label="卷明细" name="detail">
<el-table
:data="dataList2"
:height="height"
border
style="width: 100%; ">
<el-table-column
v-for="(item,index) in columnList2" :key="index"
:sortable="item.columnSortable"
:prop="item.columnProp"
:header-align="item.headerAlign"
:show-overflow-tooltip="item.showOverflowTooltip"
:align="item.align"
:fixed="item.fixed==''?false:item.fixed"
:min-width="item.columnWidth"
:label="item.columnLabel">
<template slot-scope="scope">
<span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
style="width: 100px; height: 80px"/></span>
</template>
</el-table-column>
</el-table>
</el-tab-pane>
</el-tabs>
<!-- <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">-->
<!-- <el-tab-pane label="卷明细" name="detail">-->
<!-- <el-table-->
<!-- :data="dataList2"-->
<!-- :height="height"-->
<!-- border-->
<!-- style="width: 100%; ">-->
<!-- <el-table-column-->
<!-- v-for="(item,index) in columnList2" :key="index"-->
<!-- :sortable="item.columnSortable"-->
<!-- :prop="item.columnProp"-->
<!-- :header-align="item.headerAlign"-->
<!-- :show-overflow-tooltip="item.showOverflowTooltip"-->
<!-- :align="item.align"-->
<!-- :fixed="item.fixed==''?false:item.fixed"-->
<!-- :min-width="item.columnWidth"-->
<!-- :label="item.columnLabel">-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>-->
<!-- <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"-->
<!-- style="width: 100px; height: 80px"/></span>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
<!-- </el-tab-pane>-->
<!-- </el-tabs>-->

126
src/views/modules/material/seekByTrans.vue

@ -75,7 +75,7 @@
</el-table>
<!-- <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="activeName" type="border-card" @tab-click="tabClick">-->
<!-- <el-tabs style="font-size: 12px;min-height: 200px" class="customer-tab" v-model="searchData2" type="border-card" @tab-click="tabClick">-->
<!-- <el-tab-pane label="卷明细" name="detail">-->
<!-- <el-table-->
<!-- :data="dataList2"-->
@ -146,6 +146,14 @@ export default {
id:'',
site: '',
},
searchData2: {
transNo:'',
rollNo:'',
sum:'',
manufactureDate:'',
userName:'',
enterDate:''
},
// end
searchData: {
transNo:'',
@ -499,26 +507,98 @@ export default {
fixed: '',
},
],
// columnList2:[
// {
// userId: this.$store.state.user.name,
// functionId: 200003,
// serialNumber: '200003TableTransType',
// tableId: "200003Table",
// tableName: "",
// columnWidth: 100,
// columnProp: 'transType',
// headerAlign: 'center',
// align: "center",
// columnLabel: '',
// columnHidden: false,
// columnImage: false,
// columnSortable: false,
// sortLv: 0,
// status: true,
// fixed: '',
// },
// ],
columnList2:[
{
userId: this.$store.state.user.name,
functionId: 200003,
serialNumber: '200003TableTransNo',
tableId: "200003Table",
tableName: "出入库单号",
columnWidth: 200,
columnProp: 'transNo',
headerAlign: 'center',
align: "center",
columnLabel: '出入库单号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 200003,
serialNumber: '200003TableRollNo',
tableId: "200003Table",
tableName: "卷号",
columnWidth: 200,
columnProp: 'rollNo',
headerAlign: 'center',
align: "center",
columnLabel: '卷号',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 200003,
serialNumber: '200003TableNum',
tableId: "200003Table",
tableName: "数量",
columnWidth: 200,
columnProp: 'num',
headerAlign: 'center',
align: "center",
columnLabel: '数量',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 200003,
serialNumber: '200003TableManufactureDate',
tableId: "200003Table",
tableName: "生产日期",
columnWidth: 200,
columnProp: 'manufactureDate',
headerAlign: 'center',
align: "center",
columnLabel: '生产日期',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
{
userId: this.$store.state.user.name,
functionId: 200003,
serialNumber: '200003TableEnterDate',
tableId: "200003Table",
tableName: "录入时间",
columnWidth: 200,
columnProp: 'enterDate',
headerAlign: 'center',
align: "center",
columnLabel: '录入时间',
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: '',
},
],
rules: {
warehouseId:[
{
@ -586,6 +666,10 @@ export default {
})
},
tabClick (tab, event) {
//
this.refreshCurrentTabTable()
},
changeData(row){
this.currentRow = JSON.parse(JSON.stringify(row));
this.headerData=row;

Loading…
Cancel
Save