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

.gitignore

@@ -21,6 +21,8 @@ yarn.lock
 
 pnpm-lock.yaml
 
+vite.config.js
+
 # editor directories and files
 .idea
 .vscode

src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue

@@ -66,6 +66,28 @@
       </div>
     </el-scrollbar>
   </div>
+  <div class="tips">
+      <div>
+        总货位:
+        <span class="def">{{ boxdetails.cargoNub }}</span>
+      </div>
+      <div>
+        占用货位:
+        <span class="red">{{ boxdetails.employNub }}</span>
+      </div>
+      <div>
+        未用货位:
+        <span class="green">{{ boxdetails.unusedNub }}</span>
+      </div>
+      <div>
+        禁用货位:
+        <span class="red">{{ boxdetails.disableNub }}</span>
+      </div>
+      <div>
+        货物总数:
+        <span class="red">{{ boxdetails.goodsNub }}</span>
+      </div>
+    </div>
   <div class="mabx">
     <el-scrollbar max-height="70vh">
       <div class="contentbx" :style="contenbxsty">
@@ -496,6 +518,7 @@ let details = reactive({
   checkselectchangearr: [],
   isshowdow: false,
   inputtxts1: '',
+  boxdetails:{}
 });
 onMounted(() => {
   details.contenbxsty['--length'] = details.contenarr[0]?.length || 0;
@@ -716,7 +739,8 @@ async function checkshelves() {
   console.log(res.data, 'res.data.datares.data.datares.data.datares.data.datares.data.data');
   let arrs = [];
   let maxlength = 0;
-  res.data.data.map(item => {
+  details.boxdetails=res.data.data
+  res.data.data.list.map(item => {
     if (item.columnNum > maxlength) {
       maxlength = item.columnNum;
     }
@@ -725,7 +749,7 @@ async function checkshelves() {
     arrs.push([]);
   }
   console.log(arrs, 'arrsarrsarrs');
-  res.data.data.map(item => {
+  res.data.data.list.map(item => {
     arrs[item.columnNum - 1]?.push(item);
   });
   arrs.map(item => {
@@ -2155,6 +2179,7 @@ const checkitem = ite => {
   console.log(details.isshowcon, 'details.isshowcondetails.isshowcon');
 };
 const {
+  boxdetails,
   isshowdow,
   inputtxts1,
   total,
@@ -2221,7 +2246,7 @@ const {
   // box-sizing: border-box;
   box-sizing: border-box;
   .contentbx {
-    width: calc(150 * var(--length) * 1px);
+    width: calc(150 * var(--length) * 0.0521vw);
     display: flex;
     // flex-direction: column;
     align-items: flex-end;
@@ -2380,4 +2405,36 @@ const {
     }
   }
 }
+.tips {
+    display: flex;
+    align-items: center;
+    .exprbuts{
+      width: 70px;
+      height: 30px;
+      color: #666666;
+      font-size: 12px;
+      background-color: #fff;
+      border-radius: 3px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      border: 1.5px solid #E8E8E8;
+      cursor: pointer;
+    }
+    > div {
+      margin-left: 20px;
+    }
+    .def {
+      color: rgb(30, 159, 255);
+      font-weight: 600;
+    }
+    .red {
+      color: rgb(255, 87, 34);
+      font-weight: 600;
+    }
+    .green {
+      color: rgb(95, 184, 120);
+      font-weight: 600;
+    }
+  }
 </style>

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -410,7 +410,7 @@
         </avue-form>
         <div style="bottom: 7%; margin-left: 500px; width: 50%">
           <div style="width: 100%">
-            <el-button type="primary" @click="submitForm" style="margin-right: 20%">确定</el-button>
+            <el-button type="primary" @click="submitForm">确定</el-button>
             <el-button type="primary" @click="cancellation">取消</el-button>
           </div>
         </div>
@@ -2505,18 +2505,16 @@ export default {
             console.log('更新参数>>>>>>>>', row);
              if (!!row.id) {
                updatesign(row).then(
-                       () => {
-                         this.$message({
-                           type: 'success',
-                           message: '操作成功!',
-                         });
-                         this.signBox = false;
-                         this.onLoad();
-                       },
-                       error => {
-                         console.log(error);
-                         this.signBox = false;
-                       }
+                () => {
+                  this.$message({
+                    type: 'success',
+                    message: '操作成功!',
+                  });
+                  this.onLoad();
+                },
+                error => {
+                  console.log(error);
+                }
                );
              }
           } else {
@@ -2530,10 +2528,12 @@ export default {
             console.log('一键签收data>>>>>>>>>>', data);
             getOneclickq(data).then(res => {
               this.$message.success(res.data.msg);
-              this.signBox = false;
               this.onLoad();
             });
           }
+          // 清空签收表单的数据, 并关闭弹出框
+          this.signform = {}
+          this.signBox = false;
         }
       });
     },

src/views/distribution/reservation/reservation.vue

@@ -66,13 +66,6 @@
                                         plain
                                 >批量转配送
                                 </el-button>
-                                 <el-button
-                                        type="danger"
-                                        icon="el-icon-delete"
-                                        @click="batchPrintData"
-                                        plain
-                                >批量打印
-                                </el-button>
                             </div>
                             <!-- 头部右侧按钮模块 -->
                             <div class="avue-crud__right">

src/views/distribution/reservation/reservationAddFrom.vue

@@ -378,13 +378,8 @@
                 <tablecmt
                         :columnList="columnParcels"
                         :tableData="packageData"
-                        :checkselect="packageData"
-
+                        :checkselect="packageDataSec"
                         :loading="loading"
-                        @inputTxt="inputsc"
-                        @timeCheck="timesc"
-                        @btnCheck="btnsc"
-                        @selectCheck="selectsc"
                         @selection="selectionPackageChange"
                 >
                     <template #default="slotProps">
@@ -1701,6 +1696,10 @@
         orderIds: '',
         //预约编号
         reservationId: '',
+        // 商城名称
+        marketName: '',
+        // 包件复选框列表
+        packageDataSec: [],
         inventoryData: [],
         orderData: [],
         stockListShow: false,
@@ -1841,7 +1840,11 @@
               item.applyNum = item.quantityStock - item.quantityOccupied;
             });
             this.page.total = inventoryList.total;
-            this.inventoryInfo = inventoryList.records;
+            console.log('res :>> ', res);
+            this.inventoryInfo = inventoryList.records.filter(value=>{
+              if(this.marketName === '')return value
+              return value.marketName === this.marketName
+            });
             //存在库存品，需要将库存品进行回显勾选
             if (this.inventoryData) {
               this.inventoryInfo.forEach((item, index) => {
@@ -1939,7 +1942,7 @@
         this.loading = true;
         this.packageList = row.packageList;
         this.obj = row;
-        console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
+        console.log('row>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', row);
         if (this.reservationId) {
           //这里就是编辑的数据回显问题
           let packageInfo = row.parcelListVOS;
@@ -1965,8 +1968,19 @@
             });
           }
           this.packageData = row.parcelListVOS;
+          
+          // 当row内packageList为空时, 默认全选
+          if(row.packageList.length === 0) {
+            this.packageDataSec = row.parcelListVOS
+          }else{
+            this.packageDataSec = row.parcelListVOS.filter(item => {
+              return row.packageList.some( value => value.id === item.id)
+            });
+          }
+
         } else {
           this.packageData = row.parcelListVOS;
+          this.packageDataSec = row.parcelListVOS;
           //这里回显展示的效果应该是展示被其他预约单勾选的订单处于禁用勾选，冻结订单处于禁用无法勾选，其他默认为全选
           let data = row.parcelListVOS;
           data.forEach((item, index) => {
@@ -2061,13 +2075,13 @@
         this.handleAddInventory();
       },
       onSubmitPackage() {
-        if (this.packageList.length === 0) {
+        if (this.packageDataSec.length === 0) {
           this.$message.warning('请选择包件!!!');
           return;
         }
         this.orderData.forEach(item => {
           if (item.id === this.obj.id) {
-            item.packageList = this.packageList;
+            item.packageList = this.packageDataSec;
           }
         });
         console.log('this.orderData------------>', this.orderData);
@@ -2181,6 +2195,10 @@
           }
           console.log(item);
         });
+        // 当两个列表没有数据时, 清空限制
+        if(this.inventoryData.length === 0 && this.orderData.length === 0) this.marketName = ''
+        // 当列表没有数据时, 表单清空
+        if(this.orderData.length === 0) this.form = {}
         console.log('>>>>>>>>>>>>>>>row', row);
       },
       removeStockList(row) {
@@ -2192,8 +2210,10 @@
           if (item.id === row.id) {
             this.inventoryData.splice(index, 1);
           }
-          console.log(item);
+          console.log('item>>>>>>>>>>>',item);
         });
+        // 当两个列表没有数据时, 清空限制
+        if(this.inventoryData.length === 0 && this.orderData.length === 0) this.marketName = ''
         console.log('>>>>>>>>>>>>>>>row', row);
       },
       showStockListEdit(row) {
@@ -2242,7 +2262,7 @@
       selectionPackageChange(list) {
         console.log('-----------<>', list);
         if (this.reservationId) {
-          this.packageList = list;
+          this.packageDataSec = list;
         } else {
           //新增
           let a = [];
@@ -2255,7 +2275,7 @@
               a.push(item);
             }
           });
-          this.packageList = a;
+          this.packageDataSec = a;
         }
       },
       selectionInventoryChange(list) {
@@ -2286,6 +2306,18 @@
             return;
           }
         });
+        console.log('this.inventoryList :>> ', this.inventoryList);
+        // 检测商场是否选择统一商场
+        let _marketName = ''
+        const _isUnifyMarketName = this.inventoryList.every(value => {
+          if (_marketName === '') _marketName = value.marketName
+          return _marketName === value.marketName 
+        })
+        if(!_isUnifyMarketName){
+          this.$message.warning('请选择统一商场!!!');
+          return;
+        }
+        this.marketName = _marketName
         this.inventoryData = this.inventoryList;
 
         // if (this.orderData.length) {
@@ -2340,6 +2372,9 @@
           }
         }
 
+        // 设置商场名称
+        this.marketName = list[0].marketName
+
         this.form.consignee = name;
         this.form.deliveryAddress = address;
         this.form.deliveryPhone = phone;
@@ -2433,8 +2468,9 @@
           this.reservationId,
           Object.assign(params, this.query)
         ).then(res => {
-          console.log('res------------>', res);
+          console.log('res123123------------>', res);
           const data = res.data.data;
+          console.log('data :>> ', data);
           this.stockArticleInfo = data.records;
           this.stockArticleInfo.forEach((item, index) => {
             //检查订单是否冻结
@@ -2520,9 +2556,16 @@
           page.pageSize,
           Object.assign(params, this.query)
         ).then(res => {
-          console.log('res------------>', res);
-          const data = res.data.data;
-          this.stockArticleInfo = data.records;
+          console.log('res123------------>', res);
+          const {records, total} = res.data.data;
+          this.stockArticleInfo = records.filter(value => {
+            if(this.marketName === '') return value
+            if(this.marketName) {
+              console.log('value.marketName :>> ', value.marketName);
+              return value.mallName === this.marketName
+            }
+          });
+          console.log('this.stockArticleInfo :>> ', this.stockArticleInfo);
           this.stockArticleInfo.forEach((item, index) => {
             //检查订单是否冻结
             this.checkOrder(item, index);
@@ -2537,7 +2580,7 @@
             // }else {
             //   this.orderList = [];
             // }
-            this.page.total = data.total;
+            this.page.total = total;
           });
           this.orderList = [];
         });
@@ -2586,7 +2629,9 @@
             // stockArticleListInfo.forEach(item=>{
             //
             // })
-            console.log('>>>>>>>>', reservation);
+            console.log('reservation>>>>>>>>', reservation);
+            // 添加限制的商场名称
+            this.marketName = reservation.mallName;
             this.orderData = reservation.stockArticleList;
             this.inventoryData = reservation.inventoryList;
             this.inventoryData.forEach(item => {
@@ -2610,7 +2655,7 @@
     }
   };
 </script>
-<style>
+<style lang="scss">
     input::-webkit-outer-spin-button,
     input::-webkit-inner-spin-button {
         -webkit-appearance: none;

src/views/distribution/signfor/distributionSignforedt.vue

@@ -1,129 +1,146 @@
 <template>
-    <basic-container>
-        <div class="avue-crud">
-            <el-row :gutter="24" class="rows">
-                <el-col :xl="7" :lg="7" :md="8" :sm="24">
-                    <span style="padding-left: 10%">当前签收单状态>>>>>>>>> {{signfordata.signingStatusAll}}</span>
-                </el-col>
-            </el-row>
-            <el-divider>基本信息</el-divider>
-            <el-row :gutter="24" class="rows">
-                <el-col :xl="5" :lg="7" :md="8" :sm="24">
-                    <span>预约单号：{{signfordata.reservationCode}} </span>
-                </el-col>
-                <el-col :xl="5" :lg="7" :md="8" :sm="24">
-                    <span>商场名称：{{signfordata.mallName}} </span>
-                </el-col>
-                <el-col :xl="5" :lg="7" :md="8" :sm="24">
-                    <span>预约时间：{{signfordata.reservationDate}} </span>
-                </el-col>
-<!--                <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
-<!--                    <span>配送车次：{{signfordata.deliveryType}}</span>-->
-<!--                </el-col>-->
-<!--                <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
-<!--                    <span>服务类型：{{signfordata.deliveryType}}</span>-->
-<!--                </el-col>-->
-            </el-row>
-            <el-divider>配送信息</el-divider>
-            <el-row :gutter="24" class="rows">
-                <el-col :xl="5" :lg="7" :md="8" :sm="24">
-                    <span>配送车次：{{signfordata.trainNumber}} </span>
-                </el-col>
-                <el-col :xl="5" :lg="7" :md="8" :sm="24">
-                    <span>配送司机：{{signfordata.driverName}} </span>
-                </el-col>
-                <el-col :xl="4" :lg="7" :md="8" :sm="24">
-                    <span>配送车辆：{{signfordata.vehicleName}} </span>
-                </el-col>
-                <el-col :xl="5" :lg="7" :md="8" :sm="24">
-                    <span>装车班组：{{signfordata.loadingTeamName}} </span>
-                </el-col>
-                <el-col :xl="5" :lg="7" :md="8" :sm="24">
-                    <span>卸车班组：{{signfordata.unLoadingTeamName}} </span>
-                </el-col>
-<!--                <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
-<!--                    <span>配送车次：{{signfordata.deliveryType}}</span>-->
-<!--                </el-col>-->
-<!--                <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
-<!--                    <span>服务类型：{{signfordata.deliveryType}}</span>-->
-<!--                </el-col>-->
-            </el-row>
-            <el-divider>收货人信息</el-divider>
-            <el-row :gutter="24" class="rows">
-                <el-col :xl="7" :lg="7" :md="10" :sm="24">
-                    <span>收货人：{{signfordata.consignee}} </span>
-                </el-col>
-                <el-col :xl="7" :lg="7" :md="10" :sm="24">
-                    <span>手机号码：{{signfordata.deliveryPhone}} </span>
-                </el-col>
-                <el-col :xl="7" :lg="7" :md="10" :sm="24">
-                    <span>收货地址：{{signfordata.deliveryAddress}} </span>
-                </el-col>
-            </el-row>
-            <el-row :gutter="24" class="rows">
-                <el-col :xl="7" :lg="7" :md="10" :sm="24">
-                    <span>是否加急：{{signfordata.isUrgent}} </span>
-                </el-col>
-                <el-col :xl="7" :lg="7" :md="10" :sm="24">
-                    <span>客户备注：{{signfordata.remarks}} </span>
-                </el-col>
-            </el-row>
-            <el-dialog
-                    v-model="fbox"
-                    title="增值服务"
-                    width="30%"
-            >
-                <!--                :before-close="handleClose"-->
-                <el-form-item label="增值服务" prop="freightMark">
-                    <el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange">
-                        <el-checkbox style="width: 100%;margin-bottom: 3%;"
-                                     :disabled="true"
-                                     v-for="(item,index) in addvalueServeTypeData"
-                                     :key="item.dictKey"
-                                     :label="item.dictKey"
-                        >{{item.dictValue}}
-                            <span v-if="index===0||index===6||index===2||index===4">&nbsp;件数:
-                         <el-input v-model="item.f"
-                                   :disabled="true"
-                                   style="width: 10%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-                            <span v-if="index===1">公里:
-                          <el-input v-model="item.a"
-                                    :disabled="true"
-                                    style="width: 10%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-                            <span v-if="index===3">距离:
-                      <el-input v-model="item.b"
-                                :disabled="true"
-                                style="width: 10%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-                            <span v-if="index===5">人数:
-                      <el-input v-model="item.c"
-                                :disabled="true"
-                                style="width: 10%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-                            <span v-if="index===0">楼层:
-                      <el-input v-model="item.d"
-                                :disabled="true"
-                                style="width: 10%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-                            <span v-if="item">预计费用:
-                        <el-input v-model="item.e"
-                                  :disabled="true"
-                                  style="width: 20%;border:none; border-bottom:2px solid #eee;"/>
-                     </span>
-                        </el-checkbox>
-                    </el-checkbox-group>
-                </el-form-item>
-                <template #footer>
-      <span class="dialog-footer">
-        <el-button @click="dialogVisible = false">关闭</el-button>
-          <!--        <el-button type="primary" @click="dialogVisible = false">-->
-          <!--          确定(增值服务)-->
-          <!--        </el-button>-->
-      </span>
-                </template>
-            </el-dialog>
+  <basic-container>
+    <div class="avue-crud">
+      <el-row :gutter="24" class="rows">
+        <el-col :xl="7" :lg="7" :md="8" :sm="24">
+          <span style="padding-left: 10%"
+            >当前签收单状态>>>>>>>>> {{ signfordata.signingStatusAll }}</span
+          >
+        </el-col>
+      </el-row>
+      <el-divider>基本信息</el-divider>
+      <el-row :gutter="24" class="rows">
+        <el-col :xl="5" :lg="7" :md="8" :sm="24">
+          <span>预约单号：{{ signfordata.reservationCode }} </span>
+        </el-col>
+        <el-col :xl="5" :lg="7" :md="8" :sm="24">
+          <span>商场名称：{{ signfordata.mallName }} </span>
+        </el-col>
+        <el-col :xl="5" :lg="7" :md="8" :sm="24">
+          <span>预约时间：{{ signfordata.reservationDate }} </span>
+        </el-col>
+        <!--                <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
+        <!--                    <span>配送车次：{{signfordata.deliveryType}}</span>-->
+        <!--                </el-col>-->
+        <!--                <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
+        <!--                    <span>服务类型：{{signfordata.deliveryType}}</span>-->
+        <!--                </el-col>-->
+      </el-row>
+      <el-divider>配送信息</el-divider>
+      <el-row :gutter="24" class="rows">
+        <el-col :xl="5" :lg="7" :md="8" :sm="24">
+          <span>配送车次：{{ signfordata.trainNumber }} </span>
+        </el-col>
+        <el-col :xl="5" :lg="7" :md="8" :sm="24">
+          <span>配送司机：{{ signfordata.driverName }} </span>
+        </el-col>
+        <el-col :xl="4" :lg="7" :md="8" :sm="24">
+          <span>配送车辆：{{ signfordata.vehicleName }} </span>
+        </el-col>
+        <el-col :xl="5" :lg="7" :md="8" :sm="24">
+          <span>装车班组：{{ signfordata.loadingTeamName }} </span>
+        </el-col>
+        <el-col :xl="5" :lg="7" :md="8" :sm="24">
+          <span>卸车班组：{{ signfordata.unLoadingTeamName }} </span>
+        </el-col>
+        <!--                <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
+        <!--                    <span>配送车次：{{signfordata.deliveryType}}</span>-->
+        <!--                </el-col>-->
+        <!--                <el-col :xl="3" :lg="7" :md="8" :sm="24">-->
+        <!--                    <span>服务类型：{{signfordata.deliveryType}}</span>-->
+        <!--                </el-col>-->
+      </el-row>
+      <el-divider>收货人信息</el-divider>
+      <el-row :gutter="24" class="rows">
+        <el-col :xl="7" :lg="7" :md="10" :sm="24">
+          <span>收货人：{{ signfordata.consignee }} </span>
+        </el-col>
+        <el-col :xl="7" :lg="7" :md="10" :sm="24">
+          <span>手机号码：{{ signfordata.deliveryPhone }} </span>
+        </el-col>
+        <el-col :xl="7" :lg="7" :md="10" :sm="24">
+          <span>收货地址：{{ signfordata.deliveryAddress }} </span>
+        </el-col>
+      </el-row>
+      <el-row :gutter="24" class="rows">
+        <el-col :xl="7" :lg="7" :md="10" :sm="24">
+          <span>是否加急：{{ signfordata.isUrgent }} </span>
+        </el-col>
+        <el-col :xl="7" :lg="7" :md="10" :sm="24">
+          <span>客户备注：{{ signfordata.remarks }} </span>
+        </el-col>
+      </el-row>
+      <el-dialog v-model="fbox" title="增值服务" width="30%">
+        <!--                :before-close="handleClose"-->
+        <el-form-item label="增值服务" prop="freightMark">
+          <el-checkbox-group v-model="form.addvalueType" @change="handleCheckedCitiesChange">
+            <el-checkbox
+              style="width: 100%; margin-bottom: 3%"
+              :disabled="true"
+              v-for="(item, index) in addvalueServeTypeData"
+              :key="item.dictKey"
+              :label="item.dictKey"
+              >{{ item.dictValue }}
+              <span v-if="index === 0 || index === 6 || index === 2 || index === 4"
+                >&nbsp;件数:
+                <el-input
+                  v-model="item.f"
+                  :disabled="true"
+                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                />
+              </span>
+              <span v-if="index === 1"
+                >公里:
+                <el-input
+                  v-model="item.a"
+                  :disabled="true"
+                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                />
+              </span>
+              <span v-if="index === 3"
+                >距离:
+                <el-input
+                  v-model="item.b"
+                  :disabled="true"
+                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                />
+              </span>
+              <span v-if="index === 5"
+                >人数:
+                <el-input
+                  v-model="item.c"
+                  :disabled="true"
+                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                />
+              </span>
+              <span v-if="index === 0"
+                >楼层:
+                <el-input
+                  v-model="item.d"
+                  :disabled="true"
+                  style="width: 10%; border: none; border-bottom: 2px solid #eee"
+                />
+              </span>
+              <span v-if="item"
+                >预计费用:
+                <el-input
+                  v-model="item.e"
+                  :disabled="true"
+                  style="width: 20%; border: none; border-bottom: 2px solid #eee"
+                />
+              </span>
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <template #footer>
+          <span class="dialog-footer">
+            <el-button @click="dialogVisible = false">关闭</el-button>
+            <!--        <el-button type="primary" @click="dialogVisible = false">-->
+            <!--          确定(增值服务)-->
+            <!--        </el-button>-->
+          </span>
+        </template>
+      </el-dialog>
 
       <!--      <el-dialog :title="title"-->
       <!--                 v-model="fbox"-->
@@ -1621,7 +1638,7 @@ export default {
         if (data.orderInfo) {
           this.orderData = data.orderInfo;
         }
-        console.log("data111>>>>>>",data)
+        console.log('data111>>>>>>', data);
         this.stepActive = this.stepsList.findIndex(item => item.title === data.signingStatusAll);
         this.signfordata = data;
         this.signfordata.address = 'aa';
@@ -1629,26 +1646,24 @@ export default {
         // this.getListOrders(this.page)
         this.getListPackage();
       });
-          // this.getListOrders(this.page)
+      // this.getListOrders(this.page)
 
-        });
-        this.getListPackage();
-        let a = {
-          signforId:id,
-          addvalueId:1
+      this.getListPackage();
+      let a = {
+        signforId: id,
+        addvalueId: 1,
+      };
+      addvalueInfoList(a).then(res => {
+        console.log('res------------->', res.data.data);
+        const data = res.data.data;
+        if (data === null) {
+          this.addvalueData = [];
+          this.addvalueinfo = {};
+        } else {
+          this.addvalueinfo = data;
+          this.addvalueData = data.packageEntityList;
         }
-        addvalueInfoList(a).then(res=>{
-          console.log("res------------->",res.data.data);
-          const data = res.data.data;
-          if (data === null){
-            this.addvalueData = [];
-            this.addvalueinfo = {  };
-
-          }else {
-            this.addvalueinfo = data;
-            this.addvalueData = data.packageEntityList;
-          }
-        })
+      });
 
       this.loading = false;
     },

src/views/distribution/stockup/distributionStockup.vue

@@ -602,49 +602,25 @@ export default {
     },
     //查询叉车人员
     async getFork(){
-      let ides = '';
-      let ide = {  };
-      let b = false;
       await getListUser().then(res =>{ //查询当前人信息
-        // console.log("res>>>",res.data.data);
-        if(res.data.data.userName != 'admin'){
-          b = true;
-        }
-        ides = res.data.data.tenantId;
-        this.deptId = res.data.data.deptId;
-      })
-      await getPostList(ides).then(res =>{ // 查询角色
-        // console.log("查询>>>>",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: '', //角色
-      }
-      if(b){
-        // console.log("进来了");
-        params.postId = ide.id;//岗位
-      }
-      getListOwn(Object.assign(params, this.query)).then(res =>{ //查询人员
-        // console.log(".............",res.data.data);
+        // console.log("查询当前人信息>>>",res.data.data);
         let fo = [];
         res.data.data.forEach( i =>{
           let a ={
             dictKey: i.id,
-            dictValue: i.name
+            dictValue: i.realName
           };
           fo.push(a);
+          if(!this.deptId){
+            this.deptId =i.deptId;
+          }
         });
         this.forkliftData = fo;
+
+        this.deptId = res.data.data.deptId;
       })
-     await this.getStorageArea();
-     await this.getTeam();
+      await this.getStorageArea();
+      await this.getTeam();
 
     },
     //查询班组

src/views/distribution/stockup/distributionStockupDiscuss.vue

@@ -729,47 +729,22 @@ export default {
     },
     //查询叉车人员
     async getFork(){
-      let ides = '';
-      let ide = {  };
-      let b = false;
       await getListUser().then(res =>{ //查询当前人信息
-        // console.log("res>>>",res.data.data);
-        if(res.data.data.userName != 'admin'){
-          b = true;
-        }
-        ides = res.data.data.tenantId;
-        this.deptId = res.data.data.deptId;
-      })
-      await getPostList(ides).then(res =>{ // 查询角色
-        // console.log("查询>>>>",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: '', //角色
-      }
-      if(b){
-        // console.log("进来了");
-        params.postId = ide.id;//岗位
-      }
-      // console.log("查询人员信息",params);
-      getListOwn(Object.assign(params, this.query)).then(res =>{ //查询人员
-        // console.log(".............",res.data.data);
+        console.log("查询当前人信息>>>",res.data.data);
         let fo = [];
         res.data.data.forEach( i =>{
           let a ={
             dictKey: i.id,
-            dictValue: i.name
+            dictValue: i.realName
           };
           fo.push(a);
+          if(!this.deptId){
+            this.deptId =i.deptId;
+          }
         });
         this.forkliftData = fo;
+
+        this.deptId = res.data.data.deptId;
       })
       await this.getStorageArea();
       await this.getTeam();

src/views/distribution/stockup/distributionStockupMarket.vue

@@ -229,7 +229,6 @@
 
 <script>
 import { getList, getDetail, add, update, remove,getListUser,addAssign } from "@/api/distribution/distributionStockup";
-import { getPostList } from '@/api/system/post';
 import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
 import { getListOwn,getUser } from '@/api/system/user';
 import option from "@/option/distribution/distributionStockup";
@@ -237,6 +236,8 @@ import { mapGetters } from "vuex";
 import { getListTeam } from '@/api/basicdata/basicdataTeamGroup';
 import dayjs from 'dayjs';
 import { getDictionaryBiz } from '@/api/system/dict';
+import { getRoleTree } from '@/api/system/role';
+import { getPostList } from '@/api/system/post';
 
 export default {
   data () {
@@ -668,47 +669,22 @@ export default {
     },
     //查询叉车人员
     async getFork(){
-      let ides = '';
-      let ide = {  };
-      let b = false;
       await getListUser().then(res =>{ //查询当前人信息
-        // console.log("res>>>",res.data.data);
-        if(res.data.data.userName != 'admin'){
-          b = true;
-        }
-        ides = res.data.data.tenantId;
-        this.deptId = res.data.data.deptId;
-      })
-      await getPostList(ides).then(res =>{ // 查询角色
-        // console.log("查询>>>>",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: '', //角色
-      }
-      if(b){
-        // console.log("进来了");
-        params.postId = ide.id;//岗位
-      }
-      // console.log("查询人员信息",params);
-      getListOwn(Object.assign(params, this.query)).then(res =>{ //查询人员
-        // console.log(".............",res.data.data);
+        console.log("查询当前人信息>>>",res.data.data);
         let fo = [];
         res.data.data.forEach( i =>{
           let a ={
             dictKey: i.id,
-            dictValue: i.name
+            dictValue: i.realName
           };
           fo.push(a);
+          if(!this.deptId){
+            this.deptId =i.deptId;
+          }
         });
         this.forkliftData = fo;
+
+        this.deptId = res.data.data.deptId;
       })
       await this.getStorageArea();
       await this.getTeam();
@@ -770,8 +746,8 @@ export default {
       if(!a){
         this.num = '3';
         this.dialogFormCustomer = true;
-        this.getFork();
-        this.getTeam();
+        this.getFork(); //查询叉车人员
+        this.getTeam();//查询班组
       }else{
         this.$message.warning("已指派，请勿重复指派！！！")
       }

src/views/distribution/stockup/distributionStockupSelf.vue

@@ -667,47 +667,22 @@ export default {
     },
     //查询叉车人员
     async getFork(){
-      let ides = '';
-      let ide = {  };
-      let b = false;
       await getListUser().then(res =>{ //查询当前人信息
-        console.log("当前人信息res>>>",res.data.data);
-        if(res.data.data.userName != 'admin'){
-          b = true;
-        }
-        ides = res.data.data.tenantId;
-        this.deptId = res.data.data.deptId;
-      })
-      await getPostList(ides).then(res =>{ // 查询角色
-        // console.log("查询>>>>",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: '', //角色
-      }
-      if(b){
-        // console.log("进来了");
-        params.postId = ide.id;//岗位
-      }
-      // console.log("查询人员信息",params);
-      getListOwn(Object.assign(params, this.query)).then(res =>{ //查询人员
-        // console.log(".............",res.data.data);
+        console.log("查询当前人信息>>>",res.data.data);
         let fo = [];
         res.data.data.forEach( i =>{
           let a ={
             dictKey: i.id,
-            dictValue: i.name
+            dictValue: i.realName
           };
           fo.push(a);
+          if(!this.deptId){
+            this.deptId =i.deptId;
+          }
         });
         this.forkliftData = fo;
+
+        this.deptId = res.data.data.deptId;
       })
       await this.getStorageArea();
       await this.getTeam();

src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue

@@ -52,10 +52,10 @@
               </el-select>
             </el-form-item>
 
-            <el-form-item label="客户编码" prop="clientCode">
+            <el-form-item label="客户编码" prop="customerCode">
               <!--              <el-input v-model="form.customerName" placeholder="请输入客户名称"/>-->
               <el-select
-                v-model="form.clientCode"
+                v-model="form.customerCode"
                 filterable
                 remote
                 reserve-keyword
@@ -441,6 +441,7 @@ import {
   update,
   remove,
   getWarehouseDetail,
+  getList
 } from '@/api/warehouse/warehouseWarehousingEntry';
 import option from '@/option/warehouse/warehouseWarehousingDetail';
 import { mapGetters, mapMutations } from 'vuex';
@@ -536,7 +537,7 @@ export default {
         licensePlate: [{ required: true, message: '请填写入库车牌', trigger: 'change' }],
         warehouseId: [{ required: true, message: '请选择所在仓库', trigger: 'blur' }],
         serviceType: [{ required: true, message: '请选择服务类型', trigger: 'blur' }],
-        clientCode: [{ required: true, message: '请选择客户编码', trigger: 'blur' }],
+        customerCode: [{ required: true, message: '请选择客户编码', trigger: 'blur' }],
       },
     };
   },
@@ -620,6 +621,7 @@ export default {
           });
         }
         this.form = da;
+        console.log('da :>> ', da);
         // console.log(">>>>>>",this.form.storeId);
         if (!!this.form.storeId && parseInt(this.form.storeId) == -1) {
           console.log('>>>>>>', this.form.storeId);
@@ -1255,6 +1257,14 @@ export default {
         });
       }*/
     },
+    // 获取列表数据
+    async getListData(data){
+    data.currentPage = data.currentPage || 1; // 当前页码, 默认为1
+    data.pageSize = data.pageSize || 10; // 当前页数, 默认为10
+    const res = await getList(data.currentPage, data.pageSize, {conditions: data.conditions})
+    // 抛出数据
+    return res
+    }
   },
 };
 </script>

src/views/warehouse/warehousingentry/warehouseWarehousingEntry.vue

@@ -798,8 +798,10 @@ export default {
     },
     onLoad(page, params = {}) {
       this.loading = true;
+      // 获取列表数据
       getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
         const data = res.data.data;
+        console.log('data :>> ', data);
         this.page.total = data.total;
         data.records.forEach(i => {
           if (i.conditions == '1') {

vite.config.js

@@ -16,9 +16,9 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.10.48:8888',
           // target: 'http://192.168.10.123:8889',
           // target: 'http://192.168.10.75:8777',
-          // target: 'http://192.168.10.101:8888',
+          target: 'http://192.168.10.101:8888',
           // target: 'http://192.168.10.29:13000',
-          target: 'http://test.api.huitongys.com',
+          // target: 'http://test.api.huitongys.com',
           changeOrigin: true,
           rewrite: path => path.replace(/^\/api/, ''),
         },