build

src/views/sellOut/returnGoodWorkOrder/index.vue

@@ -39,7 +39,6 @@
                 </el-select>
               </el-col>
 
-
               <el-col :span="4" style="width: 150px;margin-left:10px">
                 <el-select
                   :size="searchSize"

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/columns.js

@@ -26,6 +26,12 @@ export default [
     _slot_: 'status',
     width: '80px'
   },
+  {
+    prop: 'type',
+    label: '仓库类型',
+    _slot_: 'stock_type',
+    width: '100px'
+  },
   {
     prop: 'order_type',
     label: '商品类型',

src/views/supplierSellOut/supplierBeforeReturnGoodWorkOrder/index.vue

@@ -131,8 +131,8 @@
           <span>{{ scope.row.return_wsm_name }}</span>
         </template>
 
-        <template #type="{scope}">
-          <el-tag size="mini">{{ scope.row.type === '1' ? '未发货退货' : '售后退货' }}</el-tag>
+        <template #stock_type="{scope}">
+          <el-tag size="mini">{{scope.row.type === '1' ? '销售仓' : '次品仓'}}</el-tag>
         </template>
         
         <template #order_type="{ scope }">

src/views/supplierSellOut/supplierReturnOrder/index.vue

@@ -136,6 +136,14 @@
                   ></el-button>
                 </el-input>
               </el-col>
+
+              <el-col :span="4" style="margin-right:10px">
+                <el-select style="width:100%" placeholder="仓库类型" size="mini" clearable v-model="parmValue.type" @change="pageInfo.curr=1;parmValue.page=1;searchList()">
+                  <el-option label="销售仓" value="1" />
+                  <el-option label="次品仓" value="2" />
+                </el-select>
+              </el-col>
+              
               <el-col :span="6" style="width: 66px" class="fr">
                 <el-button
                   type="warning"

src/views/supplierSellOut/supplierReturnWorkOrder/index.vue

@@ -30,10 +30,10 @@
                 <el-input v-model="parmValue.returnCode"  placeholder="售后退货单号" size="mini" clearable @change="pageInfo.curr=1;parmValue.page=1;searchList()" />
               </el-col>
 
-              <el-col :span="4">
-                <el-select style="width:100%" placeholder="退货工单状态" size="mini" clearable v-model="parmValue.status" @change="pageInfo.curr=1;parmValue.page=1;searchList()">
-                  <el-option label="待收货" value="1" />
-                  <el-option label="已收货" value="2" />
+              <el-col :span="4" style="margin-right:10px">
+                <el-select style="width:100%" placeholder="仓库类型" size="mini" clearable v-model="parmValue.type" @change="pageInfo.curr=1;parmValue.page=1;searchList()">
+                  <el-option label="销售仓" value="1" />
+                  <el-option label="次品仓" value="2" />
                 </el-select>
               </el-col>