From 001df32ec4578be34c2c50c13c5d9960510f8da9 Mon Sep 17 00:00:00 2001 From: liulujia1 <759670076@qq.com> Date: Wed, 8 Apr 2020 17:33:12 +0800 Subject: [PATCH] 20200408llj --- src/api/MarketingCenter/CreateProject.js | 2 +- src/main.js | 4 ++++ src/utils/request.js | 1 + .../ProductionPlanQuery/index.vue | 18 +++++++++++++++++- .../MarketingCenter/CreateProject/index.vue | 19 ++++++++++++++++--- 5 files changed, 39 insertions(+), 5 deletions(-) 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/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/ManufacturingCenter/ProductionPlanQuery/index.vue b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue index 794f6a7f..87b2d17f 100644 --- a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue +++ b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue @@ -23,6 +23,7 @@ start-placeholder="开始日期" end-placeholder="结束日期"/> 查询 + 加急 @@ -32,7 +33,7 @@ - + + + +
{ + }) + }, projectChange() { this.machineName = [] this.machineNameValue = '' diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue index 11b0a7a2..0c8f405b 100644 --- a/src/views/MarketingCenter/CreateProject/index.vue +++ b/src/views/MarketingCenter/CreateProject/index.vue @@ -1,6 +1,6 @@ + + +