Browse Source

Merge remote-tracking branch 'origin/master'

master
ruanqi 5 years ago
parent
commit
9b84e053f3
  1. 3
      src/api/purchaseorder/purchaseRequisition.js
  2. 5
      src/api/yieldReport/produce_report_normal.js
  3. 29
      src/assets/scss/global.scss
  4. 8
      src/views/common/login.vue
  5. 1
      src/views/main-content.vue
  6. 67
      src/views/modules/knifemold/receive.vue
  7. 76
      src/views/modules/purchaseorder/procurementReview.vue
  8. 61
      src/views/modules/purchaseorder/purchaseRequisition.vue
  9. 4
      src/views/modules/warehouse/warehouse.vue
  10. 2
      src/views/modules/yieldReport/com_finish_roll.vue
  11. 75
      src/views/modules/yieldReport/com_produce_report_normal.vue
  12. 20
      src/views/modules/yieldReport/produce_order.vue

3
src/api/purchaseorder/purchaseRequisition.js

@ -27,6 +27,9 @@ export const downFtpFile = data => createAPI(`ftp/file/downFtpFile?ossEntity=`+d
//获取审批记录信息
export const getFileList = data => createAPI(`sys/oss/getSysOssEntityList`,'POST' ,data)
//获取工具类型
export const getPartFamilyList = data => createAPI(`base/getPartFamilyList`,'POST' ,data)

5
src/api/yieldReport/produce_report_normal.js

@ -30,6 +30,11 @@ export const getSfdcDefectByCon = data => createAPI('schedule/getSfdcDefectByCon
// 获取当前上机卷信息
export const getSfdcRollByCon = data => createAPI('schedule/getSfdcRollByCon', 'POST', data)
// 获取当前页面的按钮
export const refreshWorkPlatformButtons = data => createAPI('schedule/refreshWorkPlatformButtons', 'POST', data)

29
src/assets/scss/global.scss

@ -224,8 +224,8 @@
/* 全局缩小行间距 LR*/
/* 针对普通的input*/
.customer-css .el-form-item__content{
margin-top: -10px;
.el-form-item__content{
margin-top: -3px;
}
@ -234,7 +234,7 @@ div.el-time-width{
width: 120px !important;
}
/* 全局时间右边框*/
.customer-css input.el-input__inner{
input.el-input__inner{
height: 22px !important;
padding-right: 0px !important;
}
@ -291,13 +291,20 @@ div.el-time-width{
// 2021-11-29 13:29 sxm
//.el-form-item--medium .el-form-item__content, .el-form-item--medium .el-form-item__label {
// line-height: 20px;
//}
//
//.el-input--medium .el-input__icon {
// line-height: 30px;
//}
// 2021-12-14 13:29 sxm
.el-form-item--medium .el-form-item__label {
height: 20px;
line-height: 20px;
}
.el-input--medium .el-input__inner,.el-form-item--medium .el-form-item__content {
height: 24px;
line-height: 20px;
}
.el-input--medium .el-input__icon {
line-height: 20px;
}

8
src/views/common/login.vue

@ -159,10 +159,6 @@
width: 100%;
margin-top: 38px;
}
.el-input__inner {
font-size: 30px;
}
.login-main .el-input__inner{
margin-top: 10px;
height: 45px;
@ -174,7 +170,5 @@
border-radius: 4px;
}
}
/deep/ .el-form-item{
margin-bottom:-5px;
}
</style>

1
src/views/main-content.vue

@ -101,6 +101,7 @@
},
// tabs,
tabsCloseCurrentHandle () {
console.log(this.$route.meta.menuId)
this.removeTabHandle(this.mainTabsActiveName)
},
// tabs,

67
src/views/modules/knifemold/receive.vue

@ -200,11 +200,56 @@
:label="buttons.operating">
<template slot-scope="scope">
<a @click="fileDownload(scope.row)">{{ buttons.fileDownload }}</a>
<a @click="filePreview(scope.row)">{{ buttons.preview }}</a>
</template>
</el-table-column>
</el-table>
</el-form>
</el-dialog>
<el-dialog title="预览" :visible.sync="pdfVisible" center width="60%" >
<iframe :src="this.pdfUrl" frameborder="0" width="100%" height="400px"></iframe>
<!-- <div class="pdf">-->
<!-- <div class="pdf-tab">-->
<!-- <span-->
<!-- class="btn-def btn-pre"-->
<!-- @click.stop="prePage">上一页</span>-->
<!-- <span-->
<!-- class="btn-def btn-next"-->
<!-- @click.stop="nextPage">下一页</span>-->
<!-- <span-->
<!-- class="btn-def"-->
<!-- @click.stop="clock">顺时针</span>-->
<!-- <span-->
<!-- class="btn-def"-->
<!-- @click.stop="counterClock">逆时针</span>-->
<!-- <span-->
<!-- class="btn-def"-->
<!-- @click.stop="pdfPrintAll">全部打印</span>-->
<!-- <span-->
<!-- class="btn-def"-->
<!-- @click.stop="pdfPrint">部分打印</span>-->
<!-- </div>-->
<!-- <pdf-->
<!-- ref="pdf"-->
<!-- :src="this.pdfUrl"-->
<!-- :page="pageNum"-->
<!-- :rotate="pageRotate"-->
<!-- @password="password"-->
<!-- @progress="loadedRatio = $event"-->
<!-- @page-loaded="pageLoaded($event)"-->
<!-- @num-pages="pageTotalNum=$event"-->
<!-- @error="pdfError($event)"-->
<!-- @link-clicked="page = $event">-->
<!-- </pdf>-->
<!--&lt;!&ndash; <div>{{pageNum}}/{{pageTotalNum}}</div>&ndash;&gt;-->
<!--&lt;!&ndash; <div>进度{{loadedRatio}}</div>&ndash;&gt;-->
<!--&lt;!&ndash; <div>页面加载成功: {{curPageNum}}</div>&ndash;&gt;-->
<!-- </div>-->
</el-dialog>
</div>
</template>
@ -235,6 +280,8 @@
exportList,
getFileList,
} from "@/api/knifemold/receive.js"
import axios from "axios";
import Vue from "vue";
export default {
components: {
@ -255,6 +302,8 @@
value: 'N',
label: '不显示'
}],
select2 :[
],
},
height: 0,
//
@ -273,6 +322,7 @@
//
bannersFlag : false,
bannersBut : false,
pdfVisible : false,
torNumacc : '',
torNumdown : '',
//
@ -848,13 +898,11 @@
methods: {
//
fileDownload(row) {
this.$http({
url: this.$http.adornUrl('ftp/file/downFtpFile'),
method: 'post',
data: JSON.stringify(row),
axios.get('/api/ftp/file/downFtpFile/' + row.id, {
responseType: 'blob',
headers: {
'Content-Type': 'application/json'
'Content-Type': 'application/json',
'token':Vue.cookie.get('token')
}
}).then(({data}) => {
//
@ -866,12 +914,21 @@
linkNode.download = fileName // adownload
linkNode.style.display = 'none'
linkNode.href = URL.createObjectURL(blob) // Blob URL
// if(val == 'Y'){
// this.pdfVisible = true
// this.pdfUrl = linkNode.href
// }else {
document.body.appendChild(linkNode)
linkNode.click() //
URL.revokeObjectURL(linkNode.href) // URL
document.body.removeChild(linkNode)
// }
})
},
filePreview(row){
this.pdfVisible = true
this.pdfUrl= 'http://192.168.1.2:9002/file/'+row.newFileName
},
//
initFileModel(row){
this.getFileList(row)

76
src/views/modules/purchaseorder/procurementReview.vue

@ -175,10 +175,11 @@
<el-table-column
header-align="center"
align="center"
width="50"
width="80"
:label="buttons.operating">
<template slot-scope="scope">
<a @click="fileDownload(scope.row)">{{ buttons.fileDownload }}</a>
<a @click="filePreview(scope.row)">{{ buttons.preview }}</a>
</template>
</el-table-column>
</el-table>
@ -505,6 +506,23 @@
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 2101,
serialNumber: 'review2101EnterDate',
tableId: "review2101",
tableName: "PRHeader",
columnProp: "enterDate",
headerAlign: "center",
align: "left",
columnLabel: "创建时间",
columnHidden: false,
columnImage: false,
columnSortable: false,
sortLv: 0,
status: true,
fixed: false
},
{
userId: this.$store.state.user.name,
functionId: 2101,
@ -677,6 +695,7 @@
reviewDetails: '审批详情',
appendixInfo: '附件信息',
fileDownload: '下载',
preview : '预览',
},
// start
exportData: [],
@ -792,33 +811,36 @@
methods: {
//
fileDownload(row) {
// window.open( this.baseUrl+'/file/'+row.newFileName)
axios.get('/api/ftp/file/downFtpFile/' + row.id, {
responseType: 'blob',
headers: {
'Content-Type': 'application/json',
'token':Vue.cookie.get('token')
}
}).then(({data}) => {
//
const blob = new Blob([data], {type: "application/octet-stream"})
//
const fileName = row.fileName
// a
const linkNode = document.createElement('a')
linkNode.download = fileName // adownload
linkNode.style.display = 'none'
linkNode.href = URL.createObjectURL(blob) // Blob URL
// if(val == 'Y'){
// this.pdfVisible = true
// this.pdfUrl = linkNode.href
// }else {
document.body.appendChild(linkNode)
linkNode.click() //
URL.revokeObjectURL(linkNode.href) // URL
document.body.removeChild(linkNode)
// }
})
},
filePreview(row){
this.pdfVisible = true
this.pdfUrl= 'http://192.168.1.83:9002/file/'+row.newFileName
// axios.get('/proxyApi/ftp/file/downFtpFile/' + row.id, {
// responseType: 'blob',
// headers: {
// 'Content-Type': 'application/json',
// 'token':Vue.cookie.get('token')
// }
// }).then(({data}) => {
// //
// const blob = new Blob([data], {type: "application/octet-stream"})
// //
// const fileName = row.fileName
// // a
// const linkNode = document.createElement('a')
// linkNode.download = fileName // adownload
// linkNode.style.display = 'none'
// linkNode.href = URL.createObjectURL(blob) // Blob URL
// this.pdfUrl = linkNode.href
// // window.open( this.pdfUrl)
// // document.body.appendChild(linkNode)
// // linkNode.click() //
// // URL.revokeObjectURL(linkNode.href) // URL
// // document.body.removeChild(linkNode)
// })
this.pdfUrl= 'http://192.168.1.2:9002/file/'+row.newFileName
},
prePage(){
var p = this.pageNum

61
src/views/modules/purchaseorder/purchaseRequisition.vue

@ -253,10 +253,11 @@
<el-table-column
header-align="center"
align="center"
width="50"
width="80"
:label="buttons.operating">
<template slot-scope="scope">
<a @click="fileDownload(scope.row)">{{ buttons.fileDownload }}</a>
<a @click="filePreview(scope.row)">{{ buttons.preview }}</a>
</template>
</el-table-column>
</el-table>
@ -295,6 +296,50 @@
</el-table>
</el-dialog>
<el-dialog title="预览" :visible.sync="pdfVisible" center width="60%" >
<iframe :src="this.pdfUrl" frameborder="0" width="100%" height="400px"></iframe>
<!-- <div class="pdf">-->
<!-- <div class="pdf-tab">-->
<!-- <span-->
<!-- class="btn-def btn-pre"-->
<!-- @click.stop="prePage">上一页</span>-->
<!-- <span-->
<!-- class="btn-def btn-next"-->
<!-- @click.stop="nextPage">下一页</span>-->
<!-- <span-->
<!-- class="btn-def"-->
<!-- @click.stop="clock">顺时针</span>-->
<!-- <span-->
<!-- class="btn-def"-->
<!-- @click.stop="counterClock">逆时针</span>-->
<!-- <span-->
<!-- class="btn-def"-->
<!-- @click.stop="pdfPrintAll">全部打印</span>-->
<!-- <span-->
<!-- class="btn-def"-->
<!-- @click.stop="pdfPrint">部分打印</span>-->
<!-- </div>-->
<!-- <pdf-->
<!-- ref="pdf"-->
<!-- :src="this.pdfUrl"-->
<!-- :page="pageNum"-->
<!-- :rotate="pageRotate"-->
<!-- @password="password"-->
<!-- @progress="loadedRatio = $event"-->
<!-- @page-loaded="pageLoaded($event)"-->
<!-- @num-pages="pageTotalNum=$event"-->
<!-- @error="pdfError($event)"-->
<!-- @link-clicked="page = $event">-->
<!-- </pdf>-->
<!--&lt;!&ndash; <div>{{pageNum}}/{{pageTotalNum}}</div>&ndash;&gt;-->
<!--&lt;!&ndash; <div>进度{{loadedRatio}}</div>&ndash;&gt;-->
<!--&lt;!&ndash; <div>页面加载成功: {{curPageNum}}</div>&ndash;&gt;-->
<!-- </div>-->
</el-dialog>
</div>
</template>
@ -328,6 +373,7 @@ import {
updatePRHeaderAuthorizeFlag,
downFtpFile,
getFileList,
getPartFamilyList,
} from '@/api/purchaseorder/purchaseRequisition.js'
import upload from "../common/upload";
import axios from "axios";
@ -399,6 +445,7 @@ export default {
//
favorite: false,
addLanguage: false,
pdfVisible : false,
functionId: 2001,
tableId: "common1001",
value1: true,
@ -909,6 +956,7 @@ export default {
close: '关闭',
fileDownload: '下载',
reapply: '重新申请',
preview: '预览',
},
// start
exportData: [],
@ -1056,13 +1104,22 @@ export default {
const linkNode = document.createElement('a')
linkNode.download = fileName // adownload
linkNode.style.display = 'none'
linkNode.href = window.URL.createObjectURL(blob) // Blob URL
linkNode.href = URL.createObjectURL(blob) // Blob URL
// if(val == 'Y'){
// this.pdfVisible = true
// this.pdfUrl = linkNode.href
// }else {
document.body.appendChild(linkNode)
linkNode.click() //
URL.revokeObjectURL(linkNode.href) // URL
document.body.removeChild(linkNode)
// }
})
},
filePreview(row){
this.pdfVisible = true
this.pdfUrl= 'http://192.168.1.2:9002/file/'+row.newFileName
},
childByValue(childValue) {
// childValue
this.fileList.push(childValue)

4
src/views/modules/warehouse/warehouse.vue

@ -193,9 +193,9 @@ import {
headerInput : {
label1 : '仓库编码',
label2 : '仓库名称',
label3 : '库类型',
label3 : '库类型',
label4 : '使用状态',
label5 : '库信息',
label5 : '库信息',
},
},
selectList: {

2
src/views/modules/yieldReport/com_finish_roll.vue

@ -453,7 +453,7 @@ export default {
}
],
buttonTags:{
createRollFlag: true,
createNewRollFlag: true,
switchRollFlag: true,
separatorRollFlag: true,
finishRollFlag: true,

75
src/views/modules/yieldReport/com_produce_report_normal.vue

@ -59,7 +59,7 @@
<span>{{this.currentRollOps.rollNo}}</span>
</el-form-item>
<el-form-item>
<el-button type="primary" :disabled="buttonTags.createRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
<el-button type="primary" :disabled="buttonTags.createNewRollFlag" style="margin-left: 10px; margin-bottom: 5px;">
创建新卷</el-button>
</el-form-item>
<el-form-item>
@ -324,7 +324,7 @@
<el-form>
<el-form-item>
<el-button type="primary" @click="produceToolModal"
:disabled="buttonTags.produceToolFlag" style="margin-left: 30px; margin-top: 20px;">
:disabled="buttonTags.toolFlag" style="margin-left: 30px; margin-top: 20px;">
刀模板</el-button>
</el-form-item>
<el-form-item>
@ -431,6 +431,7 @@ import {
getSfdcRollOpsByCon,
getSfdcDefectByCon,
getSfdcRollByCon,
refreshWorkPlatformButtons,
} from "@/api/yieldReport/produce_report_normal.js";
/*引入组件*/
import comSwitchOperator from "./com_switch_operator";/*切换操作员*/
@ -2644,7 +2645,7 @@ export default {
showFlag: false
},
buttonTags:{
createRollFlag: true,
createNewRollFlag: true,
switchRollFlag: false,
separateRollFlag: false,
finishRollFlag: false,
@ -2673,7 +2674,7 @@ export default {
comProduceDown,/*生产过程的停机组件*/
},
methods: {
//
//
getScheduleDataBySeqNo(){
getScheduleDataBySeqNo(this.scheduleData.seqNo).then(({data}) => {
this.scheduleData.seqNo = data.row.seqNo;
@ -2828,7 +2829,63 @@ export default {
this.refreshCurrentTabTable();
}).then(() => {
//
//this.refreshCurrentButtons();
this.refreshPageButtons();
});
},
//
refreshPageButtons(){
refreshWorkPlatformButtons(this.searchData).then(({data}) => {
if(data.resultMap.createNewRollFlag = 'Y'){
this.buttonTags.createNewRollFlag = true;
}else{
this.buttonTags.createNewRollFlag = false;
}
if(data.resultMap.switchRollFlag = 'Y'){
this.buttonTags.switchRollFlag = true;
}else{
this.buttonTags.switchRollFlag = false;
}
if(data.resultMap.separateRollFlag = 'Y'){
this.buttonTags.separateRollFlag = true;
}else{
this.buttonTags.separateRollFlag = false;
}
if(data.resultMap.finishRollFlag = 'Y'){
this.buttonTags.finishRollFlag = true;
}else{
this.buttonTags.finishRollFlag = false;
}
if(data.resultMap.tuningFlag = 'Y'){
this.buttonTags.tuningFlag = true;
}else{
this.buttonTags.tuningFlag = false;
}
if(data.resultMap.produceFlag = 'Y'){
this.buttonTags.produceFlag = true;
}else{
this.buttonTags.produceFlag = false;
}
if(data.resultMap.defectFlag = 'Y'){
this.buttonTags.defectFlag = true;
}else{
this.buttonTags.defectFlag = false;
}
if(data.resultMap.toolFlag = 'Y'){
this.buttonTags.toolFlag = true;
}else{
this.buttonTags.toolFlag = false;
}
if(data.resultMap.materialFlag = 'Y'){
this.buttonTags.materialFlag = true;
}else{
this.buttonTags.materialFlag = false;
}
if(data.resultMap.downTimeFlag = 'Y'){
this.buttonTags.downTimeFlag = true;
}else{
this.buttonTags.downTimeFlag = false;
}
});
},
@ -2863,6 +2920,11 @@ export default {
});
},
//
createNewRollFunction(){
checkProduceButton('createNewRollFlag');
},
/*切换卷操作*/
switchRollModal(){
//1.
@ -2878,7 +2940,7 @@ export default {
separateRollModal(){
//1.
//checkProduceButton('separateRollFlag');
//
// 76
this.$nextTick(() => {
this.showSeparateFlag = true;
this.$refs.comSeparateRoll.init(this.scheduleData.seqNo, this.operatorData)
@ -2977,6 +3039,7 @@ export default {
});
},
},
created() {
// this.factoryList()

20
src/views/modules/yieldReport/produce_order.vue

@ -1,43 +1,43 @@
<template>
<div class="customer-css">
<div class="">
<!-- 菜单按钮区域 -->
<fieldset class="customer-field" style="width: 675px; padding: 0.35em 0.75em 0.425em;">
<legend>菜单</legend>
<el-form :inline="true" label-position="top" label-width="100px" style="margin-top: -5px;">
<el-form :inline="true" label-position="top" label-width="100px" style="">
<el-form-item :label="''">
<el-button type="primary" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">列表</el-button>
<el-button type="primary" style="margin-left: 10px; margin-bottom: 5px;">列表</el-button>
</el-form-item>
<el-form-item :label="''">
<el-button type="primary" style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">关闭</el-button>
<el-button type="primary" style="margin-left: 10px; margin-bottom: 5px;">关闭</el-button>
</el-form-item>
<el-form-item :label="''">
<el-button type="primary" @click="refreshPageTables()"
style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">查询
style="margin-left: 10px; margin-bottom: 5px;">查询
</el-button>
</el-form-item>
<el-form-item :label="''">
<el-button type="primary" @click="switchOperatorModal()"
style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">报工
style="margin-left: 10px; margin-bottom: 5px;">报工
</el-button>
</el-form-item>
<el-form-item :label="''">
<el-button type="primary" @click="refreshPageTables()"
style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">FQC报工
style="margin-left: 10px; margin-bottom: 5px;">FQC报工
</el-button>
</el-form-item>
<el-form-item :label="''">
<el-button type="primary" @click="refreshPageTables()"
style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">返工重检
style="margin-left: 10px; margin-bottom: 5px;">返工重检
</el-button>
</el-form-item>
<el-form-item :label="''">
<el-button type="primary" @click="refreshPageTables()"
style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">换包装
style="margin-left: 10px; margin-bottom: 5px;">换包装
</el-button>
</el-form-item>
<el-form-item :label="''">
<el-button type="primary" @click="refreshPageTables()"
style="margin-left: 10px; margin-top: 13px; margin-bottom: 5px;">FQC分卷
style="margin-left: 10px; margin-bottom: 5px;">FQC分卷
</el-button>
</el-form-item>
</el-form>

Loading…
Cancel
Save