Merge branch 'master' of http://192.168.0.112:10010/r/高精2.0

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,

src/utils/request.js

@@ -3,13 +3,17 @@ 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://localhost: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://localhost:8411/webpage/file/` // invoice
+export const readImg = `http://localhost:8411/webpage/img/` // delivery/MS/performancebond
+export const upload = `http://localhost:8411/submit/uploadFile.ashx` // ContractInformationManagement
+export const upload2 = `http://localhost:8411/submit/upload2.ashx` // delivery
+export const upload3 = `http://localhost:8411/submit/upload3.ashx` // performancebond
+export const uploadInvoiceScan = `http://localhost:8411/submit/uploadInvoiceScan.ashx` // invoice
+export const download = `http://localhost:8411/submit/downloadFile.ashx` // ContractInformationManagement
 const service = axios.create({
 
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,

src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue

@@ -631,6 +631,7 @@
 <script>
 import request from '@/utils/request'
 import elInput from 'element-ui/packages/input'
+import { readImg } from '@/utils/request'
 import { initProject, selectProvince, SelectMarketingManager, searchTable1, selectMachine, searchTableDataInvoiceRecord, searchTableContractCapitalManagement, searchTableSafetyMargin, searchTableBidBond, typeOfPerformanceBond, searchTableDataPerformanceBond, searchTableDataDeliveryManagement } from '@/api/MarketingCenter/ComprehensiveInquiryMS'
 export default {
   components: {
@@ -878,7 +879,7 @@ export default {
           name: `select * from 合同信息管理_履约保证金_履约保函 where 是否启用 = 1 and 项目流水号 = ${this.projectNum}`
         }
       })
-      this.url = 'http://localhost:8411/webpage/img/' + data[0].文件标识
+      this.url = readImg + data[0].文件标识
     },
     async handleRemove(file, fileList) {
       const { data } = await request({

src/views/MarketingCenter/DeliveryManagement/index.vue

@@ -111,7 +111,7 @@
               :before-upload="beforeUpload"
               :on-success="onSuccess"
               :limit="5"
-              :action="'http://localhost:8411/submit/upload2.ashx?InvoiceNum='+ invoiceNum"
+              :action="upload2 + '?InvoiceNum=' + invoiceNum"
               list-type="picture-card">
               <i class="el-icon-plus"/>
             </el-upload>
@@ -609,12 +609,15 @@ import elInput from 'element-ui/packages/input'
 import $ from 'jquery'
 import { selectDelivery, submitRremove, searchCargoBoxDetailed, submitMoveInto, delCargoBox, addCargoBox, searchCargoBox, editInvoice, delInvoice, addInvoice, editAdress, addAdress, deleteAdress, citySearch, provinceSearch, addressSearch, searchParts, searchHost, searchSparePart, searchProjectName, searchPackingList, searchFile, searchInvoice } from '@/api//MarketingCenter/DeliveryManagement'
 import QRCode from 'qrcode'
+import { upload2, readImg } from '@/utils/request'
+
 export default {
   components: {
     elInput
   },
   data() {
     return {
+      upload2: upload2,
       btnAdd: false,
       btnDel: false,
       btnLoading: false,
@@ -1224,7 +1227,7 @@ export default {
         return {
           _id: item.附件号,
           name: item.文件标识,
-          url: 'http://localhost:8411/webpage/img/' + item.文件标识
+          url: readImg + item.文件标识
         }
       })
     },

src/views/MarketingCenter/PerformanceBond/index.vue

@@ -209,7 +209,7 @@
                   :file-list="fileList"
                   :before-upload="beforeUpload"
                   :on-success="onSuccess"
-                  :action="'http://localhost:8411/submit/upload3.ashx?ProjectId='+ projectId"
+                  :action="upload3 + '?ProjectId=' + projectId"
                   list-type="picture-card">
                   <i class="el-icon-plus"/>
                 </el-upload>
@@ -291,6 +291,7 @@
 <script>
 import request from '@/utils/request'
 import elInput from 'element-ui/packages/input'
+import { upload3, readImg } from '@/utils/request'
 import { initProject, searchTableData1, typeOfPerformanceBond, searchTableData2, takeBack, executionProgressID, initType, addPerformanceBond, editPerformanceBond, delPerformanceBond, addPerformanceGuarantee, delPerformanceGuarantee } from '@/api/MarketingCenter/PerformanceBond'
 export default {
   components: {
@@ -305,6 +306,7 @@ export default {
       }
     }
     return {
+      upload3: upload3,
       title1: '', //   履约保证金新增或编辑对话框
       entryNameValue: '', // 查询条件_项目名称
       entryName: [], // 查询条件_项目名称数组
@@ -722,7 +724,7 @@ export default {
         return {
           _id: item.履约保函流水号,
           name: item.文件标识,
-          url: 'http://localhost:8411/webpage/img/' + item.文件标识
+          url: readImg + item.文件标识
         }
       })
     },

src/views/PurchasingCenter/PurchaseContractSearch/index.vue

@@ -268,8 +268,6 @@ export default {
           quality: 0.3
         }
       }
-      // const str = 'http://192.168.1.111:8022/searchContract.html?contractNum=' + contractNum
-      // const str = 'http://192.168.1.111:8080/#/ContractInquiry/index?id=' + contractNum
       const str = contractNum
       QRCode.toDataURL(str, opts, function(err, url) {
         if (err) throw err

src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue

@@ -279,7 +279,7 @@
 <script>
 import { searchInvoice, editInvoice, deleteInvoice, initSender, initSupplier, searchContract, searchOffline, invoiceDetail } from '@/api/PurchasingCenter/PurchaseInvoiceDelivery'
 import { mapGetters } from 'vuex'
-import { uploadInvoiceScan } from '@/utils/request'
+import { uploadInvoiceScan, readFile } from '@/utils/request'
 import request from '@/utils/request'
 
 export default {
@@ -557,7 +557,7 @@ export default {
           name: `select * from 采购管理_采购发票_附件 where 是否启用 = 1 and 发票交接流水号 = ${row.发票交接流水号}`
         }
       })
-      this.tableData1[i].scanSrc = 'http://localhost:8411/webpage/file/' + data[0].文件标识 + '.' + data[0].文件后缀
+      this.tableData1[i].scanSrc = readFile + data[0].文件标识 + '.' + data[0].文件后缀
     },
     async searchPicInner(row) {
       const { data } = await request({
@@ -568,7 +568,7 @@ export default {
           name: `select * from 采购管理_采购发票_附件 where 是否启用 = 1 and 发票交接流水号 = ${row.发票交接流水号}`
         }
       })
-      this.scanSrc = 'http://localhost:8411/webpage/file/' + data[0].文件标识 + '.' + data[0].文件后缀
+      this.scanSrc = readFile + data[0].文件标识 + '.' + data[0].文件后缀
     }
   }
 }