diff --git a/src/api/MarketingCenter/CreateProject.js b/src/api/MarketingCenter/CreateProject.js index f84d7444..28c53a75 100644 --- a/src/api/MarketingCenter/CreateProject.js +++ b/src/api/MarketingCenter/CreateProject.js @@ -49,7 +49,7 @@ export function addList() { ModularID: router.currentRoute.path, type: '2', name: '基础表_合同信息表_制造部_增加数据', - param: '项目名称=' + arguments[0] + '&备注=' + arguments[1] + '&合同签订日期=' + arguments[2] + param: '项目名称=' + arguments[0] + '&备注=' + arguments[1] + '&合同签订日期=' + arguments[2] + '&自家创建人员编号=' + arguments[3] } }) } diff --git a/src/api/Outsourcing/OutsourcingTaskExecution.js b/src/api/Outsourcing/OutsourcingTaskExecution.js index 7c92c8fa..8892255c 100644 --- a/src/api/Outsourcing/OutsourcingTaskExecution.js +++ b/src/api/Outsourcing/OutsourcingTaskExecution.js @@ -110,7 +110,7 @@ export function editData1(Number, manufacturers, freight, Explain) { ModularID: router.currentRoute.path, type: '2', name: '车间生产管理_外协加工任务单_修改数据', - param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=0&单据状态=2&入库标志=1&扣款说明=&扣款_质量=0&扣款_计划=0&扣款_其他=0' + param: '外协加工任务单流水号=' + Number + '&外协厂家=' + manufacturers + '&运费=0&单据状态=2&入库标志=1&扣款说明=&扣款_质量=0&扣款_计划=0&扣款_其他=0' } }) } @@ -138,7 +138,7 @@ export function editData(Number, manufacturers, freight, Explain) { ModularID: router.currentRoute.path, type: '2', name: '车间生产管理_外协加工任务单_修改数据', - param: '外协加工任务单流水号=' + Number + '=int&外协厂家=' + manufacturers + '=int&运费=' + freight + '=int&扣款说明=' + Explain + param: '外协加工任务单流水号=' + Number + '&外协厂家=' + manufacturers + '&运费=' + freight + '&扣款说明=' + Explain } }) } diff --git a/src/main.js b/src/main.js index 42e86a8b..4471edc9 100644 --- a/src/main.js +++ b/src/main.js @@ -25,6 +25,10 @@ import elDragDialog from '@/directive/el-dragDialog' // 全局数字、金额输入框组件 import directive from './components/AmountInputBox/index.js' Vue.use(directive) +import axios from 'axios' // 引入axios +Vue.prototype.$axios = axios // 修改原型链 + +// axios.defaults.withCredentials = true Vue.use(elDragDialog) Vue.component('barcode', VueBarcode) diff --git a/src/utils/request.js b/src/utils/request.js index 0a04c177..b7aacc73 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,6 +26,7 @@ export const MESUploadFile = `http://123.56.95.229:8010/submit/MESUploadFile.ash export const MESDownloadFile = `http://123.56.95.229:8010/submit/MESDownloadFile.ashx` const service = axios.create({ baseURL: `http://123.56.95.229:8010/submit/MESCommonBase.ashx`, + // baseURL: `http://192.168.1.192:8045/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/Assembly/QualityBasicData/index.vue b/src/views/Assembly/QualityBasicData/index.vue index c34303c4..f6542fd4 100644 --- a/src/views/Assembly/QualityBasicData/index.vue +++ b/src/views/Assembly/QualityBasicData/index.vue @@ -7,19 +7,8 @@
不合格原因
新增 - - + + -