修改了部分bug

src/utils/util.js

@@ -888,3 +888,11 @@ export const handleFilterData = (data, renderData, { inputQuery, selectQuery, ti
 
   return (renderData.value = newData);
 };
+
+/**
+ * 检测账号是否选择仓库
+ * @returns {boolean}
+ */
+export const ChecksWhetherTheWarehouseIsSelected = () => {
+  return localStorage.getItem('WarehouseName') ? true : false;
+};

src/views/Pricesystem/Price/PriceBill.vue

@@ -1138,12 +1138,17 @@ const handleAdd = () => {
 /** 给form赋值 */
 const initAssignmentForm = (data, isLine = true) => {
   if (isLine) {
-    details.form.startCity = [
-      ...new Set([data.startProvinceId + '', data.startCityId + '', data.startCountyId + '']),
-    ];
-    details.form.endCity = [
-      ...new Set([data.endProvinceId + '', data.endCityId + '', data.endCountyId + '']),
-    ];
+    details.form.startCity = [];
+    details.form.endCity = [];
+
+    data.startProvinceId && (details.form.startCity[0] = data.startProvinceId + '');
+    data.startCityId && (details.form.startCity[1] = data.startCityId + '');
+    data.startCountyId && (details.form.startCity[2] = data.startCountyId + '');
+
+    data.endProvinceId && (details.form.endCity[0] = data.endProvinceId + '');
+    data.endCityId && (details.form.endCity[1] = data.endCityId + '');
+    data.endCountyId && (details.form.endCity[2] = data.endCountyId + '');
+
     details.form.sendOrgId = data.sendOrgId;
     details.form.sendOrg = data.sendOrgName;
     details.form.priceId = data.priceId;
@@ -1395,8 +1400,8 @@ const handleSubmitLine = async () => {
   if (details.form.startCity.length <= 1 || details.form.endCity.length <= 1)
     return ElMessage.warning('地址请选择到市一级');
 
-  if (!submitData.startCountyId) delete submitData.startCountyId;
-  if (!submitData.endCountyId) delete submitData.endCountyId;
+  // if (!submitData.startCountyId) delete submitData.startCountyId;
+  // if (!submitData.endCountyId) delete submitData.endCountyId;
 
   // 如果为编辑提交
   if (details.lineType === 'edit') submitData.id = details.form.id;

src/views/Pricesystem/Price/PriceTrunkLine.vue

@@ -1128,12 +1128,17 @@ const handleAdd = () => {
 /** 给form赋值 */
 const initAssignmentForm = (data, isLine = true) => {
   if (isLine) {
-    details.form.startCity = [
-      ...new Set([data.startProvinceId + '', data.startCityId + '', data.startCountyId + '']),
-    ];
-    details.form.endCity = [
-      ...new Set([data.endProvinceId + '', data.endCityId + '', data.endCountyId + '']),
-    ];
+    details.form.startCity = [];
+    details.form.endCity = [];
+
+    data.startProvinceId && (details.form.startCity[0] = data.startProvinceId + '');
+    data.startCityId && (details.form.startCity[1] = data.startCityId + '');
+    data.startCountyId && (details.form.startCity[2] = data.startCountyId + '');
+
+    data.endProvinceId && (details.form.endCity[0] = data.endProvinceId + '');
+    data.endCityId && (details.form.endCity[1] = data.endCityId + '');
+    data.endCountyId && (details.form.endCity[2] = data.endCountyId + '');
+
     details.form.sendOrgId = data.sendOrgId;
     details.form.sendOrg = data.sendOrgName;
     details.form.priceId = data.priceId;
@@ -1370,23 +1375,25 @@ const handleSubmitLine = async () => {
   if (isRetrun) return;
 
   const submitData: any = {
-    startProvinceId: details.form.startCity[0], // 省
-    startCityId: details.form.startCity[1], // 市
-    startCountyId: details.form.startCity[2], // 区,
-    endProvinceId: details.form.endCity[0], // 省
-    endCityId: details.form.endCity[1], // 市
-    endCountyId: details.form.endCity[2], // 区,
+    startProvinceId: details.form.startCity[0] || '', // 省
+    startCityId: details.form.startCity[1] || '', // 市
+    startCountyId: details.form.startCity[2] || '', // 区,
+    endProvinceId: details.form.endCity[0] || '', // 省
+    endCityId: details.form.endCity[1] || '', // 市
+    endCountyId: details.form.endCity[2] || '', // 区,
     /** 提货 */
     serviceType: '2',
     priceId: $route.query.id,
     sendOrgId: details.form.sendOrgId,
   };
 
+  console.log('submitData :>> ', submitData);
+
   if (details.form.startCity.length <= 1 || details.form.endCity.length <= 1)
     return ElMessage.warning('地址请选择到市一级');
 
-  if (!submitData.startCountyId) delete submitData.startCountyId;
-  if (!submitData.endCountyId) delete submitData.endCountyId;
+  // if (!submitData.startCountyId) delete submitData.startCountyId;
+  // if (!submitData.endCountyId) delete submitData.endCountyId;
 
   // 如果为编辑提交
   if (details.lineType === 'edit') submitData.id = details.form.id;

src/views/distribution/artery/TripartiteTransfer.vue

@@ -202,7 +202,6 @@
             <!-- 结算 -->
             <el-text
               v-if="
-                slotProps.scope.row.signTime &&
                 permissionObj.TripartiteTransfer_Account &&
                 Number(slotProps.scope.row.isSettlement) === 1
               "
@@ -210,11 +209,14 @@
             >
               结算
             </el-text>
+
+            <!-- 装车明细 -->
             <el-text
               v-if="permissionObj.TripartiteTransfer_loadingDetail"
               @click="handleShowTruckLoadingDetails(slotProps.scope)"
-              >装车明细</el-text
             >
+              装车明细
+            </el-text>
           </template>
         </template>
       </tablecmt>

src/views/distribution/artery/truckLoadingDetails.vue

@@ -315,6 +315,7 @@ import {
   deepClone,
   handleClearTableQuery,
   getObjType,
+  ChecksWhetherTheWarehouseIsSelected,
 } from '@/utils/util';
 import { detailsColumnList } from '@/option/distribution/TripartiteTransfer';
 import { useRouter, useRoute } from 'vue-router';
@@ -1304,11 +1305,22 @@ const printTemplate = () => {
 
 /** 批量移除 */
 const handleBatchRemove = async () => {
+  const WarehouseName = localStorage.getItem('WarehouseName');
+  if (!ChecksWhetherTheWarehouseIsSelected()) return ElMessage.warning('请选择仓库');
+
   if (details.selectionList.length === 0) return ElMessage.warning('请选择需要删除的数据');
 
   for (let i = 0; i < details.selectionList.length; i++) {
     const item = details.selectionList[i];
-    if (item.isData !== 0) return ElMessage.warning('只能删除系统无编码数据');
+
+    if (Number(item.scanStatus) !== 1) return ElMessage.warning('不能删除签收或卸车数据');
+
+    console.log('item.warehouseName :>> ', item.warehouseName);
+    console.log('WarehouseName :>> ', WarehouseName);
+
+    if (WarehouseName !== item.warehouseName) {
+      if (item.isData !== 0) return ElMessage.warning('不能删除其它仓库的装车数据');
+    }
   }
 
   ElMessageBox.confirm('是否批量删除数据', '提示', {

src/views/distribution/inventory/CreateOrder.vue

@@ -388,7 +388,7 @@
                 () => {
                   details.query.pickupFee = 0;
                   if (!details.query.isPickUp) return;
-                  handlePrice();
+                  handlePrice(false, 'pickup');
                 }
               "
               v-model="query.isPickUp"
@@ -407,7 +407,7 @@
               @change="
                 () => {
                   details.query.pickupFee = 0;
-                  handlePrice();
+                  handlePrice(false, 'pickup');
                 }
               "
             >
@@ -427,7 +427,7 @@
               @change="
                 () => {
                   details.query.pickupFee = 0;
-                  handlePrice();
+                  handlePrice(false, 'pickup');
                 }
               "
             >
@@ -451,7 +451,7 @@
               @change="
                 () => {
                   details.query.totalFreight = 0;
-                  handlePrice();
+                  handlePrice(false, 'trunkline');
                 }
               "
               :disabled="isDisabled"
@@ -472,7 +472,7 @@
               @change="
                 () => {
                   details.query.totalFreight = 0;
-                  handlePrice();
+                  handlePrice(false, 'trunkline');
                 }
               "
             >
@@ -578,7 +578,7 @@
               :precision="0"
               :step="1"
               :value-on-clear="0"
-              @change="handleComputed(item)"
+              @change="() => handleComputed(item)"
             />
           </el-form-item>
 
@@ -591,7 +591,7 @@
               :precision="4"
               :step="0.1"
               :value-on-clear="0"
-              @change="handleComputed(item)"
+              @change="() => handleComputed(item)"
             />
           </el-form-item>
 
@@ -604,7 +604,7 @@
               :precision="3"
               :step="0.1"
               :value-on-clear="0"
-              @change="handleComputed(item)"
+              @change="() => handleComputed(item)"
             />
           </el-form-item>
 
@@ -617,7 +617,7 @@
               :precision="2"
               :step="0.1"
               :value-on-clear="0"
-              @change="handleComputed(item)"
+              @change="() => handleComputed(item, true)"
             />
           </el-form-item>
 
@@ -2431,8 +2431,11 @@ const destinationWarehouseNameChange = val => {
   details.query.queryDestinationWarehouseName = details.query.destinationWarehouseName;
 };
 
-/** 计算行合计 */
-const handleComputed = (row: any) => {
+/** 计算行合计
+ * row -- 行数据
+ * onlyComputedTrunline -- 是否只计算干线的价格
+ */
+const handleComputed = (row: any, onlyComputedTrunline = false) => {
   const { template, trunkLine } = details.priceTemplate;
 
   if (Boolean(isDisabled.value && template && trunkLine))
@@ -2453,25 +2456,27 @@ const handleComputed = (row: any) => {
       ? computeNumber(row.price, '*', row[_trunklineKey]).result
       : 0;
 
-  // 计算提货价格 -- 行
-  if (_pickupKey)
-    row.subtotalPickup = _pickupKey
-      ? computeNumber(row.deliveryPrice, '*', row[_pickupKey]).result
-      : 0;
+  if (onlyComputedTrunline) {
+    // 计算提货价格 -- 行
+    if (_pickupKey)
+      row.subtotalPickup = _pickupKey
+        ? computeNumber(row.pickupPrice || 0, '*', row[_pickupKey]).result
+        : 0;
 
-  // 计算配送价格 -- 行
-  if (_dispatchKey)
-    row.subtotalDispatch = _dispatchKey
-      ? computeNumber(row.deliveryPrice, '*', row[_dispatchKey]).result
-      : 0;
+    // 计算配送价格 -- 行
+    if (_dispatchKey)
+      row.subtotalDispatch = _dispatchKey
+        ? computeNumber(row.deliveryPrice || 0, '*', row[_dispatchKey]).result
+        : 0;
 
-  if (_warehouseKey)
-    row.subtotalWarehouseManagement = _warehouseKey
-      ? computeNumber(row.warehouseManagementPrice, '*', row[_warehouseKey]).result
-      : 0;
-  console.log('row :>> ', row);
+    if (_warehouseKey)
+      row.subtotalWarehouseManagement = _warehouseKey
+        ? computeNumber(row.warehouseManagementPrice || 0, '*', row[_warehouseKey]).result
+        : 0;
+    console.log('row :>> ', row);
+  }
 
-  handlePrice();
+  handlePrice(!onlyComputedTrunline, 'trunkline');
 };
 
 /** 查询客户信息 */
@@ -2848,24 +2853,27 @@ const handleWarehouseManagement = () => {
   for (let i = 0; i < details.goodsList.length; i++) {
     const value = details.goodsList[i];
 
-    _total = computeNumber(_total, '+', value.subtotalWarehouseManagement).result;
+    _total = computeNumber(_total, '+', value.subtotalWarehouseManagement || 0).result;
   }
 
   details.query.warehouseManagementFee = _total;
 };
 
 /** 处理模板费用 -- 计算 */
-const handlePrice = () => {
+const handlePrice = (isAll = false, type) => {
   const { dispatch, pickup, template, trunkLine } = details.priceTemplate;
 
+  console.log('type :>> ', type);
+  console.log('isAll :>> ', isAll);
+
   /** 处理提货费用 */
-  handlePickUpPrice(pickup, template);
+  (isAll || type === 'pickup') && handlePickUpPrice(pickup, template);
   /** 处理干线费用 */
-  handleTrunkLinePrice(trunkLine, template);
+  (isAll || type === 'trunkline') && handleTrunkLinePrice(trunkLine, template);
   /** 处理配送费 */
-  handleDispatchPrice(dispatch, template);
+  (isAll || type === 'dispatch') && handleDispatchPrice(dispatch, template);
   /** 处理仓库管理费 */
-  handleWarehouseManagement();
+  (isAll || type === 'warehouseMangement') && handleWarehouseManagement();
 };
 
 /** 重置值 */

src/views/waybill/ChangeOrder.vue

@@ -476,7 +476,7 @@ const handleGoWaybillDetails = ({ row }) => {
     query: {
       name: `查看 -- 【${row.waybillNo}】`,
       waybillNo: row.waybillNo,
-      id: row.id,
+      id: row.waybillId,
       waybillType: row.waybillType,
     },
   });

src/views/waybill/TemporaryStorageList.vue

@@ -89,6 +89,8 @@
                   v-if="permissionObj.TemporaryStorageList_batchOpenLableUpload"
                   @click="
                     () => {
+                      if (!ChecksWhetherTheWarehouseIsSelected())
+                        return ElMessage.warning('请选择仓库');
                       details.popUpShow.UploadBatch = true;
                       details.ouPaiChooseType = 0;
                     }
@@ -184,43 +186,6 @@
     </div>
   </basic-container>
 
-  <!-- 修改客户信息 -->
-  <el-dialog
-    class="el-dialog-QRCode"
-    title="修改客户信息"
-    :visible.sync="details.popUpShow.editClientInfoVisible"
-    width="780px"
-    v-model="details.popUpShow.editClientInfoVisible"
-  >
-    <div>
-      <el-divider style="font-size: 28px">修改订单自编号（）客户信息</el-divider>
-    </div>
-
-    <el-form>
-      <el-form-item label="客户姓名">
-        <el-input />
-      </el-form-item>
-
-      <el-form-item label="联系电话">
-        <el-input />
-      </el-form-item>
-
-      <el-form-item label="用户地址">
-        <el-input />
-      </el-form-item>
-    </el-form>
-
-    <template #footer>
-      <div class="flex-c-c dialog-footer">
-        <el-button icon="Position" type="primary" @click="handleSubmitClientInfo">提 交</el-button>
-        <el-button icon="Refresh" type="primary" @click="handleRefreshClientInfo">重 置</el-button>
-        <el-button icon="Close" @click="details.popUpShow.editClientInfoVisible = false">
-          取 消
-        </el-button>
-      </div>
-    </template>
-  </el-dialog>
-
   <!-- 开标签 -->
   <el-dialog
     class="el-dialog-addTagVisited"
@@ -519,6 +484,7 @@ import {
   deepClone,
   downloadFileBase64,
   handleClearTableQuery,
+  ChecksWhetherTheWarehouseIsSelected,
 } from '@/utils/util';
 import { columnList } from '@/option/waybill/TemporaryStorageList';
 import { useRouter } from 'vue-router';
@@ -614,8 +580,6 @@ const details = reactive<any>({
   popUpShow: {
     /** 包件明细 */
     packageOrderListlVisited: false,
-    /** 修改客户信息 */
-    editClientInfoVisible: false,
     /** 导入 -- 家配 */
     UploadPackageDelivery: false,
     /** 导入 -- 批量开标前 */
@@ -1112,6 +1076,8 @@ const handleShowPackageOrderList = ({ row }) => {
 
 /** 订单转运单 */
 const handleCreateOrder = () => {
+  if (!ChecksWhetherTheWarehouseIsSelected()) return ElMessage.warning('请选择仓库');
+
   if (details.selectionList.length === 0) {
     return ElMessage({
       type: 'warning',
@@ -1276,12 +1242,6 @@ const handleFullScrean = (_type: 'open' | 'close', _name: string) => {
   }
 };
 
-/** 提交修改客户信息 */
-const handleSubmitClientInfo = () => {};
-
-/** 重置客户信息 */
-const handleRefreshClientInfo = () => {};
-
 /** 上传文件 */
 const handleBeforeUpload = file => {
   console.log('file :>> ', file);
@@ -1375,9 +1335,13 @@ const handleRefreshAddTag = (formEl: FormInstance | undefined) => {
 };
 
 /** 开启开标签弹窗 */
-const handleOpenAddTagDlog = () => {
+const handleOpenAddTagDlog = async () => {
+  if (!ChecksWhetherTheWarehouseIsSelected()) return ElMessage.warning('请选择仓库');
+
   details.popUpShow.addTagVisited = true;
 
+  await nextTick();
+
   ruleFormRef.value.resetFields();
 };