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.149:10010/r/高精2.0

Browse Source
This commit is contained in:
liushuai
2019-03-02 08:59:42 +08:00
parent a0ab9b520c cdca4d6282
commit 9e1044e5db
5 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
debug.log Normal file
View File

@@ -0,0 +1 @@
[0301/083149.303:ERROR:http_transport_win.cc(273)] WinHttpSendRequest: 操作成功完成。 (0x0)

2
src/api/Outsourcing/OutsourcingPaymentPlanManagement.js
View File

@@ -68,7 +68,7 @@ export function getParts(Number, pageCurrent, pageSize) {
data: {
type: '1',
name: '车间生产管理工艺_外协发票管理_查询数据',
param: '外协加工任务单流水号=' + Number + '=int',
param: '外协厂家流水号=' + Number + '=int',
Pagination: pageCurrent + '&' + pageSize
}
})

14
src/utils/request.js
View File

@@ -7,13 +7,13 @@ export const wsuri = `ws://192.168.1.231:61101//WebMoudule//websocket`
export const name = `OP8888`
// 创建axios实例
export const readFile = `192.168.1.231:8411/webpage/file/` // invoice
export const readImg = `192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond
export const upload = `192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement
export const upload2 = `192.168.1.231:8411/submit/upload2.ashx` // delivery
export const upload3 = `192.168.1.231:8411/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan = `192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice
export const download = `192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement
export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice
export const readImg = `http://192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond
export const upload = `http://192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement
export const upload2 = `http://192.168.1.231:8411/submit/upload2.ashx` // delivery
export const upload3 = `http://192.168.1.231:8411/submit/upload3.ashx` // performancebond
export const uploadInvoiceScan = `http://192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice
export const download = `http://192.168.1.231: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`,

1
src/views/ManufacturingCenter/ProcessPlanning/index.vue
View File

@@ -402,6 +402,7 @@
v-model="tuhaoValue"
placeholder="零件图号"
size="small"
filterable
style="width:150px"
@change="numChange1()">
<el-option

14
src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue
View File

@@ -575,12 +575,16 @@ export default {
this.zhongjianbianliang = row.外协加工任务单流水号
this.fukuanshijian = row.实际付款时间
getParts(row.外协加工任务单流水号, this.pageCurrent2, this.pageSize2).then(response => {
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' '))
response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' '))
if (response.data.rows.length === 0) {
this.loading2 = false
} else {
for (let i = 0; i < response.data.rows.length; i++) {
response.data.rows[i].开票时间 = response.data.rows[i].开票时间.substring(0, response.data.rows[i].开票时间.indexOf(' '))
response.data.rows[i].接收时间 = response.data.rows[i].接收时间.substring(0, response.data.rows[i].接收时间.indexOf(' '))
}
this.tableData2 = response.data.rows
this.total2 = response.data.total
}
this.tableData2 = response.data.rows
this.total2 = response.data.total
}).then(() => {
this.loading2 = false
})