From aa94c16c00702501a788ed06ab0d30b252a65060 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Sat, 19 Aug 2023 10:06:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=A4=87=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/distribution/distributionStock.js     |   9 ++
 src/option/basicdata/basicClient.js           |   2 +-
 .../distribution/distributionStockArticle.js  |   2 +-
 .../stockup/distributionStockupDetails.vue    | 137 ++++++++++++++++--
 4 files changed, 133 insertions(+), 17 deletions(-)

diff --git a/src/api/distribution/distributionStock.js b/src/api/distribution/distributionStock.js
index ceea94e8..7a0b2441 100644
--- a/src/api/distribution/distributionStock.js
+++ b/src/api/distribution/distributionStock.js
@@ -12,6 +12,15 @@ export const getListStock = (current, size, params) => {
   })
 }
 
+export const getStockDetail = (params) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStock/addStockDetail',
+    method: 'post',
+    data: params
+
+  })
+}
+
 export const getDetail = (id) => {
   return request({
     url: '/api/logpm-distribution/distributionStock/detail',
diff --git a/src/option/basicdata/basicClient.js b/src/option/basicdata/basicClient.js
index 04f42a94..1b545b4a 100644
--- a/src/option/basicdata/basicClient.js
+++ b/src/option/basicdata/basicClient.js
@@ -94,7 +94,7 @@ export default {
       search: true,
     },
     {
-      label: "客户名称",
+      label: "客户编码",
       prop: "clientCode",
       search: true,
     },
diff --git a/src/option/distribution/distributionStockArticle.js b/src/option/distribution/distributionStockArticle.js
index 3be5ec2d..6a80cbe4 100644
--- a/src/option/distribution/distributionStockArticle.js
+++ b/src/option/distribution/distributionStockArticle.js
@@ -107,7 +107,7 @@ export default {
     },
     {
       label: '服务类型',
-      prop: 'typeServiceName',
+      prop: 'typeServerName',
       search: true
     },
     {
diff --git a/src/views/distribution/stockup/distributionStockupDetails.vue b/src/views/distribution/stockup/distributionStockupDetails.vue
index 9863ede6..e2bec107 100644
--- a/src/views/distribution/stockup/distributionStockupDetails.vue
+++ b/src/views/distribution/stockup/distributionStockupDetails.vue
@@ -156,6 +156,7 @@
 
           </el-tab-pane>
           <el-tab-pane label="备货包件" name="outbound">
+            <el-button type="primary" text icon="el-icon-view" v-if =isStockUp  @click="handleStockUp(row,'1')">备货</el-button>
             <el-table ref="table" v-loading="loading"
                       @selection-change="selectionChange"
                       :data="data1"
@@ -178,9 +179,9 @@
               <!-- 操作栏模块 -->
               <el-table-column prop="menu" label="操作" :width="220" align="center">
                 <template #="{row}">
-                  <!--              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>-->
-                  <!--              <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
-                  <!--              <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
+                   <el-button type="primary" text icon="el-icon-view" v-if="!row.stockupStatus" @click="handleStockUp(row,'2')">备货</el-button>
+<!--                   <el-button type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>-->
+<!--                   <el-button type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>-->
                 </template>
               </el-table-column>
             </el-table>
@@ -236,6 +237,27 @@
         </el-tabs>
 
       </el-row>
+      <el-dialog v-model="dialogHand" title="系统备货">
+        <el-form :model="form">
+          <el-form-item label="备货区域" :label-width="formLabelWidth" >
+            <el-select v-model="form.goodsAreaId" clearable placeholder="请选择备货区编号" @change="getForklift($event,'3')">
+              <el-option
+                v-for="item in goodsAreaIdData"
+                :key="item.dictKey"
+                :label="item.dictValue"
+                :value="item.dictKey">
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="dialogHand = false">取消</el-button>
+        <!--        <el-button type="primary" @click="dialogFormVisible = false"> 确定 </el-button>-->
+        <el-button type="primary" @click="callFordelivery()"> 确定 </el-button>
+      </span>
+        </template>
+      </el-dialog>
     <!--  <el-row>
         <div class="avue-crud__pagination" style="width:100%">
           &lt;!&ndash; 分页模块 &ndash;&gt;
@@ -288,12 +310,14 @@ import {
   update,
   remove,
   getDetailStockupOwn,
-  getDetailReservationOwn, getDetailOrderOwn, getDetailInventoryOwn
+  getDetailReservationOwn, getDetailOrderOwn, getDetailInventoryOwn, getListUser
 } from '@/api/distribution/distributionStockup';
 import option from "@/option/distribution/distributionStockup";
 import { mapGetters } from "vuex";
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getParcelListOwn } from '@/api/distribution/distributionParcelList';
+import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
+import { getStockDetail } from '@/api/distribution/distributionStock';
 
 export default {
   data () {
@@ -304,6 +328,7 @@ export default {
       title: '',
       // 是否展示弹框
       box: false,
+      isStockUp: false,
       // 是否显示查询
       search: true,
       // 加载中
@@ -343,6 +368,7 @@ export default {
       formCustomer: {}, // 客户
       // 选择行
       selectionList: [],
+      goodsAreaIdData: [],
       // 表单配置
       option: option,
       // 表单列表
@@ -358,6 +384,8 @@ export default {
       dialogTableVisible: false,
       dialogFormVisible: false,
       dialogFormCustomer: false,
+      dialogHand: false, //备货手动
+      deptId: '', //部门id
       dialogFormService: false,
       formLabelWidth: '120px',
       handler:true, //首次
@@ -399,6 +427,83 @@ export default {
     }
   },
   methods: {
+    //系统备货确定
+    callFordelivery(){
+      // console.log("确定操作",this.form);
+      let c = false;
+      if (this.selectionList.length > 0) {
+        let ids = this.selectionList.map(i => i.id).join(',');
+        this.selectionList.forEach( i =>{
+          if(!!i.stockupStatus){
+            c = true;
+          }
+        })
+        this.form.ids = ids.split(",");
+      }
+      if(c){
+        this.$message.warning("有已备货的数据！！")
+        return ;
+      }
+      this.form.stockupId = this.$route.query.id;
+      console.log("ids",this.form);
+      getStockDetail( Object.assign(this.form)).then(res =>{
+        console.log("resd",res.data.data);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
+        });
+        this.form = {};
+        this.dialogHand = false;
+      });
+
+    },
+    //选择
+    getForklift(row,ty){
+      switch (ty){
+        case '3':
+          let f = this.goodsAreaIdData.find(i =>i.dictKey == row)
+          this.form.stockupArea = f.dictValue;
+          break;
+      }
+    },
+    //备货区
+    async getStorageArea(){
+      let params ={
+        department: this.deptId
+      }
+      stockUp(params).then(res =>{
+        // console.log("res>>>",res.data.data);
+        let fo =[];
+        res.data.data.forEach(i =>{
+          let v = {
+            dictKey: i.id,
+            dictValue: i.name +'-'+i.headline
+          }
+          fo.push(v)
+        })
+        this.goodsAreaIdData = fo;
+      })
+    },
+    handleStockUp(row,type){
+      getListUser().then(res =>{ //查询当前人信息
+        console.log("res>>>",res.data.data);
+        this.deptId = res.data.data.deptId;
+        this.getStorageArea();
+      })
+    console.log("备货数据！！",row);
+    switch (type){
+      case '1':
+        if(this.selectionList.length === 0){
+          this.$message.warning("至少选择一条数据！！！");
+          return;
+        }
+        break;
+      case '2':
+        this.form.ids = row.id;
+        break;
+    }
+      this.dialogHand = true;
+    },
     handleClick (tab, event)  {
       console.log(tab, event)
       console.log(tab.props.name);
@@ -664,14 +769,14 @@ export default {
      console.log("......",a.data);
       const data = a.data.data;
       this.data3 = data.records;
-      if(!!this.data3 && this.data3.length > 0){
-        this.data3.forEach(i =>{
-          let b = this.stockupStatusList.find( a => a.dictKey == i.stockupStatus);
-          if(!!b){
-            i.stockupStatusName = b.dictValue;
-          }
-        })
-      }
+      // if(!!this.data3 && this.data3.length > 0){
+      //   this.data3.forEach(i =>{
+      //     let b = this.stockupStatusList.find( a => a.dictKey == i.stockupStatus);
+      //     if(!!b){
+      //       i.stockupStatusName = b.dictValue;
+      //     }
+      //   })
+      // }
 
      this.page3.total = a.data.data.total;
      this.loading = false;
@@ -684,9 +789,11 @@ export default {
       const data = a.data.data;
       this.data1 = data.records;
       this.data1.forEach(i =>{
-        let b = this.stockupStatusList.find( a => a.dictKey == i.stockupStatus);
-        if(!!b){
-          i.stockupStatusName = b.dictValue;
+        if(!i.stockupStatus){
+          i.stockupStatusName = "未备货";
+          this.isStockUp = true;
+        }else{
+          i.stockupStatusName = "已备货";
         }
       })
      this.page1.total = a.data.data.total;

From fee6f3c7aed726b2ed1242682b942787896be0c4 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Sat, 19 Aug 2023 14:25:26 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/basicdata/brand/basicStorageServices.vue         | 2 +-
 .../inventory/delivery/distributionStockArticle.vue        | 5 +++++
 .../inventory/delivery/distributionStockArticleDiscuss.vue | 5 +++++
 .../inventory/delivery/distributionStockArticleMarket.vue  | 7 ++++++-
 .../inventory/delivery/distributionStockArticleSelf.vue    | 5 +++++
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/views/basicdata/brand/basicStorageServices.vue b/src/views/basicdata/brand/basicStorageServices.vue
index 2ff8fd2b..abefd1a9 100644
--- a/src/views/basicdata/brand/basicStorageServices.vue
+++ b/src/views/basicdata/brand/basicStorageServices.vue
@@ -109,7 +109,7 @@
 <!--              />-->
 <!--            </el-select>-->
 <!--          </el-form-item>-->
-          <el-form-item label="发站仓库" prop="sendWarehouseIds">
+          <el-form-item label="发站仓库">
 <!--            <el-input v-model="form.forwardingUnit" placeholder="请输入发货单位"/>-->
 
 
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 956eb515..a189f660 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -18,6 +18,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               :shortcuts="shortcuts"
+              :default-time="defaultTime2"
             />
           </el-form-item>
  <!--         <el-form-item label="货物名称:">
@@ -832,6 +833,10 @@ export default {
       municipal:true, // 市
       taker:true, // 自提
       stockupDate: [],
+      defaultTime2: [
+        new Date(2000, 1, 1, 0, 0, 0),
+        new Date(2000, 2, 1, 23, 59, 59),
+      ] ,// '12:00:00', '08:00:00'
       shortcuts :[
         {
           text: '最近一周',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index d5913d6e..4bc6dd4f 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@@ -18,6 +18,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               :shortcuts="shortcuts"
+              :default-time="defaultTime2"
             />
           </el-form-item>
 <!--          <el-form-item label="货物名称:">-->
@@ -807,6 +808,10 @@ export default {
       municipal:true, // 市
       taker:true, // 自提
       stockupDate: [],
+      defaultTime2: [
+        new Date(2000, 1, 1, 0, 0, 0),
+        new Date(2000, 2, 1, 23, 59, 59),
+      ] ,// '12:00:00', '08:00:00'
       shortcuts :[
         {
           text: '最近一周',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index 9ca07847..60a8320b 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -18,6 +18,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               :shortcuts="shortcuts"
+              :default-time="defaultTime2"
             />
           </el-form-item>
           <!--         <el-form-item label="货物名称:">
@@ -796,7 +797,11 @@ export default {
       trade:false, // 商
       municipal:true, // 市
       taker:true, // 自提
-      stockupDate: [],
+      stockupDate: [],defaultTime2: [
+        new Date(2000, 1, 1, 0, 0, 0),
+        new Date(2000, 2, 1, 23, 59, 59),
+      ] ,// '12:00:00', '08:00:00'
+
       shortcuts :[
         {
           text: '最近一周',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index a80215e9..b939e1c0 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -18,6 +18,7 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               :shortcuts="shortcuts"
+              :default-time="defaultTime2"
             />
           </el-form-item>
    <!--       <el-form-item label="货物名称:">
@@ -965,6 +966,10 @@ export default {
       municipal:true, // 市
       taker:true, // 自提
       stockupDate: [],
+      defaultTime2: [
+        new Date(2000, 1, 1, 0, 0, 0),
+        new Date(2000, 2, 1, 23, 59, 59),
+      ] ,// '12:00:00', '08:00:00'
       shortcuts :[
         {
           text: '最近一周',

From 9d01695fe9424afb139dbdb697cf2014c9e0d460 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Sat, 19 Aug 2023 14:42:17 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?=
 =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E8=AE=A1=E7=AE=97=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/distribution/inventory/distrilbutionBillLading.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 38f6f9a5..0572d11e 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -1386,7 +1386,6 @@ export default {
       // console.log(">>>>>>>",value );
 
       if(value.length < 1){
-        this.costList = [];
         this.costListName = [];
       }
       this.clientType.forEach(i =>{