This commit is contained in:
parent
14b248fd21
commit
4fead746ce
|
|
@ -2,14 +2,15 @@ import request from '@/utils/request'
|
||||||
|
|
||||||
// 登录方法 - 调试使用 - 产线环境需注释
|
// 登录方法 - 调试使用 - 产线环境需注释
|
||||||
export function login(data) {
|
export function login(data) {
|
||||||
|
// return false
|
||||||
return request({
|
return request({
|
||||||
// url: '/auth/login',
|
url: '/auth/login',
|
||||||
// headers: {
|
headers: {
|
||||||
// isToken: false,
|
isToken: false,
|
||||||
// repeatSubmit: false
|
repeatSubmit: false
|
||||||
// },
|
},
|
||||||
// method: 'post',
|
method: 'post',
|
||||||
// data
|
data: data
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ export function addPartInfo(data) {
|
||||||
method: 'get',
|
method: 'get',
|
||||||
params: query,
|
params: query,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
//配件新购到货-列表详情
|
//配件新购到货-列表详情
|
||||||
export function getPartTypeCheckInfo(query) {
|
export function getPartTypeCheckInfo(query) {
|
||||||
|
|
@ -79,4 +79,13 @@ export function getSelectPartListApi(query) {
|
||||||
method: 'get',
|
method: 'get',
|
||||||
params: query
|
params: query
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 配件库存
|
||||||
|
export function getPartPersonNumApi(data){
|
||||||
|
return request({
|
||||||
|
url: '/material/complex_query/getPartPersonNum',
|
||||||
|
method: 'get',
|
||||||
|
params: data,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -834,6 +834,7 @@ export default {
|
||||||
leaseLoading: false,
|
leaseLoading: false,
|
||||||
taskType: '',
|
taskType: '',
|
||||||
currentRow: {},
|
currentRow: {},
|
||||||
|
oldTypeId: '',
|
||||||
allNum: null,
|
allNum: null,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -1143,7 +1144,8 @@ export default {
|
||||||
leaseProject: this.currentRow.leaseProject,
|
leaseProject: this.currentRow.leaseProject,
|
||||||
leaseProjectId: this.currentRow.leaseProjectId,
|
leaseProjectId: this.currentRow.leaseProjectId,
|
||||||
taskId: this.currentRow.taskId,
|
taskId: this.currentRow.taskId,
|
||||||
code: this.currentRow.code
|
code: this.currentRow.code,
|
||||||
|
oldTypeId:row.oldTypeId
|
||||||
}
|
}
|
||||||
console.log('row', row)
|
console.log('row', row)
|
||||||
console.log('[obj]', [obj])
|
console.log('[obj]', [obj])
|
||||||
|
|
@ -1162,6 +1164,7 @@ export default {
|
||||||
this.outQuery.maStatus = 1
|
this.outQuery.maStatus = 1
|
||||||
this.outQuery.code = this.currentRow.code
|
this.outQuery.code = this.currentRow.code
|
||||||
this.outObj = row
|
this.outObj = row
|
||||||
|
this.oldTypeId=row.oldTypeId
|
||||||
this.handleOutQuery()
|
this.handleOutQuery()
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
@ -1216,6 +1219,7 @@ export default {
|
||||||
this.maCodeList.forEach(item => {
|
this.maCodeList.forEach(item => {
|
||||||
item.code = this.currentRow.code
|
item.code = this.currentRow.code
|
||||||
item.keyId = this.keyId
|
item.keyId = this.keyId
|
||||||
|
item.oldTypeId=this.oldTypeId
|
||||||
})
|
})
|
||||||
let param = { leaseOutDetailsList: this.maCodeList }
|
let param = { leaseOutDetailsList: this.maCodeList }
|
||||||
submitOut(param).then(response => {
|
submitOut(param).then(response => {
|
||||||
|
|
|
||||||
|
|
@ -35,14 +35,15 @@ module.exports = {
|
||||||
proxy: {
|
proxy: {
|
||||||
// detail: https://cli.vuejs.org/config/#devserver-proxy
|
// detail: https://cli.vuejs.org/config/#devserver-proxy
|
||||||
[process.env.VUE_APP_BASE_API]: {
|
[process.env.VUE_APP_BASE_API]: {
|
||||||
target: `http://sgwpdm.ah.sgcc.com.cn/iws/jiju-api`, // 产线
|
// target: `http://sgwpdm.ah.sgcc.com.cn/iws/jiju-api`, // 产线
|
||||||
// target: `http://192.168.0.96:18080`,//马
|
// target: `http://192.168.0.96:18080`,//马
|
||||||
// target: `http://192.168.0.244:18580`,//测试
|
// target: `http://192.168.0.244:18580`,//测试
|
||||||
// target: `http://192.168.2.223:18080`,//山
|
// target: `http://192.168.2.223:18080`,//山
|
||||||
// target: `http://192.168.2.23:18080`,//洪
|
// target: `http://192.168.2.23:18080`,//洪
|
||||||
// target: `http://192.168.0.234:18080`, //阮
|
// target: `http://192.168.0.234:18080`, //阮
|
||||||
// target: `http://192.168.137.1:18080`,//
|
// target: `http://192.168.137.1:18080`,//
|
||||||
// target: `http://192.168.0.15:18080`, // 韩傲宇
|
// target: `http://172.20.10.9:18080`, // 韩傲宇
|
||||||
|
target: `http://192.168.1.115:18080`, // 韩傲宇
|
||||||
// target: `http://192.168.0.60:18080`, // 赵福海
|
// target: `http://192.168.0.60:18080`, // 赵福海
|
||||||
changeOrigin: true,
|
changeOrigin: true,
|
||||||
pathRewrite: {
|
pathRewrite: {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue