From 357d9cebd7e9ceb84362a66868b372085008618f Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Tue, 29 Aug 2023 17:31:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95=E5=8F=AF?=
 =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../delivery/distributionStockArticle.vue     |  7 ++++--
 .../distributionStockArticleDiscuss.vue       |  5 +++-
 .../distributionStockArticleMarket.vue        |  5 +++-
 .../delivery/distributionStockArticleSelf.vue |  5 +++-
 .../distributionStockArticleDetails.vue       | 25 +++++++++++++++++--
 .../stockup/distributionStockup.vue           |  5 ++--
 .../stockup/distributionStockupSelf.vue       |  3 ++-
 7 files changed, 45 insertions(+), 10 deletions(-)

diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 46b7cf64..7371f51c 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/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
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index 4bc6dd4f..ba5e46db 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/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>-->
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index db7051f2..0ef8f1a4 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/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>-->
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index b939e1c0..5b2dfd03 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/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>-->
diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue
index 906297ca..1b4527db 100644
--- a/src/views/distribution/inventory/distributionStockArticleDetails.vue
+++ b/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',
diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue
index 4da16469..f849c113 100644
--- a/src/views/distribution/stockup/distributionStockup.vue
+++ b/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;
         }
diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue
index 775d02cd..395cbb2f 100644
--- a/src/views/distribution/stockup/distributionStockupSelf.vue
+++ b/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 = {