ymy 2 жил өмнө
parent
commit
1ea6bacd0e

+ 1 - 0
src/views/oms/omsLabel/components/addLabel.vue

@@ -3,6 +3,7 @@
     <by-form :propConfig="config" ref="form"></by-form>
     <template #footer>
       <div class="btn">
+        <el-button plain size="small" @click="value = false">取消</el-button>
         <el-button type="primary" size="small" @click="btn">确定</el-button>
       </div>
     </template>

+ 6 - 1
src/views/oms/order/components/addOrder.vue

@@ -224,6 +224,7 @@ export default class AddOrder extends Vue {
         component:'by-input',
         compConfig:{
           attr:{
+            type:'integer',
             placeholder:'请输入店铺名称',
             clearable:true
           }
@@ -411,7 +412,11 @@ export default class AddOrder extends Vue {
         label:'买家账号',
         prop:'buyerId',
         component:'by-input',
-        compConfig:{}
+        compConfig:{
+          attr:{
+            type:'integer'
+          }
+        }
       },{
         span:6,
         label:'收货人',

+ 2 - 2
src/views/oms/order/index.vue

@@ -109,7 +109,7 @@
               <el-input style="width: 140px;" v-model="value.noteContent" size="mini" placeholder="备注内容"></el-input>
             </template>
           </order-radio>
-          <el-collapse-item title="标签" name="label">
+          <!-- <el-collapse-item title="标签" name="label">
             <div class="orderSelect">
               <el-select v-model="value.includeLabelsType" placeholder="请选择包含标签类型" clearable size="mini">
                 <el-option label="包含任意一个标签" :value="1"></el-option>
@@ -122,7 +122,7 @@
             <el-input placeholder="排除标签" :value="value.excludeLabels" @clear="labelsClear" class="labels-width-btn" size="mini" clearable>
               <el-button slot="append" icon="el-icon-more" @click="showLabels2"></el-button>
             </el-input>
-          </el-collapse-item>
+          </el-collapse-item> -->
           <order-radio title="订单来源" keyName="sourceFrom" ref="searchCom11" :options="sourceFromOptions" noLimit @radioChange="onChange($event,'sourceFrom')" />
           <order-checkbox title="订单类型" keyName="type" ref="searchCom12" :options="typeOption" noLimit @checkboxChange="onChange($event,'type')" />
           <el-collapse-item title="付款方式 & 是否付款" name="codAndPay">