From 3566bd147fdf9249d57f121f9b5243e83620de39 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Wed, 17 Apr 2024 15:47:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Pricesystem/Price/PriceDelivery.vue | 445 +++++++++++-------
 .../Pricesystem/Price/PriceWarehousing.vue    |   6 +-
 .../inventory/distrilbutionBillLading.vue     |  10 +-
 src/views/financialsector/FinanceHome.vue     |   1 +
 4 files changed, 294 insertions(+), 168 deletions(-)

diff --git a/src/views/Pricesystem/Price/PriceDelivery.vue b/src/views/Pricesystem/Price/PriceDelivery.vue
index 4e53a091..04e14537 100644
--- a/src/views/Pricesystem/Price/PriceDelivery.vue
+++ b/src/views/Pricesystem/Price/PriceDelivery.vue
@@ -5,40 +5,40 @@
         <div class="el_flex_row">
           <el-form-item label="配送服务类型">
             <el-select
-          class="el_Cselect"
-          style="width: 100%;"
-          v-model="form.dispatchServiceType"
-          filterable
-          placeholder="选择计费类型"
-          disabled
-          @change="chargetype"
-        >
-          <el-option
-            v-for="item in Warehousebillingmode"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
+              class="el_Cselect"
+              style="width: 100%"
+              v-model="form.dispatchServiceType"
+              filterable
+              placeholder="选择计费类型"
+              disabled
+              @change="chargetype"
+            >
+              <el-option
+                v-for="item in Warehousebillingmode"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
           </el-form-item>
           <el-form-item label="计费模式">
             <el-select
-            v-model="form.dispatchPricingType"
-            filterable
-            placeholder="请选择配送计费模式"
-            :popper-append-to-body="false"
-            style="width:100%;"
-            disabled
-            multiple
-          >
-            <el-option
-              v-for="item in ServiceList"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
+              v-model="form.dispatchPricingType"
+              filterable
+              placeholder="请选择配送计费模式"
+              :popper-append-to-body="false"
+              style="width: 100%"
+              disabled
+              multiple
             >
-            </el-option>
-          </el-select>
+              <el-option
+                v-for="item in ServiceList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
           </el-form-item>
         </div>
       </div>
@@ -50,7 +50,7 @@
       <div class="el_flex">
         <div class="el_flex_row el_flex_right el_flex_input">
           <span class="Subtitle">按件计费 </span>
-          <div class="el_flex_row_1">
+          <div class="el_flex_row_1" v-if="billing">
             <el-form-item label="统一计费(元/件)">
               <el-input-number
                 v-model="form.ss"
@@ -65,8 +65,8 @@
 
           <el-form-item label="品类计费">
             <SurchargeTable
-              :SurchargeData="form.perpieceBillingData"
-              :Surcharge="form.perpieceBilling"
+              :SurchargeData="form.pieceCategoryData"
+              :Surcharge="form.pieceCategory"
             />
           </el-form-item>
         </div>
@@ -87,33 +87,30 @@
           </div>
 
           <el-form-item label="品类计费">
-            <SurchargeTable
-              :SurchargeData="form.perpieceBillingData"
-              :Surcharge="form.perpieceBilling"
-            />
+            <SurchargeTable :SurchargeData="form.cubeCategoryData" :Surcharge="form.cubeCategory" />
           </el-form-item>
         </div>
 
         <!-- 按重量计费  -->
         <div class="el_flex_row el_flex_right">
           <span class="Subtitle">按重量计费</span>
-          <div>
-            <el-form-item label="统一计费(元/KG)" style="margin-right: 0">
-              <el-input-number
-                v-model="form.ss"
-                :precision="2"
-                :min="0"
-                :max="10"
-                :controls="false"
-                placeholder="请输入价格"
-              />
-            </el-form-item>
-          </div>
+
+          <el-form-item label="统一计费(元/KG)" style="margin-right: 0">
+            <el-input-number
+              style="width: 48%"
+              v-model="form.ss"
+              :precision="2"
+              :min="0"
+              :max="10"
+              :controls="false"
+              placeholder="请输入价格"
+            />
+          </el-form-item>
 
           <el-form-item label="品类计费">
             <SurchargeTable
-              :SurchargeData="form.perpieceBillingData"
-              :Surcharge="form.perpieceBilling"
+              :SurchargeData="form.weightCategoryData"
+              :Surcharge="form.weightCategory"
             />
           </el-form-item>
         </div>
@@ -185,17 +182,17 @@
         </div>
       </div>
       <!-- 整车计费  -->
-      <el-form-item label="品类计费" style="width: 48%">
-        <SurchargeTable :SurchargeData="form.VehiclebillingData" :Surcharge="form.Vehiclebilling">
+      <el-form-item label="整车计费" class="Subtitle Wholevehicle" style="width: 48%">
+        <SurchargeTable :SurchargeData="form.fullVehicleData" :Surcharge="form.fullVehicle">
           <template #default="slotProps">
             <template v-if="slotProps.scope.column.label === '操作'">
               <div class="eml_btn">
-                <span @click="categoriesplus(item.id)" class="el_btn_a">
+                <span @click="storageplus" class="el_btn_a">
                   <el-icon style="font-size: 12px; color: #409eff; margin-right: 3px"
                     ><CirclePlus /></el-icon
                   >新增
                 </span>
-                <span @click="categoriesduce(item.id)" class="el_btn_b">
+                <span @click="storagereduce(slotProps.scope.row.index)" class="el_btn_b">
                   <el-icon style="font-size: 12px; color: #f00; margin-right: 3px"
                     ><Delete /></el-icon
                   >删除
@@ -207,8 +204,8 @@
       </el-form-item>
       <!-- 附加费用  -->
       <div class="el_flex_Surcharge">
-        <div class="el_sever_title"> 
-        <span>附加费用</span>  
+        <div class="el_sever_title">
+          <span>附加费用</span>
         </div>
         <span class="Subtitle">统一计费</span>
         <div class="el_flex">
@@ -277,17 +274,17 @@
           </div>
         </div>
         <!-- 品类计费  -->
-        <el-form-item label="品类计费" class="el_flex_row">
-          <SurchargeTable :SurchargeData="form.SurchargeData" :Surcharge="form.Surcharge" />
+        <el-form-item label="品类计1费" class="el_flex_row">
+          <SurchargeTable
+          :SurchargeData="form.aaaData" :Surcharge="form.aaa"
+       
+          />
         </el-form-item>
       </div>
-
       <!-- 最低等级计费 -->
       <div>
         <div class="el_sever_title">
-        <span>
-          最低计费等级
-        </span>  
+          <span> 最低计费等级 </span>
         </div>
         <div class="el_flex_Minimum">
           <template v-for="item in form.Minimumbilling" :key="item.label">
@@ -329,7 +326,7 @@
 </template>
 
 <script setup>
-import { ref , defineEmits, defineComponent} from 'vue';
+import { ref, defineEmits, defineComponent, computed } from 'vue';
 import SurchargeTable from '@/components/pric/tablePric.vue';
 import { putBasicdataPrice } from '@/api/Pricesystem/index';
 import { useRoute } from 'vue-router';
@@ -345,40 +342,123 @@ const props = defineProps({
   templateData: Object,
 });
 console.log(props, '来自父页面参数');
-const ServiceList=ref([])
+const ServiceList = ref([]);
 const requestInfo = ref({}); //价格回显
-const request=ref({})
-const Warehousebillingmode=ref([]);//服务类型
+const request = ref({});
+const Warehousebillingmode = ref([]); //服务类型
+const pricevehicle = ref([]); //车型
 const form = ref({
+  // 附加费品类
+  aaa:[
+    { label: '序号', prop: 'index', type: 'string', width: '78', disabled: true },
+    {
+      label: '产品品类(元/件)',
+      prop: 'categoryId',
+      type: 'select',
+      width: 'auto',
+      disabled: true,
+    },
+    {
+      label: '操作/装卸费(元/件)',
+      prop: 'handlingPrice',
+      type: 'number',
+      width: 'auto',
+      disabled: true,
+    },
+    {
+      label: '分货费(元/件)',
+      prop: 'sortPrice',
+      type: 'number',
+      width: 'auto',
+      disabled: true,
+    },
+    {
+      label: '平移费(元/件)',
+      prop: 'relocationPrice',
+      type: 'number',
+      width: 'auto',
+      disabled: true,
+    },
+    {
+      label: '上楼费价格(元/层)',
+      prop: 'upstairsDeliveryPrice',
+      type: 'number',
+      width: 'auto',
+      disabled: true,
+    },
+  ],
+
+  aaa: [
+    {
+    index:1,
+    handlingPrice:0,
+    sortPrice:0,
+    relocationPrice:0,
+    upstairsDeliveryPrice:0,
+  }
+],
+
   // 按件计费
-  perpieceBilling: [
+  pieceCategory: [
     { label: '序号', prop: 'index', type: 'string', width: '78', disabled: true },
-    { label: '产品品类', prop: 'category', type: 'string', width: 'auto', disabled: true },
+    { label: '产品品类', prop: 'categoryId', type: 'select', width: 'auto', disabled: true },
     {
       label: '单价(元/件)',
-      prop: 'storageFee',
+      prop: 'price',
       type: 'number',
       width: 'auto',
       disabled: true,
     },
     {
       label: '遗留件单价(元/件)',
-      prop: 'managementFeea',
+      prop: 'leaveBehindPrice',
       type: 'number',
       width: 'auto',
       disabled: true,
     },
   ],
+  //按件品类
+  pieceCategoryData: [],
 
-  perpieceBillingData: [
+  // 按方品类计费
+  cubeCategory: [
+    { label: '序号', prop: 'index', type: 'string', width: '78', disabled: true },
+    { label: '产品品类', prop: 'categoryId', type: 'select', width: 'auto', disabled: true },
+    { label: '单价(元/m³)', prop: 'price', type: 'number', width: 'auto', disabled: true },
     {
-      index: 0,
-      category: '暂无',
-      storageFee: 0,
-      managementFee: 0,
-      managementFeea: 0,
+      label: '遗留单价(元/m³)',
+      prop: 'leaveBehindPrice',
+      type: 'number',
+      width: 'auto',
+      disabled: true,
+    },
+  ],
+  // 按件品类
+  cubeCategoryData: [],
+  // 按重量品类计费
+  weightCategory: [
+    { label: '序号', prop: 'index', type: 'string', width: '78', disabled: true },
+    { label: '产品品类', prop: 'categoryId', type: 'select', width: 'auto', disabled: true },
+    { label: '单价(元/kg)', prop: 'price', type: 'number', width: 'auto', disabled: true },
+    {
+      label: '遗留单价(元/kg)',
+      prop: 'leaveBehindPrice',
+      type: 'number',
+      width: 'auto',
+      disabled: true,
     },
   ],
+  // 按重量品类
+  weightCategoryData: [],
+  // 按整车计费
+  fullVehicle: [
+    { label: '序号', prop: 'index', type: 'string', width: '78', disabled: true },
+    { label: '车型', prop: 'vehicleType', type: 'select', width: 'auto', disabled: true },
+    { label: '分拣费(元/车)', prop: 'price', type: 'number', width: 'auto', disabled: true },
+    { label: '操作', prop: '', type: '', width: 'auto', disabled: true },
+  ],
+  // 按整车计费
+  fullVehicleData: [],
 
   // 品类计费
   Billingcategory: [
@@ -431,10 +511,6 @@ const form = ref({
       prop: 'category',
       type: 'select',
       width: 'auto',
-      options: [
-        { value: 'option1', label: 'Option 1' },
-        { value: 'option2', label: 'Option 2' },
-      ],
       disabled: true,
     },
     {
@@ -447,6 +523,8 @@ const form = ref({
     { label: '操作', prop: '', type: '', width: '130', disabled: true },
   ],
 
+
+
   VehiclebillingData: [
     {
       index: 1,
@@ -455,48 +533,7 @@ const form = ref({
       managementFee: 0,
     },
   ],
-  // 附加费用
-  Surcharge: [
-    { label: '序号', prop: 'index', type: 'string', width: '78', disabled: true },
-    { label: '产品品类(元/件)', prop: 'category', type: 'string', width: '200', disabled: true },
-    {
-      label: '操作/装卸费(元/件)',
-      prop: 'storageFee',
-      type: 'number',
-      width: '200',
-      disabled: true,
-    },
-    {
-      label: '分贷费(元/件)',
-      prop: 'managementFeea',
-      type: 'number',
-      width: '200',
-      disabled: true,
-    },
-    {
-      label: '平移费(元/件)',
-      prop: 'managementFeea',
-      type: 'number',
-      width: '200',
-      disabled: true,
-    },
-    {
-      label: '上楼费(元/层)',
-      prop: 'managementFeea',
-      type: 'number',
-      width: '200',
-      disabled: true,
-    },
-  ],
-  SurchargeData: [
-    {
-      index: 1,
-      category: '暂无',
-      storageFee: 0,
-      managementFee: 0,
-      managementFeea: 0,
-    },
-  ],
+
   // 最低计费等级
   Minimumbilling: [
     {
@@ -578,26 +615,115 @@ function updateDictionary(targetArray, dictionaryType) {
     .catch(() => {})
     .finally(() => {});
 }
-const  onLoad= async()=>{
- await updateDictionary(Warehousebillingmode.value, 'dispatch_type'); //仓储计费类型
- await updateDictionary(ServiceList.value, 'dispatch_pricing_type'); //仓储计费类型
-  if(props.templateData.request){
-    console.log(props.templateData.request,'props.templateData.request');
-    request.value =await deepClone(props.templateData.request)
-    form.value.dispatchServiceType= request.value.dispatchServiceType;//配送服务类型
-    
-    form.value.dispatchPricingType = request.value.dispatchPricingType
-          ? request.value.dispatchPricingType.split(',').map(Number)
-          : []; //服务类型
+
+// 移除对象
+function removeItemById(array, id) {
+  const index = array.findIndex(item => item.index === id);
+  if (index !== -1) {
+    array.splice(index, 1);
+    array.forEach((item, index) => {
+      item.index = index + 1;
+    });
   }
 }
-onLoad()
+function addItemAfterId(array) {
+  console.log(array);
+  const newItem = {
+    index: array.length + 1, // 新对象的 ID 为当前数组长度加 1
+    plus: false, // 是否显示加号
+    reduce: true, // 是否显示减号
+    vehicleType: '', //	车型
+    loading: false,
+    price: 0, //价格
+    options: pricevehicle.value, //选择框列表
+  };
+  array.push(newItem);
+}
+// 仓储减
+const storagereduce = id => {
+  removeItemById(form.value.fullVehicleData, id); //传入配置项和对应的ID
+};
+
+// 仓储加
+const storageplus = data => {
+  addItemAfterId(form.value.fullVehicleData);
+};
+
+const onLoad = async () => {
+  await updateDictionary(Warehousebillingmode.value, 'dispatch_type'); //仓储计费类型
+  await updateDictionary(ServiceList.value, 'dispatch_pricing_type'); //仓储计费类型
+  await updateDictionary(pricevehicle.value, 'price_vehicle_type'); //车型
+
+  //  回显
+  if (props.templateData.request) {
+    console.log(props.templateData.request, 'props.templateData.request');
+    request.value = await deepClone(props.templateData.request);
+    form.value.dispatchServiceType = request.value.dispatchServiceType; //配送服务类型
+
+    form.value.dispatchPricingType = request.value.dispatchPricingType
+      ? request.value.dispatchPricingType.split(',').map(Number)
+      : []; //服务类型
+    addItemAfterId(form.value.fullVehicleData); //整车计费(缺少判断)
+    // 缺少判断
+    // 按件品类计费
+    if (form.value.dispatchPricingType.includes(1)) {
+      request.value.dispatchPieceCategorys.forEach((item, index) => {
+        form.value.pieceCategoryData.push({
+          index: index + 1,
+          categoryId: item.id, //品类
+          price: 0, //价格
+          leaveBehindPrice: 0, //遗留单价
+          options: [{ label: item.name, value: item.id }],
+        });
+      });
+    }
+    //  按方计费
+    if (form.value.dispatchPricingType.includes(3)) {
+      request.value.dispatchCubeCategorys.forEach((item, index) => {
+        form.value.cubeCategoryData.push({
+          index: index + 1,
+          categoryId: item.id, //品类
+          price: 0, //价格
+          leaveBehindPrice: 0, //遗留单价
+          options: [{ label: item.name, value: item.id }],
+        });
+      });
+    }
+    //  按重量
+    if (form.value.dispatchPricingType.includes(3)) {
+      request.value.dispatchWeightCategorys.forEach((item, index) => {
+        form.value.weightCategoryData.push({
+          index: index + 1,
+          categoryId: item.id, //品类
+          price: 0, //价格
+          leaveBehindPrice: 0, //遗留单价
+          options: [{ label: item.name, value: item.id }],
+        });
+      });
+    }
+
+    //  附加费品类
+    //  request.value.dispatchAdditionalCategorys.forEach((item,index)=>{
+    //   form.value.additionalCategoryData.push()
+    //  })
+  }
+};
+
+onLoad();
 const btn = () => {
   console.log(form.value);
 };
 const view = val => {
   console.log(val);
 };
+
+const billing = computed(() => {
+  if (!request.value.value) {
+    return true;
+  } else {
+    return false;
+  }
+});
 </script>
 
 <style scoped lang="scss">
@@ -675,17 +801,14 @@ const view = val => {
   .el_row {
     width: 48%;
   }
-  :deep(.el_flex_row_1){
-
-    .el-form-item__content{
+  :deep(.el_flex_row_1) {
+    .el-form-item__content {
       width: 48% !important;
       .el-input-number {
-      width: 100%;
+        width: 100%;
+      }
     }
-    
-  }
   }
-
 }
 .el_flex_row {
   width: 48%;
@@ -712,29 +835,33 @@ const view = val => {
     }
   }
 }
-.el_sever_title{
-  span{
+.el_sever_title {
+  span {
     padding-left: 10px;
-  color: #d58833;
-  font-size: 18px;
-  font-weight: bold;
-  position: relative;
+    color: #d58833;
+    font-size: 18px;
+    font-weight: bold;
+    position: relative;
   }
-  span::before{
-  content: '';
-  width: 4px;
-  height: 70%;
-  background-color: #d58833;
-  position: absolute;
-  left: 0px;
-  top:4px;
-
+  span::before {
+    content: '';
+    width: 4px;
+    height: 70%;
+    background-color: #d58833;
+    position: absolute;
+    left: 0px;
+    top: 4px;
   }
-
 }
-.Subtitle{
+.Subtitle {
   display: block;
   margin-top: 10px;
   color: #d58833;
 }
+:deep(.Wholevehicle) {
+  .el-form-item__label {
+    color: #d58833;
+    font-size: 18px;
+  }
+}
 </style>
diff --git a/src/views/Pricesystem/Price/PriceWarehousing.vue b/src/views/Pricesystem/Price/PriceWarehousing.vue
index e4c1f81d..7b0f6356 100644
--- a/src/views/Pricesystem/Price/PriceWarehousing.vue
+++ b/src/views/Pricesystem/Price/PriceWarehousing.vue
@@ -185,8 +185,6 @@ import { deepClone } from '@/utils/util';
 import { ElMessage } from 'element-plus';
 import { putBasicdataPrice } from '@/api/Pricesystem/index';
 import { useRoute } from 'vue-router';
-import { valid } from 'mockjs';
-import page from '@/router/page';
 const $route = useRoute(); //获取地址栏参数
 const emit = defineEmits(['request-data']);
 defineComponent({
@@ -476,7 +474,7 @@ const onLoad = async () => {
 const price = async () => {
 
   if (Object.keys(requestInfo.value).length > 0) {
-    if (requestInfo.value.catergory.length) {
+    if (requestInfo.value.catergory && requestInfo.value.catergory.length) {
       // 仓储
       requestInfo.value.catergory.forEach(res => {
         let data = form.value.publicData.find(temp => temp.categoryId == res.categoryId);
@@ -489,7 +487,7 @@ const price = async () => {
       });
     }
     // 附加费（还差状态）
-    if (requestInfo.value.additionalCategory.length) {
+    if (requestInfo.value.additionalCategory && requestInfo.value.additionalCategory.length) {
       requestInfo.value.additionalCategory.forEach(res => {
         let data = form.value.SurchargeData.find(temp => temp.categoryId == res.categoryId);
         if (data) {
diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue
index 7bfc9d2a..5457c528 100644
--- a/src/views/distribution/inventory/distrilbutionBillLading.vue
+++ b/src/views/distribution/inventory/distrilbutionBillLading.vue
@@ -2293,11 +2293,11 @@ export default {
     },
     //确定
     callFordelivery(inde) {
-      // if (!this.selectionList.length) {
-      //   console.log(this.selectionListStock, '23');
-      //   this.$message.warning('至少选择一条数据！');
-      //   return;
-      // }
+      if (!this.selectionList.length) {
+        console.log(this.selectionListStock, '23');
+        this.$message.warning('至少选择一条数据！');
+        return;
+      }
       let isa = false;
       this.selectionList.some(i => {
         if (parseInt(i.inventoryQuantity) > parseInt(i.quantityStock)) {
diff --git a/src/views/financialsector/FinanceHome.vue b/src/views/financialsector/FinanceHome.vue
index 1d79a62d..ff85d1ee 100644
--- a/src/views/financialsector/FinanceHome.vue
+++ b/src/views/financialsector/FinanceHome.vue
@@ -358,4 +358,5 @@ const handleChange = () => {
   padding:0 10px !important;
 }
 }
+
 </style>