diff --git a/src/api/Outsourcing/OutsourcingTaskExecution.js b/src/api/Outsourcing/OutsourcingTaskExecution.js index 8892255c..47dc8899 100644 --- a/src/api/Outsourcing/OutsourcingTaskExecution.js +++ b/src/api/Outsourcing/OutsourcingTaskExecution.js @@ -115,7 +115,7 @@ export function editData1(Number, manufacturers, freight, Explain) { }) } // 新建外协加工任务单 -export function addTable(contractNumber, personNum, manufacturers, time, freight) { +export function addTable(contractNumber, personNum, manufacturers, time, time2, freight) { return request({ url: '', method: 'post', @@ -124,12 +124,12 @@ export function addTable(contractNumber, personNum, manufacturers, time, freight ModularID: router.currentRoute.path, type: '2', name: '车间生产管理_外协加工任务单_增加数据', - param: '表单号=' + contractNumber + '=string&外协计划员编号=' + personNum + '&外协厂家=' + manufacturers + '=int&任务下达日期=' + time + '=string&运费=' + freight + '=int' + param: '表单号=' + contractNumber + '&外协计划员编号=' + personNum + '&外协厂家=' + manufacturers + '&任务下达日期=' + time + '&到货日期=' + time2 + '&运费=' + freight } }) } // 外协加工任务单修改 -export function editData(Number, manufacturers, freight, Explain) { +export function editData(Number, manufacturers, freight, Explain, time2) { return request({ url: '', method: 'post', @@ -138,7 +138,7 @@ export function editData(Number, manufacturers, freight, Explain) { ModularID: router.currentRoute.path, type: '2', name: '车间生产管理_外协加工任务单_修改数据', - param: '外协加工任务单流水号=' + Number + '&外协厂家=' + manufacturers + '&运费=' + freight + '&扣款说明=' + Explain + param: '外协加工任务单流水号=' + Number + '&外协厂家=' + manufacturers + '&运费=' + freight + '&扣款说明=' + Explain + '&到货日期=' + time2 } }) } @@ -152,7 +152,7 @@ export function deleteData(Number) { ModularID: router.currentRoute.path, type: '2', name: '车间生产管理_外协加工任务单_删除数据', - param: '外协加工任务单流水号=' + Number + '=int' + param: '外协加工任务单流水号=' + Number } }) } @@ -166,7 +166,7 @@ export function deleteData1(Number) { ModularID: router.currentRoute.path, type: '2', name: '车间生产管理_外协加工任务单明细_删除数据', - param: '外协加工任务单明细流水号=' + Number + '=int' + param: '外协加工任务单明细流水号=' + Number } }) } @@ -181,7 +181,7 @@ export function getNumber(time) { ModularID: router.currentRoute.path, type: '1', name: '车间生产管理_外协加工任务单_查询数据_单据编号', - param: '任务下达日期=' + time + '=string&表单号=1=string=output' + param: '任务下达日期=' + time + '&表单号=1=string=output' } }) } diff --git a/src/api/TechnologyCenter/ImportParts.js b/src/api/TechnologyCenter/ImportParts.js index eaacc48b..4554fbd2 100644 --- a/src/api/TechnologyCenter/ImportParts.js +++ b/src/api/TechnologyCenter/ImportParts.js @@ -420,6 +420,7 @@ export function transferMX(num1, name, num2, remark, mark, num3, num4, num5, num } }) } + // 传递零件 export function transferMX1(num1, name, num2, remark, mark, num3, num4, num5, num7, type, transmit, num6, num8, num9, id, oldId, oldNum, peopleid) { return request({ diff --git a/src/utils/index.js b/src/utils/index.js index e97a8bea..819c4ba7 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -68,3 +68,29 @@ export function formatTime(time, option) { ) } } + +function zeroFill(i) { + if (i >= 0 && i <= 9) { + return '0' + i + } else { + return i + } +} + +export function getNowDAY() { // 默认显示今天 +// 获取当前时间 + const date = new Date() + const month = zeroFill(date.getMonth() + 1) + const day = zeroFill(date.getDate()) + const time = date.getFullYear() + '-' + month + '-' + day + return time +} + +export function get90DAY() { // 3个月显示今天 + var Data = new Date() + Data.setTime(Data.getTime() - 3600 * 1000 * 24 * 90) + const month = zeroFill(Data.getMonth() + 1) + const day = zeroFill(Data.getDate()) + const time = Data.getFullYear() + '-' + month + '-' + day + return time +} diff --git a/src/utils/request.js b/src/utils/request.js index 1a0a2e90..0e7d73f1 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,6 +1,6 @@ import axios from 'axios' -import Cookies from 'js-cookie' -import store from '@/store' +// import Cookies from 'js-cookie' +// import store from '@/store' export const wsuri = `ws://123.56.95.229:61101//WebMoudule//websocket` export const name = `OP8888` @@ -33,16 +33,16 @@ const service = axios.create({ // && config.data.name !== '菜单系统模块_通知信息_查询数据' && config.data.name !== '菜单系统模块_首页信息_查询数据1' && config.data.name !== '菜单系统模块_首页信息_查询数据2' service.interceptors.request.use(config => { - if (config.data.name !== '菜单系统模块_用户名密码_查询数据_new2' && config.data.name !== '菜单系统模块_获取角色模块_查询数据') { - getSession_id().then(res => { - if (res === 0) { - store.dispatch('FedLogOut').then(() => { - location.reload() // 为了重新实例化vue-router对象 避免bug - alert('此账号已异地登录,请查重新登录') - }) - } - }) - } + // if (config.data.name !== '菜单系统模块_用户名密码_查询数据_new2' && config.data.name !== '菜单系统模块_获取角色模块_查询数据') { + // getSession_id().then(res => { + // if (res === 0) { + // store.dispatch('FedLogOut').then(() => { + // location.reload() // 为了重新实例化vue-router对象 避免bug + // alert('此账号已异地登录,请查重新登录') + // }) + // } + // }) + // } return config }, error => { Promise.reject(error) @@ -50,22 +50,22 @@ service.interceptors.request.use(config => { export default service -async function getSession_id() { - const id = Cookies.get('id') - const session_id = Cookies.get('session_id') - const param = { - url: url, - method: 'post', - data: { - type: '1', - name: '菜单系统模块_用户sessionID_查询数据', - param: '人员编号=' + id - } - } - const res = await axios(param) - if (session_id !== res.data[0].session_id) { - return 0 - } else { - return 1 - } -} +// async function getSession_id() { +// const id = Cookies.get('id') +// const session_id = Cookies.get('session_id') +// const param = { +// url: url, +// method: 'post', +// data: { +// type: '1', +// name: '菜单系统模块_用户sessionID_查询数据', +// param: '人员编号=' + id +// } +// } +// const res = await axios(param) +// if (session_id !== res.data[0].session_id) { +// return 0 +// } else { +// return 1 +// } +// } diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index 5fdb5a45..0ddd6c82 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -21,7 +21,7 @@ :value="item.value"/> - 查询 + 查询 - +