diff --git a/src/api/shopOrder/shopOrder.js b/src/api/shopOrder/shopOrder.js index 5b541dc..a9c0927 100644 --- a/src/api/shopOrder/shopOrder.js +++ b/src/api/shopOrder/shopOrder.js @@ -95,6 +95,9 @@ export const deleteShopOrderToolData = data => createAPI('/shopOrder/deleteShopO // 更改生产工单工艺路线 export const shopOrderUpdateRoutingViaRev = data => createAPI('/shopOrder/shopOrderUpdateRoutingViaRev', 'post', data) -// 查询工单的工具信息 +// 查询生产通知单信息 export const shopNoticeSearch = data => createAPI('/shopOrder/shopNoticeSearch', 'post', data) +// 获取文件export const downLoadObjectFile = data => createAPI(`pms/eamObject/downLoadObjectFile?id=`+data.id,'post',777) +export const downLoadObjectFile = data => createAPI(`shopOrder/downLoadObjectFile?id=`+data.id,'post',777) + diff --git a/src/utils/httpRequest.js b/src/utils/httpRequest.js index bde06a6..0105d14 100644 --- a/src/utils/httpRequest.js +++ b/src/utils/httpRequest.js @@ -112,15 +112,55 @@ instance.interceptors.response.use(response => { }) +// ============================= 下载功能的请求 ============================= +const instance2 = axios.create({ + baseURL: (process.env.NODE_ENV !== 'production' && process.env.OPEN_PROXY ? '/proxyApi/' : window.SITE_CONFIG.baseUrl), + timeout: 10000 * 30, + withCredentials: true, + responseType: 'blob', + headers: { + 'Content-Type': 'application/json; charset=utf-8' + } +}) + +/** + * 请求拦截 + */ +instance2.interceptors.request.use(config => { + config.headers['token'] = Vue.cookie.get('token') // 请求头带上token + return config +}, error => { + return Promise.reject(error) +}) + +/** + * 响应拦截 + */ +instance2.interceptors.response.use(response => { + if (response.data && response.data.code === 401) { // 401, token失效 + clearLoginInfo() + router.push({name: 'login'}) + } + return response +}, error => { + return Promise.reject(error) +}) -export const createAPI = (url, method, data) => { +export const createAPI = (url, method, data, type) => { let config = {} if (method === 'get') { config.params = data } else { config.data = data } + if (data === 777 || type === 'download'){ // 下载功能的请求 + return instance2({ + url, + method, + ...config + }) + } return instance({ url, method, diff --git a/src/views/modules/base/workCenter.vue b/src/views/modules/base/workCenter.vue index ad566c1..fd495ef 100644 --- a/src/views/modules/base/workCenter.vue +++ b/src/views/modules/base/workCenter.vue @@ -365,11 +365,12 @@ SOP文件(点击上传) - + 保存 @@ -1550,18 +1551,21 @@ export default { sopFileListSearch(inData).then(({data}) => { // 遍历data for (let i = 0; i < data.rows.length; i++) { - if (data.rows[i].expiryDate != null) { - if (data.rows[i].expiryDate < this.dayjs().format('YYYY-MM-DD')) { - data.rows[i].status = '失效' + if (i + 1 !== data.rows.length){ + data.rows[i].status = '失效' + } else { + if (data.rows[i].expiryDate != null) { + if (data.rows[i].expiryDate < this.dayjs().format('YYYY-MM-DD')) { + data.rows[i].status = '失效' + } else { + data.rows[i].status = '有效' + } } else { data.rows[i].status = '有效' } - } else { - data.rows[i].status = '有效' } this.sopFileList.push(data.rows[i]); this.sopFileList[i].versionNumber = data.rows[i].orderRef4 - } // 如果this.sopFileList不为空，拿到versionNumber的最后一个并给versionNumber赋值（versionNumber由 A + 两位数组成，赋值时给数字+1） if (this.sopFileList.length > 0) { diff --git a/src/views/modules/shopOrder/shopOrder/shopNotice.vue b/src/views/modules/shopOrder/shopOrder/shopNotice.vue index 52edb08..a057a81 100644 --- a/src/views/modules/shopOrder/shopOrder/shopNotice.vue +++ b/src/views/modules/shopOrder/shopOrder/shopNotice.vue @@ -3,9 +3,9 @@ - - + style="margin-top: 20px; position: fixed; top: 55px; margin-left: -20px; margin-right: 0px;width: 100%; z-index: 1000; background-color: white; padding: 10px; border: 3px solid #17B3A3;" + > + 产品SOP信息 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -193,6 +195,7 @@ - + - + 附件 图纸 刀线 @@ -253,20 +260,304 @@ style="width: 100px; height: 80px"/> + + + + + + + + +
+ + +
+ + + + 关闭 + + +