diff --git a/src/api/purchaseorder/purchaseRequisition.js b/src/api/purchaseorder/purchaseRequisition.js index d16deb7..996d877 100644 --- a/src/api/purchaseorder/purchaseRequisition.js +++ b/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) + diff --git a/src/api/yieldReport/produce_report_normal.js b/src/api/yieldReport/produce_report_normal.js index f1451cc..2c3416e 100644 --- a/src/api/yieldReport/produce_report_normal.js +++ b/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) + + + diff --git a/src/assets/scss/global.scss b/src/assets/scss/global.scss index 1e6f4fe..8ff1f50 100644 --- a/src/assets/scss/global.scss +++ b/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; +} + + + diff --git a/src/views/common/login.vue b/src/views/common/login.vue index 45ac487..5a39041 100644 --- a/src/views/common/login.vue +++ b/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; - } + diff --git a/src/views/main-content.vue b/src/views/main-content.vue index 4503db0..67dd210 100644 --- a/src/views/main-content.vue +++ b/src/views/main-content.vue @@ -101,6 +101,7 @@ }, // tabs, 关闭当前 tabsCloseCurrentHandle () { + console.log(this.$route.meta.menuId) this.removeTabHandle(this.mainTabsActiveName) }, // tabs, 关闭其它 diff --git a/src/views/modules/knifemold/receive.vue b/src/views/modules/knifemold/receive.vue index d0d92ad..0ef4419 100644 --- a/src/views/modules/knifemold/receive.vue +++ b/src/views/modules/knifemold/receive.vue @@ -200,11 +200,56 @@ :label="buttons.operating"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -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 // a标签的download属性规定下载文件的名称 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) diff --git a/src/views/modules/purchaseorder/procurementReview.vue b/src/views/modules/purchaseorder/procurementReview.vue index d2422e2..fddca3c 100644 --- a/src/views/modules/purchaseorder/procurementReview.vue +++ b/src/views/modules/purchaseorder/procurementReview.vue @@ -175,10 +175,11 @@ @@ -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 // a标签的download属性规定下载文件的名称 + 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 // a标签的download属性规定下载文件的名称 - // 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 diff --git a/src/views/modules/purchaseorder/purchaseRequisition.vue b/src/views/modules/purchaseorder/purchaseRequisition.vue index d40a4c1..07971f0 100644 --- a/src/views/modules/purchaseorder/purchaseRequisition.vue +++ b/src/views/modules/purchaseorder/purchaseRequisition.vue @@ -253,10 +253,11 @@ @@ -295,6 +296,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -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 // a标签的download属性规定下载文件的名称 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) diff --git a/src/views/modules/warehouse/warehouse.vue b/src/views/modules/warehouse/warehouse.vue index d06b9b9..3ecdfea 100644 --- a/src/views/modules/warehouse/warehouse.vue +++ b/src/views/modules/warehouse/warehouse.vue @@ -193,9 +193,9 @@ import { headerInput : { label1 : '仓库编码', label2 : '仓库名称', - label3 : '库位类型', + label3 : '仓库类型', label4 : '使用状态', - label5 : '库房信息', + label5 : '仓库信息', }, }, selectList: { diff --git a/src/views/modules/yieldReport/com_finish_roll.vue b/src/views/modules/yieldReport/com_finish_roll.vue index 52ac368..8cf3f8b 100644 --- a/src/views/modules/yieldReport/com_finish_roll.vue +++ b/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, diff --git a/src/views/modules/yieldReport/com_produce_report_normal.vue b/src/views/modules/yieldReport/com_produce_report_normal.vue index af74ae2..02c231c 100644 --- a/src/views/modules/yieldReport/com_produce_report_normal.vue +++ b/src/views/modules/yieldReport/com_produce_report_normal.vue @@ -59,7 +59,7 @@ {{this.currentRollOps.rollNo}} - + 创建新卷 @@ -324,7 +324,7 @@ + :disabled="buttonTags.toolFlag" style="margin-left: 30px; margin-top: 20px;"> 刀模板 @@ -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() diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue index 23de72f..79112a7 100644 --- a/src/views/modules/yieldReport/produce_order.vue +++ b/src/views/modules/yieldReport/produce_order.vue @@ -1,43 +1,43 @@