From 39ebdea20e2a095cc0d3a13c436b5ad41a14c2c4 Mon Sep 17 00:00:00 2001
From: kilo <wan.ren@foxmail.com>
Date: Thu, 28 Sep 2023 18:10:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E8=A3=85=E8=BD=A6=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/distribution/distributionSignfor.js   |  24 ++
 .../distribution/reservation/reservation.vue  |   4 +-
 .../signfor/distributionSignfortreat.vue      | 374 +++++++++++++++++-
 .../turndelivery/deliveryDiscuss.vue          |  83 ++--
 .../turndelivery/deliveryMarket.vue           |   2 +-
 5 files changed, 447 insertions(+), 40 deletions(-)

diff --git a/src/api/distribution/distributionSignfor.js b/src/api/distribution/distributionSignfor.js
index 37095791..a56287e1 100644
--- a/src/api/distribution/distributionSignfor.js
+++ b/src/api/distribution/distributionSignfor.js
@@ -99,6 +99,30 @@ export const update = (row) => {
   })
 }
 
+export const loadingAbnormalPackageListDetail = (signId) => {
+  return request({
+    url: '/api/logpm-distribution/signfor/loadingAbnormalPackageListDetail',
+    method: 'get',
+    params: {
+      signId,
+    }
+  })
+}
+/**
+ * 审核异常包件
+ * @param signId
+ * @returns {AxiosPromise}
+ */
+export const loadingAbnormalPackageListAuditing = (ids) => {
+  return request({
+    url: '/api/logpm-distribution/signfor/loadingAbnormalPackageListAuditing',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
 export const signforPackageList = (signforId) => {
   return request({
     url: '/api/logpm-distribution/signfor/signforPackageList',
diff --git a/src/views/distribution/reservation/reservation.vue b/src/views/distribution/reservation/reservation.vue
index 8b46eb22..73c5a5c0 100644
--- a/src/views/distribution/reservation/reservation.vue
+++ b/src/views/distribution/reservation/reservation.vue
@@ -433,7 +433,7 @@
   import { getPostList } from '@/api/system/post';
   import { getListOwn } from '@/api/system/user';
   import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
-  import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
+  import { getStockUpArea, stockUp } from '@/api/basicdata/basicdataGoodsArea';
   import dayjs from 'dayjs';
   import print from '@/utils/print';
 
@@ -1258,7 +1258,7 @@
         let params = {
           department: this.deptId
         };
-        stockUp(params).then(res => {
+        getStockUpArea().then(res => {
           // console.log("res>>>",res.data.data);
           let fo = [];
           res.data.data.forEach(i => {
diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue
index d5a0df2c..7187a2a0 100644
--- a/src/views/distribution/signfor/distributionSignfortreat.vue
+++ b/src/views/distribution/signfor/distributionSignfortreat.vue
@@ -128,6 +128,7 @@
                 >
                     <template #default="slotProps">
                         <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
+                        <el-text size="small" v-if="slotProps.scope.row.isHaveAbnormalPackage === 2" @click="viewAbnormalLoading(slotProps.scope)">异 常 审 核</el-text>
                         <el-text size="small" v-if="slotProps.scope.row.signingStatusAll == '司机签收'" @click="handleSign(slotProps.scope.row)">复 核</el-text>
                         <!--            <el-button size="small" type="danger" @click="delectsolt(slotProps.scope)"-->
                         <!--              >Delete</el-button>-->
@@ -255,6 +256,71 @@
             :drawerShow="drawerShow"
             :columnList="columnList"
     ></edittablehead>
+    <el-dialog
+            title="异常装车包件列表"
+            v-model="abnormalBox"
+            width="50%"
+            :before-close="beforeClose"
+            append-to-body>
+        <el-table
+                ref="table"
+                v-loading="loading"
+                @selection-change="selectionChange"
+                :data="wrapdata"
+                :height="height"
+                style="width: 100%"
+                :border="option.border">
+            <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+            <template v-for="(item, index) in wrapoption.column">
+                <!-- table字段 -->
+                <el-table-column
+                        v-if="item.hide !== true"
+                        :prop="item.prop"
+                        :label="item.label"
+                        :show-overflow-tooltip="true"
+                        :width="item.width"
+                        :key="index"
+                >
+                    <!--                            :align="center"-->
+                </el-table-column>
+            </template>
+            <el-table-column
+                    fixed="right"
+                    label="操作"
+                    width="100">
+                <template #default="scope">
+                    <el-button v-if="scope.row.auditingStatus === 1 || scope.row.auditingStatusName === '待审核'" @click="auditing(scope.row)" type="text" size="small" >审 核</el-button>
+<!--                    <el-button type="text" size="small">编辑</el-button>-->
+                </template>
+            </el-table-column>
+        </el-table>
+        <div style="width: 100%">
+            <el-button type="primary" @click="fastAuditing" style="margin-left: 40%">一键审批</el-button>
+            <el-button type="primary" @click="this.abnormalBox = false">关闭</el-button>
+        </div>
+<!--        <div class="avue-crud__pagination" style="width: 100%">-->
+<!--            &lt;!&ndash; 分页模块 &ndash;&gt;-->
+<!--            <el-pagination-->
+<!--                    background-->
+<!--                    @size-change="wsizeChange"-->
+<!--                    @current-change="wcurrentChange"-->
+<!--                    :current-page="wpage.currentPage"-->
+<!--                    :page-sizes="[30, 50, 80, 120]"-->
+<!--                    :page-size="wpage.pageSize"-->
+<!--                    layout="total, sizes, prev, pager, next, jumper"-->
+<!--                    :total="wpage.total"-->
+<!--            >-->
+<!--                &lt;!&ndash;                        :align="center"&ndash;&gt;-->
+<!--            </el-pagination>-->
+<!--        </div>-->
+        <!-- 表单按钮 -->
+        <!--        <template #footer>-->
+        <!--          <span v-if="!view" class="dialog-footer">-->
+        <!--            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>-->
+        <!--            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>-->
+        <!--          </span>-->
+        <!--        </template>-->
+    </el-dialog>
 </template>
 
 <script>
@@ -265,7 +331,7 @@
     update,
     remove,
     getPage,
-    getstatistics
+    getstatistics, loadingAbnormalPackageListDetail, loadingAbnormalPackageListAuditing
   } from '@/api/distribution/distributionSignfor';
   import { update as updatesign } from '@/api/distribution/distributionSignfor';
   import option from '@/option/distribution/distributionSignfor';
@@ -487,7 +553,7 @@
             sortable: true
           },
           {
-            prop: 'signingStatusAll',
+            prop: 'sijiSigningStatus',
             label: '司机签收状态',
             type: 3,
             values: '',
@@ -505,6 +571,26 @@
             fixed: false,
             sortable: true
           },
+
+          {
+            prop: 'wenyuanSigningStatus',
+            label: '文员审核状态',
+            type: 3,
+            values: '',
+            width: '150',
+            checkarr: [
+              {
+                value: '2',
+                label: '已签收'
+              },
+              {
+                value: '1',
+                label: '未签收'
+              }
+            ],
+            fixed: false,
+            sortable: true
+          },
           {
             prop: '',
             label: '操作',
@@ -642,6 +728,239 @@
           ]
         },
         columnListedit: [],
+        wrapdata:[],
+        wrapoption: {
+          expand: false,
+          index: true,
+          border: true,
+          selection: true,
+          column: [
+            {
+              label: '配送车次',
+              prop: 'trainNumber',
+              search: true,
+              width: '100px',
+            },
+            {
+              label: '运单号',
+              prop: 'waybillNumber',
+              search: true,
+              width: '100px',
+            },
+            {
+              label: '服务号',
+              prop: 'serviceNumber',
+              search: true,
+              width: '100px',
+            },
+            {
+              label: '订单自编号',
+              prop: 'orderCode',
+              width: '100px',
+              search: true,
+            },
+            {
+              label: '货物名称',
+              prop: 'materialName',
+              width: '100px',
+              search: true,
+            },
+            {
+              label: '包条码',
+              prop: 'packageCode',
+              search: true,
+              width: '100px',
+            },
+            // {
+            //   label: '仓库',
+            //   prop: 'warehouse',
+            //   search: true,
+            //   width: '100px',
+            // },
+            // {
+            //   label: '发站仓',
+            //   prop: 'sendWarehouseName',
+            //   search: true,
+            //   width: '100px',
+            // },
+            // {
+            //   label: '目的仓',
+            //   prop: 'acceptWarehouseName',
+            //   search: true,
+            //   width: '100px',
+            // },
+            // {
+            //   label: '发货时间',
+            //   prop: 'waybillNumber',
+            //   search: true,
+            //   width: '100px',
+            // },
+            // {
+            //   label: '入库时间',
+            //   prop: 'warehouseEntryTimeEnd',
+            //   search: true,
+            //   width: '100px',
+            // },
+            // {
+            //   label: '客户车次号',
+            //   prop: 'trainNumber',
+            //   search: true,
+            //   width: '100px'
+            // },
+            // {
+            //   label: '发站出库车次',
+            //   prop: 'trainNumber',
+            //   search: true,
+            //   width: '100px'
+            // },
+            // {
+            //   label: '入库车次',
+            //   prop: 'trainNumber',
+            //   search: true,
+            //   width: '100px',
+            // },
+            {
+              label: '一级品类',
+              prop: 'firsts',
+              search: true,
+              width: '100px',
+            },
+            {
+              label: '二级品类',
+              prop: 'second',
+              search: true,
+              width: '100px',
+            },
+            {
+              label: '三级品类',
+              prop: 'thirdProduct',
+              search: true,
+              width: '100px',
+            },
+            // {
+            //   label: '物料编号',
+            //   prop: 'materialCode',
+            //   search: true,
+            //   width: '100px'
+            // },
+            // {
+            //   label: '物料名称',
+            //   prop: 'materialName',
+            //   search: true,
+            //   width: '100px'
+            // },
+
+            {
+              label: '包件状态',
+              prop: 'orderPackageStatusName',
+              search: true,
+              width: '100px',
+            },
+            {
+              label: '冻结状态',
+              prop: 'orderPackageFreezeStatusName',
+              search: true,
+              width: '100px',
+            },
+            // {
+            //   label: '上架状态',
+            //   prop: 'orderPackageGroundingStatusName',
+            //   search: true,
+            //   width: '100px',
+            // },
+            {
+              label: '备货状态',
+              prop: 'orderPackageStockupStatusName',
+              search: true,
+              width: '100px',
+            },
+            {
+              label: '预约状态',
+              prop: 'orderPackageReservationStatusName',
+              search: true,
+              width: '100px',
+            },
+            {
+              label: '装车状态',
+              prop: 'orderPackageLoadingStatusName',
+              search: true,
+              width: '100px',
+            },
+            // {
+            //   label: '配送计划状态',
+            //   prop: 'orderPackageDeliveryStatus',
+            //   search: true,
+            //   width: '130px'
+            // },
+            //  {
+            //   label: '装车扫描时间',
+            //   prop: 'orderPackageReservationStatusName',
+            //   search: true,
+            //   width: '150px'
+            // },
+            // {
+            //   label: '装车方式',
+            //   prop: 'scanStatus',
+            //   search: true,
+            //   width: '150px',
+            // },
+            // {
+            //   label: '装车扫描人员',
+            //   prop: 'orderPackageDeliveryStatus',
+            //   search: true,
+            //   width: '150px'
+            // },
+            // {
+            //   label: '计划装车人',
+            //   prop: 'driverName',
+            //   search: true,
+            //   width: '150px',
+            // },
+            {
+              label: '实际装车人',
+              prop: 'scanUser',
+              search: true,
+              width: '150px',
+            },
+            // {
+            //   label: '签收扫描时间',
+            //   prop: 'signingTime',
+            //   search: true,
+            //   width: '150px',
+            // },
+            {
+              label: '审核状态',
+              prop: 'auditingStatusName',
+              search: true,
+              width: '150px',
+            },
+            {
+              label: '审核时间',
+              prop: 'auditingTime',
+              search: true,
+              width: '150px',
+            },
+            {
+              label: '审核人',
+              prop: 'auditingUser',
+              search: true,
+              width: '150px',
+            },
+
+            // {
+            //   label: '托盘码',
+            //   prop: 'pallet',
+            //   width: '100px'
+            // },
+            // {
+            //   label: '库位号',
+            //   prop: 'goodsAllocation',
+            //   width: '100px'
+            // }
+
+          ]
+        },
+
         drawerShow: false,
         height: 0,
         // 弹框标题
@@ -662,6 +981,7 @@
         signdata: [],
         // 查询信息
         query: {},
+        abnormalBox:false,
         // 表单配置
         signoption: {
           height: 'auto',
@@ -902,6 +1222,7 @@
       showdrawer(value) {
         this.drawerShow = value;
       },
+
       /**
        * 弹窗的勾选回调，用于更改头部数组
        * 固定搭配，只需要更换   columnList
@@ -918,7 +1239,6 @@
           this.columnList = newarr;
           this.$functions.setStorage(window.location.pathname + 'sortlist', headarr);
         }
-
       },
       //取消
       cancellation() {
@@ -956,6 +1276,43 @@
         const { row } = scope;
         console.log(row);
       },
+      //审批异常装车包件
+      auditing(row){
+        // const { row } = scope;
+        console.log("----------->row",row);
+
+
+        loadingAbnormalPackageListAuditing(row.id).then(res=>{
+          console.log("res-------->",res);
+          if (res){
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+          }
+        })
+      },
+      /**
+       * 一键审批
+       */
+      fastAuditing(){
+        console.log("this.wrapdata---------->",this.wrapdata);
+        let ids = []
+        this.wrapdata.forEach(item=>{
+          ids.push(item.id)
+        })
+        loadingAbnormalPackageListAuditing(ids.join(",")).then(res=>{
+          console.log("res-------->",res);
+          if (res){
+            this.$message({
+              type: 'success',
+              message: '操作成功!'
+            });
+            this.abnormalBox = false;
+          }
+        })
+        console.log("ids---------->",ids);
+      },
       handleSign(row) {
         console.log('签收>>>>>>>>>>', row);
         // this.title = '查看';
@@ -965,6 +1322,17 @@
         //  this.wid= row.id
         // this.getWrapdetails(this.wpage)
       },
+      viewAbnormalLoading(scope){
+        const { row } = scope;
+        // this.title = '查看';
+        // this.view = true;
+        this.abnormalBox = true;
+        console.log("异常装车审核------------->",row);
+        loadingAbnormalPackageListDetail(row.id).then(res=>{
+          this.wrapdata = res.data.data;
+          console.log("res------------->",res.data.data);
+        })
+      },
       editsolt(scope) {
         const { row } = scope;
         console.log('row>>>>>>>>>>>>>>>>>>>', row);
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index b99a0541..696cc16e 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -801,40 +801,55 @@
     methods: {
       //查询叉车人员
       async getFork() {
-        let ides = '';
-        let ide = {};
-        await getListUser().then(res => {
-          console.log('res>>>', res.data.data);
-          ides = res.data.data.tenantId;
-          this.deptId = res.data.data.deptId;
-        });
-        await getPostList(ides).then(res => {
-          console.log('>>>>', res.data.data);
-          // this.forkliftData = res.data.data;
-          res.data.data.forEach(i => {
-            if (i.postName == '叉车') {
-              ide = i;
-            }
-          });
-        });
-        // console.log("ied>>>>>",ide);
-        let params = {
-          postId: ide.id, //岗位
-          deptId: this.deptId //部门
-          // roleId: '', //角色
-        };
-        getListOwn(Object.assign(params, this.query)).then(res => {
-          // console.log(".............",res.data.data);
-          let fo = [];
-          res.data.data.forEach(i => {
-            let a = {
-              dictKey: i.id,
-              dictValue: i.name
-            };
-            fo.push(a);
-          });
-          this.forkliftData = fo;
-        });
+        await getListUser().then(res =>{ //查询当前人信息
+            console.log("查询当前人信息>>>",res.data.data);
+            let fo = [];
+            res.data.data.forEach( i =>{
+              let a ={
+                dictKey: i.id,
+                dictValue: i.realName
+              };
+              fo.push(a);
+              if(!this.deptId){
+                this.deptId =i.deptId;
+              }
+            });
+            this.forkliftData = fo;
+        })
+        // let ides = '';
+        // let ide = {};
+        // await getListUser().then(res => {
+        //   console.log('res>>>', res.data.data);
+        //   ides = res.data.data.tenantId;
+        //   this.deptId = res.data.data.deptId;
+        // });
+        // await getPostList(ides).then(res => {
+        //   console.log('>>>>', res.data.data);
+        //   // this.forkliftData = res.data.data;
+        //   res.data.data.forEach(i => {
+        //     if (i.postName == '叉车') {
+        //       ide = i;
+        //     }
+        //   });
+        // });
+        // // console.log("ied>>>>>",ide);
+        // let params = {
+        //   postId: ide.id, //岗位
+        //   deptId: this.deptId //部门
+        //   // roleId: '', //角色
+        // };
+        // getListOwn(Object.assign(params, this.query)).then(res => {
+        //   // console.log(".............",res.data.data);
+        //   let fo = [];
+        //   res.data.data.forEach(i => {
+        //     let a = {
+        //       dictKey: i.id,
+        //       dictValue: i.name
+        //     };
+        //     fo.push(a);
+        //   });
+        //   this.forkliftData = fo;
+        // });
         await this.getStorageArea();
         await this.getTeam();
       },
diff --git a/src/views/distribution/turndelivery/deliveryMarket.vue b/src/views/distribution/turndelivery/deliveryMarket.vue
index 7d22e030..f34772fe 100644
--- a/src/views/distribution/turndelivery/deliveryMarket.vue
+++ b/src/views/distribution/turndelivery/deliveryMarket.vue
@@ -1020,7 +1020,7 @@
             }
             if (this.stockUpForm.unloader) {
               this.loaderData.forEach(a => {
-                if (this.stockUpForm.loader === a.dictKey) {
+                if (this.stockUpForm.unloader === a.dictKey) {
                   stockup.unloaderName = a.dictValue;
                   stockup.unloaderId = a.dictKey;
                 }