商品提货订单新增订单类型字段

src/views/order/deliver/index.vue

@@ -27,6 +27,22 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="订单类型">
+<!--        1111111111111111111111111111111111-->
+        <el-select
+          v-model="queryParams.resource"
+          placeholder="请选择订单类型"
+          style="width: 240px"
+          size="small"
+          filterable
+          clearable
+          @change="handleQuery"
+        >
+          <el-option label="全部" value=""></el-option>
+          <el-option label="提货订单" value="1"></el-option>
+          <el-option label="现金购买" value="2"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="订单号">
         <el-input
           v-model="queryParams.orderId"
@@ -159,6 +175,11 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column label="订单类型" prop="resource" min-width="70" align="center">
+        <template slot-scope="{ row }">
+          <div>{{ JSON.parse(row.resource).desc }}</div>
+        </template>
+      </el-table-column>
       <el-table-column label="订单状态" align="center">
         <template slot-scope="{ row }">
           <div>
@@ -255,6 +276,9 @@ export default {
   methods: {
     // 订单列表
     getList() {
+      if(this.queryParams.resource){
+        this.queryParams.resource = Number(this.queryParams.resource)
+      }
       this.loading = true;
       getDeliverList(
         "pageNum=" +