Merge remote-tracking branch 'origin/master'

ywj_dev
郑明梁 2 years ago
commit 000244f28f

@ -35,7 +35,7 @@
<el-col :span="6"> <el-col :span="6">
<el-form-item label="供应商:"> <el-form-item label="供应商:">
<el-select <el-select
v-model="filterQuery.companyName" v-model="filterQuery.customerId"
filterable filterable
remote remote
clearable="true" clearable="true"
@ -49,7 +49,7 @@
v-for="item in companyNames" v-for="item in companyNames"
:key="item.companyName" :key="item.companyName"
:label="item.companyName" :label="item.companyName"
:value="item.companyName" :value="item.customerId"
> >
<span style="float: left">{{ item.companyName }}</span> <span style="float: left">{{ item.companyName }}</span>
</el-option> </el-option>
@ -268,7 +268,6 @@ export default {
}) })
}, },
detailDialog(row) { detailDialog(row) {
debugger
if(row.type==1){ if(row.type==1){
let query = { uuid: row.uuid } let query = { uuid: row.uuid }
getDiProductDetail(query).then((res) => { getDiProductDetail(query).then((res) => {

Loading…
Cancel
Save