|
@@ -52,17 +52,12 @@
|
|
</a-row>
|
|
</a-row>
|
|
<a-row :gutter="15">
|
|
<a-row :gutter="15">
|
|
<a-col :span="20">
|
|
<a-col :span="20">
|
|
-<<<<<<< HEAD
|
|
|
|
<a-form-model-item label="退货仓库" prop="warehouseSn">
|
|
<a-form-model-item label="退货仓库" prop="warehouseSn">
|
|
<warehouse
|
|
<warehouse
|
|
v-model="form.warehouseSn"
|
|
v-model="form.warehouseSn"
|
|
id="chooseCustom-basicInfo-warehouseSn"
|
|
id="chooseCustom-basicInfo-warehouseSn"
|
|
placeholder="请选择退货仓库"
|
|
placeholder="请选择退货仓库"
|
|
/>
|
|
/>
|
|
-=======
|
|
|
|
- <a-form-model-item label="退货仓库" prop="warehouse">
|
|
|
|
- <chooseWarehouse ref="warehouse" @change="handleWarehouse"></chooseWarehouse>
|
|
|
|
->>>>>>> 30156afbe414cfeef9704bfbf3026972e5066757
|
|
|
|
</a-form-model-item>
|
|
</a-form-model-item>
|
|
</a-col>
|
|
</a-col>
|
|
</a-row>
|
|
</a-row>
|
|
@@ -85,11 +80,7 @@ import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
export default {
|
|
export default {
|
|
name: 'SalesReturnChooseCustomModal',
|
|
name: 'SalesReturnChooseCustomModal',
|
|
mixins: [commonMixin],
|
|
mixins: [commonMixin],
|
|
-<<<<<<< HEAD
|
|
|
|
components: { VSelect, warehouse },
|
|
components: { VSelect, warehouse },
|
|
-=======
|
|
|
|
- components: { VSelect, chooseWarehouse },
|
|
|
|
->>>>>>> 30156afbe414cfeef9704bfbf3026972e5066757
|
|
|
|
props: {
|
|
props: {
|
|
show: [Boolean]
|
|
show: [Boolean]
|
|
},
|
|
},
|