wilson
/
ha-mes-vue
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

0904

master
ruanqi 5 years ago
parent
6d8673d2d3
commit
ee3bfbe7ea
11 changed files with 224 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      config/index.js
  2. 12
      src/App.vue
  3. 12
      src/assets/scss/rq.scss
  4. 47
      src/views/modules/board/nextWeekShipmentBoard.vue
  5. 68
      src/views/modules/board/productionBlankingBoard.vue
  6. 58
      src/views/modules/board/thisWeekShipmentBoard.vue
  7. 2
      src/views/modules/pad/padPart1.vue
  8. 12
      src/views/modules/pad/padPartPhoto.vue
  9. 25
      src/views/modules/production/dailyPlan.vue
  10. 58
      src/views/modules/production/searchDailyPlan.vue
  11. 2
      static/config/index.js

4
config/index.js
View File

@ -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,

12
src/App.vue
View File

@ -5,7 +5,7 @@
</template>
<script>
// import {searchSysLanguagePack} from "./api/sysLanguage.js"
import {searchSysLanguagePack} from "./api/sysLanguage.js"
export default {
data() {
@ -14,15 +14,15 @@
}
},
created() {
// this.test();
this.test();
// this.languageRefresh()
},
methods: {
test() {
// searchSysLanguagePack().then(({data}) => {
// this.$i18n.mergeLocaleMessage('en', data.data.en)
// this.$i18n.mergeLocaleMessage('cn', data.data.cn)
// })
searchSysLanguagePack().then(({data}) => {
this.$i18n.mergeLocaleMessage('en', data.data.en)
this.$i18n.mergeLocaleMessage('cn', data.data.cn)
})
}
}
}

12
src/assets/scss/rq.scss
View File

@ -43,3 +43,15 @@
.pad .el-select-dropdown__item{
font-size: 18px;
}
//.board .el-table .cell {
// line-height: 22px;
// font-size: 18px;
// height: 22px;
//}
//
//.board .el-table .success-row {
// background: #1bb61b;
//}
//.board .el-table .false-row {
// background: #db1212;
//}

47
src/views/modules/board/nextWeekShipmentBoard.vue
View File

@ -18,7 +18,7 @@
prop="planShipDate"
header-align="center"
align="left"
min-width="60"
min-width="45"
style="font-size: 20px"
label="发货日期">
</el-table-column>
@ -26,65 +26,72 @@
prop="partSpec"
header-align="center"
align="left"
min-width="160"
min-width="120"
label="产品型号">
</el-table-column>
<el-table-column
prop="notifyQty"
header-align="center"
align="right"
min-width="50"
min-width="45"
label="需求总数">
</el-table-column>
<el-table-column
prop="qtyPerBox"
header-align="center"
align="right"
min-width="50"
min-width="45"
label="袋装数量">
</el-table-column>
<el-table-column
prop="weightperBag"
header-align="center"
align="right"
min-width="50"
min-width="45"
label="袋装重量">
</el-table-column>
<el-table-column
prop="bagsperBox"
header-align="center"
align="right"
min-width="50"
min-width="45"
label="每箱袋数">
</el-table-column>
<el-table-column
prop="boxType"
header-align="center"
align="right"
min-width="50"
min-width="45"
label="纸箱规格">
</el-table-column>
<el-table-column
prop="weightperBox"
header-align="center"
align="right"
min-width="50"
label="每箱总重">
</el-table-column>
<!-- <el-table-column-->
<!-- prop="weightperBox"-->
<!-- header-align="center"-->
<!-- align="right"-->
<!-- min-width="50"-->
<!-- label="每箱总重">-->
<!-- </el-table-column>-->
<el-table-column
prop="operationSz"
header-align="center"
align="left"
min-width="100"
min-width="60"
label="工艺备注-烘烤">
</el-table-column>
<el-table-column
prop="operationHk"
header-align="center"
align="left"
min-width="100"
min-width="60"
label="工艺备注-水煮">
</el-table-column>
<el-table-column
prop="remark"
header-align="center"
align="left"
min-width="120"
label="备注">
</el-table-column>
</el-table>
</div>
@ -117,9 +124,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 () {
@ -184,5 +194,8 @@
.board .el-table .success-row {
background: #1bb61b;
}
.board .el-table .false-row {
background: #db1212;
}
</style>

68
src/views/modules/board/productionBlankingBoard.vue
View File

@ -3,7 +3,7 @@
<div style="text-align: center">
<h1>生产打料看板</h1>
</div>
<div class="board">
<div class="board2">
<el-table
cell-style="cc"
:height="height"
@ -26,36 +26,57 @@
prop="partDescSpec"
header-align="center"
align="left"
min-width="160"
min-width="120"
label="硫化产品名称">
</el-table-column>
<el-table-column
prop="compPartDescSpec"
header-align="center"
align="left"
min-width="160"
min-width="120"
label="混炼胶名称">
</el-table-column>
<el-table-column
prop="sjph"
prop="qtyRequired"
header-align="center"
align="right"
min-width="50"
label="混炼胶用量">
</el-table-column>
<el-table-column
prop="sjph1"
header-align="center"
align="left"
min-width="50"
label="生胶排号">
label="生胶牌号1">
</el-table-column>
<el-table-column
prop="qtyRequired"
prop="sjphQtyReq1"
header-align="center"
align="right"
align="left"
min-width="50"
label="班需求数量">
label="生胶1用量">
</el-table-column>
<el-table-column
prop="planStartDate"
prop="sjph2"
header-align="center"
align="right"
align="left"
min-width="50"
label="生胶牌号2">
</el-table-column>
<el-table-column
prop="sjphQtyReq2"
header-align="center"
align="left"
min-width="50"
label="排产日期">
label="生胶2用量">
</el-table-column>
<el-table-column
prop="planStartDate"
header-align="center"
align="left"
min-width="45"
label="需求日期">
</el-table-column>
</el-table>
</div>
@ -86,13 +107,28 @@
this.$nextTick(() => {
this.height = window.innerHeight - 80
})
this.autoRoll()
},
methods: {
tableRowClassName ({row, rowIndex}) {
if (row.finishedFlag != 'N') {
if (row.finishedFlag == '2') {
return 'success-row'
}
if (row.finishedFlag == '3') {
return 'false-row'
}
return ''
// if (row.finishedFlag == '2') {
//
// // return {css:{"background-color":"#1bb61b"}};
// return 'success-row'
// }
// if (row.finishedFlag == '3') {
// return 'false-row'
// // return {css:{"background-color":"#cbcb14"}};
// }
// return ''
},
search () {
productionBlankingBoard().then(({data}) => {
@ -144,13 +180,17 @@
</script>
<style >
.board .el-table .cell {
.board2 .el-table .cell {
line-height: 25px;
font-size: 18px;
height: 25px;
}
.board .el-table .success-row {
.board2 .el-table .success-row {
background: #1bb61b;
}
.board2 .el-table .false-row {
background: #cbcb14;
}
</style>

58
src/views/modules/board/thisWeekShipmentBoard.vue
View File

@ -3,7 +3,7 @@
<div style="text-align: center">
<h1>本周发货看板</h1>
</div>
<div class="aaa">
<div class="board">
<el-table
cell-style="cc"
:height="height"
@ -18,7 +18,7 @@
prop="planShipDate"
header-align="center"
align="left"
min-width="60"
min-width="45"
style="font-size: 20px"
label="发货日期">
</el-table-column>
@ -26,64 +26,71 @@
prop="partSpec"
header-align="center"
align="left"
min-width="160"
min-width="120"
label="产品型号">
</el-table-column>
<el-table-column
prop="notifyQty"
header-align="center"
align="right"
min-width="50"
min-width="45"
label="需求总数">
</el-table-column>
<el-table-column
prop="qtyPerBox"
header-align="center"
align="right"
min-width="50"
min-width="45"
label="袋装数量">
</el-table-column>
<el-table-column
prop="weightperBag"
header-align="center"
align="right"
min-width="50"
min-width="45"
label="袋装重量">
</el-table-column>
<el-table-column
prop="bagsperBox"
header-align="center"
align="right"
min-width="50"
min-width="45"
label="每箱袋数">
</el-table-column>
<el-table-column
prop="boxType"
header-align="center"
align="right"
min-width="50"
min-width="45"
label="纸箱规格">
</el-table-column>
<!-- <el-table-column-->
<!-- prop="weightperBox"-->
<!-- header-align="center"-->
<!-- align="right"-->
<!-- min-width="50"-->
<!-- label="每箱总重">-->
<!-- </el-table-column>-->
<el-table-column
prop="weightperBox"
prop="operationSz"
header-align="center"
align="right"
min-width="50"
label="每箱总重">
align="left"
min-width="60"
label="工艺备注-水煮">
</el-table-column>
<el-table-column
prop="operationSz"
prop="operationHk"
header-align="center"
align="left"
min-width="100"
min-width="60"
label="工艺备注-烘烤">
</el-table-column>
<el-table-column
prop="operationHk"
prop="remark"
header-align="center"
align="left"
min-width="100"
label="工艺备注-水煮">
min-width="120"
label="备注">
</el-table-column>
</el-table>
</div>
@ -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 @@
</script>
<style >
.aaa .el-table .cell {
line-height: 25px;
.board .el-table .cell {
line-height: 22px;
font-size: 18px;
height: 25px;
height: 22px;
}
.board .el-table .success-row {
background: #1bb61b;
}
.board .el-table .false-row {
background: #db1212;
}
</style>

2
src/views/modules/pad/padPart1.vue
View File

@ -42,7 +42,7 @@
label="产品名称">
</el-table-column>
<el-table-column
prop="umid"
prop="spec"
header-align="center"
align="left"
min-width="60"

12
src/views/modules/pad/padPartPhoto.vue
View File

@ -93,9 +93,9 @@
})
return false;
}
this.fileName=this.photoDatas[this.num-1].attaFileName;
this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
this.fileTitle="文件名 （"+this.num+"/"+this.photoDatas.length+")";
this.photoUrl='http://192.168.1.130/upload/'+this.photoDatas[this.num-1].attaFileName;
this.photoUrl='http://192.168.2.172/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
})
},
nextPicture(){
@ -111,9 +111,9 @@
}else{
this.num=this.num+1;
}
this.fileName=this.photoDatas[this.num-1].attaFileName;
this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
this.fileTitle="文件名 （"+this.num+"/"+this.photoDatas.length+")";
this.photoUrl='http://192.168.1.130/upload/'+this.photoDatas[this.num-1].attaFileName;
this.photoUrl='http://192.168.2.172/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
},
lastPicture(){
if(this.photoDatas.length==0){
@ -128,9 +128,9 @@
}else{
this.num=this.num-1;
}
this.fileName=this.photoDatas[this.num-1].attaFileName;
this.fileName=this.photoDatas[this.num-1].attaFileNameDb;
this.fileTitle="文件名 （"+this.num+"/"+this.photoDatas.length+")";
this.photoUrl='http://192.168.1.130/upload/'+this.photoDatas[this.num-1].attaFileName;
this.photoUrl='http://192.168.2.172/upload/'+this.photoDatas[this.num-1].attaFileNameDb;
},
},
created () {

25
src/views/modules/production/dailyPlan.vue
View File

@ -49,6 +49,7 @@
</el-form-item>
</el-form>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 5px;">
<el-form-item :label="'状态：'">
<el-select filterable v-model="searchData.status" style="width: 120px">
@ -235,7 +236,7 @@
label="操作">
<template slot-scope="scope" class="foo_container">
<a type="text" size="small" @click="editSchedule(scope.row)">编辑</a>
<a type="text" size="small" @click="deleteSchedule(scope.row)">删除</a>
<a type="text" size="small" @click="deleteSchedule(scope.row)">取消</a>
</template>
</el-table-column>
</el-table>
@ -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 ''

58
src/views/modules/production/searchDailyPlan.vue
View File

@ -32,6 +32,21 @@
</el-date-picker>
</el-form-item>
<el-button @click="search()" style="margin-left: 0px;margin-top: 33px" type="primary">查询</el-button>
<download-excel
:fields="exportDataStandard"
:data="tableData"
type="xlsx"
:name="exportName"
:header="exportHeader"
:footer="exportFooter"
:defaultValue="exportDefaultValue"
:fetch="createExportData"
:before-generate="startDownload"
:before-finish="finishDownload"
worksheet="导出信息"
class="el-button el-button--primary el-button--medium">
{{'导出'}}
</download-excel>
</el-form>
<el-table
:height="height"
@ -115,7 +130,24 @@
name: 'searchDailyPlan',
data () {
return {
// 导出 start
exportData: [],
exportDataStandard: {
"日计划单号": "orderNo",
"计划日期": "orderDate",
"订单号": "orderRef1",
"物料编码": "partNo",
"物料名称": "partDescription",
"计划数量": "orderQty",
"已完工数": "qtyfinished",
"录入人": "userName",
"录入时间": "enterDate"
},
exportName: "日计划列表"+this.getStrDate(),
exportHeader: ["日计划列表"],
exportFooter: [],
exportDefaultValue: "这一行这一列没有数据",
// 导出 end
height:200,
tableData:[],
date1:'',
@ -141,6 +173,30 @@
this.tableData = data.rows;
})
},
createExportData() {
return this.tableData;
},
startDownload() {
// this.exportData = this.dataList
},
finishDownload() {
},
getStrDate() {
let dd = new Date();
let Y = dd.getFullYear();
let M = (dd.getMonth() + 1) < 10 ? "0" + (dd.getMonth() + 1) : (dd.getMonth() + 1);//获取当前月份的日期，不足10补0
let D = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();//获取当前几号，不足10补0
let H = dd.getHours() < 10 ? "0" + dd.getHours() : dd.getHours();
let MM = dd.getMinutes() < 10 ? "0" + dd.getMinutes() : dd.getMinutes();
let S = dd.getSeconds() < 10 ? "0" + dd.getSeconds() : dd.getSeconds();
return Y + M + D + H + MM + S;
}
},
created() {
}

2
static/config/index.js
View File

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

Write Preview
Loading…
Cancel
Save