Commit 3c585488 authored by youjie's avatar youjie

no message

parent 1808caf4
...@@ -101,10 +101,10 @@ ...@@ -101,10 +101,10 @@
class="w135 _border_b_1" class="w135 _border_b_1"
> >
<el-option <el-option
v-for="item in supplierList" v-for="(item,index) in supplierList"
:label="item.Name" :label="item.Name"
:value="item.ID" :value="item.ID"
:key="item.ID" :key="index"
> >
</el-option> </el-option>
</el-select> </el-select>
...@@ -383,7 +383,7 @@ ...@@ -383,7 +383,7 @@
if(this.addMsg.Type!=10){ if(this.addMsg.Type!=10){
this.addMsg.ObjID = null this.addMsg.ObjID = null
this.addMsg.ObjIdStr = '' this.addMsg.ObjIdStr = ''
this.getSupplierGetPageList() // this.getSupplierGetPageList()
}else{ }else{
this.addMsg.ObjID = this.$route.query.id this.addMsg.ObjID = this.$route.query.id
} }
...@@ -502,19 +502,31 @@ ...@@ -502,19 +502,31 @@
url, url,
msg, msg,
(res) => { (res) => {
if (res.data.resultCode == 1 &&res.data.data&&res.data.data.pageData.length>0) { if (res.data.resultCode == 1) {
this.supplierList = [] this.supplierList = []
res.data.data.pageData.forEach(x=>{ let dataList
if(res.data.data.pageData&&res.data.data.pageData.length>0){
dataList = res.data.data.pageData
}
if(res.data.data.pages&&res.data.data.pages.pageData.length>0){
dataList = res.data.data.pages.pageData
}
dataList&&dataList.forEach(x=>{
let Obj = { let Obj = {
Name: '', Name: '',
ID: 0 ID: 0
} }
if(this.supplierMsg.Type==9){ if(this.supplierMsg.Type==9||this.supplierMsg.Type==8){
Obj = { Obj = {
Name: x.EmName, Name: x.EmName,
ID: x.EmployeeId ID: x.EmployeeId
} }
}else{ }else if(this.supplierMsg.Type==6){
Obj = {
Name: x.AlName,
ID: x.AirLineId
}
} else{
Obj = { Obj = {
Name:x.Name, Name:x.Name,
ID: x.ID ID: x.ID
...@@ -522,8 +534,7 @@ ...@@ -522,8 +534,7 @@
} }
this.supplierList.push(Obj) this.supplierList.push(Obj)
}) })
// this.supplierList = res.data.data.pageData // console.log(this.supplierMsg.Type,'-------',this.supplierList[0])
console.log(this.supplierMsg.Type,'-------',this.supplierList[0])
if(this.addMsg.ObjIdStr&&this.supplierList.length>0){ if(this.addMsg.ObjIdStr&&this.supplierList.length>0){
this.addMsg.ObjID = Number(this.supplierList[0].ID) this.addMsg.ObjID = Number(this.supplierList[0].ID)
} }
......
...@@ -691,7 +691,37 @@ export default { ...@@ -691,7 +691,37 @@ export default {
msg, msg,
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.supplierList = res.data.data.pageData this.supplierList = []
let dataList
if(res.data.data.pageData&&res.data.data.pageData.length>0){
dataList = res.data.data.pageData
}
if(res.data.data.pages&&res.data.data.pages.pageData.length>0){
dataList = res.data.data.pages.pageData
}
dataList&&dataList.forEach(x=>{
let Obj = {
Name: '',
ID: 0
}
if(this.supplierMsg.Type==9||this.supplierMsg.Type==8){
Obj = {
Name: x.EmName,
ID: x.EmployeeId
}
}else if(this.supplierMsg.Type==6){
Obj = {
Name: x.AlName,
ID: x.AirLineId
}
} else{
Obj = {
Name:x.Name,
ID: x.ID
}
}
this.supplierList.push(Obj)
})
if(this.addMsg.ObjIdStr&&this.supplierList&&this.supplierList.length>0){ if(this.addMsg.ObjIdStr&&this.supplierList&&this.supplierList.length>0){
this.addMsg.ObjID = Number(this.supplierList[0].ID) this.addMsg.ObjID = Number(this.supplierList[0].ID)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment