lilei před 2 roky
rodič
revize
efbccc159b

+ 0 - 9
src/views/salesReturnManagement/salesReturn/chooseCustomModal.vue

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