meswork/JY1.0
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
caoxinyu
2018-12-29 09:34:46 +08:00
parent 679a6d3c90 2d69c5e288
commit 7ee74a318a
18 changed files with 46 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build/webpack.prod.conf.js
View File

@@ -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,

2
src/api/ManufacturingCenter/ProcessPlanning.js
View File

@@ -115,7 +115,7 @@ export function processNameClick() {
method: 'post',
data: {
type: '1',
name: '车间生产管理工艺_基础表_工艺分类名称_查询数据'
name: '车间生产管理工艺_基础表_工艺分类名称_查询数据_零件工艺制定专用'
}
})
}

2
src/api/WorkshopProcurement/AccountingPrice.js
View File

@@ -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
}

1
src/icons/svg/CreatePreparationBill.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545978709631" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="889" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M905.991306 283.750529l-22.87294-22.791076 0-51.319829-51.486628 0-22.87294-22.791076 0-51.326992-51.479465 0-22.881127-22.799262L734.398206 61.402465 213.876112 61.402465c-82.138742 0-148.72016 66.3655-148.72016 148.237159l0 592.950683c0 81.871659 66.582441 148.237159 148.72016 148.237159l594.881662 0c82.138742 0 148.72016-66.3655 148.72016-148.237159L957.477934 283.750529 905.991306 283.750529zM808.757774 802.590308 213.876112 802.590308 213.876112 209.639624l297.441343 0 0 296.475342 297.441343 0L808.758798 802.590308zM808.757774 357.876784 660.037614 357.876784 660.037614 209.639624l74.360592 0 0 74.110905 74.360592 0L808.758798 357.876784z" p-id="890"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

1
src/icons/svg/MachiningSequenceAdjustment.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545978842550" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1498" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 1024C229.248 1024 0 794.752 0 512 0 229.205333 229.248 0 512 0s512 229.205333 512 512c0 282.752-229.248 512-512 512z m0-938.666667C276.352 85.333333 85.333333 276.352 85.333333 512s191.018667 426.666667 426.666667 426.666667 426.666667-191.018667 426.666667-426.666667S747.648 85.333333 512 85.333333z m213.333333 640h-298.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333333h42.666666a42.666667 42.666667 0 0 1 85.333334 0h298.666666a42.666667 42.666667 0 0 1 0 85.333333z m0-170.666666h-42.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333334h298.666666a42.666667 42.666667 0 0 1 85.333334 0h42.666666a42.666667 42.666667 0 0 1 0 85.333334z m0-170.666667h-298.666666a42.666667 42.666667 0 0 1-85.333334 0H298.666667a42.666667 42.666667 0 0 1 0-85.333333h42.666666a42.666667 42.666667 0 0 1 85.333334 0h298.666666a42.666667 42.666667 0 0 1 0 85.333333z" p-id="1499"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

1
src/icons/svg/MaterialArrivalManagement.svg Normal file
View File

@@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1545978796022" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1103" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M835.584 1016.32H50.176c-14.336 0-25.6-11.264-25.6-25.6V76.8c0-14.336 11.264-25.6 25.6-25.6h545.28c6.656 0 13.312 2.56 17.92 7.68l240.128 240.64c4.608 4.608 7.68 11.264 7.68 17.92v673.28c0 14.336-11.264 25.6-25.6 25.6z m-759.808-51.2h734.208V328.192l-225.28-225.792H75.776v862.72z" p-id="1104"></path><path d="M835.584 343.04h-240.128c-14.336 0-25.6-11.264-25.6-25.6V76.8c0-14.336 11.264-25.6 25.6-25.6s25.6 11.264 25.6 25.6v215.04h214.528c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM688.128 865.792c-6.656 0-13.312-2.56-17.92-7.68l-99.84-99.84c-4.608-4.608-7.68-11.264-7.68-17.92 0-6.656 2.56-13.312 7.68-17.92l99.84-99.328c10.24-9.728 26.112-9.728 36.352 0 9.728 10.24 9.728 26.112 0 36.352l-81.92 80.896 81.92 81.92c10.24 10.24 10.24 26.112 0 36.352-5.12 4.608-11.776 7.168-18.432 7.168zM574.464 428.544H247.808c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h326.656c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM574.464 604.672H247.808c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h326.656c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6z" p-id="1105"></path><path d="M984.064 769.024h-345.6c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h345.6c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6zM376.32 770.56H247.808c-14.336 0-25.6-11.264-25.6-25.6s11.264-25.6 25.6-25.6h128.512c14.336 0 25.6 11.264 25.6 25.6s-11.264 25.6-25.6 25.6z" p-id="1106"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

14
src/utils/request.js
View File

@@ -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 // 请求超时时间

3
src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue
View File

@@ -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({

7
src/views/MarketingCenter/DeliveryManagement/index.vue
View File

@@ -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.文件标识
}
})
},

6
src/views/MarketingCenter/PerformanceBond/index.vue
View File

@@ -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.文件标识
}
})
},

5
src/views/PurchasingCenter/OfflineContract/index.vue
View File

@@ -143,7 +143,7 @@
<template slot-scope="scope">
<el-tag v-if="Number(scope.row.离线合同状态)===1" type="warning" size="small">编辑中</el-tag>
<el-tag v-if="Number(scope.row.离线合同状态)===2&&Number(scope.row.总采购数量)!==Number(scope.row.总到货数量)" type="primary" size="small">已采购</el-tag>
<el-tag v-if="Number(scope.row.总采购数量)===Number(scope.row.总到货数量)" type="success" size="small">全部到货</el-tag>
<el-tag v-if="Number(scope.row.总采购数量)===Number(scope.row.总到货数量)&&Number(scope.row.总采购数量)!==0" type="success" size="small">全部到货</el-tag>
</template>
</el-table-column>
<el-table-column label="离线合同编号" align="center" min-width="170">
@@ -755,6 +755,7 @@ export default {
if (response.data[0].result === '1') {
this.$message.success('删除成功')
this.searchTable2()
this.disable = true
searchMateriel(this.offlineContractNum).then(response => {
this.tableData3 = response.data
})
@@ -973,7 +974,7 @@ export default {
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().show()
body.children().not('script').show()
printNode.remove()
}).catch(res => {
console.log(res)

4
src/views/PurchasingCenter/PurchaseContractSearch/index.vue
View File

@@ -254,7 +254,7 @@ export default {
const printNode = $(htmlNode)
body.append(printNode)
window.print()
body.children().show()
body.children().not('script').show()
printNode.remove()
} else {
this.$message.error('请选择合同')
@@ -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

6
src/views/PurchasingCenter/PurchaseInvoiceDelivery/index.vue
View File

@@ -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].文件后缀
}
}
}

5
src/views/TechnologyCenter/CreatePackingList/index.vue
View File

@@ -16,6 +16,7 @@
v-loading="loading"
:data="receiptData"
border
size="mini"
style="margin-top:20px">
<el-table-column
label="装箱单号"
@@ -74,12 +75,14 @@
v-loading="loading"
:data="machineTableData"
border
size="mini"
style="margin-top:20px">
<el-table-column type="expand">
<template slot-scope="props">
<el-table
:data="props.row.groupData"
border
size="mini"
style="width: 90%">
<el-table-column
label="序号"
@@ -171,6 +174,7 @@
v-loading="loading"
:data="spareData"
border
size="mini"
style="margin-top:20px">
<el-table-column
label="序号"
@@ -228,6 +232,7 @@
v-loading="fileLoading"
:data="fileData"
border
size="mini"
style="margin-top:20px">
<el-table-column
label="序号"

1
src/views/TechnologyCenter/ImportChangeParts/specificationData1.vue
View File

@@ -26,6 +26,7 @@
v-loading="listLoading"
:data="tableData"
:row-class-name="tableRowClassName"
size="mini"
border>
<el-table-column align="center" label="图号" min-width="150">
<template slot-scope="scope">

1
src/views/TechnologyCenter/ImportParts/specificationData.vue
View File

@@ -27,6 +27,7 @@
v-loading="listLoading"
:data="tableData"
:row-class-name="tableRowClassName"
size="mini"
border>
<el-table-column align="center" label="物料状态" min-width="100">
<template slot-scope="scope">

5
src/views/TechnologyCenter/QueryParts/index.vue
View File

@@ -36,6 +36,7 @@
:data="tableData"
highlight-current-row
border
size="mini"
style="width: 100%;max-height: 520px"
height="520">
<el-table-column
@@ -109,6 +110,7 @@
v-loading="loadingWB"
:data="tableDataWB"
style="width: 100%;min-height: 600px;"
size="mini"
height="600"
highlight-current-row
border>
@@ -211,8 +213,9 @@ export default {
},
watch: {
project(val) {
console.log(val)
if (val.length > 0) {
this.projectValue = val[1].value
this.projectValue = val[0].value
}
},
projectValue(val) {

40
src/views/login/index.vue
View File

@@ -39,46 +39,6 @@
<el-button :loading="loading" class="signIn" type="primary" style="width:100%;" @click.native.prevent="handleLogin">
登录
</el-button>
<div class="tips">
<span>超级管理员</span>
<span>账号：0000</span>
<span>密码：admin</span>
</div>
<div class="tips">
<span>营销中心</span>
<span>账号：2001</span>
<span>密码：2001</span>
</div>
<div class="tips">
<span>技术中心</span>
<span>账号：3001</span>
<span>密码：3001</span>
</div>
<div class="tips">
<span>制造中心</span>
<span>账号：4001</span>
<span>密码：4001</span>
</div>
<div class="tips">
<span>采购部</span>
<span>账号：4101</span>
<span>密码：4101</span>
</div>
<div class="tips">
<span>仓库</span>
<span>账号：4201</span>
<span>密码：4201</span>
</div>
<div class="tips">
<span>金工车间</span>
<span>账号：4301</span>
<span>密码：4301</span>
</div>
<div class="tips">
<span>装配车间</span>
<span>账号：4401</span>
<span>密码：4401</span>
</div>
</div>
</el-form>
</div>