diff --git a/config/index.js b/config/index.js index 2984559..ba0f313 100644 --- a/config/index.js +++ b/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, diff --git a/src/api/production.js b/src/api/production.js index 67dbf5e..6ce490d 100644 --- a/src/api/production.js +++ b/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); diff --git a/src/views/modules/board/nextWeekShipmentBoard.vue b/src/views/modules/board/nextWeekShipmentBoard.vue index 8045b27..2ceae21 100644 --- a/src/views/modules/board/nextWeekShipmentBoard.vue +++ b/src/views/modules/board/nextWeekShipmentBoard.vue @@ -26,7 +26,7 @@ prop="partSpec" header-align="center" align="left" - min-width="120" + min-width="100" label="产品型号"> + label="工艺备注-水煮"> + label="工艺备注-烘烤"> + + @@ -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 () { diff --git a/src/views/modules/board/productionBlankingBoard.vue b/src/views/modules/board/productionBlankingBoard.vue index 8f6bd44..c728ced 100644 --- a/src/views/modules/board/productionBlankingBoard.vue +++ b/src/views/modules/board/productionBlankingBoard.vue @@ -4,13 +4,13 @@

生产打料看板

+ + @@ -18,7 +18,7 @@ prop="orderNo" header-align="center" align="left" - min-width="50" + min-width="65" style="font-size: 20px" label="硫化订单号"> @@ -40,13 +40,13 @@ prop="qtyRequired" header-align="center" align="right" - min-width="50" - label="计划需求量"> + min-width="45" + label="混炼胶用量"> @@ -54,13 +54,13 @@ prop="sjphQtyReq1" header-align="center" align="right" - min-width="50" + min-width="45" label="生胶1用量"> @@ -68,13 +68,13 @@ prop="sjphQtyReq2" header-align="center" align="right" - min-width="50" + min-width="45" label="生胶2用量"> @@ -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; } diff --git a/src/views/modules/board/thisWeekShipmentBoard.vue b/src/views/modules/board/thisWeekShipmentBoard.vue index 1317486..bf876b2 100644 --- a/src/views/modules/board/thisWeekShipmentBoard.vue +++ b/src/views/modules/board/thisWeekShipmentBoard.vue @@ -26,7 +26,7 @@ prop="partSpec" header-align="center" align="left" - min-width="120" + min-width="100" label="产品型号"> + + @@ -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) } }, diff --git a/src/views/modules/production/dailyPlan.vue b/src/views/modules/production/dailyPlan.vue index 2077178..bdbe70d 100644 --- a/src/views/modules/production/dailyPlan.vue +++ b/src/views/modules/production/dailyPlan.vue @@ -81,6 +81,13 @@ + + + + + + + 查询 @@ -225,7 +232,7 @@ @@ -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++) { diff --git a/src/views/modules/production/productionBlankingSearch.vue b/src/views/modules/production/productionBlankingSearch.vue new file mode 100644 index 0000000..897d135 --- /dev/null +++ b/src/views/modules/production/productionBlankingSearch.vue @@ -0,0 +1,203 @@ + + + + + diff --git a/static/config/index.js b/static/config/index.js index 6357957..3874b47 100644 --- a/static/config/index.js +++ b/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'] = './'; // 域名