添加订单可空格查询

src/views/distribution/inventory/delivery/distributionStockArticle.vue

@@ -6,7 +6,10 @@
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <el-form-item label="订单自编号:">
-            <el-input v-model="query.orderCode" placeholder="请输入订单自编号" ></el-input>
+            <el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" ></el-input>
+          </el-form-item>
+          <el-form-item label="运单">
+            <el-input v-model="query.waybillNum"  placeholder="请输入运单编号" />
           </el-form-item>
           <el-form-item label="入库时间:">
             <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->
@@ -169,7 +172,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="费用" :label-width="formLabelWidth">
-            <el-input v-model="formService.cost" autocomplete="off"   placeholder="请填写费用"/>
+            <el-input v-model="formService.cost" autocomplete="off"   placeholder="请填写费用 "/>
           </el-form-item>
           <el-form-item label="原因" :label-width="formLabelWidth">
             <el-input

src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue

@@ -6,7 +6,10 @@
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <el-form-item label="订单自编号:">
-            <el-input v-model="query.orderCode" placeholder="请输入订单自编号" ></el-input>
+            <el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" ></el-input>
+          </el-form-item>
+          <el-form-item label="运单">
+            <el-input v-model="query.waybillNum"  placeholder="请输入运单编号" />
           </el-form-item>
           <el-form-item label="入库时间:">
             <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->

src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue

@@ -6,7 +6,10 @@
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <el-form-item label="订单自编号:">
-            <el-input v-model="query.orderCode" placeholder="请输入订单自编号" ></el-input>
+            <el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" ></el-input>
+          </el-form-item>
+          <el-form-item label="运单">
+            <el-input v-model="query.waybillNum"  placeholder="请输入运单编号" />
           </el-form-item>
           <el-form-item label="入库时间:">
             <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->

src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue

@@ -6,7 +6,10 @@
         <!-- 查询模块 -->
         <el-form :inline="true" :model="query">
           <el-form-item label="订单自编号:">
-            <el-input v-model="query.orderCode" placeholder="请输入订单自编号" ></el-input>
+            <el-input v-model="query.orderCodeNum" placeholder="请输入订单自编号" ></el-input>
+          </el-form-item>
+          <el-form-item label="运单">
+            <el-input v-model="query.waybillNum"  placeholder="请输入运单编号" />
           </el-form-item>
           <el-form-item label="入库时间:">
             <!--            <el-input v-model="query.stockupArea" placeholder="请输入备货区"></el-input>-->

src/views/distribution/inventory/distributionStockArticleDetails.vue

@@ -429,8 +429,8 @@ export default {
           fixed: true,
         },
         {
-          prop: 'warehouse',
-          label: '仓库',
+          prop: 'serviceNumber',
+          label: '服务号',
           type: 2,
           values: '',
           width: '150',
@@ -449,6 +449,27 @@ export default {
           fixed: true,
           sortable: true,
           head: false,
+        }, {
+          prop: 'orderCode',
+          label: '订单自编号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'warehouse',
+          label: '仓库',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
         },
         {
           prop: 'orderPackageStatusName',

src/views/distribution/stockup/distributionStockup.vue

@@ -671,8 +671,9 @@ export default {
       let params ={
         department: this.deptId
       }
+      console.log("备货区参数>>>",params);
       stockUp(params).then(res =>{
-        // console.log("res>>>",res.data.data);
+        console.log("备货区数据",res.data.data);
         let fo =[];
         res.data.data.forEach(i =>{
           let v = {
@@ -695,7 +696,7 @@ export default {
        }
       let a = false ;
       this.selectionList.some(i =>{
-        if(i.assignStatus == "2"){
+        if(i.assignStatus == "20"){
           a = true;
           return;
         }

src/views/distribution/stockup/distributionStockupSelf.vue

@@ -736,8 +736,9 @@ export default {
       let params ={
         department: this.deptId
       }
+      // console.log("备货参数<><><>",params);
       stockUp(params).then(res =>{
-        // console.log("res>>>",res.data.data);
+        // console.log("备货区数据>>>",res.data.data);
         let fo =[];
         res.data.data.forEach(i =>{
           let v = {