Merge branch 'dev' into pre-production

src/api/distribution/AddVehicleStowage.js

@@ -23,7 +23,7 @@ export const postFindWarehouseListByName = data => {
 };
 
 /**
- * 创建新提货单
+ * 查询可用订单
  */
 export const postFindAllOrderList = data => {
   return request({
@@ -34,66 +34,22 @@ export const postFindAllOrderList = data => {
 };
 
 /**
- * 查询运单列表
+ * 根据名称查询车辆
  */
-export const postList = data => {
+export const postFindCarListByName = data => {
   return request({
-    url: '/api/logpm-warehouseWaybill/list',
+    url: '/api/logpm-trunkline/billlading/findCarListByName',
     method: 'post',
     data,
   });
 };
 
 /**
- * 更新提货单状态
+ * 通过名称查司机
  */
-export const postUpdateBillladingStatus = data => {
+export const postFindDriverListByName = data => {
   return request({
-    url: '/api/logpm-trunkline/billlading/updateBillladingStatus',
-    method: 'post',
-    data,
-  });
-};
-
-/**
- * 查询提货单详情
- */
-export const postBillladingDetail = data => {
-  return request({
-    url: '/api/logpm-trunkline/billlading/billladingDetail',
-    method: 'post',
-    data,
-  });
-};
-
-/**
- * 查询提货单包件明细
- */
-export const postBillladingPackageDetail = data => {
-  return request({
-    url: '/api/logpm-trunkline/billlading/billladingPackageDetail',
-    method: 'post',
-    data,
-  });
-};
-
-/**
- * 更新提货单关联运单数据
- */
-export const postUpdateBillladingWaybillNum = data => {
-  return request({
-    url: '/api/logpm-trunkline/billlading/updateBillladingWaybillNum',
-    method: 'post',
-    data,
-  });
-};
-
-/**
- * 提货单添加运单
- */
-export const postAddWaybillToBillladingId = data => {
-  return request({
-    url: '/api/logpm-trunkline/billlading/addWaybillToBillladingId',
+    url: '/api/logpm-trunkline/billlading/findDriverListByName',
     method: 'post',
     data,
   });

src/option/distribution/addVehicleStowage.js

@@ -476,6 +476,28 @@ export const newColumnList = [
     isshowSummary: true,
     sortable: true,
   },
+  {
+    prop: 'planNum',
+    label: '计划数',
+    type: 6,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    isshowSummary: true,
+    sortable: true,
+  },
+  {
+    prop: 'loadingNum',
+    label: '装车数',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    isshowSummary: true,
+    sortable: true,
+  },
   {
     prop: 'price',
     label: '单价',

src/views/distribution/artery/AddVehicleStowage.vue

@@ -51,7 +51,7 @@
                 >
                   <el-option
                     v-for="val in details.options"
-                    :key="val.value"
+                    :key="val.warehouseName"
                     :label="val.warehouseName"
                     :value="val.warehouseId"
                   />
@@ -64,7 +64,22 @@
             <!-- 车牌号 -->
             <div class="form_row_item">
               <el-form-item inline label="车牌号">
-                <el-input v-model="form.carNumber" />
+                <el-select
+                  v-model="form.carNumber"
+                  filterable
+                  remote
+                  reserve-keyword
+                  placeholder="车牌号"
+                  :remote-method="remoteMethodCar"
+                  :loading="details.loadingObj.loading"
+                >
+                  <el-option
+                    v-for="val in details.carListByName"
+                    :key="val.carNumber"
+                    :label="val.carNumber"
+                    :value="val.carId"
+                  />
+                </el-select>
               </el-form-item>
               <el-button type="primary" @click="handleAddCar" icon="Plus"></el-button>
             </div>
@@ -72,7 +87,22 @@
             <!-- 主驾司机 -->
             <div class="form_row_item">
               <el-form-item inline label="主驾司机">
-                <el-input v-model="form.driverName" />
+                <el-select
+                  v-model="form.driverName"
+                  filterable
+                  remote
+                  reserve-keyword
+                  placeholder="车牌号"
+                  :remote-method="remoteMethodDriver"
+                  :loading="details.loadingObj.loading"
+                >
+                  <el-option
+                    v-for="val in details.driverListByName"
+                    :key="val.driverName"
+                    :label="val.driverName"
+                    :value="val.driverId"
+                  />
+                </el-select>
               </el-form-item>
               <el-button type="primary" @click="handleAddDriver" icon="Plus"></el-button>
             </div>
@@ -80,7 +110,22 @@
             <!-- 副驾司机 -->
             <div class="form_row_item">
               <el-form-item inline label="副驾司机">
-                <el-input v-model="form.name" />
+                <el-select
+                  v-model="form.name"
+                  filterable
+                  remote
+                  reserve-keyword
+                  placeholder="车牌号"
+                  :remote-method="remoteMethodDriver"
+                  :loading="details.loadingObj.loading"
+                >
+                  <el-option
+                    v-for="val in details.driverListByName"
+                    :key="val.driverName"
+                    :label="val.driverName"
+                    :value="val.driverId"
+                  />
+                </el-select>
               </el-form-item>
             </div>
 
@@ -106,15 +151,9 @@
             <!-- 配载类型 -->
             <div class="form_row_item">
               <el-form-item inline label="配载类型">
-                <el-select
-                  v-model="form.loadType"
-                  class="m-2"
-                  filterable
-                  multiple
-                  placeholder="配载类型"
-                >
+                <el-select v-model="form.loadType" class="m-2" filterable placeholder="配载类型">
                   <el-option
-                    v-for="item in query.receiptList"
+                    v-for="item in details.pageInfo.loadType"
                     :key="item.dictValue"
                     :label="item.dictValue"
                     :value="item.dictKey"
@@ -123,18 +162,12 @@
               </el-form-item>
             </div>
 
-            <!-- 主驾司机 -->
+            <!-- 分摊方式 -->
             <div class="form_row_item">
               <el-form-item inline label="分摊方式">
-                <el-select
-                  v-model="form.chargeType"
-                  class="m-2"
-                  filterable
-                  multiple
-                  placeholder="分摊方式"
-                >
+                <el-select v-model="form.chargeType" class="m-2" filterable placeholder="分摊方式">
                   <el-option
-                    v-for="item in query.receiptList"
+                    v-for="item in details.pageInfo.chargeType"
                     :key="item.dictValue"
                     :label="item.dictValue"
                     :value="item.dictKey"
@@ -158,11 +191,11 @@
             </div>
 
             <!-- 预计发车 -->
-            <div class="form_row_item">
+            <!--             <div class="form_row_item">
               <el-form-item inline label="预计发车">
                 <el-input />
               </el-form-item>
-            </div>
+            </div> -->
           </div>
 
           <el-form-item label="备注">
@@ -382,6 +415,13 @@
                 :loading="item.loading"
                 @selection="list => item.selectionChange(list, index)"
               >
+                <template #default="slotProps">
+                  <template v-if="slotProps.scope.column.label === '计划数'">
+                    <el-text size="small" text @click="handleEditplanNum(slotProps.scope)">{{
+                      slotProps.scope.row.planNum
+                    }}</el-text>
+                  </template>
+                </template>
               </tablecmt>
             </div>
           </template>
@@ -408,6 +448,8 @@ import {
   postloadFindLoadInitData,
   postFindWarehouseListByName,
   postFindAllOrderList,
+  postFindCarListByName,
+  postFindDriverListByName,
 } from '@/api/distribution/AddVehicleStowage';
 import { useRouter, useRoute } from 'vue-router';
 import { ElMessage, ElMessageBox } from 'element-plus';
@@ -522,9 +564,25 @@ const details = reactive<any>({
     truckLoadingDetailPopUp: false,
     comparativeStatementPopUp: false,
   },
+  /** 匹配 */
+  rules: {
+    /** 发站仓名称 */
+    departureWarehouseName: [
+      {
+        required: true,
+        message: '请填写或选择发站仓',
+        trigger: ['change', 'blur'],
+      },
+    ],
+  },
   /** 页面信息 */
   pageInfo: {},
+  /** 目的仓 */
   options: [],
+  /** 车牌号 */
+  carListByName: [],
+  /** 司机 */
+  driverListByName: [],
   /** 当前页面类型 -- 1: 新增; 2: 编辑 */
   pageType: 1,
   /** 编辑模式下当前仓的位置索引 */
@@ -539,6 +597,8 @@ const details = reactive<any>({
   }),
   /** 被选中的orderCode组成的list */
   orderCodeList: [],
+  /** 计划数修改的信息 */
+  editInfo: {},
 });
 
 const {
@@ -663,15 +723,18 @@ const destinationWarehouseNameChange = (val, index) => {
   details.nodeInfoData[index].nodeId = _value.warehouseId;
 };
 
+/** 请求运单数据 */
 const initOriginWarehouseOrder = async (params = {}) => {
   try {
     details.loadingObj.oldListLoading = true;
     const submitData = {
       ...details.page,
       loadId: details.pageInfo.startWarehouseInfo.warehouseId,
+      orderCodes: details.orderCodeList,
       ...details.query,
       ...params,
     };
+    if (submitData.orderCodes.length === 0) delete submitData.orderCodes;
     const res = await postFindAllOrderList(submitData);
     console.log('res :>> ', res);
     const { code, data } = res.data;
@@ -827,10 +890,9 @@ const handleComputedNum = () => {
     for (let item of details.nodeInfoData) {
       for (let index = 0; index < nodeInfokeys.length; index++) {
         const _key = nodeInfokeys[index];
-        let _number = item[_key];
         // 检测是否为数字
-        if (!isNumer(_number)) _number = 0;
-        _totalNum = computeNumber(_totalNum, '+', _number).result;
+        if (!isNumer(item[_key])) item[_key] = 0;
+        _totalNum = computeNumber(_totalNum, '+', item[_key]).result;
       }
     }
 
@@ -870,6 +932,7 @@ const handleAddNode = () => {
   // 始发仓没有数据时, 请求数据
   if (details.data.length === 0) initOriginWarehouseOrder();
   setTabelHeight();
+  handleComputedNum();
 };
 
 /** 删除目的仓 */
@@ -888,7 +951,12 @@ const handleAddWaybill = (index: number) => {
       message: '未选择目的仓或目的仓信息异常',
     });
   }
-  details.nodeInfoData[index].data = details.selectionList;
+  details.nodeInfoData[index].data = details.selectionList.map(val => {
+    val.planNum = val.stockNum;
+    val.loadingNum = 0;
+
+    return val;
+  });
   details.orderCodeList = [
     ...new Set([
       ...details.orderCodeList,
@@ -900,7 +968,7 @@ const handleAddWaybill = (index: number) => {
   const orderCodes = details.selectionList.map(val => val.orderCode);
   clearSelectionList();
   details.page.pageNum = 1;
-  initOriginWarehouseOrder({ orderCodes: details.orderCodeList });
+  initOriginWarehouseOrder();
 };
 
 /** 移除调度池 */
@@ -913,8 +981,42 @@ const handleRemoveWaybill = (index: number) => {
       message: '未选择目的仓或目的仓信息异常',
     });
   }
+  console.log('_node :>> ', _node);
+  // 将被选中的数据筛选出去
+  _node.data = _node.data.filter((val, index) => {
+    const _flag = !_node.selectionList.includes(val);
+    if (!_flag) {
+      const _code = val.orderCode + ',' + val.waybillNo;
+      const _index = details.orderCodeList.indexOf(_code);
+      // 删除映射的订单号+运单号
+      details.orderCodeList.splice(_index, 1);
+    }
+    return _flag;
+  });
   clearSelectionList();
+  initOriginWarehouseOrder();
+};
+
+/** 查询司机信息 */
+const remoteMethodDriver = async val => {
+  const res = await postFindDriverListByName({ driverName: val });
+  console.log('res :>> ', res);
+  const { code, data } = res.data;
+  if (code !== 200) return;
+  details.driverListByName = data;
 };
+
+/** 查询司机信息 */
+const remoteMethodCar = async val => {
+  const res = await postFindCarListByName({ carNumber: val });
+  console.log('res :>> ', res);
+  const { code, data } = res.data;
+  if (code !== 200) return;
+  details.carListByName = data;
+};
+
+/** 修改计划数 */
+const handleEditplanNum = row => {};
 </script>
 
 <style scoped lang="scss">

src/views/distribution/artery/VehicleStowage.vue

@@ -506,6 +506,78 @@ onMounted(() => {
     console.log('details.listNode :>> ', details.listNode);
     clearTimeout(timer);
   }, 100);
+
+  /**
+   * 初始化获取本地缓存的编辑隐藏的列表
+   *  固定搭配，不能更改
+   */
+  let checkListnewarr = functions.getStorage(window.location.pathname + 'checkList');
+  let flexListnewarr = functions.getStorage(window.location.pathname + 'flexList');
+  let sortlistnewarr = functions.getStorage(window.location.pathname + 'sortlist');
+  if (checkListnewarr) {
+    details.columnList.map(item => {
+      item.head = false;
+    });
+    checkListnewarr.map(ite => {
+      details.columnList.map(item => {
+        if (ite == item.label) {
+          item.head = true;
+        }
+      });
+    });
+  } else {
+    let arr = [];
+    details.columnList.map(item => {
+      if (item.head) {
+        arr.push(item.label);
+      }
+    });
+    functions.setStorage(window.location.pathname + 'checkList', arr);
+  }
+  if (flexListnewarr) {
+    details.columnList.map(item => {
+      item.fixed = false;
+    });
+    flexListnewarr.map(ite => {
+      details.columnList.map(item => {
+        if (ite == item.label) {
+          if (item.type == 6) {
+            item.fixed = 'right';
+          } else {
+            item.fixed = true;
+          }
+        }
+      });
+    });
+  } else {
+    let arr = [];
+    details.columnList.map(item => {
+      if (item.fixed) {
+        arr.push(item.label);
+      }
+    });
+    functions.setStorage(window.location.pathname + 'flexList', arr);
+  }
+  if (sortlistnewarr) {
+    details.columnList.map(item => {
+      item.sortable = false;
+    });
+    sortlistnewarr.map(ite => {
+      details.columnList.map(item => {
+        if (ite == item.label) {
+          item.sortable = true;
+        }
+      });
+    });
+  } else {
+    let arr = [];
+    details.columnList.map(item => {
+      if (item.sortable) {
+        arr.push(item.label);
+      }
+    });
+    functions.setStorage(window.location.pathname + 'sortlist', arr);
+  }
 });
 
 /** 请求页面数据 */

src/views/distribution/inventory/CreateOrder.vue

@@ -27,7 +27,9 @@
             </div>
             <div class="mt10">
               <el-form-item class="mt10" label="运单号: " prop="waybillNo" label-width="80px">
-                <div><el-input v-model="query.waybillNo" placeholder="运单号" clearable /></div>
+                <div>
+                  <el-input v-model.trim="query.waybillNo" placeholder="运单号" clearable />
+                </div>
               </el-form-item>
             </div>
           </div>

src/views/waybill/CreateZeroOrder.vue

@@ -14,7 +14,7 @@
         <div class="flex-c-sb form_top">
           <div>
             <el-form-item class="mt10" label="运单号: " prop="waybillNo" label-width="80px">
-              <div><el-input v-model="query.waybillNo" placeholder="运单号" clearable /></div>
+              <div><el-input v-model.trim="query.waybillNo" placeholder="运单号" clearable /></div>
             </el-form-item>
           </div>
 

vite.config.js

@@ -14,7 +14,7 @@ export default ({ mode, command }) => {
         '/api': {
           // target: 'http://192.168.10.126:8889',
           // hy
-          // target: 'http://192.168.10.48:8888',
+          target: 'http://192.168.10.48:13000',
           // lmy
           // target: 'http://192.168.10.123:8889',
           // target: 'http://192.168.10.101:8888',