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

src/components/tablecmt/tablecmt.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="maboxhi">
+  <div class="maboxhi" id="bodys">
     <el-table
       :data="tableData"
       style="width: 100%"
@@ -190,7 +190,26 @@ const selecttable = ref(null);
  * selectCheck:下拉框选中事件
  * selection:勾选框事件
  */
+onMounted(()=>{
+    function getWinHight(){
+      var windowHight=0;
+      if(document.body.clientHeight&&document.documentElement.clientHeight){
+        windowHight=(document.body.clientHeight<document.documentElement.clientHeight)?document.body.clientHeight:document.documentElement.clientHeight;
 
+      }
+      else{
+        // windowHight=(document.body.clientHeight>document.documentElement.clientHeight)?document.body.clientHeight:document.documentElement.clientHeight;
+      }
+      // return windowHight;
+      return document.documentElement.clientHeight;
+    
+    }
+    // alert(getWinHight());
+
+   var bodyContent=document.getElementById('bodys');
+    bodyContent.setAttribute("style","height.500px");
+   
+})
 interface TableColumnType {
   /** 表格列的key */
   prop: string;
@@ -519,6 +538,7 @@ function copyContent(content: string) {
     return copyResult;
   }
 }
+
 </script>
 <style lang="scss" scope>
 // :root{
@@ -539,7 +559,8 @@ function copyContent(content: string) {
 // }
 .maboxhi {
   width: 100%;
-  height: calc(100vh - 350px);
+  min-height: 950px;
+  // height: 841px;
   // flex:1;
   // min-height: 100%;
 }

src/views/distribution/inventory/distrilbutionBillLading.vue

@@ -2133,21 +2133,21 @@ export default {
                   : a.join(',');
             }
 
-            const data = this.form;
+            const submitFormData = this.form;
             // 当有零担数据时
-            if (zeroOrderList){   
-              data.parcelLisList = []
-              data.zeroType = '2'
+            if (zeroOrderList.length !== 0) {
+              submitFormData.parcelLisList = [];
+              submitFormData.zeroType = '2';
               zeroOrderList.forEach(val => {
                 val.ParcelLisList.forEach(item => {
-                  data.parcelLisList.push(item)
-                })
-              })
-            }else{
-              data.zeroType = '1'
+                  submitFormData.parcelLisList.push(item);
+                });
+              });
+            } else {
+              submitFormData.zeroType = '1';
             }
 
-            add(this.form).then(() => {
+            add(submitFormData).then(() => {
               this.box = false;
               this.onLoad(this.page);
               this.$message({

src/views/distribution/reservation/reservationAddFrom.vue

@@ -1868,12 +1868,13 @@
         } else {
           return true;
         }
-        return false;
       },
       handleAddInventory() {
         let page = this.page;
         let params = {};
         this.query.serviceType = '2';
+        params.marketName =  this.marketName
+        console.log('params :>> ', params);
         getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(
           res => {
             const inventoryList = res.data.data;
@@ -1883,10 +1884,11 @@
             });
             this.page.total = inventoryList.total;
             console.log('res :>> ', res);
-            this.inventoryInfo = inventoryList.records.filter(value=>{
-              if(this.marketName === '')return value
-              return value.marketName === this.marketName
-            });
+            // this.inventoryInfo = inventoryList.records.filter(value=>{
+            //   if(this.marketName === '')return value
+            //   return value.marketName === this.marketName
+            // });
+            this.inventoryInfo = inventoryList.records
             //存在库存品，需要将库存品进行回显勾选
             if (this.inventoryData) {
               this.inventoryInfo.forEach((item, index) => {
@@ -2251,6 +2253,7 @@
       },
       selectionChange(list) {
         this.orderList = list;
+        console.log('list :>> ', list);
       },
       selectionPackageChange(list) {
         console.log('-----------<>', list);
@@ -2339,46 +2342,34 @@
        */
       onSubmitOrder() {
         console.log('-------------》', this.orderList);
+        if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!')
         const list = this.orderList;
-        let name = list[0].customerName;
-        let address = list[0].customerAddress;
-        let phone = list[0].customerTelephone;
-        if (!!this.form.consignee) {
-          if (this.form.consignee !== name) {
-            this.$message.warning('请选择统一顾客订单!!!');
-            return;
-          }
-        }
-        if (!!this.form.customerAddress) {
-          if (this.form.customerAddress !== address) {
-            this.$message.warning('请选择统一顾客订单!!!');
-            return;
-          }
-        }
-        if (!!this.form.customerTelephone) {
-          if (this.form.customerTelephone !== phone) {
-            this.$message.warning('请选择统一顾客订单!!!');
-            return;
+        let _name = list[0].customerName;
+        let _address = list[0].customerAddress;
+        let _phone = list[0].customerTelephone;
+        let _marketName = list[0].mallName
+
+        // 循环查看数据是否符合要求
+        const isRturn = list.every((item)=>{
+          if (item.mallName !== _marketName) {
+            this.$message.warning('请选择统一商场!!!')
+            return false
           }
-        }
-        //市配  --- 最终客户校验
-        for (let i = 1; i < list.length; i++) {
-          if (
-            list[i].customerName !== name ||
-            list[i].customerAddress !== address ||
-            list[i].customerTelephone !== phone
-          ) {
-            this.$message.warning('请选择统一顾客订单!!!');
-            return;
+          if (item.customerName !== _name || item.customerAddress !== _address || item.customerTelephone !== _phone) {
+            this.$message.warning('请选择统一顾客订单!!!')
+            return false
           }
-        }
+          return true
+        })
+
+        if (!isRturn) return
 
         // 设置商场名称
-        this.marketName = list[0].marketName
+        if (this.marketName === '') this.marketName = _marketName
 
-        this.form.consignee = name;
-        this.form.deliveryAddress = address;
-        this.form.deliveryPhone = phone;
+        this.form.consignee = _name;
+        this.form.deliveryAddress = _address;
+        this.form.deliveryPhone = _phone;
         //这里需要对选择的订单进行筛选
         const info = [];
         this.stockArticleInfo.forEach((item, index) => {
@@ -2543,6 +2534,7 @@
       onLoadOrder(page, params = {}) {
         this.query.typeService = 2;
         this.query.genre = '1';
+        this.query.marketName = this.marketName
         // const page = this.page;
         let a = [];
         if (this.orderData) {
@@ -2551,7 +2543,7 @@
           });
         }
         this.query.orderIds = a.join(',');
-        console.log('-------------->', this.query);
+        console.log('--------------query>', this.query);
         selectStockArticleInfoList(
           page.currentPage,
           page.pageSize,
@@ -2559,13 +2551,7 @@
         ).then(res => {
           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
-            }
-          });
+          this.stockArticleInfo = records
           console.log('this.stockArticleInfo :>> ', this.stockArticleInfo);
           this.stockArticleInfo.forEach((item, index) => {
             //检查订单是否冻结