Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

public/css/loadinge.css

@@ -41,47 +41,58 @@ body {
   background: -moz-linear-gradient(left, rgba(30, 252, 200, 1) 0%, rgba(29, 211, 214, 1) 100%);
   background: -webkit-linear-gradient(left, #172e60 0%, #172e60 100%);
   background: linear-gradient(to right, #b9c0cf36 0%, #000000 100%);
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#1efcc8', endColorstr='#1dd3d6',GradientType=1 );
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#1efcc8', endColorstr='#1dd3d6', GradientType=1);
   color: white;
   padding-top: 8px;
   padding-bottom: 18px;
   animation: bg 3s linear infinite;
 }
 
+@keyframes truckMove {
+  0% {
+    transform: translateX(-250px);
+    /* 卡车从屏幕左侧外部开始 */
+  }
+
+  50% {
+    transform: translateX(calc(10px));
+    /* 卡车移出到屏幕右侧外部 */
+  }
+
+  100% {
+    transform: translateX(150px);
+    /* 卡车从左侧再次进入 */
+  }
+}
+
 .truck {
   height: 110px;
   width: 150px;
   position: absolute;
-
   bottom: 48px;
   left: calc(50% + 10px);
   transform: translateX(-50%);
+  animation: truckMove 2s linear infinite;
 }
 
-.truck > .truck-container {
+.truck>.truck-container {
   background: rgb(175, 189, 195);
-  background: -moz-linear-gradient(
+  background: -moz-linear-gradient(-45deg,
-    -45deg,
+      rgba(175, 189, 195, 1) 0%,
-    rgba(175, 189, 195, 1) 0%,
+      rgba(175, 189, 195, 1) 50%,
-    rgba(175, 189, 195, 1) 50%,
+      rgba(143, 163, 173, 1) 51%,
-    rgba(143, 163, 173, 1) 51%,
+      rgba(143, 163, 173, 1) 100%);
-    rgba(143, 163, 173, 1) 100%
+  background: -webkit-linear-gradient(-45deg,
-  );
+      rgba(175, 189, 195, 1) 0%,
-  background: -webkit-linear-gradient(
+      rgba(175, 189, 195, 1) 50%,
-    -45deg,
+      rgba(143, 163, 173, 1) 51%,
-    rgba(175, 189, 195, 1) 0%,
+      rgba(143, 163, 173, 1) 100%);
-    rgba(175, 189, 195, 1) 50%,
+  background: linear-gradient(135deg,
-    rgba(143, 163, 173, 1) 51%,
+      rgba(175, 189, 195, 1) 0%,
-    rgba(143, 163, 173, 1) 100%
+      rgba(175, 189, 195, 1) 50%,
-  );
+      rgba(143, 163, 173, 1) 51%,
-  background: linear-gradient(
+      rgba(143, 163, 173, 1) 100%);
-    135deg,
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#afbdc3', endColorstr='#8fa3ad', GradientType=1);
-    rgba(175, 189, 195, 1) 0%,
-    rgba(175, 189, 195, 1) 50%,
-    rgba(143, 163, 173, 1) 51%,
-    rgba(143, 163, 173, 1) 100%
-  );
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#afbdc3', endColorstr='#8fa3ad',GradientType=1 );
   height: 60px;
   width: 60px;
   position: absolute;
@@ -91,30 +102,24 @@ body {
   background: url('../img/Clogo.png') no-repeat !important;
 }
 
-.truck > .glases {
+.truck>.glases {
   background: rgb(40, 181, 245);
-  background: -moz-linear-gradient(
+  background: -moz-linear-gradient(-45deg,
-    -45deg,
+      rgba(40, 181, 245, 1) 0%,
-    rgba(40, 181, 245, 1) 0%,
+      rgba(40, 181, 245, 1) 50%,
-    rgba(40, 181, 245, 1) 50%,
+      rgba(2, 153, 227, 1) 52%,
-    rgba(2, 153, 227, 1) 52%,
+      rgba(2, 153, 227, 1) 100%);
-    rgba(2, 153, 227, 1) 100%
+  background: -webkit-linear-gradient(-45deg,
-  );
+      rgba(40, 181, 245, 1) 0%,
-  background: -webkit-linear-gradient(
+      rgba(40, 181, 245, 1) 50%,
-    -45deg,
+      rgba(2, 153, 227, 1) 52%,
-    rgba(40, 181, 245, 1) 0%,
+      rgba(2, 153, 227, 1) 100%);
-    rgba(40, 181, 245, 1) 50%,
+  background: linear-gradient(135deg,
-    rgba(2, 153, 227, 1) 52%,
+      rgba(40, 181, 245, 1) 0%,
-    rgba(2, 153, 227, 1) 100%
+      rgba(40, 181, 245, 1) 50%,
-  );
+      rgba(2, 153, 227, 1) 52%,
-  background: linear-gradient(
+      rgba(2, 153, 227, 1) 100%);
-    135deg,
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#28b5f5', endColorstr='#0299e3', GradientType=1);
-    rgba(40, 181, 245, 1) 0%,
-    rgba(40, 181, 245, 1) 50%,
-    rgba(2, 153, 227, 1) 52%,
-    rgba(2, 153, 227, 1) 100%
-  );
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#28b5f5', endColorstr='#0299e3',GradientType=1 );
   position: absolute;
   height: 25px;
   width: 25px;
@@ -125,7 +130,8 @@ body {
   border-top-right-radius: 6px;
   animation: updown-half 0.4s linear infinite;
 }
-.truck > .glases:after {
+
+.truck>.glases:after {
   content: '';
   display: block;
   background-color: #fbd734;
@@ -140,7 +146,7 @@ body {
   border-top-left-radius: 0px;
 }
 
-.truck > .glases:before {
+.truck>.glases:before {
   content: '';
   display: block;
   background-color: #f9bf2c;
@@ -152,7 +158,7 @@ body {
   border-top-right-radius: 4px;
 }
 
-.truck > .bonet {
+.truck>.bonet {
   background-color: #f9bf2c;
   position: absolute;
   width: 124px;
@@ -163,32 +169,26 @@ body {
   animation: updown 0.4s linear infinite;
 }
 
-.truck > .bonet:after {
+.truck>.bonet:after {
   content: '';
   display: block;
   background: rgb(255, 255, 255);
-  background: -moz-linear-gradient(
+  background: -moz-linear-gradient(-45deg,
-    -45deg,
+      rgba(255, 255, 255, 1) 0%,
-    rgba(255, 255, 255, 1) 0%,
+      rgba(241, 241, 241, 1) 50%,
-    rgba(241, 241, 241, 1) 50%,
+      rgba(225, 225, 225, 1) 51%,
-    rgba(225, 225, 225, 1) 51%,
+      rgba(246, 246, 246, 1) 100%);
-    rgba(246, 246, 246, 1) 100%
+  background: -webkit-linear-gradient(-45deg,
-  );
+      rgba(255, 255, 255, 1) 0%,
-  background: -webkit-linear-gradient(
+      rgba(241, 241, 241, 1) 50%,
-    -45deg,
+      rgba(225, 225, 225, 1) 51%,
-    rgba(255, 255, 255, 1) 0%,
+      rgba(246, 246, 246, 1) 100%);
-    rgba(241, 241, 241, 1) 50%,
+  background: linear-gradient(135deg,
-    rgba(225, 225, 225, 1) 51%,
+      rgba(255, 255, 255, 1) 0%,
-    rgba(246, 246, 246, 1) 100%
+      rgba(241, 241, 241, 1) 50%,
-  );
+      rgba(225, 225, 225, 1) 51%,
-  background: linear-gradient(
+      rgba(246, 246, 246, 1) 100%);
-    135deg,
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f6f6f6', GradientType=1);
-    rgba(255, 255, 255, 1) 0%,
-    rgba(241, 241, 241, 1) 50%,
-    rgba(225, 225, 225, 1) 51%,
-    rgba(246, 246, 246, 1) 100%
-  );
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f6f6f6',GradientType=1 );
   height: 10px;
   width: 6px;
   position: absolute;
@@ -197,7 +197,7 @@ body {
   border-top-left-radius: 4px;
 }
 
-.truck > .base {
+.truck>.base {
   position: absolute;
   background-color: #445a64;
   width: 106px;
@@ -208,7 +208,7 @@ body {
   animation: updown 0.4s linear infinite;
 }
 
-.truck > .base:before {
+.truck>.base:before {
   content: '';
   display: block;
   background-color: #e54a18;
@@ -220,7 +220,7 @@ body {
   border-bottom-left-radius: 4px;
 }
 
-.truck > .base:after {
+.truck>.base:after {
   content: '';
   display: block;
   background-color: RGB(84, 110, 122);
@@ -233,7 +233,7 @@ body {
   z-index: -1;
 }
 
-.truck > .base-aux {
+.truck>.base-aux {
   width: 82px;
   height: 8px;
   background-color: #f9bf2c;
@@ -243,77 +243,66 @@ body {
   border-bottom-right-radius: 4px;
   animation: updown 0.4s linear infinite;
 }
-.truck > .wheel-back {
+
+.truck>.wheel-back {
   left: 20px;
 }
 
-.truck > .wheel-front {
+.truck>.wheel-front {
   left: 95px;
 }
 
-.truck > .wheel-back,
+.truck>.wheel-back,
-.truck > .wheel-front {
+.truck>.wheel-front {
   border-radius: 100%;
   position: absolute;
   background: rgb(84, 110, 122);
-  background: -moz-linear-gradient(
+  background: -moz-linear-gradient(-45deg,
-    -45deg,
+      rgba(84, 110, 122, 1) 0%,
-    rgba(84, 110, 122, 1) 0%,
+      rgba(84, 110, 122, 1) 49%,
-    rgba(84, 110, 122, 1) 49%,
+      rgba(68, 90, 100, 1) 52%,
-    rgba(68, 90, 100, 1) 52%,
+      rgba(68, 90, 100, 1) 100%);
-    rgba(68, 90, 100, 1) 100%
+  background: -webkit-linear-gradient(-45deg,
-  );
+      rgba(84, 110, 122, 1) 0%,
-  background: -webkit-linear-gradient(
+      rgba(84, 110, 122, 1) 49%,
-    -45deg,
+      rgba(68, 90, 100, 1) 52%,
-    rgba(84, 110, 122, 1) 0%,
+      rgba(68, 90, 100, 1) 100%);
-    rgba(84, 110, 122, 1) 49%,
+  background: linear-gradient(135deg,
-    rgba(68, 90, 100, 1) 52%,
+      rgba(84, 110, 122, 1) 0%,
-    rgba(68, 90, 100, 1) 100%
+      rgba(84, 110, 122, 1) 49%,
-  );
+      rgba(68, 90, 100, 1) 52%,
-  background: linear-gradient(
+      rgba(68, 90, 100, 1) 100%);
-    135deg,
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#546e7a', endColorstr='#445a64', GradientType=1);
-    rgba(84, 110, 122, 1) 0%,
-    rgba(84, 110, 122, 1) 49%,
-    rgba(68, 90, 100, 1) 52%,
-    rgba(68, 90, 100, 1) 100%
-  );
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#546e7a', endColorstr='#445a64',GradientType=1 );
   top: 80px;
   height: 22px;
   width: 22px;
   animation: spin 0.6s linear infinite;
 }
 
-.truck > .wheel-back:before,
+.truck>.wheel-back:before,
-.truck > .wheel-front:before {
+.truck>.wheel-front:before {
   content: '';
   border-radius: 100%;
   left: 5px;
   top: 5px;
   position: absolute;
   background: rgb(175, 189, 195);
-  background: -moz-linear-gradient(
+  background: -moz-linear-gradient(-45deg,
-    -45deg,
+      rgba(175, 189, 195, 1) 0%,
-    rgba(175, 189, 195, 1) 0%,
+      rgba(175, 189, 195, 1) 50%,
-    rgba(175, 189, 195, 1) 50%,
+      rgba(143, 163, 173, 1) 51%,
-    rgba(143, 163, 173, 1) 51%,
+      rgba(143, 163, 173, 1) 100%);
-    rgba(143, 163, 173, 1) 100%
+  background: -webkit-linear-gradient(-45deg,
-  );
+      rgba(175, 189, 195, 1) 0%,
-  background: -webkit-linear-gradient(
+      rgba(175, 189, 195, 1) 50%,
-    -45deg,
+      rgba(143, 163, 173, 1) 51%,
-    rgba(175, 189, 195, 1) 0%,
+      rgba(143, 163, 173, 1) 100%);
-    rgba(175, 189, 195, 1) 50%,
+  background: linear-gradient(135deg,
-    rgba(143, 163, 173, 1) 51%,
+      rgba(175, 189, 195, 1) 0%,
-    rgba(143, 163, 173, 1) 100%
+      rgba(175, 189, 195, 1) 50%,
-  );
+      rgba(143, 163, 173, 1) 51%,
-  background: linear-gradient(
+      rgba(143, 163, 173, 1) 100%);
-    135deg,
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#afbdc3', endColorstr='#8fa3ad', GradientType=1);
-    rgba(175, 189, 195, 1) 0%,
-    rgba(175, 189, 195, 1) 50%,
-    rgba(143, 163, 173, 1) 51%,
-    rgba(143, 163, 173, 1) 100%
-  );
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#afbdc3', endColorstr='#8fa3ad',GradientType=1 );
   height: 12px;
   width: 12px;
 }
@@ -322,6 +311,7 @@ body {
   50% {
     top: 81px;
   }
+
   100% {
     transform: rotate(360deg);
   }
@@ -331,6 +321,7 @@ body {
   30% {
     transform: rotate(1deg);
   }
+
   50% {
     top: 11px;
   }
@@ -341,7 +332,8 @@ body {
   }
 }
 
-.truck > .smoke {
+
+.truck>.smoke {
   position: absolute;
   background-color: #afbdc3;
   border-radius: 100%;
@@ -353,7 +345,7 @@ body {
   opacity: 0;
 }
 
-.truck > .smoke:after {
+.truck>.smoke:after {
   content: '';
   position: absolute;
   background-color: RGB(143, 163, 173);
@@ -364,7 +356,7 @@ body {
   left: 4px;
 }
 
-.truck > .smoke:before {
+.truck>.smoke:before {
   content: '';
   position: absolute;
   background-color: RGB(143, 163, 173);
@@ -375,11 +367,13 @@ body {
   left: 0px;
 }
 
+
 @keyframes fade {
   30% {
     opacity: 0.3;
     left: 7px;
   }
+
   50% {
     opacity: 0.5;
     left: 6px;
@@ -400,6 +394,7 @@ body {
   from {
     background-position-x: 0px;
   }
+
   to {
     background-position-x: -400px;
   }
@@ -423,4 +418,4 @@ body {
   70% {
     transform: translateY(-5%);
   }
-}
+}

src/api/basicdata/basicdataWarehouse.js

@@ -204,3 +204,19 @@ export const $_basicdataWarehousedetail = params => {
     params,
   });
 };
+// 扩展配置
+export const $_warehouseConfig = params => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseConfig/detail',
+    method: 'get',
+    params,
+  });
+};
+// 扩展配置更新
+export const $_warehouseConfigupdate = data => {
+  return request({
+    url: '/api/logpm-warehouse/warehouseConfig/update',
+    method: 'post',
+    data,
+  });
+};

src/api/distribution/distributionDeliveryList.js

@@ -374,7 +374,7 @@ export const $_showInventoryPackgeCode = params => {
 // 驳回
 export const $_loadingAbnormalPackageListTurnDown = params => {
   return request({
-    url: '/api/logpm-distribution/signfor/loadingAbnormalPackageListTurnDown',
+    url: '/api/logpm-distribution/signfor/newLoadingAbnormalPackageListTurnDown',
     method: 'get',
     params,
   });

src/api/distribution/distributionSignfor.js

@@ -198,6 +198,15 @@ export const loadingAbnormalPackageListDetail = signId => {
     },
   });
 };
+export const $_newLoadingAbnormalPackageListDetail = signId => {
+  return request({
+    url: '/api/logpm-distribution/signfor/newLoadingAbnormalPackageListDetail',
+    method: 'get',
+    params: {
+      signId,
+    },
+  });
+};
 /**
  * 审核异常包件
  * @param signId

src/option/basicdata/basicdataWarehouseTemp.js

@@ -337,7 +337,7 @@ export const columnList = [
       label: '操作',
       type: 6,
       values: '',
-      width: '150',
+      width: '180',
       checkarr: [],
       fixed: 'right',
       sortable: false,

src/option/distribution/DeliveryExceptionReview.js

@@ -203,20 +203,10 @@ export const AbnormalReview = [
     sortable: false,
     head: false,
   },
+
   {
-    prop: 'isAbnormalLoading',
+    prop: 'abnormalTypeName',
-    label: '异常装车',
+    label: '异常类型',
-    type:1,
-    values: '',
-    width: '100',
-    checkarr: [],
-    fixed: false,
-    sortable: false,
-    head: false,
-  },
-  {
-    prop: 'isAbnormalSigning',
-    label: '异常签收',
     type: 1,
     values: '',
     width: '100',
@@ -452,7 +442,7 @@ export const AbnormalReview = [
     label: '操作',
     type: 6,
     values: '',
-    width: '120',
+    width: '180',
     checkarr: [],
     fixed: 'right',
     sortable: false,

src/option/distribution/createTask.js

@@ -475,7 +475,7 @@ export const columnListInventory = [
   {
     prop: 'materialCode',
     label: '物料编码',
-    type: 15,
+    type: 1,
     values: '',
     width: '150',
     checkarr: [],
@@ -495,16 +495,16 @@ export const columnListInventory = [
     head: false,
   },
 
-  {
+  // {
-    prop: '',
+  //   prop: '',
-    label: '操作',
+  //   label: '操作',
-    type: 6,
+  //   type: 6,
-    values: '',
+  //   values: '',
-    width: '120',
+  //   width: '120',
-    checkarr: [],
+  //   checkarr: [],
-    fixed: 'right',
+  //   fixed: 'right',
-    sortable: false,
+  //   sortable: false,
-  },
+  // },
 ];
 
 export const comparativecolumnList = [

src/utils/util.js

@@ -547,13 +547,11 @@ const updateDetailQuery = (index, propName, detailsQuery) => {
   } else {
     if (detailsQuery.hasOwnProperty(propName)) {
       delete detailsQuery[propName]; // 确保删除属性
-    } else {
     }
   }
 };
-// 处理 row 属性并更新 details.query
+// 处理 row 属性并更新 details.query（不可移除）
 export const processRowProperty = (index, row, details) => {
-  console.log(`Processing: ${row.prop}`);
   if (typeof row.prop === 'string') {
     const nameRegex = /([a-zA-Z0-9_]+)NameS$/;
     const match = row.prop.match(nameRegex);
@@ -569,10 +567,27 @@ export const processRowProperty = (index, row, details) => {
     } else {
       updateDetailQuery(index, row.prop, details.query);
     }
-  } else {
   }
 };
+// 处理 row 属性并更新 details.query新版支持多个，
+export const processRowPropertyName = (index, row, details) => {
+  if (typeof row.prop === 'string') {
+    const nameRegex = /([a-zA-Z0-9_]+)NameS$/;
+    const match = row.prop.match(nameRegex);
+    if (match) {
+      const basePropName = match[1];
+      const fullPropNameS = basePropName + 'NameS';
 
+      if (details.hasOwnProperty(fullPropNameS)) {
+        delete details[fullPropNameS];
+      } else {
+      }
+      updateDetailQuery(index, basePropName, details);
+    } else {
+      updateDetailQuery(index, row.prop, details);
+    }
+  }
+};
 /**
  * 数字运算（主要用于小数点精度问题）
  * [see](https://juejin.im/post/6844904066418491406#heading-12)

src/views/Pricesystem/Price/PriceBill.vue

@@ -321,7 +321,6 @@
         :rules="[{ required: true, message: '请选择发货单位', trigger: ['blur', 'change'] }]"
       >
         <el-select
-          class="w100"
           v-model="details.form.sendOrg"
           filterable
           clearable

src/views/Pricesystem/Price/PriceDelivery.vue

@@ -45,7 +45,7 @@
         </div>
         <!-- 服务类型  -->
         <div class="el_sever_title">
-          <span>市配</span>
+          <span>{{form.dispatchServiceType ==1?'商配':'市配'}}</span>
         </div>
 
         <div class="el_flex">

src/views/Pricesystem/Price/PriceTrunkLine.vue

@@ -141,7 +141,7 @@
 
                     <tbody>
                       <tr v-for="(item, index) in value.categories">
-                        <td class="index">{{ index }}</td>
+                        <td class="index">{{ index +1 }}</td>
                         <!-- 品类名称 -->
                         <td>{{ item.name }}</td>
                         <!-- 费用 -->
@@ -333,7 +333,6 @@
         :rules="[{ required: true, message: '请选择发货单位', trigger: ['blur', 'change'] }]"
       >
         <el-select
-          class="w100"
           v-model="details.form.sendOrg"
           filterable
           clearable
@@ -477,7 +476,7 @@
 
                   <tbody>
                     <tr v-for="(item, index) in value.categories">
-                      <td class="index">{{ index }}</td>
+                      <td class="index">{{ index  +1}}</td>
                       <!-- 品类名称 -->
                       <td>{{ item.name }}</td>
                       <!-- 费用 -->

src/views/basicdata/warehouse/warehouse/basicdataWarehouse.vue

@@ -1,8 +1,7 @@
 <template>
   <basic-container>
     <el-row v-if="details.search">
-      <el-form :inline="true" :model="Topquery" class="el-fr-d">
+      <el-form :inline="true" :model="Topquery" class="el-fr-d"> </el-form>
-      </el-form>
     </el-row>
     <!-- 头部右侧按钮模块 -->
     <div class="el_top_btn">
@@ -35,9 +34,10 @@
         <template #default="slotProps">
           <template v-if="slotProps.scope.column.label === '操作'">
             <div class="ElBtnClass">
-              <el-button @click="view(slotProps.scope)">查看</el-button>
+              <el-text @click="Expandconfiguration(slotProps.scope.row)">扩展配置</el-text>
-              <el-button @click="edit(slotProps.scope)">编辑</el-button>
+              <el-text @click="view(slotProps.scope)">查看</el-text>
-              <el-button @click="DeleteInformation(slotProps.scope)">删除</el-button>
+              <el-text @click="edit(slotProps.scope)">编辑</el-text>
+              <el-text @click="DeleteInformation(slotProps.scope)">删除</el-text>
             </div>
           </template>
         </template>
@@ -308,7 +308,7 @@
           />
         </el-form-item>
 
-        <el-form-item label="日期范围"  prop="daterange">
+        <el-form-item label="日期范围" prop="daterange">
           <el-date-picker
             v-model="Addform.daterange"
             type="daterange"
@@ -374,6 +374,59 @@
         </div>
       </template>
     </el-dialog>
+
+    <!-- 扩展配置 -->
+    <el-dialog
+      v-model="dialogExpandconfiguration"
+      width="50%"
+      :fullscreen="Isitfullscreen"
+      :show-close="false"
+      class="el_Inventorydialog"
+    >
+      <template #header>
+        <div class="el_dialog__header">
+          <div>
+            <span>扩展配置</span>
+          </div>
+          <div>
+            <el-icon @click="Isfullscreen"><FullScreen /></el-icon>
+            <el-icon @click="dialogExpandconfiguration=false"><Close /></el-icon>
+          </div>
+        </div>
+      </template>
+      <el-form
+        v-loading="Expandconfigurationloading"
+        element-loading-text="Loading..."
+        :model="Expandconfigurationform"
+        label-width="200px"
+        class="el_Expandconfiguration"
+      >
+        <el-form-item label="是否强制装车">
+          <el-select
+            v-model="Expandconfigurationform.isStrictLoading"
+            placeholder="请选择是否强制装车"
+          >
+            <el-option
+              v-for="item in Compulsoryoptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialogExpandconfiguration = false">取消</el-button>
+          <el-button
+            type="primary"
+            @click="Expandconfigurationsubmit"
+            :disabled="Expandconfigurationloading"
+            >确定
+          </el-button>
+        </div>
+      </template>
+    </el-dialog>
   </basic-container>
   <!-- 列表配置显示 -->
   <edittablehead
@@ -408,6 +461,8 @@ import {
   $_basicdataWarehousesave,
   $_basicdataWarehouse,
   $_basicdataWarehousedetail,
+  $_warehouseConfig,
+  $_warehouseConfigupdate,
 } from '@/api/basicdata/basicdataWarehouse';
 
 import { processRowProperty, deepClone } from '@/utils/util';
@@ -417,22 +472,35 @@ import dayjs from 'dayjs';
 import { Delete, Download, Plus, ZoomIn } from '@element-plus/icons-vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { compressImageBlob } from '@/components/IMGcompressor/imgcompressor.js';
-import { add } from '@/api/distribution/distributionParcelNumber';
 const dataRwo = ref({}); //当前行数据
 const props = { multiple: true };
 const options = ref([]); //职能类型
+const Compulsoryoptions = [
+  {
+    value: 1,
+    label: '是',
+  },
+  {
+    value: 0,
+    label: '否',
+  },
+];
+const Expandconfigurationform = ref({});
 const selectAll = ref([]);
 const formdisabled = ref(false);
 const search = ref(false); //搜索展开
+const warehouseID = ref('');
 const Manageregionalconfiguration = {
   multiple: true,
   checkStrictly: true,
 };
-const dialogDetail = ref(false); //查看详情弹窗
 const dialogImageUrl = ref('');
 const dialogVisible = ref(false);
 const TCloading = ref(false);
 const disabled = ref(false);
+const dialogExpandconfiguration = ref(false);
+const Expandconfigurationloading = ref(false);
+const Isitfullscreen = ref(false);
 const dialogTitle = ref('新增');
 const handleRemove = file => {
   console.log(file);
@@ -456,7 +524,6 @@ const rules = reactive({
   department: [{ required: true, message: '请选择所属部门', trigger: 'change' }],
   address: [{ required: true, message: '请选择仓库地址', trigger: 'change' }],
   daterange: [{ required: true, message: '请选日期范围', trigger: 'change' }],
-  
 });
 const Topquery = ref({}); //顶部搜索参数
 const newlyaddload = ref(false); //新增弹窗
@@ -663,7 +730,6 @@ const showdrawer = _flag => {
 function updateDictionary(targetArray, dictionaryType) {
   getDictionaryBiz(dictionaryType).then(res => {
     res.data.data.forEach(item => {
-      console.log(item);
       targetArray.push({
         dictKey: item.dictKey,
         dictValue: item.dictValue,
@@ -671,6 +737,15 @@ function updateDictionary(targetArray, dictionaryType) {
     });
   });
 }
+// 获取当前仓库ID
+const getwarehouse = () => {
+  // 获取本地存储的值
+  const my_data = JSON.parse(localStorage.getItem('my_data'));
+  warehouseID.value = my_data.id;
+  console.log(warehouseID.value, '仓库ID');
+};
+getwarehouse();
+
 const dictionary = () => {
   updateDictionary(options.value, 'warehouse_function_type'); //职能类型
   updateDictionary(WarehouseType.value, 'warehouse_type'); //仓库类型
@@ -788,9 +863,7 @@ const onLoad = val => {
     });
 };
 onLoad();
-const searchHide = () => {
+const searchHide = () => {};
-  
-};
 
 // 每页多少条
 const sizeChange = val => {
@@ -915,7 +988,10 @@ const edit = value => {
   newlyaddload.value = true; //展开弹窗
   GetDetails(value); //获取详情
 };
-
+// 是否全屏
+const Isfullscreen = () => {
+  Isitfullscreen.value = !Isitfullscreen.value;
+};
 // 查看详情
 const view = value => {
   dialogTitle.value = '查看详情';
@@ -940,6 +1016,57 @@ const beforeAvatarUpload = async rawFile => {
   const res = await compressImageBlob(rawFile);
   return res;
 };
+// 扩展配置
+const Expandconfiguration = async row => {
+  if (!row.id) {
+    ElMessage({
+      message: '当前仓库数据错误',
+      type: 'warning',
+    });
+    return;
+  }
+  console.log('扩展配置');
+  try {
+    let data = {
+      warehouseId: row.id,
+    };
+
+    let _res = await $_warehouseConfig(data);
+
+    if (_res.data.code == 200) {
+      const { id, isStrictLoading } = _res.data.data;
+      dialogExpandconfiguration.value = true;
+      Expandconfigurationform.value.id = id; //id
+      Expandconfigurationform.value.isStrictLoading = isStrictLoading; //是否强制装车
+    }
+    console.log(_res, '_res');
+  } catch (err) {
+    console.log(err);
+  } finally {
+  }
+};
+// 扩展配置提交
+const Expandconfigurationsubmit = async () => {
+  try {
+    let data = {
+      ...Expandconfigurationform.value,
+    };
+    Expandconfigurationloading.value = true;
+    let _res = await $_warehouseConfigupdate(data);
+    if (_res.data.code == 200) {
+      dialogExpandconfiguration.value = false; //关闭弹窗
+      ElMessage({
+        message: _res.data.msg,
+        type: 'success',
+      });
+    }
+    console.log(_res);
+  } catch (error) {
+    console.log(error, 'error');
+  } finally {
+    Expandconfigurationloading.value = false;
+  }
+};
 // 删除
 const DeleteInformation = val => {
   ElMessageBox.confirm('是否删除该条数据?确定此操作后不可撤销！', '删除提示', {
@@ -1004,16 +1131,16 @@ const newlyaddSubmit = () => {
           return;
         }
         data.paymentCodeUrl = imgURl.join(',');
-      }else{
+      } else {
-        delete data.paymentCodeUrl
+        delete data.paymentCodeUrl;
       }
       data.warehouseAddress = Addform.value.address[2]; //地址
       console.log(Addform.value, 'Addform.value');
       if (data.daterange?.length) {
         data.daterange[0] = dayjs(data.daterange[0]).format('YYYY-MM-DD');
         data.daterange[1] = dayjs(data.daterange[1]).format('YYYY-MM-DD');
-      }else{
+      } else {
-       delete data.daterange
+        delete data.daterange;
       }
       data.administrativeAreas = data.administrativeAreas.join(',');
       if (Addform.value.daterange?.length) {
@@ -1111,4 +1238,26 @@ const newlyaddSubmit = () => {
   color: white;
   background-color: #8f8f8f;
 }
+.el_dialog__header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  i {
+    margin: 0 8px;
+  }
+}
+:deep(.el_Inventorydialog) {
+  .el-tab-pane {
+    display: none;
+  }
+  .el-tabs__content {
+    padding: 0 10px;
+  }
+}
+.el_Expandconfiguration {
+  .el-form-item {
+    flex-direction: column;
+    width: 20%;
+  }
+}
 </style>

src/views/distribution/checkInventoryTask/createTask.vue

@@ -46,7 +46,6 @@
           :loading="loadingObj.list"
           @inputTxt="inputsc"
           @timeCheck="timesc"
-          @btnCheck="btnsc"
           @selectCheck="selectsc"
           @selection="selectionChange"
         >
@@ -252,19 +251,29 @@
       </template>
 
       <el-tabs type="border-card" v-model="eltabs" @tab-click="tabclick">
-        <el-tab-pane label="未盘点明细" :name="0"></el-tab-pane>
         <el-tab-pane label="已盘点明细" :name="1"></el-tab-pane>
+        <el-tab-pane label="未盘点明细" :name="0"></el-tab-pane>
+        <div class="el_top_button">
+          <div class="el_top_button_left">
+            <el-button type="primary" icon="Download" @click="ExportDataInventory"
+              >导出数据</el-button
+            >
+            <el-button type="primary" icon="EditPen" @click="Submitmodifications" v-if="eltabs"
+              >提交修改</el-button
+            >
+            <el-button type="primary" icon="Menu" @click="Inventorypackages" v-if="!eltabs"
+              >盘点包件</el-button
+            >
+            <el-button type="primary" icon="Delete" v-if="eltabs" @click="BatchdeletePackages"
+              >删除包件</el-button
+            >
+          </div>
+          <div>
+            <el-button icon="el-icon-refresh" @click="Inventorysearch" circle></el-button>
+            <el-button icon="CircleClose" @click="Inventoryempty" circle></el-button>
+          </div>
+        </div>
         <!-- 首页表格 -->
-        <el-button type="primary" icon="Download" @click="ExportDataInventory">导出数据</el-button>
-        <el-button type="primary" icon="EditPen" @click="Submitmodifications" v-if="eltabs"
-          >提交修改</el-button
-        >
-        <el-button type="primary" icon="Menu" @click="Inventorypackages" v-if="!eltabs"
-          >盘点包件</el-button
-        >
-        <el-button type="primary" icon="Delete" v-if="eltabs" @click="BatchdeletePackages"
-          >删除包件</el-button
-        >
         <el-row>
           <!-- 列表模块 -->
           <tablecmt
@@ -274,7 +283,6 @@
             :loading="loadingObj.inventorylist"
             @inputTxt="inputsc"
             @timeCheck="timesc"
-            @btnCheck="btnsc"
             @selectCheck="selectsc"
             @selection="selectionChange"
           >
@@ -291,7 +299,7 @@
                   cancel-button-text="取消"
                   icon="Download"
                   icon-color="#626AEF"
-                  title="是否导出数据?"
+                  title="是否导出该条数据?"
                   @confirm="ExportDataIndexRwo(slotProps.scope.row)"
                 >
                   <template #reference>
@@ -337,7 +345,6 @@
           :loading="loadingObj.comparativelist"
           @inputTxt="inputsc"
           @timeCheck="timesc"
-          @btnCheck="btnsc"
           @selectCheck="selectsc"
           @selection="selectionChange"
         >
@@ -387,7 +394,7 @@ import {
 } from '@/option/distribution/createTask.js';
 import { processRowProperty, setNodeHeight } from '@/utils/util';
 import { ElMessageBox, ElMessage } from 'element-plus';
-import { downloadXls, handleClearTableQuery } from '@/utils/util';
+import { downloadXls, handleClearTableQuery,processRowPropertyName } from '@/utils/util';
 import {
   getTaskQuestPage,
   getAllDataWithPackage,
@@ -426,7 +433,7 @@ const popupnotInventoryloading = ref(false);
 const popupnotiInventory = ref(false);
 const Inventorydialog = ref(false);
 const DataRow = ref({});
-const eltabs = ref(0);
+const eltabs = ref(1);
 const comparativedialog = ref(false);
 const Inventorydetailsstatus = ref(false);
 const rules = reactive({
@@ -551,10 +558,7 @@ const showdrawer = _flag => {
 /** 表格表头输入框搜索 */
 /** 表格表头输入框搜索 */
 const inputsc = (index, row) => {
-  // Inventorydetailsstatus:表示是盘点明细弹窗 否则就是首页搜索
+  processRowPropertyName(index, row, Inventorydetailsstatus.value ? details.queryInventory: details.query);
-  const queryField = Inventorydetailsstatus.value ? details.queryInventory : details.query;
-  queryField[row.prop] = index;
-  processRowProperty(index, row, details);
   Inventorydetailsstatus.value ? InventoriedData() : onLoad();
 };
 /** 表格表头时间选择 */
@@ -570,15 +574,9 @@ const timesc = (index, row) => {
   onLoad();
 };
 
-/** 表格表头输入框搜索 */
-const btnsc = val => {
-  console.log(val);
-};
 /** 表格表头下拉框选择 */
 const selectsc = (index, row) => {
-  const queryField = Inventorydetailsstatus.value ? details.queryInventory : details.query;
+  processRowPropertyName(index, row,Inventorydetailsstatus.value ? details.queryInventory: details.query);
-  queryField[row.prop] = index;
-  processRowProperty(index, row, details);
   Inventorydetailsstatus.value ? InventoriedData() : onLoad();
 };
 /** 表格表头复选框选择 */
@@ -1004,7 +1002,7 @@ const Inventorydetails = async row => {
   Inventorydialog.value = true; //展开盘点明细
   await nextTick(); //
   const _node = document.querySelector('.InventorytableNode');
-  setNodeHeight(_node, '70vh', true);
+  setNodeHeight(_node, '60vh', true);
   tabclick(); //获取盘点明细数据
 };
 // 盘点明细编辑
@@ -1019,14 +1017,15 @@ const tabclick = async value => {
   if (value) {
     eltabs.value = value.props.name;
   } else {
-    eltabs.value = 0; //默认获取未盘点数据
+    eltabs.value = 1; //默认获取已盘点数据
   }
   details.inventorypage.currentPage = 1; //重置页码
   details.queryInventory = {}; //清空搜索条件
   await handleClearTableQuery(details.columnListInventory); //重置搜索表头搜索条件
   InventoriedData(); //获取数据
 };
-// 已盘点明细
+
+// 盘点明细
 const InventoriedData = value => {
   const { id, questNum } = DataRow.value;
   let data = {
@@ -1058,6 +1057,18 @@ const InventoriedData = value => {
       details.loadingObj.inventorylist = false;
     });
 };
+
+// 盘点明细清空搜索条件
+const Inventoryempty = () => {
+  details.queryInventory = {};
+  handleClearTableQuery(details.columnListInventory); //重置搜索表头搜索条件
+  details.inventorypage.currentPage = 1;
+  InventoriedData();
+};
+// 盘点明细刷新
+const Inventorysearch = () => {
+  InventoriedData();
+};
 // 删除盘点包件校验
 const BatchdeletePackages = () => {
   if (!details.selectionList.length) {
@@ -1172,7 +1183,7 @@ const Submitmodifications = () => {
         let _res = await $_updateDetailInfo(data);
         console.log(_res, '修改品类提交');
         if (_res.data.code == 200) {
-          InventoriedData();
+          await InventoriedData();
           ElMessage({
             message: _res.data.msg,
             type: 'success',
@@ -1365,4 +1376,13 @@ const Inventorysynchronization = row => {
     padding: 0 10px;
   }
 }
+.el_top_button {
+  margin: 8px 0;
+  display: flex;
+  justify-content: space-between;
+  .el_top_button_left {
+    display: flex;
+    align-items: center;
+  }
+}
 </style>

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -770,6 +770,7 @@
       @close="Abnormalshutdown"
       class="el_abnormalBox"
     >
+    <el-button type="primary" @click="abnormalViewQRcode(1)">批量查看二维码</el-button>
       <tablecmt
         :columnList="AbnormalReview"
         :tableData="AbnormalReviewData"
@@ -782,31 +783,36 @@
       >
         <template #default="slotProps">
           <template v-if="slotProps.scope.column.label == '操作'">
+            <div v-if="slotProps.scope.row.auditingStatusName === '待审核'">
+              <el-text
+                v-if="slotProps.scope.row.abnormalTypeName !== '装车异常'"
+                size="small"
+                @click="auditing(slotProps.scope.row)"
+                >审 核</el-text
+              >
+              <el-text
+                v-if="slotProps.scope.row.abnormalTypeName === '计划异常'"
+                type="primary"
+                text
+                icon="el-icon-view"
+                @click="RejectFn(slotProps.scope.row)"
+                >驳回
+              </el-text>
+            </div>
+
             <el-text
-              v-if="
+              @click="abnormalViewQRcode(2,slotProps.scope.row)"
-                slotProps.scope.row.auditingStatus === 1 ||
+              style="margin-left: 10px"
-                slotProps.scope.row.auditingStatusName == '待审核'
-              "
-              size="small"
-              @click="auditing(slotProps.scope.row)"
-              >审 核</el-text
-            >
-            <el-text
-              v-if="
-                slotProps.scope.row.isAbnormalSigning == '否' &&
-                slotProps.scope.row.auditingStatusName == '待审核'
-              "
               type="primary"
               text
-              icon="el-icon-view"
+            >
-              @click="RejectFn(slotProps.scope.row)"
+              查看二维码
-              >驳回
             </el-text>
-            <el-text
+            <!-- <el-text
               v-if="slotProps.scope.row.auditingStatusName == '已驳回'"
               @click="abnormalretention(slotProps.scope.row)"
               >滞留
-            </el-text>
+            </el-text> -->
           </template>
         </template>
       </tablecmt>
@@ -898,6 +904,7 @@ import {
   deliveryPicture,
   recheck,
   loadingAbnormalPackageListDetail,
+  $_newLoadingAbnormalPackageListDetail,
   loadingAbnormalPackageListAuditing,
   $_getReservationZeroPackageList,
 } from '@/api/distribution/distributionSignfor';
@@ -3247,6 +3254,40 @@ export default {
     },
   },
   methods: {
+    async abnormalViewQRcode(index, row) {
+      let qr = {};
+      if (index == 1) {
+        if (!this.selectionList.length) {
+          ElMessage({
+            message: `请勾选要查看二维码的数据`,
+            type: 'warning',
+          });
+          return;
+        }
+        qr.ids = this.selectionList.map(res => res.packageId).join(',');
+      } else {
+        qr.ids = row.packageId;
+      }
+      try {
+        this.AbnormalReviewloading = true;
+        this.html = '';
+        const res = await showOrderPackgeCode(qr);
+
+        const { code, data } = res.data;
+
+        if (code !== 200) return;
+
+        for (let i = 0; i < data.moldList.length; i++) {
+          const element = data.moldList[i];
+          this.html += element;
+        }
+        this.isShowPrint = true;//开启二维码弹出框
+      } catch (error) {
+        console.log('error :>> ', error);
+      } finally {
+        this.AbnormalReviewloading = false;
+      }
+    },
     // 异常审核函数
     viewAbnormalLoading(scope) {
       console.log(this.$refs.YcwtableBox, '2');
@@ -3255,7 +3296,7 @@ export default {
       this.AbnormalReviewloading = true; //开启加载
       console.log(scope, 'scope');
       this.abnormalBox = true;
-      loadingAbnormalPackageListDetail(scope.signId)
+      $_newLoadingAbnormalPackageListDetail(scope.signId)
         .then(res => {
           console.log(res, '异常审核查询');
           res.data.data.forEach(res => {
@@ -3295,8 +3336,16 @@ export default {
       $_loadingAbnormalPackageListTurnDown(data).then(res => {
         if (res.data.code == 200) {
           console.log(res, '驳回成功返回值');
+          ElMessage({
+          message: res.data.msg,
+          type: 'success',
+        })
           this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据
         }
+      }).catch(error=>{
+        console.log(error,'error');
+      }).finally(()=>{
+        this.AbnormalReviewloading = false; //关闭加载
       });
     },
     //审批异常装车包件
@@ -3314,6 +3363,10 @@ export default {
           console.log();
           this.viewAbnormalLoading(this.toexamineID); //驳回完成更新数据
         }
+      }).catch(error=>{
+        console.log(error,'error');
+      }).finally(()=>{
+        this.AbnormalReviewloading = false; //关闭加载
       });
     },
     // 一键审核

src/views/mail/inventory/list.vue

@@ -417,6 +417,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'quantityOccupied',
@@ -427,6 +428,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'outboundQuantity',
@@ -437,6 +439,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         /* {
            prop: 'despatch',
@@ -528,6 +531,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'unpack',

src/views/mail/order/list.vue

@@ -496,6 +496,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'handQuantity',
@@ -506,6 +507,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         // {
         //   prop: 'availableQuantity',
@@ -526,6 +528,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'sortingQuantity',
@@ -536,6 +539,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'deliveryQuantity',
@@ -546,6 +550,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'transferQuantity',
@@ -556,6 +561,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'signinQuantity',
@@ -566,6 +572,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'groundingStatusName',

src/views/mail/reservation/list.vue

@@ -520,6 +520,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'reservationStockListNum',
@@ -530,6 +531,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'collectionFee',
@@ -540,6 +542,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'otherFee',
@@ -550,6 +553,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'replaceFee',
@@ -560,6 +564,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         // {
         //   prop: 'fee',

src/views/mail/signfor/list.vue

@@ -444,6 +444,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'loadedNumber',
@@ -454,6 +455,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'receivedQuantity',
@@ -464,6 +466,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'withoutScanning',
@@ -474,6 +477,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'unsigneds',
@@ -484,6 +488,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         // {
         //   prop: 'deliveryDriverName',