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

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

Browse Source
This commit is contained in:
Vergil
2020-04-27 09:48:42 +08:00
parent f3e13b9b09 f953291273
commit 1c76ff0ed8
5 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/utils/request.js
View File

@@ -8,24 +8,24 @@ export const name1 = `OP1000`
export const name3 = `OP2000` export const name3 = `OP2000`
export const name4 = `OP9999` export const name4 = `OP9999`
export const readFile = `http://123.56.95.229:8010/webpage/file/` // invoice export const readFile = `http://123.56.95.229:58010/webpage/file/` // invoice
export const readImg = `http://123.56.95.229:8010/webpage/img/` // delivery/MS/performancebond export const readImg = `http://123.56.95.229:58010/webpage/img/` // delivery/MS/performancebond
export const upload = `http://123.56.95.229:8010/submit/uploadFile.ashx` // ContractInformationManagement export const upload = `http://123.56.95.229:58010/submit/uploadFile.ashx` // ContractInformationManagement
export const upload2 = `http://123.56.95.229:8010/submit/upload2.ashx` // delivery export const upload2 = `http://123.56.95.229:58010/submit/upload2.ashx` // delivery
export const upload3 = `http://123.56.95.229:8010/submit/upload3.ashx` // performancebond export const upload3 = `http://123.56.95.229:58010/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan = `http://123.56.95.229:8010/submit/uploadInvoiceScan.ashx` // invoice export const uploadInvoiceScan = `http://123.56.95.229:58010/submit/uploadInvoiceScan.ashx` // invoice
export const uploadInvoiceScan1 = `http://123.56.95.229:8010/submit/uploadInvoiceScan1.ashx` // invoice(workshop) export const uploadInvoiceScan1 = `http://123.56.95.229:58010/submit/uploadInvoiceScan1.ashx` // invoice(workshop)
export const download = `http://123.56.95.229:8010/submit/downloadFile.ashx` // ContractInformationManagement export const download = `http://123.56.95.229:58010/submit/downloadFile.ashx` // ContractInformationManagement
export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx` export const uploadPerson = `http://123.56.95.229:58010/submit/uploadPerson.ashx`
export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx` export const uploadOP = `http://123.56.95.229:58010/submit/uploadOP.ashx`
export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 export const url = `http://123.56.95.229:58010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESCommonBase.ashx' // 导出excel export const ExcelDownLoad = 'http://123.56.95.229:58010/submit/MESCommonBase.ashx' // 导出excel
// 技术中心程序发布时要更改下面所有的IP到0段 // 技术中心程序发布时要更改下面所有的IP到0段
export const ServerIP = `http://123.56.95.229:8010/webpage/file/` export const ServerIP = `http://123.56.95.229:58010/webpage/file/`
export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 export const uploadFileMachine = `http://123.56.95.229:58010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231
export const downloadFileMachine = `http://123.56.95.229:8010/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 export const downloadFileMachine = `http://123.56.95.229:58010/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231
export const MESUploadFile = `http://123.56.95.229:8010/submit/MESUploadFile.ashx` export const MESUploadFile = `http://123.56.95.229:58010/submit/MESUploadFile.ashx`
export const MESDownloadFile = `http://123.56.95.229:8010/submit/MESDownloadFile.ashx` export const MESDownloadFile = `http://123.56.95.229:58010/submit/MESDownloadFile.ashx`
const service = axios.create({ const service = axios.create({
baseURL: `http://123.56.95.229:58010/submit/MESCommonBase.ashx`, baseURL: `http://123.56.95.229:58010/submit/MESCommonBase.ashx`,
timeout: 1500000 // 请求超时时间 timeout: 1500000 // 请求超时时间

4
src/views/Assembly/AssemblyQualityInspection/index.vue
View File

@@ -176,8 +176,8 @@ export default {
if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check4 = 1 } else { this.check4 = 0 } if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check4 = 1 } else { this.check4 = 0 }
selecttable22(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.TestValue, this.check4, this.qualityInspectionValue).then(response => { selecttable22(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.TestValue, this.check4, this.qualityInspectionValue).then(response => {
import('@/vendor/Export2Excel').then(excel => { import('@/vendor/Export2Excel').then(excel => {
const tHeader = ['是否合格', '机床图号', '机床名称', '组号', '部件名称', '检测项', '检测项明细', '备注'] const tHeader = ['检验情况', '机床图号', '机床名称', '组号', '部件名称', '检测项', '检测项明细', '质检时间', '质检员', '备注']
const filterVal = ['合格情况', '机床图号', '机床名称', '组号', '组件名称', '检测项', '检测项明细', '备注'] const filterVal = ['合格情况', '机床图号', '机床名称', '组号', '组件名称', '检测项', '检测项明细', '质检时间', '姓名', '备注']
const list = response.data const list = response.data
const data = this.formatJson(filterVal, list) const data = this.formatJson(filterVal, list)
excel.export_json_to_excel({ excel.export_json_to_excel({

5
src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue
View File

@@ -66,6 +66,11 @@
{{ scope.row.审核情况内容 }} {{ scope.row.审核情况内容 }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="未过原因" align="center" min-width="60">
<template slot-scope="scope">
{{ scope.row.未通过审核原因 }}
</template>
</el-table-column>
<el-table-column label="审批时间" align="center" min-width="60"> <el-table-column label="审批时间" align="center" min-width="60">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }} {{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}

2
src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
View File

@@ -338,7 +338,7 @@
<el-table-column align="center" label="采购数量" width="100px"> <el-table-column align="center" label="采购数量" width="100px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.采购数量 }} {{ scope.row.采购数量 }}
{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || '—' }} <!--{{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.数量 || '—' }}-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="到货数量" width="100px"> <el-table-column align="center" label="到货数量" width="100px">

2
src/views/PurchasingCenter/ReceiveCheck/index.vue
View File

@@ -326,7 +326,7 @@ export default {
param[6] = ['机床号物料名称_check', check4] param[6] = ['机床号物料名称_check', check4]
param[7] = ['机床号物料名称', this.machinenum] param[7] = ['机床号物料名称', this.machinenum]
param[8] = ['合计', this.totalPrice] param[8] = ['合计', this.totalPrice]
param[9] = ['表名', '采购核算'] param[9] = ['表名', '领用核算']
var Data = this.CreateData('2001', '采购管理_领用核算_查询数据_导出', param) var Data = this.CreateData('2001', '采购管理_领用核算_查询数据_导出', param)
this.exportExcel_NPOI(Data) this.exportExcel_NPOI(Data)
} }