Commit 8a274223 authored by Marcus's avatar Marcus

是否显示待确认商品,不传默认不显示

parent c960d245
...@@ -34,6 +34,11 @@ export default { ...@@ -34,6 +34,11 @@ export default {
lang: { lang: {
type: String, type: String,
default: 'Zh' default: 'Zh'
},
// 是否显示待确认商品,不传默认不显示
determined: {
type: Boolean,
default: false
} }
}, },
data(){ data(){
...@@ -85,7 +90,7 @@ export default { ...@@ -85,7 +90,7 @@ export default {
remoteMethod(keyword){ remoteMethod(keyword){
let params = { let params = {
pageSize: keyword ? 100000 : 10, pageSize: keyword ? 100000 : 10,
filter: false filter: !this.determined
} }
if(this.productType){ if(this.productType){
params.typeId = this.productType params.typeId = this.productType
......
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
<el-descriptions-item> <el-descriptions-item>
<template slot="label"><span style="color: red">*</span>{{ $t('中文品名') }}</template> <template slot="label"><span style="color: red">*</span>{{ $t('中文品名') }}</template>
<span style="min-width: 200px;margin-right: 15px;display: inline-block"> <span style="min-width: 200px;margin-right: 15px;display: inline-block">
<product-selector v-if="!order.parentOrderId && !isAdd" v-model="form.prodId" @change="onProductChange"/> <product-selector v-if="!order.parentOrderId && !isAdd" v-model="form.prodId" @change="onProductChange" determined/>
<span v-else>{{ warehousing.prodTitleZh }}</span> <span v-else>{{ warehousing.prodTitleZh }}</span>
</span> </span>
<el-button v-if="!order.parentOrderId && !isAdd" type="text" @click="isShowProduct = true">添加新商品</el-button> <el-button v-if="!order.parentOrderId && !isAdd" type="text" @click="isShowProduct = true">添加新商品</el-button>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item> <el-descriptions-item>
<template slot="label"><span style="color: red">*</span>{{ $t('英文品名') }}</template> <template slot="label"><span style="color: red">*</span>{{ $t('英文品名') }}</template>
<product-selector v-if="!order.parentOrderId && !isAdd" lang="En" v-model="form.prodId" @change="onProductChange"/> <product-selector v-if="!order.parentOrderId && !isAdd" lang="En" v-model="form.prodId" @change="onProductChange" determined/>
<span v-else>{{ warehousing.prodTitleEn }}</span> <span v-else>{{ warehousing.prodTitleEn }}</span>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('品牌')"> <el-descriptions-item :label="$t('品牌')">
......
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