diff --git a/build/webpack.prod.conf.js b/build/webpack.prod.conf.js
index 2cfaedc8..4be56e77 100644
--- a/build/webpack.prod.conf.js
+++ b/build/webpack.prod.conf.js
@@ -56,6 +56,9 @@ const webpackConfig = merge(baseWebpackConfig, {
inject: true,
favicon: resolve('favicon.ico'),
title: 'vue-admin-template',
+ templateParameters: {
+ BASE_URL: config.build.assetsPublicPath + config.build.assetsSubDirectory,
+ },
minify: {
removeComments: true,
collapseWhitespace: true,
diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js
index 72d253a9..6f0f26fc 100644
--- a/src/api/ManufacturingCenter/ProcessPlanning.js
+++ b/src/api/ManufacturingCenter/ProcessPlanning.js
@@ -115,7 +115,7 @@ export function processNameClick() {
method: 'post',
data: {
type: '1',
- name: '车间生产管理工艺_基础表_工艺分类名称_查询数据'
+ name: '车间生产管理工艺_基础表_工艺分类名称_查询数据_零件工艺制定专用'
}
})
}
diff --git a/src/api/WorkshopProcurement/AccountingPrice.js b/src/api/WorkshopProcurement/AccountingPrice.js
index 175fd598..2f1c25a8 100644
--- a/src/api/WorkshopProcurement/AccountingPrice.js
+++ b/src/api/WorkshopProcurement/AccountingPrice.js
@@ -18,7 +18,7 @@ export function searchParts(pageCurrent, pageSize, check1, num, check2, name) {
method: 'post',
data: {
type: '1',
- name: '车间管理_基本件外购质检_查询数据',
+ name: '车间管理_核算价格_查询数据',
param: `采购合同流水号_check=${check1}&采购合同流水号=${num}&供应商名称_check=${check2}&供应商名称=${name}`,
Pagination: pageCurrent + '&' + pageSize
}
diff --git a/src/icons/svg/CreatePreparationBill.svg b/src/icons/svg/CreatePreparationBill.svg
new file mode 100644
index 00000000..82524232
--- /dev/null
+++ b/src/icons/svg/CreatePreparationBill.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/MachiningSequenceAdjustment.svg b/src/icons/svg/MachiningSequenceAdjustment.svg
new file mode 100644
index 00000000..399e3967
--- /dev/null
+++ b/src/icons/svg/MachiningSequenceAdjustment.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/MaterialArrivalManagement.svg b/src/icons/svg/MaterialArrivalManagement.svg
new file mode 100644
index 00000000..6366a880
--- /dev/null
+++ b/src/icons/svg/MaterialArrivalManagement.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/utils/request.js b/src/utils/request.js
index 6db16b7c..558460f9 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,19 +3,23 @@ import axios from 'axios'
// import store from '../store'
// import { getToken } from '@/utils/auth'
-export const wsuri = `ws://192.168.0.108:61101//WebMoudule//websocket`
+export const wsuri = `ws://192.168.0.2:61101//WebMoudule//websocket`
export const name = `OP8888`
// 创建axios实例
-export const upload = `http://localhost:8411/submit/uploadFile.ashx`
-export const uploadInvoiceScan = `http://localhost:8411/submit/uploadInvoiceScan.ashx`
-export const download = `http://localhost:8411/submit/downloadFile.ashx`
+export const readFile = `http://192.168.0.2:8411/webpage/file/` // invoice
+export const readImg = `http://192.168.0.2:8411/webpage/img/` // delivery/MS/performancebond
+export const upload = `http://192.168.0.2:8411/submit/uploadFile.ashx` // ContractInformationManagement
+export const upload2 = `http://192.168.0.2:8411/submit/upload2.ashx` // delivery
+export const upload3 = `http://192.168.0.2:8411/submit/upload3.ashx` // performancebond
+export const uploadInvoiceScan = `http://192.168.0.2:8411/submit/uploadInvoiceScan.ashx` // invoice
+export const download = `http://192.168.0.2:8411/submit/downloadFile.ashx` // ContractInformationManagement
const service = axios.create({
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
- baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
+ baseURL: `http://192.168.0.2:8411/submit/MESCommonBase.ashx`,
// baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
// baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间
diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
index b191b77d..83ecf558 100644
--- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
+++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
@@ -631,6 +631,7 @@