合并

MrShi

16 小时以前 e4f9739d74323aacf09d139700f22a383910ee97

 admin/src/views/business/goodsorder.vue

@@ -22,30 +22,29 @@
      </div>
      <div>
        <el-form-item label="订单编号" prop="code">
          <el-input v-model="searchForm.code" placeholder="请输入订单编号" type="number" clearable @keypress.enter.native="search"></el-input>
          <el-input v-model="searchForm.code" style="width: 150px" placeholder="订单编号" type="number" clearable @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="收货人" prop="nickName">
          <el-input v-model="searchForm.nickName" placeholder="请输入姓名/手机号" clearable  @keypress.enter.native="search"></el-input>
          <el-input v-model="searchForm.nickName"  style="width: 150px" placeholder="姓名/手机号" clearable  @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="取货方式" prop="receiveType">
          <el-select v-model="searchForm.receiveType"    placeholder="请选择取货方式" clearable   @change="search" >
          <el-select v-model="searchForm.receiveType"     style="width: 150px" placeholder="取货方式" clearable   @change="search" >
            <el-option :key="0" :value="0" label="快递配送"></el-option>
            <el-option :key="1" :value="1" label="自提"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="商品名称" prop="shopName">
          <el-input v-model="searchForm.goodsName" placeholder="请输入商品名称" clearable @keypress.enter.native="search"></el-input>
          <el-input v-model="searchForm.goodsName"  style="width: 150px" placeholder="商品名称" clearable @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="归属经销商" prop="shopName">
          <el-input v-model="searchForm.shopName" placeholder="请输入经销商名称" clearable @keypress.enter.native="search"></el-input>
          <el-input v-model="searchForm.shopName"  style="width: 150px" placeholder="经销商名称" clearable @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="支付单号" prop="payOrderId">
          <el-input v-model="searchForm.payOrderId" placeholder="请输入支付单号" clearable  @keypress.enter.native="search"></el-input>
          <el-input v-model="searchForm.payOrderId"  style="width: 150px" placeholder="支付单号" clearable  @keypress.enter.native="search"></el-input>
        </el-form-item>
        <div class="date-style" style="display: inline">
          <el-form-item label="订单时间" prop="starttime" >
            <el-date-picker
                style="width: 180px"
                style="width: 200px"
                clearable
                @change="search"
                v-model="searchForm.starttime"
@@ -58,7 +57,7 @@
          </el-form-item>
          <el-form-item label="-" label-width="10px" prop="endtime" >
            <el-date-picker
                style="width: 180px"
                style="width: 200px"
                clearable
                     v-model="searchForm.endtime"
                type="datetime"
@@ -69,14 +68,12 @@
                placeholder="截止时间"
            ></el-date-picker>
          </el-form-item>
        </div>
        <section>
          <el-button type="primary" @click="search">搜索</el-button>
          <el-button @click="reset">重置</el-button>
          <el-button type="primary" :loading="isWorking.export" v-permissions="['business:goodsorder:exportExcel']" @click="exportExcel">导出</el-button>
        </section>
      </div>

      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:goodsorder:exportExcel']" @click="exportExcel">导出</el-button>
      </section>
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>