Browse Source

0907更新:页面调整

master
ruanqi 4 years ago
parent
commit
fbe1a12325
  1. 4
      config/index.js
  2. 2
      src/api/production.js
  3. 98
      src/views/modules/board/nextWeekShipmentBoard.vue
  4. 102
      src/views/modules/board/productionBlankingBoard.vue
  5. 94
      src/views/modules/board/thisWeekShipmentBoard.vue
  6. 19
      src/views/modules/production/dailyPlan.vue
  7. 203
      src/views/modules/production/productionBlankingSearch.vue
  8. 2
      static/config/index.js

4
config/index.js

@ -13,7 +13,7 @@ module.exports = {
// 代理列表, 是否开启代理通过[./dev.env.js]配置
proxyTable: devEnv.OPEN_PROXY === false ? {} : {
'/proxyApi': {
target: 'http://192.168.1.130:9090',
target: 'http://192.168.0.193:9090',
changeOrigin: true,
pathRewrite: {
// 把 /proxyApi 替换成 /
@ -23,7 +23,7 @@ module.exports = {
},
// Various Dev Server settings
host: '192.168.1.130', // can be overwritten by process.env.HOST
host: '192.168.0.193', // can be overwritten by process.env.HOST
port: 8002, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: true,
errorOverlay: true,

2
src/api/production.js

@ -26,7 +26,7 @@ export const getDailyPlanData=data => createAPI(`dailyPlan/getDailyPlanData`, 'p
export const dailyPlanReportSave=data => createAPI(`dailyPlan/dailyPlanReportSave`, 'post', data);
export const productionBlankingSearch=data => createAPI(`dailyPlan/productionBlankingSearch`, 'post', data);

98
src/views/modules/board/nextWeekShipmentBoard.vue

@ -26,7 +26,7 @@
prop="partSpec"
header-align="center"
align="left"
min-width="120"
min-width="100"
label="产品型号">
</el-table-column>
<el-table-column
@ -76,20 +76,27 @@
header-align="center"
align="left"
min-width="70"
label="工艺备注-烘烤">
label="工艺备注-水煮">
</el-table-column>
<el-table-column
prop="operationHk"
header-align="center"
align="left"
min-width="70"
label="工艺备注-水煮">
label="工艺备注-烘烤">
</el-table-column>
<el-table-column
prop="abbreviateName"
header-align="center"
align="left"
min-width="45"
label="客户简称">
</el-table-column>
<el-table-column
prop="remark"
header-align="center"
align="left"
min-width="120"
min-width="95"
label="备注">
</el-table-column>
</el-table>
@ -109,12 +116,14 @@
name: 'nextWeekShipmentBoardData',
data () {
return {
pageIndex: 1,
totalPage: 1,
height: 200,
tableData: [],
//
refreshTime: 5,
rollTime: 5,
rollPx: 1,
// refreshTime: 5,
// rollTime: 5,
// rollPx: 1,
}
},
mounted () {
@ -133,48 +142,55 @@
return ''
},
search () {
nextWeekShipmentBoardData().then(({data}) => {
this.tableData = data.rows
let inData= {number:this.pageIndex};
nextWeekShipmentBoardData(inData).then(({data}) => {
this.tableData = data.rows;
this.totalPage= data.maxPage;
if(this.pageIndex+1>data.maxPage){
this.pageIndex=1
}else {
this.pageIndex=this.pageIndex+1
}
})
},
//
mouseEnter (time) {
//
this.autoRoll(true)
},
// mouseEnter (time) {
// //
// this.autoRoll(true)
// },
//
mouseLeave () {
//
this.autoRoll()
},
// mouseLeave () {
// //
// this.autoRoll()
// },
//
autoRoll (stop) {
if (stop) {
clearInterval(rolltimer)
return
}
// DOM
const table = this.$refs.wt_table
// div
const divData = table.bodyWrapper
//
rolltimer = setInterval(() => {
//
divData.scrollTop = this.decimalUtil.add(Number(divData.scrollTop), Number(this.rollPx))
// (+=)
if (divData.clientHeight + divData.scrollTop +1>= divData.scrollHeight) {
// table
divData.scrollTop = 0
}
}, this.rollTime * 10)
},
// autoRoll (stop) {
// if (stop) {
// clearInterval(rolltimer)
// return
// }
//
// // DOM
// const table = this.$refs.wt_table
// // div
// const divData = table.bodyWrapper
// //
// rolltimer = setInterval(() => {
// //
// divData.scrollTop = this.decimalUtil.add(Number(divData.scrollTop), Number(this.rollPx))
// // (+=)
// if (divData.clientHeight + divData.scrollTop +1>= divData.scrollHeight) {
// // table
//
// divData.scrollTop = 0
//
// }
// }, this.rollTime * 10)
// },
refreshTable () {
refresher = setInterval(() => {
this.search()
}, 600000)
}, 30000)
}
},
created () {

102
src/views/modules/board/productionBlankingBoard.vue

@ -4,13 +4,13 @@
<h1>生产打料看板</h1>
</div>
<div class="board2">
<!-- @mouseenter.native="mouseEnter"-->
<!-- @mouseleave.native="mouseLeave"-->
<el-table
cell-style="cc"
:height="height"
:data="tableData"
ref="wt_table"
@mouseenter.native="mouseEnter"
@mouseleave.native="mouseLeave"
border
:row-class-name="tableRowClassName"
style="width: 100%;">
@ -18,7 +18,7 @@
prop="orderNo"
header-align="center"
align="left"
min-width="50"
min-width="65"
style="font-size: 20px"
label="硫化订单号">
</el-table-column>
@ -40,13 +40,13 @@
prop="qtyRequired"
header-align="center"
align="right"
min-width="50"
label="计划需求量">
min-width="45"
label="混炼胶用量">
</el-table-column>
<el-table-column
prop="sjph1"
header-align="center"
align="left"
align="center"
min-width="50"
label="生胶牌号1">
</el-table-column>
@ -54,13 +54,13 @@
prop="sjphQtyReq1"
header-align="center"
align="right"
min-width="50"
min-width="45"
label="生胶1用量">
</el-table-column>
<el-table-column
prop="sjph2"
header-align="center"
align="left"
align="center"
min-width="50"
label="生胶牌号2">
</el-table-column>
@ -68,13 +68,13 @@
prop="sjphQtyReq2"
header-align="center"
align="right"
min-width="50"
min-width="45"
label="生胶2用量">
</el-table-column>
<el-table-column
prop="planStartDate"
header-align="center"
align="left"
align="center"
min-width="45"
label="需求日期">
</el-table-column>
@ -95,19 +95,21 @@
name: 'productionBlankingBoard',
data () {
return {
pageIndex: 1,
totalPage: 1,
height: 200,
tableData: [],
//
refreshTime: 5,
rollTime: 5,
rollPx: 1,
// refreshTime: 5,
// rollTime: 5,
// rollPx: 1,
}
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight - 80
})
this.autoRoll()
// this.autoRoll()
},
methods: {
tableRowClassName ({row, rowIndex}) {
@ -131,45 +133,52 @@
// return ''
},
search () {
productionBlankingBoard().then(({data}) => {
this.tableData = data.rows
let inData= {number:this.pageIndex};
productionBlankingBoard(inData).then(({data}) => {
this.tableData = data.rows;
this.totalPage= data.maxPage;
if(this.pageIndex+1>data.maxPage){
this.pageIndex=1
}else {
this.pageIndex=this.pageIndex+1
}
})
},
//
mouseEnter (time) {
//
this.autoRoll(true)
},
// mouseEnter (time) {
// //
// this.autoRoll(true)
// },
//
mouseLeave () {
//
this.autoRoll()
},
// mouseLeave () {
// //
// this.autoRoll()
// },
//
autoRoll (stop) {
if (stop) {
clearInterval(rolltimer)
return
}
// DOM
const table = this.$refs.wt_table
// div
const divData = table.bodyWrapper
//
rolltimer = setInterval(() => {
//
divData.scrollTop = this.decimalUtil.add(Number(divData.scrollTop), Number(this.rollPx))
// (+=)
if (divData.clientHeight + divData.scrollTop +1>= divData.scrollHeight) {
// table
divData.scrollTop = 0
}
}, this.rollTime * 10)
},
// autoRoll (stop) {
// if (stop) {
// clearInterval(rolltimer)
// return
// }
// // DOM
// const table = this.$refs.wt_table
// // div
// const divData = table.bodyWrapper
// //
// rolltimer = setInterval(() => {
// //
// divData.scrollTop = this.decimalUtil.add(Number(divData.scrollTop), Number(this.rollPx))
// // (+=)
// if (divData.clientHeight + divData.scrollTop +1>= divData.scrollHeight) {
// // table
// divData.scrollTop = 0
// }
// }, this.rollTime * 10)
// },
refreshTable () {
refresher = setInterval(() => {
this.search()
}, 600000)
}, 30000)
}
},
created () {
@ -191,7 +200,8 @@
background: #1bb61b;
}
.board2 .el-table .false-row {
background: #cbcb14;
/*background: #cbcb14;*/
background: #db1212;
}
</style>

94
src/views/modules/board/thisWeekShipmentBoard.vue

@ -26,7 +26,7 @@
prop="partSpec"
header-align="center"
align="left"
min-width="120"
min-width="100"
label="产品型号">
</el-table-column>
<el-table-column
@ -85,11 +85,18 @@
min-width="70"
label="工艺备注-烘烤">
</el-table-column>
<el-table-column
prop="abbreviateName"
header-align="center"
align="left"
min-width="45"
label="客户简称">
</el-table-column>
<el-table-column
prop="remark"
header-align="center"
align="left"
min-width="120"
min-width="95"
label="备注">
</el-table-column>
</el-table>
@ -110,12 +117,14 @@
name: 'thisWeekShipmentBoard',
data () {
return {
pageIndex: 1,
totalPage: 1,
height: 200,
tableData: [],
//
refreshTime: 5,
rollTime: 5,
rollPx: 1,
// refreshTime: 5,
// rollTime: 5,
// rollPx: 1,
}
},
mounted () {
@ -123,7 +132,7 @@
this.$nextTick(() => {
this.height = window.innerHeight - 80
})
this.autoRoll()
// this.autoRoll()
},
methods: {
tableRowClassName ({row, rowIndex}) {
@ -136,47 +145,54 @@
return ''
},
search () {
thisWeekShipmentBoardData().then(({data}) => {
this.tableData = data.rows
let inData= {number:this.pageIndex};
thisWeekShipmentBoardData(inData).then(({data}) => {
this.tableData = data.rows;
this.totalPage= data.maxPage;
if(this.pageIndex+1>data.maxPage){
this.pageIndex=1
}else {
this.pageIndex=this.pageIndex+1
}
})
},
//
mouseEnter (time) {
//
this.autoRoll(true)
},
// mouseEnter (time) {
// //
// this.autoRoll(true)
// },
//
mouseLeave () {
//
this.autoRoll()
},
// mouseLeave () {
// //
// this.autoRoll()
// },
//
autoRoll (stop) {
if (stop) {
clearInterval(rolltimer)
return
}
// DOM
const table = this.$refs.wa_table
// div
const divData = table.bodyWrapper
//
rolltimer = setInterval(() => {
//
divData.scrollTop = this.decimalUtil.add(Number(divData.scrollTop), Number(this.rollPx))
// (+=)
if (divData.clientHeight + divData.scrollTop+1 >= divData.scrollHeight) {
// table
divData.scrollTop = 0
}
}, this.rollTime * 10)
},
// autoRoll (stop) {
// if (stop) {
// clearInterval(rolltimer)
// return
// }
//
// // DOM
// const table = this.$refs.wa_table
// // div
// const divData = table.bodyWrapper
// //
// rolltimer = setInterval(() => {
// //
// divData.scrollTop = this.decimalUtil.add(Number(divData.scrollTop), Number(this.rollPx))
// // (+=)
// if (divData.clientHeight + divData.scrollTop+1 >= divData.scrollHeight) {
// // table
// divData.scrollTop = 0
//
// }
// }, this.rollTime * 10)
// },
refreshTable () {
refresher = setInterval(() => {
this.search()
}, 600000)
}, 30000)
}
},

19
src/views/modules/production/dailyPlan.vue

@ -81,6 +81,13 @@
<el-form-item :label="'物料编码:'">
<el-input v-model="searchData.partNo" style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'排产情况:'">
<el-select filterable v-model="searchData.planStatus" style="width: 120px">
<el-option label="全部" value=""></el-option>
<el-option label="未排产完" value="a.LotSize >ISNULL(so.scheduling_size,0)"></el-option>
<el-option label="已排产完" value="ISNULL(so.scheduling_size,0) >=a.LotSize"></el-option>
</el-select>
</el-form-item>
<el-form-item style="margin-top: 30px">
<el-button @click="search()" style="margin-left: 24px" type="primary">查询</el-button>
</el-form-item>
@ -225,7 +232,7 @@
<el-table-column
prop="enterDate"
header-align="center"
align="left"
align="center"
min-width="90"
label="录入日期">
</el-table-column>
@ -372,7 +379,8 @@
partNo: '',
startDate3: '',
endDate3: '',
site: this.$store.state.user.site
site: this.$store.state.user.site,
planStatus: 'ISNULL(so.scheduling_size,0) >=a.LotSize'
},
// table
height: 200
@ -541,7 +549,12 @@
})
return false
}
this.scheduledingsData.orderQty=this.scheduledingsData.qty/this.scheduledingsData.dayQty;
let num=this.scheduledingsData.qty/this.scheduledingsData.dayQty;
if(Math.round(num)==num){
this.scheduledingsData.orderQty=num;
}else{
this.scheduledingsData.orderQty=num.toFixed(1);
}
let scheduledList=[];
let theOrderDate= this.getLastDay(this.scheduledingsData.orderDate)
for (let i = 0; i < this.scheduledingsData.dayQty; i++) {

203
src/views/modules/production/productionBlankingSearch.vue

@ -0,0 +1,203 @@
<template>
<div class="mod-config">
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -20px;">
<el-form-item :label="'硫化订单号:'">
<el-input v-model="searchData.orderNo" style="width: 120px"></el-input>
</el-form-item>
<el-form-item :label="'硫化产品名称:'">
<el-input v-model="searchData.partDescSpec" style="width: 120px"></el-input>
</el-form-item>
<el-button @click="search()" style="margin-left: 0px;margin-top: 33px" type="primary">查询</el-button>
<el-button @click="getSum()" style="margin-left: 0px;margin-top: 33px" type="primary">计算选中订单合计</el-button>
</el-form>
<div class="search1">
<el-table
cell-style="cc"
:height="height"
:data="tableData"
ref="wt_table"
@selection-change="selectionChangeHandle"
border
:row-class-name="tableRowClassName"
style="width: 100%;">
<el-table-column
type="selection"
align="center"
width="30">
</el-table-column>
<el-table-column
prop="orderNo"
header-align="center"
align="left"
min-width="65"
label="硫化订单号">
</el-table-column>
<el-table-column
prop="partDescSpec"
header-align="center"
align="left"
min-width="120"
label="硫化产品名称">
</el-table-column>
<el-table-column
prop="compPartDescSpec"
header-align="center"
align="left"
min-width="120"
label="混炼胶名称">
</el-table-column>
<el-table-column
prop="qtyRequired"
header-align="center"
align="right"
min-width="45"
label="混炼胶用量">
</el-table-column>
<el-table-column
prop="sjph1"
header-align="center"
align="center"
min-width="50"
label="生胶牌号1">
</el-table-column>
<el-table-column
prop="sjphQtyReq1"
header-align="center"
align="right"
min-width="45"
label="生胶1用量">
</el-table-column>
<el-table-column
prop="sjph2"
header-align="center"
align="center"
min-width="50"
label="生胶牌号2">
</el-table-column>
<el-table-column
prop="sjphQtyReq2"
header-align="center"
align="right"
min-width="45"
label="生胶2用量">
</el-table-column>
<el-table-column
prop="planStartDate"
header-align="center"
align="center"
min-width="45"
label="需求日期">
</el-table-column>
</el-table>
</div>
<el-dialog title="合计" :close-on-click-modal="false" v-drag :visible.sync="sumFlag" width="341px">
<el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
<el-form-item :label="'混炼胶用量:'">
<el-input v-model="qty1" readonly style="width: 130px"></el-input>
</el-form-item>
<el-form-item :label="'生胶1用量:'">
<el-input v-model="qty2" readonly style="width: 130px" ></el-input>
</el-form-item>
<el-form-item :label="'生胶2用量:'">
<el-input v-model="qty3" readonly style="width: 130px" ></el-input>
</el-form-item>
</el-form>
<el-footer style="height:40px;margin-top: 20px;text-align:center">
<el-button type="primary" @click="sumFlag = false">关闭</el-button>
</el-footer>
</el-dialog>
</div>
</template>
<script>
import {
productionBlankingSearch,
} from '@/api/production.js'
export default {
name: 'productionBlankingSearch',
data () {
return {
sumFlag:false,
pageIndex: 1,
totalPage: 1,
height: 200,
tableData: [],
searchData:{
orderNo:'',
partDescSpec:''
},
dataListSelections: [],
qty1:0,
qty2:0,
qty3:0,
}
},
mounted () {
this.$nextTick(() => {
this.height = window.innerHeight - 210
})
// this.autoRoll()
},
methods: {
//
selectionChangeHandle (val) {
this.dataListSelections = val
},
tableRowClassName ({row, rowIndex}) {
if (row.finishedFlag == '2') {
return 'success-row'
}
if (row.finishedFlag == '3') {
return 'false-row'
}
return ''
},
search () {
productionBlankingSearch(this.searchData).then(({data}) => {
this.tableData = data.rows;
})
},
getSum(){
this.qty1=0;
this.qty2=0;
this.qty3=0;
if(this.dataListSelections.length==0){
this.$alert('未勾选订单!', '错误', {
confirmButtonText: '确定'
})
return false
}
let dataList=this.dataListSelections;
for (let i = 0; i <dataList.length ; i++) {
if(dataList[i].qtyRequired!=null){
let num1=this.qty1+dataList[i].qtyRequired;
this.qty1=num1;
}
if(dataList[i].sjphQtyReq1!=null){
let num2=this.qty2+dataList[i].sjphQtyReq1;
this.qty2=num2;
}
if(dataList[i].sjphQtyReq2!=null){
let num3=this.qty3+dataList[i].sjphQtyReq2;
this.qty3=num3;
}
}
this.qty1=Number(this.qty1).toFixed(2);
this.qty2=Number(this.qty2).toFixed(2);
this.qty3=Number(this.qty3).toFixed(2);
this.sumFlag=true;
}
}
}
</script>
<style >
.search1 .el-table .success-row {
background: #1bb61b;
}
.search1 .el-table .false-row {
/*background: #cbcb14;*/
background: #db1212;
}
</style>

2
static/config/index.js

@ -5,7 +5,7 @@
window.SITE_CONFIG = {};
// api接口请求地址
window.SITE_CONFIG['baseUrl'] = 'http://192.168.1.130:9090/';
window.SITE_CONFIG['baseUrl'] = 'http://192.168.0.193:9090/';
// cdn地址 = 域名 + 版本号
window.SITE_CONFIG['domain'] = './'; // 域名

Loading…
Cancel
Save