现场 wms 去除固定单据 任务状态

ruoyi-ui/src/views/check/job/in/index.vue

@@ -248,7 +248,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         jobId: null,
-        status: '1',
+        status: null,
         onLineType: null,
         taskNo: null,
         supplierId: null,

ruoyi-ui/src/views/check/job/out/index.vue

@@ -182,7 +182,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         jobId: null,
-        status: '1',
+        status: null,
         onLineType: null,
         taskNo: null,
         supplierId: null,

ruoyi-ui/src/views/check/stockCheck/index.vue

@@ -285,7 +285,7 @@ export default {
         checkType: null,
         createDate: null,
         createManId: null,
-        status: '1',
+        status: null,
         warehouseId: null,
         finishDate: null,
         erpBill: null,

ruoyi-ui/src/views/in/job/index.vue

@@ -220,7 +220,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         jobId: null,
-        status: '1',
+        status: null,
         onLineType: null,
         taskNo: null,
         supplierId: null,

ruoyi-ui/src/views/in/stockIn/index.vue

@@ -116,7 +116,7 @@
       </el-col>
       <el-col :span="1.5">
 
-        <el-button
+<!--        <el-button
           type="info"
           plain
           icon="el-icon-download"
@@ -125,8 +125,8 @@
           @click="bindTrayCode"
           v-hasPermi="['in:stockIn:barcodePrinting']"
         >绑定托盘
-        </el-button>
-<!--        <el-button
+        </el-button>-->
+        <el-button
           type="info"
           plain
           icon="el-icon-download"
@@ -134,8 +134,8 @@
           :disabled="detailMultiple"
           @click="handleBarcodePrinting"
           v-hasPermi="['in:stockIn:barcodePrinting']"
-        >打印条码&lt;!&ndash;打印条码&ndash;&gt;
-        </el-button>-->
+        >打印条码<!--打印条码-->
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -145,7 +145,6 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="GUID" align="center" prop="stockinGuid" v-if="false"/>
       <el-table-column label="入库订单" align="left" prop="stockinId" width="150"/><!--入库订单-->
-      <el-table-column label="订单号" align="left" prop="erpBill"  width="150"/><!--入库订单-->
       <el-table-column label="入库类型" align="left" prop="inType"><!--入库类型-->
         <template slot-scope="scope">
           <dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
@@ -161,11 +160,7 @@
           <dict-tag :options="dict.type.bill_resource" :value="scope.row.stockSource"/>
         </template>
       </el-table-column>
-<!--      <el-table-column label="形态类型" align="left" prop="spare1">&lt;!&ndash;形态类型&ndash;&gt;
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.product_type" :value="scope.row.spare1"/>
-        </template>
-      </el-table-column>-->
+      <el-table-column label="上位单号" align="left" prop="erpBill"  width="150"/><!--入库订单-->
       <el-table-column label="仓库" align="left" prop="warehouseName"/><!--仓库-->
       <el-table-column label="创建人" align="left" prop="createManName"/><!--创建人-->
       <el-table-column label="部门" align="left" prop="departmentName"/><!--部门-->
@@ -296,7 +291,7 @@ import {
   reviewStockIn,
   confirmationStockIn
 } from "@/api/in/stockIn"
-import {listStockInDetail, barcodePrinting, bindTray} from "@/api/in/stockInDetail"
+import {listStockInDetail, barcodePrinting} from "@/api/in/stockInDetail"
 import {getLodop} from "@/plugins/LodopFuncs.js"
 import {listWarehouse} from "@/api/bas/warehouse";
 import vueEasyPrint from 'vue-easy-print'

ruoyi-ui/src/views/job/outJobManagement.vue

@@ -247,7 +247,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         // jobId: null,
-        status: '1',
+        status: null,
         onLineType: null,
         taskNo: null,
         supplierId: null,

ruoyi-ui/src/views/out/outStockoutManage.vue

@@ -472,7 +472,7 @@ export default {
         productName: null,
         startDate: null,
         finishDate: null,
-        status: '1'
+        status: null
       },
       // 子表分页参数
       detailQueryParams: {