diff --git a/config/index.js b/config/index.js index 2984559..7b85bdb 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.1.110: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.1.110', // 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/App.vue b/src/App.vue index e2dae7c..17d7203 100644 --- a/src/App.vue +++ b/src/App.vue @@ -5,7 +5,7 @@ diff --git a/src/views/modules/board/thisWeekShipmentBoard.vue b/src/views/modules/board/thisWeekShipmentBoard.vue index 0ba61a6..cb546d7 100644 --- a/src/views/modules/board/thisWeekShipmentBoard.vue +++ b/src/views/modules/board/thisWeekShipmentBoard.vue @@ -3,7 +3,7 @@

本周发货看板

-
+
@@ -26,64 +26,71 @@ prop="partSpec" header-align="center" align="left" - min-width="160" + min-width="120" label="产品型号"> + + + + + + + + align="left" + min-width="60" + label="工艺备注-水煮"> + min-width="120" + label="备注">
@@ -120,9 +127,12 @@ }, methods: { tableRowClassName ({row, rowIndex}) { - if (row.finishedFlag != 'N') { + if (row.finishedFlag == '2') { return 'success-row' } + if (row.finishedFlag == '3') { + return 'false-row' + } return '' }, search () { @@ -156,8 +166,6 @@ // 元素自增距离顶部像素 divData.scrollTop = this.decimalUtil.add(Number(divData.scrollTop), Number(this.rollPx)) // 判断元素是否滚动到底部(可视高度+距离顶部=整个高度) - console.log(divData.scrollTop+Number(divData.clientHeight) ) - console.log(divData.scrollHeight) if (divData.clientHeight + divData.scrollTop+1 >= divData.scrollHeight) { // 重置table距离顶部距离 divData.scrollTop = 0 @@ -182,14 +190,16 @@ diff --git a/src/views/modules/pad/padPart1.vue b/src/views/modules/pad/padPart1.vue index 13bd0b5..76688ea 100644 --- a/src/views/modules/pad/padPart1.vue +++ b/src/views/modules/pad/padPart1.vue @@ -42,7 +42,7 @@ label="产品名称"> + @@ -235,7 +236,7 @@ label="操作"> @@ -467,7 +468,14 @@ savePlan(this.scheduledingData).then(({data}) => { if (data && data.code === 0) { - + this.scheduledModelData.schedulingSize = data.schedulingSize; + this.scheduledModelData.unSchedulingSize = this.scheduledingData.lotSize - data.schedulingSize; + let data1 = {orderNo: this.scheduledModelData.orderNo} + getWorkPlanData(data1).then(({data}) => { + this.scheduleTableData = data.rows + }) + this.getData(); + this.scheduledingData.orderDate=this.getNextDay(this.scheduledingData.orderDate); this.$message({ message: '操作成功', type: 'success', @@ -503,10 +511,11 @@ orderQty: row.orderQty, orderRef1: row.orderRef1 } - this.$confirm(`是否删除此条记录?`, '提示', { + this.$confirm(`是否取消此条日计划?`, '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' + }).then(() => { delPlan(delData).then(({data}) => { if (data && data.code === 0) { @@ -533,7 +542,15 @@ }).catch(() => { }) }, - + getNextDay(dateTime){ + var dd =new Date(dateTime); + dd.setDate(dd.getDate()+1);//获取1天后的日期 + var y = dd.getFullYear(); + var m = (dd.getMonth()+1)<10?"0"+(dd.getMonth()+1):(dd.getMonth()+1);//获取当前月份的日期，不足10补0 + var d = dd.getDate()<10?"0"+dd.getDate():dd.getDate();//获取当前几号，不足10补0 + // let haha= new Date(y+"-"+m+"-"+d); + return y+"-"+m+"-"+d; + }, getTime (date) { if (date == '') { return '' diff --git a/src/views/modules/production/searchDailyPlan.vue b/src/views/modules/production/searchDailyPlan.vue index 7fd6144..f9ebfa8 100644 --- a/src/views/modules/production/searchDailyPlan.vue +++ b/src/views/modules/production/searchDailyPlan.vue @@ -32,6 +32,21 @@ 查询 + + {{'导出'}} +