合并

MrShi

9 小时以前 41115bb4b6d0161ff6d2c15ef6b3d5386a14ac9c

 admin/src/views/business/goodsorder.vue

@@ -2,72 +2,76 @@
  <TableLayout :permissions="['business:goodsorder:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <!-- 0待支付 1待发货 2待收货 3交易完成 4已关闭 5部分发货 -->
      <el-tabs v-model="status" @tab-click="handleClick">
        <el-tab-pane
            v-for="tab in statusList"
            :key="tab.name"
            :name="tab.name"
        >
          <template #label>
            <span>{{ tab.label }}</span>
            <el-badge
                v-if="tab.count > 0"
                :value="tab.count"
                class="tab-badge"
            />
          </template>
        </el-tab-pane>
      </el-tabs>
      <el-form-item label="订单编号" prop="code">
        <el-input v-model="searchForm.code" 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-form-item>
      <el-form-item label="取货方式" prop="receiveType">
        <el-select v-model="searchForm.receiveType"    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-form-item>
      <el-form-item label="归属经销商" prop="shopName">
        <el-input v-model="searchForm.shopName" 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-form-item>
      <div class="date-style" style="display: inline">
        <el-form-item label="订单时间" prop="starttime" >
          <el-date-picker
              style="width: 180px"
              clearable
              @change="search"
              v-model="searchForm.starttime"
              type="datetime"
              value-format="yyyy-MM-dd HH:mm:ss"
              format="yyyy-MM-dd HH:mm:ss"
              range-separator="至"
              placeholder="开始时间"
          ></el-date-picker>
        </el-form-item>
        <el-form-item label="-" label-width="10px" prop="endtime" >
          <el-date-picker
              style="width: 180px"
              clearable
              v-model="searchForm.endtime"
              type="datetime"
              @change="search"
              value-format="yyyy-MM-dd HH:mm:ss"
              format="yyyy-MM-dd HH:mm:ss"
              range-separator="至"
              placeholder="截止时间"
          ></el-date-picker>
        </el-form-item>
      <div>
        <el-tabs v-model="status" @tab-click="handleClick">
          <el-tab-pane
              v-for="tab in statusList"
              :key="tab.name"
              :name="tab.name"
          >
            <template #label>
              <span>{{ tab.label }}</span>
              <el-badge
                  v-if="tab.count > 0"
                  :value="tab.count"
                  class="tab-badge"
              />
            </template>
          </el-tab-pane>
        </el-tabs>
      </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-form-item>
        <el-form-item label="收货人" prop="nickName">
          <el-input v-model="searchForm.nickName" 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-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-form-item>
        <el-form-item label="归属经销商" prop="shopName">
          <el-input v-model="searchForm.shopName" 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-form-item>
        <div class="date-style" style="display: inline">
          <el-form-item label="订单时间" prop="starttime" >
            <el-date-picker
                style="width: 180px"
                clearable
                @change="search"
                v-model="searchForm.starttime"
                type="datetime"
                value-format="yyyy-MM-dd HH:mm:ss"
                format="yyyy-MM-dd HH:mm:ss"
                range-separator="至"
                placeholder="开始时间"
            ></el-date-picker>
          </el-form-item>
          <el-form-item label="-" label-width="10px" prop="endtime" >
            <el-date-picker
                style="width: 180px"
                clearable
                     v-model="searchForm.endtime"
                type="datetime"
                @change="search"
                value-format="yyyy-MM-dd HH:mm:ss"
                format="yyyy-MM-dd HH:mm:ss"
                range-separator="至"
                placeholder="截止时间"
            ></el-date-picker>
          </el-form-item>
        </div>
      </div>

      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
@@ -107,7 +111,8 @@
                <div class="attr">x{{ goods.goodsNum }}</div>
              </div>
            </div>
            <div class="mark" v-if="item.sysInfo&& item.sysInfo.length" >备注：{{item.sysInfo}}</div>
            <div class="mark" v-if="item.sysInfo&& item.sysInfo.length" >平台备注：{{item.sysInfo}}</div>
            <div class="mark" v-if="item.memberInfo&& item.memberInfo.length" >客户备注：{{item.memberInfo}}</div>
          </div>
          <div class="member-message right-border">
            <div class="el-icon-user" style="padding: 5px 5px;width: 100%;">{{ item.linkname }}</div>