diff --git a/src/views/Pricesystem/Price/PriceBill.vue b/src/views/Pricesystem/Price/PriceBill.vue
index 9da9327d..5f3b8e39 100644
--- a/src/views/Pricesystem/Price/PriceBill.vue
+++ b/src/views/Pricesystem/Price/PriceBill.vue
@@ -268,10 +268,14 @@
     width="70%"
     v-model="details.popUpShow.addVsitied"
   >
-    <el-form inline label-width="130px">
-      <el-form-item label="始发地">
+    <el-form inline :model="details.form" ref="lineFormRef" label-width="130px">
+      <el-form-item
+        label="始发地"
+        prop="startCity"
+        :rules="[{ required: true, message: '请选择始发地', trigger: ['blur', 'change'] }]"
+      >
         <el-cascader
-          pleceholder="请选择到站地址"
+          pleceholder="请选择始发地"
           :options="details.regionOptione"
           style="width: 100%"
           v-model="details.form.startCity"
@@ -286,9 +290,13 @@
         </el-cascader>
       </el-form-item>
 
-      <el-form-item label="目的地">
+      <el-form-item
+        label="目的地"
+        prop="endCity"
+        :rules="[{ required: true, message: '请选择目的地', trigger: ['blur', 'change'] }]"
+      >
         <el-cascader
-          pleceholder="请选择到站地址"
+          pleceholder="请选择目的地"
           :options="details.regionOptione"
           style="width: 100%"
           v-model="details.form.endCity"
@@ -303,7 +311,11 @@
         </el-cascader>
       </el-form-item>
 
-      <el-form-item label="发货单位">
+      <el-form-item
+        label="发货单位"
+        prop="sendOrg"
+        :rules="[{ required: true, message: '请选择发货单位', trigger: ['blur', 'change'] }]"
+      >
         <el-select
           class="w100"
           v-model="details.form.sendOrg"
@@ -541,6 +553,9 @@ console.log('props :>> ', props);
 /** 表单实例 */
 const formRef = ref();
 
+/** 提货路径表单 */
+const lineFormRef = ref();
+
 const VehicleBillingFormRef = ref();
 
 // 品类价格
@@ -565,7 +580,7 @@ interface BillTemplateDetail {
 /** 整车计费 */
 interface VehicleBilling {
   /** 车型 */
-  pickupPricingType: string;
+  vehicleType: string;
   /** 车型计费(元/车) */
   price: number;
 }
@@ -604,7 +619,7 @@ const details = reactive({
   VehicleBillingDetal: [
     {
       /** 车型 */
-      pickupPricingType: '',
+      vehicleType: '',
       /** 车型计费(元/车) */
       price: 0,
     },
@@ -824,16 +839,18 @@ const handleVehicleTypeArr = response => {
 
 /** 获取业务字典 */
 const initDictionaryBiz = async () => {
+  console.log('123213213 :>> ', 123213213);
   try {
-    // 干线计费方式
-    const trunkLinePromise = getDictionaryBiz('trunk_line_pricing_type');
-    // 车辆类型
-    const priceVehiclePromise = getDictionaryBiz('price_vehicle_type');
+    const { trunkLineResult, priceVehicleResult, regionOptione } = props.templateData;
+    // // 干线计费方式
+    // const trunkLinePromise = getDictionaryBiz('trunk_line_pricing_type');
+    // // 车辆类型
+    // const priceVehiclePromise = getDictionaryBiz('price_vehicle_type');
 
-    const [trunkLineResult, priceVehicleResult] = await Promise.all([
-      trunkLinePromise,
-      priceVehiclePromise,
-    ]);
+    // const [trunkLineResult, priceVehicleResult] = await Promise.all([
+    //   trunkLinePromise,
+    //   priceVehiclePromise,
+    // ]);
 
     await nextTick();
 
@@ -853,12 +870,15 @@ const initDictionaryBiz = async () => {
 
       // 不按统一区域计费, 初始化获取数据
       if (details.form.pickupIsUnifyAreaBill === '0') {
+        console.log('123 :>> ', 123);
+
         // 获取省市区信息
-        const res = await getLazyTreeAll();
-        if (res.data.success) {
-          details.regionOptione = res.data.data || [];
+        if (regionOptione.data.success) {
+          details.regionOptione = regionOptione.data.data || [];
         }
 
+        console.log('123321 :>> ', 123321);
+
         initLineData();
       }
     }
@@ -867,6 +887,7 @@ const initDictionaryBiz = async () => {
     handleTrunkLinePricingType(trunkLineResult);
     handleVehicleTypeArr(priceVehicleResult);
 
+    initAssignmentForm(props.templateData.requestInfo.pickup, false);
     // 初始化复制form数据
     initFormData();
   } catch (error) {
@@ -894,7 +915,7 @@ const handlePlusVehicle = async (index: number) => {
 
   details.VehicleBillingDetal.splice(index + 1, 0, {
     /** 车型 */
-    pickupPricingType: '',
+    vehicleType: '',
     /** 车型计费(元/车) */
     price: 0,
   });
@@ -972,7 +993,7 @@ const initLineData = async () => {
   try {
     details.loadingObj.list = true;
 
-    const res = await getPage({ ...details.page, priceId: $route.query.id });
+    const res = await getPage({ ...details.page, priceId: $route.query.id, serviceType: '1' });
     const { code, data } = res.data;
 
     if (code !== 200) return;
@@ -1081,7 +1102,7 @@ const handleAdd = () => {
   details.VehicleBillingDetal = [
     {
       /** 车型 */
-      pickupPricingType: '',
+      vehicleType: '',
       /** 车型计费(元/车) */
       price: 0,
     },
@@ -1091,22 +1112,31 @@ const handleAdd = () => {
 };
 
 /** 给form赋值 */
-const initAssignmentForm = data => {
-  details.form.startCity = [
-    ...new Set([data.startProvinceId + '', data.startCityId + '', data.startCountyId + '']),
-  ];
-  details.form.endCity = [
-    ...new Set([data.endProvinceId + '', data.endCityId + '', data.endCountyId + '']),
-  ];
-  details.form.sendOrgId = data.sendOrgId;
-  details.form.sendOrg = data.sendOrgName;
-  details.form.priceId = data.priceId;
+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.sendOrgId = data.sendOrgId;
+    details.form.sendOrg = data.sendOrgName;
+    details.form.priceId = data.priceId;
+  }
 
   details.form.minCost = data.minCost || 0;
   details.form.additionalCost = data.additionalCost || 0;
 
   // 车辆赋值
-  details.VehicleBillingDetal = data.fullVehicle || [];
+  details.VehicleBillingDetal = data.fullVehicle || [
+    {
+      /** 车型 */
+      vehicleType: '',
+      /** 车型计费(元/车) */
+      price: 0,
+    },
+  ];
 
   for (let i = 0; i < details.VehicleBillingDetal.length; i++) {
     const value = details.VehicleBillingDetal[i];
@@ -1169,7 +1199,7 @@ const handleEdit = async ({ row }) => {
     details.VehicleBillingDetal = [
       {
         /** 车型 */
-        pickupPricingType: '',
+        vehicleType: '',
         /** 车型计费(元/车) */
         price: 0,
       },
@@ -1240,17 +1270,51 @@ const resetFormData = () => {
 
 /** 提交 */
 const handleSubmit = async () => {
-  if (details.form.pickupPricingType.length === 0) ElMessage.error('请选择计价方式');
-
   let isRetrun = false;
 
   await formRef.value.validate(valid => {
     // if (!valid) return;
-    console.log('222 :>> ', 222);
     isRetrun = !valid;
   });
 
   if (isRetrun) return;
+
+  const submitData: any = {
+    checkType: '1',
+    id: $route.query.id,
+    pickup: {},
+  };
+
+  // 是否最低计费
+  if (details.form.pickupIsMinCost === '1') {
+    submitData.pickup.minCost = details.form.minCost;
+    submitData.pickup.additionalCost = details.form.additionalCost;
+  }
+
+  for (let i = 0; i < details.form.billTemplateDetail.length; i++) {
+    const item = details.form.billTemplateDetail[i];
+
+    if (!details.form.pickupPricingType.includes(item.code)) continue;
+
+    // 按件
+    if (item.code === '1') submitData.pickup.pieceCategory = item.categories;
+    // 按方
+    else if (item.code === '3') submitData.pickup.cubeCategory = item.categories;
+    // 按重量
+    else if (item.code === '4') submitData.pickup.weightCategory = item.categories;
+  }
+
+  // 按整车
+  if (details.form.pickupPricingType.includes('2')) {
+    for (let i = 0; i < details.VehicleBillingDetal.length; i++) {
+      const value = details.VehicleBillingDetal[i];
+
+      if (!value.vehicleType) return ElMessage.warning('存在未选车型, 请选择车型');
+    }
+
+    submitData.pickup.fullVehicle = details.VehicleBillingDetal;
+  }
+
   ElMessageBox.confirm('确认提交', '', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -1259,34 +1323,6 @@ const handleSubmit = async () => {
     try {
       details.loadingObj.pageLoading = true;
 
-      const submitData: any = {
-        checkType: '1',
-        id: $route.query.id,
-        pickup: {},
-      };
-
-      // 是否最低计费
-      if (details.form.pickupIsMinCost === '1') {
-        submitData.pickup.minCost = details.form.minCost;
-        submitData.pickup.additionalCost = details.form.additionalCost;
-      }
-
-      for (let i = 0; i < details.form.billTemplateDetail.length; i++) {
-        const item = details.form.billTemplateDetail[i];
-
-        if (!details.form.pickupPricingType.includes(item.code)) continue;
-
-        // 按件
-        if (item.code === '1') submitData.pickup.pieceCategory = item.categories;
-        // 按方
-        else if (item.code === '3') submitData.pickup.cubeCategory = item.categories;
-        // 按重量
-        else if (item.code === '4') submitData.pickup.weightCategory = item.categories;
-      }
-      // 按整车
-      if (details.form.pickupPricingType.includes('2'))
-        submitData.pickup.fullVehicle = details.VehicleBillingDetal;
-
       const res = await putBasicdataPrice(submitData);
 
       const { code, msg } = res.data;
@@ -1304,7 +1340,62 @@ const handleSubmit = async () => {
 };
 
 /** 提货线路提交 */
-const handleSubmitLine = () => {
+const handleSubmitLine = async () => {
+  let isRetrun = false;
+
+  await lineFormRef.value.validate(valid => {
+    // if (!valid) return;
+    isRetrun = !valid;
+  });
+
+  if (isRetrun) return;
+
+  const submitData: any = {
+    startProvinceId: details.form.startProvinceId, // 省
+    startCityId: details.form.startCityId, // 市
+    startCountyId: details.form.startCountyId, // 区,
+    endProvinceId: details.form.endProvinceId, // 省
+    endCityId: details.form.endCityId, // 市
+    endCountyId: details.form.endCountyId, // 区,
+    /** 提货 */
+    serviceType: '1',
+    priceId: $route.query.id,
+    sendOrgId: details.form.sendOrgId,
+  };
+
+  // 如果为编辑提交
+  if (details.lineType === 'edit') submitData.id = details.form.id;
+
+  // 是否最低计费
+  if (details.form.pickupIsMinCost === '1') {
+    submitData.minCost = details.form.minCost;
+    submitData.additionalCost = details.form.additionalCost;
+  }
+
+  for (let i = 0; i < details.form.billTemplateDetail.length; i++) {
+    const item = details.form.billTemplateDetail[i];
+
+    if (!details.form.pickupPricingType.includes(item.code)) continue;
+
+    // 按件
+    if (item.code === '1') submitData.pieceCategory = item.categories;
+    // 按方
+    else if (item.code === '3') submitData.cubeCategory = item.categories;
+    // 按重量
+    else if (item.code === '4') submitData.weightCategory = item.categories;
+  }
+
+  // 按整车
+  if (details.form.pickupPricingType.includes('2')) {
+    for (let i = 0; i < details.VehicleBillingDetal.length; i++) {
+      const value = details.VehicleBillingDetal[i];
+
+      if (!value.vehicleType) return ElMessage.warning('存在未选车型, 请选择车型');
+    }
+
+    submitData.fullVehicle = details.VehicleBillingDetal;
+  }
+
   ElMessageBox.confirm('确认提交', '', {
     confirmButtonText: '确认',
     cancelButtonText: '取消',
@@ -1316,44 +1407,6 @@ const handleSubmitLine = () => {
 
       console.log('details.form :>> ', details.form);
 
-      const submitData: any = {
-        startProvinceId: details.form.startProvinceId, // 省
-        startCityId: details.form.startCityId, // 市
-        startCountyId: details.form.startCountyId, // 区,
-        endProvinceId: details.form.endProvinceId, // 省
-        endCityId: details.form.endCityId, // 市
-        endCountyId: details.form.endCountyId, // 区,
-        /** 提货 */
-        serviceType: '1',
-        priceId: $route.query.id,
-        sendOrgId: details.form.sendOrgId,
-      };
-
-      // 如果为编辑提交
-      if (details.lineType === 'edit') submitData.id = details.form.id;
-
-      // 是否最低计费
-      if (details.form.pickupIsMinCost === '1') {
-        submitData.minCost = details.form.minCost;
-        submitData.additionalCost = details.form.additionalCost;
-      }
-
-      for (let i = 0; i < details.form.billTemplateDetail.length; i++) {
-        const item = details.form.billTemplateDetail[i];
-
-        if (!details.form.pickupPricingType.includes(item.code)) continue;
-
-        // 按件
-        if (item.code === '1') submitData.pieceCategory = item.categories;
-        // 按方
-        else if (item.code === '3') submitData.cubeCategory = item.categories;
-        // 按重量
-        else if (item.code === '4') submitData.weightCategory = item.categories;
-      }
-      // 按整车
-      if (details.form.pickupPricingType.includes('2'))
-        submitData.fullVehicle = details.VehicleBillingDetal;
-
       const res = await postSubmit(submitData);
 
       const { code, msg } = res.data;
diff --git a/src/views/Pricesystem/Price/PriceTrunkLine.vue b/src/views/Pricesystem/Price/PriceTrunkLine.vue
index ba8dd688..5434b477 100644
--- a/src/views/Pricesystem/Price/PriceTrunkLine.vue
+++ b/src/views/Pricesystem/Price/PriceTrunkLine.vue
@@ -1,211 +1,579 @@
 <template>
   <div v-loading="details.loadingObj.pageLoading">
-    <el-form label-width="150px" :model="details.form" ref="formRef">
-      <!-- 计价方式 -->
+    <!-- 是否按统一区域计费 -->
+    <template v-if="details.form.trunklineIsUnifyAreaBill === '1'">
+      <el-form label-width="130px" :model="details.form" ref="formRef">
+        <!-- 计费类型 -->
+        <el-form-item
+          label="计费类型"
+          prop="trunklinePricingType"
+          :rules="[{ required: true, message: '请选择计价方式', trigger: ['blur', 'change'] }]"
+        >
+          <el-select
+            disabled
+            v-model="details.form.trunklinePricingType"
+            clearable
+            multiple
+            placeholder="请选择计价方式"
+            style="width: 20vw"
+          >
+            <el-option
+              v-for="item in details.priceMethodType"
+              :key="item.dictKey"
+              :label="item.dictValue"
+              :value="item.dictKey"
+            />
+          </el-select>
+        </el-form-item>
+      </el-form>
+
+      <!-- 整车计费 -->
+      <template v-if="details.form.trunklinePricingType.includes('2')">
+        <el-divider content-position="left">整车计费</el-divider>
+
+        <table class="table" border style="border-collapse: collapse">
+          <thead class="header">
+            <tr align="center">
+              <th class="index">序号</th>
+              <th width="200px">车型</th>
+              <th width="200px">整车计费 ( 元/车 )</th>
+              <th width="100px">操作</th>
+            </tr>
+          </thead>
+
+          <tbody>
+            <tr v-for="(value, index) in details.VehicleBillingDetal" :key="value">
+              <td class="index">{{ index }}</td>
+              <td>
+                <el-select
+                  class="w100"
+                  v-model="value.vehicleType"
+                  filterable
+                  clearable
+                  placeholder="请选择车型"
+                  @change="handleCheckVehicleType"
+                >
+                  <el-option
+                    v-for="item in details.vehicleTypeArr"
+                    :key="item.dictKey"
+                    :label="item.dictValue"
+                    :value="item.dictKey"
+                    :disabled="item.isCheck === true"
+                  />
+                </el-select>
+              </td>
+              <td>
+                <el-input-number
+                  class="w100"
+                  v-model="value.price"
+                  :controls="false"
+                  :precision="2"
+                  :value-on-clear="0"
+                  :min="0"
+                />
+              </td>
+              <!-- 新增 && 删除 -->
+              <td>
+                <el-button
+                  v-if="index === 0"
+                  @click="() => handlePlusVehicle(index)"
+                  class="addButton"
+                  icon="CirclePlus"
+                  >新 增</el-button
+                >
+                <el-button
+                  v-else
+                  @click="() => handleReduceVehicle(index)"
+                  class="removeButton"
+                  icon="CircleClose"
+                  >移 除</el-button
+                >
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </template>
+
+      <!-- 品类计费 -->
+      <template
+        v-if="
+          details.form.trunklinePricingType.includes('1') ||
+          details.form.trunklinePricingType.includes('3') ||
+          details.form.trunklinePricingType.includes('4')
+        "
+      >
+        <el-divider content-position="left">品类管理</el-divider>
+
+        <div class="billTemplateDetail_container">
+          <template v-for="value in details.form.billTemplateDetail" :key="value.title">
+            <!-- 是否勾选该计费类型 -->
+            <template v-if="details.form.trunklinePricingType.includes(value.code)">
+              <!-- 是否区分品类计费 -->
+              <template v-if="details.form.trunklineIsByCategory === '0'">
+                <!-- 附加费品类最低计费 -->
+                <div>
+                  <div class="title">{{ value.title }}</div>
+
+                  <el-input-number
+                    v-model="value.categories[0].price"
+                    style="width: 13vw"
+                    :controls="false"
+                    :precision="2"
+                    :value-on-clear="0"
+                    :min="0"
+                  />
+                </div>
+              </template>
+
+              <template v-else>
+                <!-- 附加费品类 -->
+                <div>
+                  <div class="title">{{ value.title }}</div>
+
+                  <table class="table" border>
+                    <thead class="header">
+                      <tr>
+                        <th class="index">序号</th>
+                        <th width="200px">产品品类</th>
+                        <th width="200px">按件计费(元/件)</th>
+                      </tr>
+                    </thead>
+
+                    <tbody>
+                      <tr v-for="(item, index) in value.categories">
+                        <td class="index">{{ index }}</td>
+                        <!-- 品类名称 -->
+                        <td>{{ item.name }}</td>
+                        <!-- 费用 -->
+                        <td>
+                          <el-input-number
+                            class="w100"
+                            v-model="item.price"
+                            style="width: 100%"
+                            :controls="false"
+                            :precision="2"
+                            :value-on-clear="0"
+                            :min="0"
+                          />
+                        </td>
+                      </tr>
+                    </tbody>
+                  </table>
+                </div>
+              </template>
+            </template>
+          </template>
+        </div>
+      </template>
+
+      <template
+        v-if="
+          details.form.trunklineIsMinCost === '1' && details.form.trunklineIsPeculiarSetup === '0'
+        "
+      >
+        <!-- 最低计费 -->
+        <el-divider content-position="left">最低计费</el-divider>
+        <el-form label-width="130px" :model="details.form" inline>
+          <el-form-item
+            label="最低计费价格"
+            prop="minCost"
+            :rules="[{ required: true, validator: validatePrice, trigger: ['blur', 'change'] }]"
+          >
+            <el-input-number
+              v-model="details.form.minCost"
+              style="width: 13vw"
+              :controls="false"
+              :precision="2"
+              :value-on-clear="0"
+              :min="0"
+            />
+          </el-form-item>
+
+          <el-form-item
+            label="加算价格"
+            prop="additionalCost"
+            :rules="[{ required: true, validator: validatePrice, trigger: ['blur', 'change'] }]"
+          >
+            <el-input-number
+              v-model="details.form.additionalCost"
+              style="width: 13vw"
+              :controls="false"
+              :precision="2"
+              :value-on-clear="0"
+              :min="0"
+            />
+          </el-form-item>
+        </el-form>
+      </template>
+
+      <!-- 操作按钮 -->
+      <div class="flex-c-c">
+        <el-button type="primary" icon="Refresh" @click="resetFormData">重置</el-button>
+        <el-button type="primary" icon="Position" @click="handleSubmit">保存</el-button>
+      </div>
+    </template>
+
+    <!-- 提货路径 -->
+    <template v-else>
+      <div class="flex-c-sb">
+        <el-divider content-position="left">提货路径</el-divider>
+
+        <el-button icon="CirclePlus" class="ml10" type="primary" @click="handleAdd">
+          新 增
+        </el-button>
+      </div>
+
+      <tablecmt
+        class="tableNode"
+        ref="tableNode"
+        :columnList="details.columnList"
+        :tableData="details.data"
+        :loading="details.loadingObj.list"
+      >
+        <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label === '操作'">
+            <el-text class="button" @click="() => handleEdit(slotProps.scope)"
+              ><el-icon>
+                <CirclePlus />
+              </el-icon>
+              编 辑
+            </el-text>
+            <el-text class="button remove" @click="() => handleRemoveLine(slotProps.scope)">
+              <el-icon>
+                <Delete />
+              </el-icon>
+              删 除
+            </el-text>
+          </template>
+        </template>
+      </tablecmt>
+
+      <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
+        <div></div>
+        <el-pagination
+          align="right"
+          background
+          @size-change="sizeChange"
+          @current-change="currentChange"
+          :current-page="details.page.current"
+          :page-sizes="[30, 50, 80, 120]"
+          :page-size="details.page.size"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="details.page.total"
+        >
+        </el-pagination>
+      </div>
+    </template>
+  </div>
+
+  <el-dialog
+    :title="details.lineType === 'add' ? '新增提货路径' : '编辑提货路径'"
+    :visible.sync="details.popUpShow.addVsitied"
+    width="70%"
+    v-model="details.popUpShow.addVsitied"
+  >
+    <el-form inline :model="details.form" ref="lineFormRef" label-width="130px">
       <el-form-item
-        label="计价方式"
-        prop="trunklinePricingType"
-        :rules="[{ required: true, message: '请选择计价方式', trigger: ['blur', 'change'] }]"
+        label="始发地"
+        prop="startCity"
+        :rules="[{ required: true, message: '请选择始发地', trigger: ['blur', 'change'] }]"
       >
-        <el-select
-          v-model="details.form.trunklinePricingType"
+        <el-cascader
+          pleceholder="请选择始发地"
+          :options="details.regionOptione"
+          style="width: 100%"
+          v-model="details.form.startCity"
+          filterable
+          @change="value => handleChangeCity(value, 'start')"
           clearable
-          multiple
-          placeholder="请选择计价方式"
-          style="width: 20vw"
-          @change="handleChangePrcieMethod"
         >
-          <el-option
-            v-for="item in details.priceMethodType"
-            :key="item.dictKey"
-            :label="item.dictValue"
-            :value="item.dictKey"
-          />
-        </el-select>
+          <template #default="{ node, data }">
+            <span>{{ data.label }}</span>
+            <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+          </template>
+        </el-cascader>
       </el-form-item>
 
-      <!-- 是否统一区域计费 -->
-      <el-form-item label="是否统一区域计费">
-        <el-radio-group v-model="details.form.trunklineIsUnifyAreaBill" class="ml-4">
-          <el-radio
-            v-for="item in details.isType"
-            :key="item.value"
-            :label="item.value"
-            size="large"
-            >{{ item.label }}
-          </el-radio>
-        </el-radio-group>
+      <el-form-item
+        label="目的地"
+        prop="endCity"
+        :rules="[{ required: true, message: '请选择目的地', trigger: ['blur', 'change'] }]"
+      >
+        <el-cascader
+          pleceholder="请选择目的地"
+          :options="details.regionOptione"
+          style="width: 100%"
+          v-model="details.form.endCity"
+          @change="value => handleChangeCity(value, 'end')"
+          filterable
+          clearable
+        >
+          <template #default="{ node, data }">
+            <span>{{ data.label }}</span>
+            <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+          </template>
+        </el-cascader>
       </el-form-item>
 
-      <!-- 是否区分品类 -->
-      <el-form-item label="是否区分品类">
-        <el-radio-group v-model="details.form.trunklineIsByCategory" class="ml-4">
-          <el-radio
-            v-for="item in details.isType"
-            :key="item.value"
-            :label="item.value"
-            size="large"
-            >{{ item.label }}
-          </el-radio>
-        </el-radio-group>
+      <el-form-item
+        label="发货单位"
+        prop="sendOrg"
+        :rules="[{ required: true, message: '请选择发货单位', trigger: ['blur', 'change'] }]"
+      >
+        <el-select
+          class="w100"
+          v-model="details.form.sendOrg"
+          filterable
+          clearable
+          placeholder="请选择发货单位"
+          style="width: 240px"
+          :loading="details.loadingObj.loading"
+          @change="
+            () => {
+              details.form.sendOrgId = details.form.sendOrg;
+            }
+          "
+          remote
+          reserve-keyword
+          default-first-option
+          :remote-method="value => debounce(remoteMethod(value), 500)"
+        >
+          <el-option
+            v-for="val in details.sendOrgArr"
+            :key="val.id"
+            :label="val.clientName"
+            :value="val.id"
+          />
+        </el-select>
       </el-form-item>
     </el-form>
 
-    <template v-if="details.form.trunklineIsByCategory === '1'">
-      <el-divider content-position="left">品类管理</el-divider>
+    <!-- 整车计费 -->
+    <template v-if="details.form.trunklinePricingType.includes('2')">
+      <el-divider content-position="left">整车计费</el-divider>
 
-      <template v-for="value in details.form.billTemplateDetail" :key="value.title">
-        <!-- 附加费品类 -->
-        <el-form-item
-          label-width="150px"
-          v-if="details.form.trunklinePricingType.includes(value.code)"
-          :label="value.title"
-        >
-          <div
-            class="el_Storagecategory"
-            v-loading="goriesloading"
-            element-loading-text="Loading..."
-          >
-            <div class="el_table_span">
-              <div class="el_table_id">序号</div>
-              <div class="el_table_title">产品品类</div>
-            </div>
-
-            <!-- 表格循环 -->
-            <div class="el_table_td" v-for="(item, index) in value.categories">
-              <div class="el_table_idNumber">{{ index }}</div>
+      <table class="table" border style="border-collapse: collapse">
+        <thead class="header">
+          <tr align="center">
+            <th class="index">序号</th>
+            <th width="200px">车型</th>
+            <th width="200px">整车计费 ( 元/车 )</th>
+            <th width="100px">操作</th>
+          </tr>
+        </thead>
+
+        <tbody>
+          <tr v-for="(value, index) in details.VehicleBillingDetal" :key="value">
+            <td class="index">{{ index }}</td>
+            <td>
               <el-select
-                :ref="value.title + index"
-                class="el_Cselect"
-                v-model="item.goods"
+                class="w100"
+                v-model="value.vehicleType"
                 filterable
                 clearable
-                placeholder="请选择品类"
-                style="width: 240px"
-                :loading="item.loading"
-                @change="handleChangeCategory(item)"
-                remote
-                reserve-keyword
-                default-first-option
-                :remote-method="value => debounce(remoteMethod(value, item), 500)"
+                placeholder="请选择车型"
+                @change="handleCheckVehicleType"
               >
                 <el-option
-                  v-for="val in item.goodsArr"
-                  :key="val.goodsId"
-                  :label="val.goodsName"
-                  :value="val.goodsId"
+                  v-for="item in details.vehicleTypeArr"
+                  :key="item.dictKey"
+                  :label="item.dictValue"
+                  :value="item.dictKey"
+                  :disabled="item.isCheck === true"
                 />
               </el-select>
-              <div class="el_table_operation">
-                <!-- 新增 -->
-                <span
-                  v-if="item.plus"
-                  @click="handlePlus(value, index)"
-                  class="el_table_operation_span_b"
-                  >+
-                </span>
-                <!-- 删除 -->
-                <span
-                  v-if="item.reduce"
-                  @click="handleReduce(value, index)"
-                  class="el_table_operation_span_a"
-                  >-
-                </span>
-              </div>
-            </div>
-          </div>
-        </el-form-item>
-      </template>
+            </td>
+            <td>
+              <el-input-number
+                class="w100"
+                v-model="value.price"
+                :controls="false"
+                :precision="2"
+                :value-on-clear="0"
+                :min="0"
+              />
+            </td>
+            <td>
+              <el-button
+                v-if="index === 0"
+                @click="() => handlePlusVehicle(index)"
+                class="addButton"
+                icon="CirclePlus"
+                >新 增</el-button
+              >
+              <el-button
+                v-else
+                @click="() => handleReduceVehicle(index)"
+                class="removeButton"
+                icon="CircleClose"
+                >移 除</el-button
+              >
+            </td>
+          </tr>
+        </tbody>
+      </table>
     </template>
 
-    <el-divider content-position="left">特殊计费</el-divider>
-
-    <!-- 是否特殊配置 -->
-    <el-form-item label-width="150px" label="是否特殊配置">
-      <el-radio-group v-model="details.form.trunklineIsPeculiarSetup" class="ml-4">
-        <el-radio v-for="item in details.isType" :key="item.value" :label="item.value" size="large"
-          >{{ item.label }}
-        </el-radio>
-      </el-radio-group>
-    </el-form-item>
-
-    <el-divider content-position="left">一般计费</el-divider>
-
-    <!-- 是否最低计费 -->
-    <el-form-item label-width="150px" label="是否最低计费">
-      <el-radio-group v-model="details.form.trunklineIsMinCost" class="ml-4">
-        <el-radio v-for="item in details.isType" :key="item.value" :label="item.value" size="large"
-          >{{ item.label }}
-        </el-radio>
-      </el-radio-group>
-    </el-form-item>
-
-    <!-- 最低计费类型 -->
-    <el-form-item
-      v-if="details.form.trunklineIsMinCost === '1'"
-      label-width="150px"
-      label="最低计费类型"
+    <!-- 品类计费 -->
+    <template
+      v-if="
+        details.form.trunklinePricingType.includes('1') ||
+        details.form.trunklinePricingType.includes('3') ||
+        details.form.trunklinePricingType.includes('4')
+      "
     >
-      <el-radio-group v-model="details.form.trunklineMinCostType" class="ml-4">
-        <template v-for="item in details.lowestType" :key="item.value">
-          <el-radio
-            v-if="!item.MappingOrNot || details.form.trunklinePricingType.includes(item.mapValue)"
-            :label="item.dictKey"
-            size="large"
-            >{{ item.dictValue }}
-          </el-radio>
-
-          <el-radio v-else :label="item.dictKey" size="large" disabled>{{
-            item.dictValue
-          }}</el-radio>
+      <el-divider content-position="left">品类管理</el-divider>
+
+      <div class="billTemplateDetail_container">
+        <template v-for="value in details.form.billTemplateDetail" :key="value.title">
+          <!-- 是否勾选该计费类型 -->
+          <template v-if="details.form.trunklinePricingType.includes(value.code)">
+            <!-- 是否区分品类计费 -->
+            <template v-if="details.form.trunklineIsByCategory === '0'">
+              <!-- 附加费品类最低计费 -->
+              <div>
+                <div class="title">{{ value.title }}</div>
+
+                <el-input-number
+                  v-model="value.categories[0].price"
+                  style="width: 13vw"
+                  :controls="false"
+                  :precision="2"
+                  :value-on-clear="0"
+                  :min="0"
+                />
+              </div>
+            </template>
+
+            <template v-else>
+              <!-- 附加费品类 -->
+              <div>
+                <div class="title">{{ value.title }}</div>
+
+                <table class="table" border>
+                  <thead class="header">
+                    <tr>
+                      <th class="index">序号</th>
+                      <th width="200px">产品品类</th>
+                      <th width="200px">按件计费(元/件)</th>
+                    </tr>
+                  </thead>
+
+                  <tbody>
+                    <tr v-for="(item, index) in value.categories">
+                      <td class="index">{{ index }}</td>
+                      <!-- 品类名称 -->
+                      <td>{{ item.name }}</td>
+                      <!-- 费用 -->
+                      <td>
+                        <el-input-number
+                          class="w100"
+                          v-model="item.price"
+                          style="width: 100%"
+                          :controls="false"
+                          :precision="2"
+                          :value-on-clear="0"
+                          :min="0"
+                        />
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </template>
+          </template>
         </template>
-      </el-radio-group>
-    </el-form-item>
+      </div>
+    </template>
 
-    <!-- 操作按钮 -->
-    <div class="flex-c-c">
-      <el-button type="primary" icon="Refresh" @click="resetFormData">重置</el-button>
-      <el-button type="primary" icon="Position" @click="handleSubmit">保存</el-button>
+    <template
+      v-if="
+        details.form.trunklineIsMinCost === '1' && details.form.trunklineIsPeculiarSetup === '0'
+      "
+    >
+      <!-- 最低计费 -->
+      <el-divider content-position="left">最低计费</el-divider>
+      <el-form label-width="130px" :model="details.form" inline>
+        <el-form-item
+          label="最低计费价格"
+          prop="minCost"
+          :rules="[{ required: true, validator: validatePrice, trigger: ['blur', 'change'] }]"
+        >
+          <el-input-number
+            v-model="details.form.minCost"
+            style="width: 13vw"
+            :controls="false"
+            :precision="2"
+            :value-on-clear="0"
+            :min="0"
+          />
+        </el-form-item>
+
+        <el-form-item
+          label="加算价格"
+          prop="additionalCost"
+          :rules="[{ required: true, validator: validatePrice, trigger: ['blur', 'change'] }]"
+        >
+          <el-input-number
+            v-model="details.form.additionalCost"
+            style="width: 13vw"
+            :controls="false"
+            :precision="2"
+            :value-on-clear="0"
+            :min="0"
+          />
+        </el-form-item>
+      </el-form>
+    </template>
+
+    <div slot="footer" class="dialog-footer mt10">
+      <el-button icon="CircleClose" @click="details.popUpShow.addVsitied = false">关 闭</el-button>
+      <el-button type="primary" icon="Position" @click="handleSubmitLine">提 交</el-button>
     </div>
-  </div>
+  </el-dialog>
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, getCurrentInstance, nextTick,defineEmits, defineComponent } from 'vue';
-import { debounce, deepClone } from '@/utils/util';
+import { ref, reactive, getCurrentInstance, nextTick } from 'vue';
+import { getLazyTreeAll } from '@/api/base/region';
+import { debounce, deepClone, setNodeHeight } from '@/utils/util';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { getDictionaryBiz } from '@/api/system/dict';
-import { $_priceTemplate } from '@/api/financialsector/index'; //价格模板
-import { postFindCategoryInfo } from '@/api/distribution/CreateOrder.js';
-const emit = defineEmits(['request-data']);
-defineComponent({
-  emits: ['request-data'],
-});
-// 接收参数
+import {
+  putBasicdataPrice,
+  getPage,
+  postSubmit,
+  postRemove,
+  getDetails,
+} from '@/api/Pricesystem/index';
+import { useRoute } from 'vue-router';
+import { getList } from '@/api/basicdata/basicClient';
+const $route = useRoute(); //获取地址栏参数
+
+const instance = getCurrentInstance();
+
 const props = defineProps({
   templateData: Object,
 });
-console.log(props, '来自父页面参数');
-const instance = getCurrentInstance();
 
-// 表单实例
+console.log('props :>> ', props);
+
+/** 表单实例 */
 const formRef = ref();
 
+/** 提货路径表单 */
+const lineFormRef = ref();
+
+const VehicleBillingFormRef = ref();
+
+// 品类价格
 interface categories {
   /** 品类名称 */
-  goodsName: string;
+  title: string;
   /** 品类id */
-  goodsId: string;
-  /** 显示新增 */
-  plus: boolean;
-  /** 显示删除 */
-  reduce: boolean;
-  /** 品类名映射 */
-  goods: string;
-  /** 模糊查询存放品类的数组 */
-  goodsArr: {}[];
-  /** loading */
-  loading: boolean;
+  categoryId: string;
+  /** 费用 */
+  price: number;
 }
 
 interface BillTemplateDetail {
@@ -217,6 +585,14 @@ interface BillTemplateDetail {
   categories: categories[];
 }
 
+/** 整车计费 */
+interface VehicleBilling {
+  /** 车型 */
+  vehicleType: string;
+  /** 车型计费(元/车) */
+  price: number;
+}
+
 /** 页面数据 */
 const details = reactive({
   /** 计价方式集合 */
@@ -238,87 +614,122 @@ const details = reactive({
       value: '3',
     },
   ],
-  isType: [
-    {
-      label: '是',
-      value: '1',
-    },
-    {
-      label: '否',
-      value: '0',
-    },
-  ],
-  /** 最低计费类型集合
-   * mapValue 用于映射最低计费类型 当选择的计价方式内与该项中mapValue相同时, 显示其选项
-   * 当 MappingOrNot 为false时, 不需要检测, 直接显示
-   */
-  lowestType: [
-    {
-      label: '价格',
-      value: '0',
-      MappingOrNot: false,
-    },
-    {
-      label: '件',
-      value: '1',
-      mapValue: '0',
-      MappingOrNot: true,
-    },
-    {
-      label: '方数(m³)',
-      value: '2',
-      mapValue: '2',
-      MappingOrNot: true,
-    },
-    {
-      label: '重量(kg)',
-      value: '3',
-      mapValue: '3',
-      MappingOrNot: true,
-    },
-  ],
+  /** 车型类型集合 */
+  vehicleTypeArr: [],
   /** 表单数据 */
   form: {
     /** 计价方式 */
     trunklinePricingType: [],
-    /** 是否统一区域计费 */
-    trunklineIsUnifyAreaBill: '0',
-    /** 是否区分品类 */
-    trunklineIsByCategory: '0',
-    /** 是否特殊配置 */
-    trunklineIsPeculiarSetup: '0',
-    /** 是否最低计费 */
-    trunklineIsMinCost: '0',
-    /** 最低计费类型 */
-    trunklineMinCostType: '1',
     /** 计费模版详情 */
     billTemplateDetail: [] as BillTemplateDetail[],
   },
+  /** 整车计费 */
+  VehicleBillingDetal: [
+    {
+      /** 车型 */
+      vehicleType: '',
+      /** 车型计费(元/车) */
+      price: 0,
+    },
+  ] as VehicleBilling[],
   /** 初始化form数据 */
   initForm: {},
   /** loading */
   loadingObj: {
     pageLoading: false,
+    list: false,
+    loading: false,
+  },
+  popUpShow: {
+    addVsitied: false,
   },
+  /** 提货路线表格表头 */
+  columnList: [
+    // {
+    //   prop: '',
+    //   label: '序号',
+    //   type: 12,
+    //   values: '',
+    //   width: 55,
+    //   fixed: true,
+    // },
+    {
+      prop: 'startCountyName',
+      label: '始发地',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      // sortable: true,
+      head: false,
+    },
+    {
+      prop: 'endCountyName',
+      label: '目的地',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      // sortable: true,
+      head: false,
+    },
+    {
+      prop: 'sendOrgName',
+      label: '发货单位',
+      type: 1,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      // sortable: true,
+      head: false,
+    },
+    {
+      prop: '',
+      label: '操作',
+      type: 6,
+      values: '',
+      width: '150',
+      checkarr: [],
+      fixed: false,
+      head: false,
+    },
+  ],
+  /** 提货线路数据 */
+  data: [],
+  /** 提货线路分页参数 */
+  page: {
+    /** 当前页 */
+    current: 1,
+    /** 每页页数 */
+    size: 30,
+    /** 总数 */
+    total: 0,
+  },
+  /** 发货单位数组 */
+  sendOrgArr: [],
+  /** 省市区 */
+  regionOptione: [],
+  /** 提货路线type */
+  lineType: 'add' as 'add' | 'edit',
 });
 
-const goriesloading = ref(false);
+const tableNode = ref();
 
-/** 计价方式改变时 */
-const handleChangePrcieMethod = value => {
-  console.log('value :>> ', value);
+const validatePrice = (rule: any, value: any, callback: any) => {
+  const message = '请输入大于0的费用';
 
-  let activeItem: any = {};
-  for (let i = 0; i < details.lowestType.length; i++) {
-    const item = details.lowestType[i];
-    if (item.value !== details.form.trunklineMinCostType) continue;
-    activeItem = item;
-    break;
+  if (!value) {
+    callback(new Error(message));
+    return false;
+  } else if (value <= 0) {
+    callback(new Error(message));
+    return false;
+  } else {
+    callback();
   }
-
-  if (!activeItem.MappingOrNot) return;
-  if (!details.form.trunklinePricingType.includes(activeItem.mapValue))
-    details.form.trunklineMinCostType = '0';
 };
 
 /** 处理干线计费模式 */
@@ -329,138 +740,489 @@ const handleTrunkLinePricingType = response => {
 
   details.priceMethodType = data || [];
 
+  const { trunklinePieceCategorys, trunklineWeightCategorys, trunklineCubeCategorys } =
+    props.templateData.request;
+
   const _billTemplateDetailArr = [];
   for (let i = 0; i < details.priceMethodType.length; i++) {
     const value = details.priceMethodType[i];
-    console.log(value,'value');
-    
-    if(value.dictKey !='2'){
-      console.log(value,'value====');
-      _billTemplateDetailArr.push({
+
+    if (value.dictKey === '2') continue;
+
+    const _itemObj = {
       title: value.dictValue + '计费品类',
       code: value.dictKey,
       categories: [
         {
-          reduce: false,
-          plus: true,
-          goodsName: '',
-          goodsId: '',
+          title: '',
+          categoryId: '',
           goods: '',
-          goodsArr: [],
-          loading: false,
+          price: 0,
         },
       ],
-    });
+    };
+
+    if (!props.templateData.request) {
+      _billTemplateDetailArr.push(_itemObj);
+      continue;
+    }
+
+    let _Array = [];
+
+    const _arr = [];
+
+    // 按件
+    if (value.dictKey === '1') _Array = trunklinePieceCategorys || [];
+    // 按方
+    else if (value.dictKey === '3') _Array = trunklineCubeCategorys || [];
+    // 按重量
+    else if (value.dictKey === '4') _Array = trunklineWeightCategorys || [];
+
+    if (_Array && _Array.length !== 0) {
+      for (let i = 0; i < _Array.length; i++) {
+        const item = _Array[i];
+
+        _arr.push({
+          name: item.name,
+          categoryId: item.id,
+          price: 0,
+        });
+      }
+
+      _itemObj.categories = _arr;
     }
 
+    _billTemplateDetailArr.push(_itemObj);
   }
 
   details.form.billTemplateDetail = _billTemplateDetailArr;
+  console.log('details.form.billTemplateDetail :>> ', details.form.billTemplateDetail);
 };
 
-/** 处理最低计费价格 */
-const handleLowestPrice = response => {
+/** 处理车辆类型 */
+const handleVehicleTypeArr = response => {
   console.log('response :>> ', response);
+
   const { code, data } = response.data;
 
   if (code !== 200) return;
 
-  const _dataArr = [];
-
-  if (!data) {
-  }
-
-  details.lowestType = data || [];
-};
-
-/** 复制form初始数据 */
-const initFormData = () => {
-  details.initForm = deepClone(details.form);
+  details.vehicleTypeArr = data || [];
 };
 
 /** 获取业务字典 */
 const initDictionaryBiz = async () => {
   try {
-    // 干线计费方式
-    const trunkLinePromise = getDictionaryBiz('trunk_line_pricing_type');
-    // 最低计费价格
-    const minCostPromise = getDictionaryBiz('min_cost_type');
+    // // 干线计费方式
+    // const trunkLinePromise = getDictionaryBiz('trunk_line_pricing_type');
+    // // 车辆类型
+    // const priceVehiclePromise = getDictionaryBiz('price_vehicle_type');
+
+    // const [trunkLineResult, priceVehicleResult] = await Promise.all([
+    //   trunkLinePromise,
+    //   priceVehiclePromise,
+    // ]);
+
+    const { trunkLineResult, priceVehicleResult, regionOptione } = props.templateData;
+
+    await nextTick();
+
+    if (Object.keys(props.templateData).length !== 0) {
+      console.log('123 :>> ', 123);
+      details.form = deepClone(props.templateData.request);
 
-    const [trunkLineResult, minCostResult] = await Promise.all([trunkLinePromise, minCostPromise]);
+      details.form.trunklinePricingType = details.form.trunklinePricingType
+        ? details.form.trunklinePricingType.split(',')
+        : [];
+      details.form.trunklineIsByCategory += '';
+      details.form.trunklineMinCostType += '';
+      details.form.trunklineIsUnifyAreaBill += '';
+      details.form.trunklineIsMinCost += '';
+      details.form.trunklineIsPeculiarSetup += '';
+      details.form.minCost = 0;
+      details.form.additionalCost = 0;
+
+      // 不按统一区域计费, 初始化获取数据
+      if (details.form.trunklineIsUnifyAreaBill === '0') {
+        // 获取省市区信息
+        if (regionOptione.data.success) {
+          details.regionOptione = regionOptione.data.data || [];
+        }
+
+        initLineData();
+      }
+    }
 
     // 处理干线
     handleTrunkLinePricingType(trunkLineResult);
-    handleLowestPrice(minCostResult);
+    handleVehicleTypeArr(priceVehicleResult);
 
+    initAssignmentForm(props.templateData.requestInfo.trunkLine, false);
     // 初始化复制form数据
     initFormData();
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
+    console.log('details.form :>> ', details.form);
   }
 };
 
-initDictionaryBiz();
-
-/** 新增品类 */
-const handlePlus = async (value: any, index: number) => {
-  value.categories.splice(index + 1, 0, {
-    reduce: true,
-    plus: true,
-    goodsName: '',
-    goodsId: '',
-    goods: '',
-    goodsArr: [],
-    loading: false,
+// initDictionaryBiz();
+
+/** 复制form初始数据 */
+const initFormData = () => {
+  details.initForm = deepClone(details.form);
+};
+
+/** 新增车辆 */
+const handlePlusVehicle = async (index: number) => {
+  if (details.VehicleBillingDetal.length === details.vehicleTypeArr.length)
+    return ElMessage.warning('已无更多车型, 无法再新增');
+
+  for (let i = 0; i < details.vehicleTypeArr.length; i++) {
+    const value = details.vehicleTypeArr[i];
+    if (value.isCheck) return ElMessage.warning('暂无可选车型');
+  }
+
+  details.VehicleBillingDetal.splice(index + 1, 0, {
+    /** 车型 */
+    vehicleType: '',
+    /** 车型计费(元/车) */
+    price: 0,
   });
 
-  await nextTick();
+  // await nextTick();
 
-  instance.ctx.$refs[value.title + (index + 1)][0].focus();
-  console.log('instance :>> ', instance.ctx);
+  // instance.ctx.$refs[value.title + (index + 1)][0].focus();
+  // console.log('instance :>> ', instance.ctx);
 };
 
-/** 删除品类 */
-const handleReduce = (value: any, index: number) => {
+/** 删除车辆 */
+const handleReduceVehicle = (index: number) => {
   if (index === 0) return;
-  value.categories.splice(index, 1);
+  details.VehicleBillingDetal.splice(index, 1);
+  handleCheckVehicleType();
 };
 
-/** 货物变化时 */
-const handleChangeCategory = item => {
-  if (!item.goods) {
-    item.goodsId = '';
-    item.goodsName = '';
-    return;
+/** 车型选择 */
+const handleCheckVehicleType = () => {
+  const codeArr = details.VehicleBillingDetal.map(val => val.vehicleType);
+
+  for (let i = 0; i < details.vehicleTypeArr.length; i++) {
+    const value = details.vehicleTypeArr[i];
+    value.isCheck = codeArr.includes(value.dictKey) ? true : false;
   }
+};
+
+/** 转译始发地和目的地
+ * @param {Array} 循环数组
+ * @param {String} province 省
+ * @param {String} city 市
+ * @param {String} region 区
+ */
+const handleTranslation = (province, city, region) => {
+  console.log('province, city, region :>> ', province, city, region);
+
+  let name = '';
+
+  for (let i = 0; i < details.regionOptione.length; i++) {
+    const value = details.regionOptione[i];
+
+    if (value.value !== province + '') continue;
+    name += value.label;
+
+    if (!value.children || value.children.length === 0) return name;
+
+    for (let index = 0; index < value.children.length; index++) {
+      const element = value.children[index];
+
+      if (element.value !== city + '') continue;
+      name += '/' + element.label;
+
+      if (!element.children || element.children.length === 0) return name;
 
-  for (let i = 0; i < item.goodsArr.length; i++) {
-    const value = item.goodsArr[i];
+      for (let j = 0; j < element.children.length; j++) {
+        const item = element.children[j];
 
-    if (item.goods !== value.goodsId) continue;
-    item.goodsId = value.goodsId;
-    item.goodsName = value.goodsName;
+        if (item.value === region + '') {
+          name += '/' + item.label;
+          break;
+        }
+      }
+      break;
+    }
     break;
   }
+
+  return name;
+};
+
+/** 获取提货路径数据 */
+const initLineData = async () => {
+  setNodeHeight(tableNode.value.$el, '70vh');
+
+  try {
+    details.loadingObj.list = true;
+
+    const res = await getPage({
+      ...details.page,
+      priceId: $route.query.id,
+      serviceType: '2',
+    });
+    const { code, data } = res.data;
+
+    if (code !== 200) return;
+
+    details.data = data.records;
+
+    for (let i = 0; i < details.data.length; i++) {
+      const value = details.data[i];
+
+      value.startCountyName = handleTranslation(
+        value.startProvinceId,
+        value.startCityId,
+        value.startCountyId
+      );
+      value.endCountyName = handleTranslation(
+        value.endProvinceId,
+        value.endCityId,
+        value.endCountyId
+      );
+    }
+
+    console.log('details.data :>> ', details.data);
+
+    details.page.total = data.total;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.list = false;
+  }
+};
+
+/** 页数改变 */
+const sizeChange = size => {
+  details.page.size = size;
+  details.page.current = 1;
+  initLineData();
+};
+
+/** 页码改变 */
+const currentChange = current => {
+  details.page.current = current;
+  initLineData();
+};
+
+/** 城市改变 */
+const handleChangeCity = (CascaderValue: any[] | null, type: 'start' | 'end') => {
+  console.log('CascaderValue :>> ', CascaderValue);
+
+  // 赋值
+  switch (type) {
+    case 'start':
+      if (!CascaderValue) {
+        details.form.startProvinceId = ''; // 省
+        details.form.startCityId = ''; // 市
+        details.form.startCountyId = ''; // 区
+      }
+
+      if (CascaderValue.length === 1) {
+        details.form.startProvinceId = CascaderValue[0]; // 省
+        details.form.startCityId = CascaderValue[0]; // 市
+        details.form.startCountyId = CascaderValue[0]; // 区
+      } else if (CascaderValue.length === 2) {
+        details.form.startProvinceId = CascaderValue[0]; // 省
+        details.form.startCityId = CascaderValue[0]; // 市
+        details.form.startCountyId = CascaderValue[1]; // 区
+      } else {
+        details.form.startProvinceId = CascaderValue[0]; // 省
+        details.form.startCityId = CascaderValue[1]; // 市
+        details.form.startCountyId = CascaderValue[2]; // 区
+      }
+      break;
+
+    case 'end':
+      if (!CascaderValue) {
+        details.form.endProvinceId = ''; // 省
+        details.form.endCityId = ''; // 市
+        details.form.startCountyId = ''; // 区
+      }
+
+      if (CascaderValue.length === 1) {
+        details.form.endProvinceId = CascaderValue[0]; // 省
+        details.form.endCityId = CascaderValue[0]; // 市
+        details.form.endCountyId = CascaderValue[0]; // 区
+      } else if (CascaderValue.length === 2) {
+        details.form.endProvinceId = CascaderValue[0]; // 省
+        details.form.endCityId = CascaderValue[0]; // 市
+        details.form.endCountyId = CascaderValue[1]; // 区
+      } else {
+        details.form.endProvinceId = CascaderValue[0]; // 省
+        details.form.endCityId = CascaderValue[1]; // 市
+        details.form.endCountyId = CascaderValue[2]; // 区
+      }
+      break;
+
+    default:
+      break;
+  }
+};
+
+/** 新增提货路径 */
+const handleAdd = () => {
+  handleVehicleTypeStatus();
+
+  details.lineType = 'add';
+
+  details.VehicleBillingDetal = [
+    {
+      /** 车型 */
+      vehicleType: '',
+      /** 车型计费(元/车) */
+      price: 0,
+    },
+  ];
+  details.form = deepClone(details.initForm);
+  details.popUpShow.addVsitied = true;
+};
+
+/** 给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.sendOrgId = data.sendOrgId;
+    details.form.sendOrg = data.sendOrgName;
+    details.form.priceId = data.priceId;
+  }
+
+  details.form.minCost = data.minCost || 0;
+  details.form.additionalCost = data.additionalCost || 0;
+
+  // 车辆赋值
+  details.VehicleBillingDetal = data.fullVehicle || [
+    {
+      /** 车型 */
+      vehicleType: '',
+      /** 车型计费(元/车) */
+      price: 0,
+    },
+  ];
+
+  for (let i = 0; i < details.VehicleBillingDetal.length; i++) {
+    const value = details.VehicleBillingDetal[i];
+
+    value.vehicleType += '';
+  }
+
+  const _billTemplateDetailArr = [];
+
+  // 品类赋值
+  for (let i = 0; i < details.form.billTemplateDetail.length; i++) {
+    const value = details.form.billTemplateDetail[i];
+    const _itemObj = {
+      title: value.dictValue + '计费品类',
+      code: value.dictKey,
+      categories: [
+        {
+          title: '',
+          categoryId: '',
+          goods: '',
+          price: 0,
+        },
+      ],
+    };
+
+    const _arr = [];
+
+    for (let i = 0; i < value.categories.length; i++) {
+      const item = value.categories[i];
+
+      const Arr =
+        value.code === '1'
+          ? // 按件
+            data.pieceCategory
+          : value.code === '3'
+          ? // 按方
+            data.cubeCategory
+          : // 按重量
+            data.weightCategory;
+      if (!Arr || Arr.length === 0) break;
+
+      for (let index = 0; index < Arr.length; index++) {
+        const val = Arr[index];
+        if (val.categoryId !== item.categoryId) continue;
+        item.price = val.price;
+      }
+    }
+  }
 };
 
-/** 插混品类 */
-const remoteMethod = async (value, item) => {
+/** 编辑提货路径 */
+const handleEdit = async ({ row }) => {
+  try {
+    details.loadingObj.pageLoading = true;
+    details.form = deepClone(details.initForm);
+
+    handleVehicleTypeStatus();
+
+    details.lineType = 'edit';
+    details.VehicleBillingDetal = [
+      {
+        /** 车型 */
+        vehicleType: '',
+        /** 车型计费(元/车) */
+        price: 0,
+      },
+    ];
+
+    const res = await getDetails(row.id);
+
+    const { code, data } = res.data;
+    if (code !== 200) return;
+
+    initAssignmentForm(data);
+    details.form.id = row.id;
+
+    console.log('details.form :>> ', details.form);
+
+    details.popUpShow.addVsitied = true;
+  } catch (error) {
+    console.log('error :>> ', error);
+  } finally {
+    details.loadingObj.pageLoading = false;
+  }
+};
+
+/** 查询收货单位 */
+const remoteMethod = async value => {
   try {
     if (!value) return;
-    item.loading = true;
+    details.loadingObj.loading = true;
 
-    const response = await postFindCategoryInfo({ goodsName: value });
+    const response = await getList(1, 10, { clientName: value });
 
     const { code, data } = response.data;
 
     if (code !== 200) return;
 
-    item.goodsArr = data || [];
+    details.sendOrgArr = data.records || [];
   } catch (error) {
     console.log('error :>> ', error);
   } finally {
-    item.loading = false;
+    details.loadingObj.loading = false;
+  }
+};
+
+/** 恢复车辆选择状态 */
+const handleVehicleTypeStatus = () => {
+  for (let i = 0; i < details.vehicleTypeArr.length; i++) {
+    const value = details.vehicleTypeArr[i];
+    value.isCheck = false;
   }
 };
 
@@ -482,70 +1244,189 @@ const resetFormData = () => {
 };
 
 /** 提交 */
-const handleSubmit = async() => {
-  if (details.form.trunklinePricingType.length === 0) ElMessage.error('请选择计价方式');
-
-  formRef.value.validate(async valid => {
-    await emit('request-data'); //通知父页面传递数据
-    if (!valid) return;
-  console.log(props, 'props');
-  if (!props.templateData.TemplateName) {
-    ElMessage({
-      message: '请输入模板名称',
-      type: 'warning',
-    });
-    return;
-  } else {
-    details.form.name = props.templateData.TemplateName; //模板名称
+const handleSubmit = async () => {
+  let isRetrun = false;
+
+  await formRef.value.validate(valid => {
+    // if (!valid) return;
+    isRetrun = !valid;
+  });
+
+  if (isRetrun) return;
+
+  const submitData: any = {
+    checkType: '2',
+    id: $route.query.id,
+    trunkLine: {},
+  };
+
+  // 是否最低计费
+  if (details.form.trunklineIsMinCost === '1' && details.form.trunklineIsPeculiarSetup === '0') {
+    submitData.trunkLine.minCost = details.form.minCost;
+    submitData.trunkLine.additionalCost = details.form.additionalCost;
   }
 
-  if (!props.templateData.brand) {
-    ElMessage({
-      message: '请选择品牌',
-      type: 'warning',
-    });
-    return;
-  } else {
-    details.form.brandId = props.templateData.brand; //品牌ID
-  }
-    console.log(details.form,'初始表单');
-    const submitData = deepClone(details.form);//深拷贝
-    //  计价方式
-    submitData.trunklinePricingType= submitData.trunklinePricingType.join(',')
-    //品类管理
-    submitData.billTemplateDetail.forEach(item=>{
-      switch (item.code) {
-        case '1':
-        submitData.trunklinePieceCategory = item.categories.filter(res => res.goodsId).map(res => res.goodsId).join(',');
-          break;
-        case '3':
-        submitData.trunklineCubeCategory = item.categories.filter(res => res.goodsId).map(res => res.goodsId).join(',');
-          break;
-        case '4':
-        submitData.trunklineWeightCategory = item.categories.filter(res => res.goodsId).map(res => res.goodsId).join(',');
-          break;
-        default:
-        break;
-      }
-    })
-    submitData.serviceType = '2'; //服务类型（干线固定参数）
-    delete submitData.billTemplateDetail;//删除是否区分品类多余参数
-    console.log(submitData,'处理好的参数');
-    let data={
-      ...submitData,//提交的参数
+  for (let i = 0; i < details.form.billTemplateDetail.length; i++) {
+    const item = details.form.billTemplateDetail[i];
+
+    if (!details.form.trunklinePricingType.includes(item.code)) continue;
+
+    // 按件
+    if (item.code === '1') submitData.trunkLine.pieceCategory = item.categories;
+    // 按方
+    else if (item.code === '3') submitData.trunkLine.cubeCategory = item.categories;
+    // 按重量
+    else if (item.code === '4') submitData.trunkLine.weightCategory = item.categories;
+  }
+
+  // 按整车
+  if (details.form.trunklinePricingType.includes('2')) {
+    for (let i = 0; i < details.VehicleBillingDetal.length; i++) {
+      const value = details.VehicleBillingDetal[i];
+
+      if (!value.vehicleType) return ElMessage.warning('存在未选车型, 请选择车型');
     }
-    $_priceTemplate(data).then(res=>{
-      console.log(res,'提交成功返回值');
-      if (res.data.code == 200) {
-      ElMessage({
-        message: res.data.msg,
-        type: 'success',
-      });
-      emit('request-data',res.data.data);//把获取到的数据传递给父页面
+
+    submitData.trunkLine.fullVehicle = details.VehicleBillingDetal;
+  }
+
+  ElMessageBox.confirm('确认提交', '', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'success',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+
+      const res = await putBasicdataPrice(submitData);
+
+      const { code, msg } = res.data;
+
+      if (code !== 200) return;
+
+      ElMessage.success(msg);
+      console.log('submitData :>> ', submitData);
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
     }
-    })
   });
 };
+
+/** 提货线路提交 */
+const handleSubmitLine = async () => {
+  let isRetrun = false;
+
+  await lineFormRef.value.validate(valid => {
+    // if (!valid) return;
+    isRetrun = !valid;
+  });
+
+  if (isRetrun) return;
+
+  const submitData: any = {
+    startProvinceId: details.form.startProvinceId, // 省
+    startCityId: details.form.startCityId, // 市
+    startCountyId: details.form.startCountyId, // 区,
+    endProvinceId: details.form.endProvinceId, // 省
+    endCityId: details.form.endCityId, // 市
+    endCountyId: details.form.endCountyId, // 区,
+    /** 提货 */
+    serviceType: '2',
+    priceId: $route.query.id,
+    sendOrgId: details.form.sendOrgId,
+  };
+
+  // 如果为编辑提交
+  if (details.lineType === 'edit') submitData.id = details.form.id;
+
+  // 是否最低计费
+  if (details.form.trunklineIsMinCost === '1' && details.form.trunklineIsPeculiarSetup === '0') {
+    submitData.minCost = details.form.minCost;
+    submitData.additionalCost = details.form.additionalCost;
+  }
+
+  for (let i = 0; i < details.form.billTemplateDetail.length; i++) {
+    const item = details.form.billTemplateDetail[i];
+
+    if (!details.form.trunklinePricingType.includes(item.code)) continue;
+
+    // 按件
+    if (item.code === '1') submitData.pieceCategory = item.categories;
+    // 按方
+    else if (item.code === '3') submitData.cubeCategory = item.categories;
+    // 按重量
+    else if (item.code === '4') submitData.weightCategory = item.categories;
+  }
+
+  // 按整车
+  if (details.form.trunklinePricingType.includes('2')) {
+    for (let i = 0; i < details.VehicleBillingDetal.length; i++) {
+      const value = details.VehicleBillingDetal[i];
+
+      if (!value.vehicleType) return ElMessage.warning('存在未选车型, 请选择车型');
+    }
+
+    submitData.fullVehicle = details.VehicleBillingDetal;
+  }
+
+  ElMessageBox.confirm('确认提交', '', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+    type: 'success',
+  }).then(async () => {
+    try {
+      details.popUpShow.addVsitied = false; // 关闭弹窗
+      details.loadingObj.pageLoading = true; // 开启loading
+
+      console.log('details.form :>> ', details.form);
+
+      const res = await postSubmit(submitData);
+
+      const { code, msg } = res.data;
+
+      if (code !== 200) return;
+
+      ElMessage.success(msg);
+
+      handleVehicleTypeStatus();
+
+      initLineData();
+      console.log('submitData :>> ', submitData);
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
+};
+
+/** 删除路径 */
+const handleRemoveLine = ({ row }) => {
+  ElMessageBox.confirm(`确认删除 【${row.startCountyName}】-【${row.endCountyName}】 数据`, '', {
+    confirmButtonText: '删除',
+    cancelButtonText: '取消',
+    type: 'warning',
+  }).then(async () => {
+    try {
+      details.loadingObj.pageLoading = true;
+
+      const res = await postRemove({ ids: row.id });
+      const { code, msg } = res.data;
+      if (code !== 200) return;
+      ElMessage.success(msg);
+
+      initLineData();
+    } catch (error) {
+      console.log('error :>> ', error);
+    } finally {
+      details.loadingObj.pageLoading = false;
+    }
+  });
+};
+
+defineExpose({ initDictionaryBiz });
 </script>
 
 <style lang="scss" scoped>
@@ -585,6 +1466,7 @@ const handleSubmit = async() => {
     color: #606266;
   }
   .el_table_title {
+    width: 240px;
     font-weight: 600;
     color: #606266;
   }
@@ -594,42 +1476,6 @@ const handleSubmit = async() => {
     align-items: center;
     border-bottom: 1px solid #ccc;
     position: relative;
-    .el_table_operation {
-      width: 70px;
-      height: 100%;
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      position: absolute;
-      right: -80px;
-      .el_table_operation_span_a,
-      .el_table_operation_span_b {
-        font-size: 20px;
-        font-weight: bold;
-        width: 40%;
-        border: 2px solid #f00;
-        color: #f00;
-        height: 70%;
-        border-radius: 6px;
-        display: block;
-        line-height: 23px;
-        text-align: center;
-        cursor: pointer;
-      }
-      .el_table_operation_span_b {
-        border: 2px solid #0d83b7;
-        color: #0d83b7;
-      }
-
-      .el_table_operation_span_a:hover {
-        background-color: #f00;
-        color: #ccc;
-      }
-      .el_table_operation_span_b:hover {
-        background-color: #0d83b7;
-        color: #ccc;
-      }
-    }
   }
   .el_table_idNumber {
     width: 50px;
@@ -642,8 +1488,108 @@ const handleSubmit = async() => {
     justify-content: center;
     border-right: 1px solid #ccc;
   }
-  :deep(.el-input__wrapper) {
-    box-shadow: none;
+}
+
+.button_container {
+  height: 40px;
+  position: relative;
+}
+
+.title {
+  font-size: 1rem;
+  font-weight: bold;
+  color: var(--el-color-primary);
+  margin-bottom: 10px;
+}
+
+.table {
+  text-align: center;
+  border-color: #e8e8e8;
+  font-size: 12px;
+  line-height: 17px;
+  font-weight: bold;
+
+  td,
+  th {
+    padding: 5px 10px;
+    box-sizing: border-box;
+  }
+
+  th.index {
+    width: fit-content;
+    padding: 0 20px;
+  }
+
+  td.index {
+    font-size: 14px;
+  }
+
+  th {
+    height: 32px;
+  }
+
+  .header {
+    background: #f5f8fa;
+  }
+}
+
+:deep(.el-divider__text.is-left) {
+  font-size: 1.04167vw;
+  font-weight: bold;
+  color: #d3832a;
+}
+
+// 新增按钮
+.addButton {
+  background: #0086f1;
+  border-color: #0086f1;
+  color: #fff !important;
+  cursor: pointer;
+
+  &:hover {
+    background: #79bbff;
+    border-color: #79bbff;
+  }
+}
+
+// 移除按钮
+.removeButton {
+  background: #f85b52;
+  border-color: #f85b52;
+  color: #fff !important;
+  cursor: pointer;
+
+  &:hover {
+    background: #f89898;
+    border-color: #f89898;
+  }
+}
+
+.w100 {
+  width: 100% !important;
+}
+
+:deep(.button.el-text) {
+  color: #d3832a !important;
+  font-weight: normal;
+  cursor: pointer;
+  margin-right: 15px;
+
+  &.remove {
+    color: #f85b52 !important;
+  }
+}
+
+.billTemplateDetail_container {
+  display: flex;
+  flex-wrap: wrap;
+
+  & > div {
+    margin-right: 20px;
   }
 }
+
+.dialog-footer {
+  text-align: end;
+}
 </style>
diff --git a/src/views/Pricesystem/PricesyHome.vue b/src/views/Pricesystem/PricesyHome.vue
index 52e6bf7c..9346a16e 100644
--- a/src/views/Pricesystem/PricesyHome.vue
+++ b/src/views/Pricesystem/PricesyHome.vue
@@ -2,14 +2,20 @@
   <basic-container v-loading="pageLoading">
     <!-- 模板内容 -->
     <div class="content">
-      <el-tabs type="border-card" v-model="Tabmenu">
+      <el-tabs type="border-card" @tab-click="handleClick" v-model="Tabmenu">
         <template v-for="item in ServiceList" :key="item.label">
           <el-tab-pane :name="item.label" v-if="item.state" :label="item.label">
             <span v-if="item.label == '提货'"
-              ><FinancialBill ref="financialBill" :templateData="templateInfo"
+              ><FinancialBill
+                @request-data="provideData"
+                ref="financialBill"
+                :templateData="templateInfo"
             /></span>
             <span v-if="item.label == '干线'"
-              ><FinancialTrunkLine @request-data="provideData" :templateData="templateInfo"
+              ><FinancialTrunkLine
+                ref="financialTrunkLine"
+                @request-data="provideData"
+                :templateData="templateInfo"
             /></span>
             <span v-if="item.label == '仓储'"
               ><FinancialWarehousing @request-data="provideData" :templateData="templateInfo"
@@ -29,7 +35,8 @@
 import { ref, defineAsyncComponent } from 'vue';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { $_basicdataBrande } from '@/api/financialsector/index'; //价格模板
-import { $_InfopriceTemplate as getInfo,getBasicdataPrice } from '@/api/Pricesystem/index.js';
+import { $_InfopriceTemplate as getInfo, getBasicdataPrice } from '@/api/Pricesystem/index.js';
+import { getLazyTreeAll } from '@/api/base/region';
 import { $_InfopriceTemplate } from '@/api/financialsector/index.js';
 import { useRoute } from 'vue-router';
 import { nextTick } from 'vue';
@@ -61,6 +68,8 @@ const VehicleTypeList = ref([]);
 
 const financialBill = ref();
 
+const financialTrunkLine = ref();
+
 // 字典公共函数
 function updateDictionary(targetArray, dictionaryType) {
   getDictionaryBiz(dictionaryType)
@@ -100,7 +109,7 @@ const initData = async () => {
     const { code, data } = res.data;
 
     if (code !== 200) return;
-    form.value.requestInfo=data;//发送回显数据
+    form.value.requestInfo = data; //发送回显数据
     // form.value = data;
   } catch (error) {
     console.log('error :>> ', error);
@@ -111,17 +120,32 @@ const initData = async () => {
 const onLoad = async () => {
   try {
     pageLoading.value = true;
-  
-    const PromiseAll = [
+
+    // const PromiseAll = [
+    //   /** 车辆类型 */
+    //   updateDictionary(VehicleTypeList.value, 'price_vehicle_type'),
+    // ];
+
+    // await Promise.all(PromiseAll);
+
+    // 干线计费方式
+    const trunkLinePromise = getDictionaryBiz('trunk_line_pricing_type');
+    // 车辆类型
+    const priceVehiclePromise = getDictionaryBiz('price_vehicle_type');
+
+    const regionOptionePromise = await getLazyTreeAll();
+
+    const [trunkLineResult, priceVehicleResult, regionOptione] = await Promise.all([
+      trunkLinePromise,
+      priceVehiclePromise,
+      regionOptionePromise,
       /** 服务类型 */
       updateDictionary(ServiceList.value, 'service_type'),
-      /** 车辆类型 */
-      updateDictionary(VehicleTypeList.value, 'price_vehicle_type'),
-    ];
+    ]);
 
-    await Promise.all(PromiseAll);
-  
-   
+    form.value.trunkLineResult = trunkLineResult;
+    form.value.priceVehicleResult = priceVehicleResult;
+    form.value.regionOptione = regionOptione;
 
     console.log('VehicleTypeList :>> ', VehicleTypeList);
     let data = {
@@ -135,18 +159,19 @@ const onLoad = async () => {
       console.log(res, '获取详情');
       form.value.TemplateName = data.name || ''; //模板名称
       form.value.ServiceType = data.serviceType.split(',') || []; //服务类型
-      form.value.request=data
+      form.value.request = data;
       form.value.request = data;
       console.log('form.value.ServiceType :>> ', form.value.ServiceType);
       const result = ServiceList.value.filter(item => form.value.ServiceType.includes(item.value));
       await initData();
       // 激活菜单设置为已经存在的
       executeCheckedResults(result);
- 
+
       await nextTick();
       setTimeout(() => {
         console.log('financialBill :>> ', financialBill);
         financialBill.value[0].initDictionaryBiz();
+        financialTrunkLine.value[0].initDictionaryBiz();
       }, 1000);
     });
   } catch (error) {
@@ -188,6 +213,10 @@ const provideData = data => {
     templateInfo.value.code = data; //接收来自子页面第一次保存的返回值
   }
 };
+
+const handleClick = (tab, event) => {
+  console.log(tab, event);
+};
 </script>
 
 <style scoped lang="scss">
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index a86cecec..07f427a3 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -158,11 +158,7 @@
             <!-- 装车方式 -->
             <div class="form_row_item">
               <el-form-item inline label="装车方式" prop="loadingType">
-                <el-radio-group
-                  v-model="form.loadingType"
-                  :disabled="Number(details.pageType) !== 1"
-                  class="ml-4"
-                >
+                <el-radio-group v-model="form.loadingType" class="ml-4">
                   <el-radio label="1" size="large">手动装车(后台)</el-radio>
                   <el-radio label="2" size="large">扫描装车</el-radio>
                 </el-radio-group>
@@ -175,7 +171,7 @@
             <!-- 经办人 -->
             <div class="form_row_item">
               <el-form-item inline label="经办人">
-                <el-input v-model="userInfo.user_name" readonly />
+                <el-input v-model="form.operator" readonly />
               </el-form-item>
             </div>
 
@@ -962,6 +958,7 @@ const onLoad = async () => {
       details.nodeInfoData = handleEditForbidden(details.nodeInfoData);
       details.form.startWarehouseName = data.startWarehouseInfo.warehouseName;
       details.form.startWarehouseId = data.startWarehouseInfo.warehouseId;
+      details.form.operator = userInfo.value.nick_name;
     }
     // 编辑
     else {
diff --git a/src/views/financialsector/Financialse/FinancialBill.vue b/src/views/financialsector/Financialse/FinancialBill.vue
index f5dce537..0f7cd6f4 100644
--- a/src/views/financialsector/Financialse/FinancialBill.vue
+++ b/src/views/financialsector/Financialse/FinancialBill.vue
@@ -25,7 +25,13 @@
       </el-form-item>
 
       <!-- 是否统一区域计费 -->
-      <el-form-item label="是否统一区域计费">
+      <el-form-item
+        label="是否统一区域计费"
+        prop="pickupIsUnifyAreaBill"
+        :rules="[
+          { required: true, message: '请选择是否统一区域计费', trigger: ['blur', 'change'] },
+        ]"
+      >
         <el-radio-group v-model="details.form.pickupIsUnifyAreaBill" class="ml-4">
           <el-radio
             v-for="item in details.isType"
@@ -38,7 +44,11 @@
       </el-form-item>
 
       <!-- 是否区分品类 -->
-      <el-form-item label="是否区分品类">
+      <el-form-item
+        label="是否区分品类"
+        prop="pickupIsByCategory"
+        :rules="[{ required: true, message: '请选择是否区分品类', trigger: ['blur', 'change'] }]"
+      >
         <el-radio-group v-model="details.form.pickupIsByCategory" class="ml-4">
           <el-radio
             v-for="item in details.isType"
@@ -120,7 +130,12 @@
     </template>
 
     <!-- 是否最低计费 -->
-    <el-form-item label-width="150px" label="是否最低计费">
+    <el-form-item
+      label-width="150px"
+      label="是否最低计费"
+      prop="pickupIsMinCost"
+      :rules="[{ required: true, message: '请选择是否最低计费', trigger: ['blur', 'change'] }]"
+    >
       <el-radio-group v-model="details.form.pickupIsMinCost" class="ml-4">
         <el-radio v-for="item in details.isType" :key="item.value" :label="item.value" size="large"
           >{{ item.label }}
@@ -133,6 +148,8 @@
       v-if="details.form.pickupIsMinCost === '1'"
       label-width="150px"
       label="最低计费类型"
+      prop="pickupMinCostType"
+      :rules="[{ required: true, message: '请选择最低计费类型', trigger: ['blur', 'change'] }]"
     >
       <el-radio-group v-model="details.form.pickupMinCostType" class="ml-4">
         <template v-for="item in details.lowestType" :key="item.value">
diff --git a/src/views/financialsector/Financialse/FinancialTrunkLine.vue b/src/views/financialsector/Financialse/FinancialTrunkLine.vue
index d4b39905..be95cc3d 100644
--- a/src/views/financialsector/Financialse/FinancialTrunkLine.vue
+++ b/src/views/financialsector/Financialse/FinancialTrunkLine.vue
@@ -25,7 +25,13 @@
       </el-form-item>
 
       <!-- 是否统一区域计费 -->
-      <el-form-item label="是否统一区域计费">
+      <el-form-item
+        label="是否统一区域计费"
+        prop="trunklineIsUnifyAreaBill"
+        :rules="[
+          { required: true, message: '请选择是否统一区域计费', trigger: ['blur', 'change'] },
+        ]"
+      >
         <el-radio-group v-model="details.form.trunklineIsUnifyAreaBill" class="ml-4">
           <el-radio
             v-for="item in details.isType"
@@ -38,7 +44,11 @@
       </el-form-item>
 
       <!-- 是否区分品类 -->
-      <el-form-item label="是否区分品类">
+      <el-form-item
+        label="是否区分品类"
+        prop="trunklineIsByCategory"
+        :rules="[{ required: true, message: '请选择是否区分品类', trigger: ['blur', 'change'] }]"
+      >
         <el-radio-group v-model="details.form.trunklineIsByCategory" class="ml-4">
           <el-radio
             v-for="item in details.isType"
@@ -49,118 +59,141 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-    </el-form>
-
-    <template v-if="details.form.trunklineIsByCategory === '1'">
-      <el-divider content-position="left">品类管理</el-divider>
-
-      <template v-for="value in details.form.billTemplateDetail" :key="value.title">
-        <!-- 附加费品类 -->
-        <el-form-item
-          label-width="150px"
-          v-if="details.form.trunklinePricingType.includes(value.code)"
-          :label="value.title"
-        >
-          <div
-            class="el_Storagecategory"
-            v-loading="goriesloading"
-            element-loading-text="Loading..."
+      <template v-if="details.form.trunklineIsByCategory === '1'">
+        <el-divider content-position="left">品类管理</el-divider>
+
+        <template v-for="value in details.form.billTemplateDetail" :key="value.title">
+          <!-- 附加费品类 -->
+          <el-form-item
+            label-width="150px"
+            v-if="details.form.trunklinePricingType.includes(value.code)"
+            :label="value.title"
           >
-            <div class="el_table_span">
-              <div class="el_table_id">序号</div>
-              <div class="el_table_title">产品品类</div>
-            </div>
+            <div
+              class="el_Storagecategory"
+              v-loading="goriesloading"
+              element-loading-text="Loading..."
+            >
+              <div class="el_table_span">
+                <div class="el_table_id">序号</div>
+                <div class="el_table_title">产品品类</div>
+              </div>
 
-            <!-- 表格循环 -->
-            <div class="el_table_td" v-for="(item, index) in value.categories">
-              <div class="el_table_idNumber">{{ index + 1 }}</div>
-              <el-select
-                :ref="value.title + index"
-                class="el_Cselect"
-                v-model="item.goods"
-                filterable
-                clearable
-                placeholder="请选择品类"
-                style="width: 240px"
-                :loading="item.loading"
-                @change="handleChangeCategory(item)"
-                remote
-                reserve-keyword
-                default-first-option
-                :remote-method="value => debounce(remoteMethod(value, item), 500)"
-              >
-                <el-option
-                  v-for="val in item.goodsArr"
-                  :key="val.goodsId"
-                  :label="val.goodsName"
-                  :value="val.goodsId"
-                />
-              </el-select>
-              <div class="el_table_operation">
-                <!-- 新增 -->
-                <span
-                  v-if="item.plus"
-                  @click="handlePlus(value, index)"
-                  class="el_table_operation_span_b"
-                  >+
-                </span>
-                <!-- 删除 -->
-                <span
-                  v-if="item.reduce"
-                  @click="handleReduce(value, index)"
-                  class="el_table_operation_span_a"
-                  >-
-                </span>
+              <!-- 表格循环 -->
+              <div class="el_table_td" v-for="(item, index) in value.categories">
+                <div class="el_table_idNumber">{{ index + 1 }}</div>
+                <el-select
+                  :ref="value.title + index"
+                  class="el_Cselect"
+                  v-model="item.goods"
+                  filterable
+                  clearable
+                  placeholder="请选择品类"
+                  style="width: 240px"
+                  :loading="item.loading"
+                  @change="handleChangeCategory(item)"
+                  remote
+                  reserve-keyword
+                  default-first-option
+                  :remote-method="value => debounce(remoteMethod(value, item), 500)"
+                >
+                  <el-option
+                    v-for="val in item.goodsArr"
+                    :key="val.goodsId"
+                    :label="val.goodsName"
+                    :value="val.goodsId"
+                  />
+                </el-select>
+                <div class="el_table_operation">
+                  <!-- 新增 -->
+                  <span
+                    v-if="item.plus"
+                    @click="handlePlus(value, index)"
+                    class="el_table_operation_span_b"
+                    >+
+                  </span>
+                  <!-- 删除 -->
+                  <span
+                    v-if="item.reduce"
+                    @click="handleReduce(value, index)"
+                    class="el_table_operation_span_a"
+                    >-
+                  </span>
+                </div>
               </div>
             </div>
-          </div>
-        </el-form-item>
+          </el-form-item>
+        </template>
       </template>
-    </template>
-
-    <el-divider content-position="left">特殊计费</el-divider>
-
-    <!-- 是否特殊配置 -->
-    <el-form-item label-width="150px" label="是否特殊配置">
-      <el-radio-group v-model="details.form.trunklineIsPeculiarSetup" class="ml-4">
-        <el-radio v-for="item in details.isType" :key="item.value" :label="item.value" size="large"
-          >{{ item.label }}
-        </el-radio>
-      </el-radio-group>
-    </el-form-item>
-
-    <el-divider content-position="left">一般计费</el-divider>
-
-    <!-- 是否最低计费 -->
-    <el-form-item label-width="150px" label="是否最低计费">
-      <el-radio-group v-model="details.form.trunklineIsMinCost" class="ml-4">
-        <el-radio v-for="item in details.isType" :key="item.value" :label="item.value" size="large"
-          >{{ item.label }}
-        </el-radio>
-      </el-radio-group>
-    </el-form-item>
-
-    <!-- 最低计费类型 -->
-    <el-form-item
-      v-if="details.form.trunklineIsMinCost === '1'"
-      label-width="150px"
-      label="最低计费类型"
-    >
-      <el-radio-group v-model="details.form.trunklineMinCostType" class="ml-4">
-        <template v-for="item in details.lowestType" :key="item.value">
+
+      <el-divider content-position="left">特殊计费</el-divider>
+
+      <!-- 是否特殊配置 -->
+      <el-form-item
+        label-width="150px"
+        label="是否特殊配置"
+        prop="trunklineIsPeculiarSetup"
+        :rules="[{ required: true, message: '请选择是否特殊配置', trigger: ['blur', 'change'] }]"
+      >
+        <el-radio-group v-model="details.form.trunklineIsPeculiarSetup" class="ml-4">
           <el-radio
-            v-if="!item.MappingOrNot || details.form.trunklinePricingType.includes(item.mapValue)"
-            :label="item.dictKey"
+            v-for="item in details.isType"
+            :key="item.value"
+            :label="item.value"
             size="large"
-            >{{ item.dictValue }}
+            >{{ item.label }}
           </el-radio>
+        </el-radio-group>
+      </el-form-item>
 
-          <el-radio v-else :label="item.dictKey" size="large" disabled>{{
-            item.dictValue
-          }}</el-radio>
-        </template>
-      </el-radio-group>
-    </el-form-item>
+      <template v-if="details.form.trunklineIsPeculiarSetup === '0'">
+        <el-divider content-position="left">一般计费</el-divider>
+
+        <!-- 是否最低计费 -->
+        <el-form-item
+          label-width="150px"
+          label="是否最低计费"
+          prop="trunklineIsMinCost"
+          :rules="[{ required: true, message: '请选择是否最低计费', trigger: ['blur', 'change'] }]"
+        >
+          <el-radio-group v-model="details.form.trunklineIsMinCost" class="ml-4">
+            <el-radio
+              v-for="item in details.isType"
+              :key="item.value"
+              :label="item.value"
+              size="large"
+              >{{ item.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <!-- 最低计费类型 -->
+        <el-form-item
+          v-if="details.form.trunklineIsMinCost === '1'"
+          label-width="150px"
+          label="最低计费类型"
+          prop="trunklineMinCostType"
+          :rules="[{ required: true, message: '请选择最低计费类型', trigger: ['blur', 'change'] }]"
+        >
+          <el-radio-group v-model="details.form.trunklineMinCostType" class="ml-4">
+            <template v-for="item in details.lowestType" :key="item.value">
+              <el-radio
+                v-if="
+                  !item.MappingOrNot || details.form.trunklinePricingType.includes(item.mapValue)
+                "
+                :label="item.dictKey"
+                size="large"
+                >{{ item.dictValue }}
+              </el-radio>
+
+              <el-radio v-else :label="item.dictKey" size="large" disabled>{{
+                item.dictValue
+              }}</el-radio>
+            </template>
+          </el-radio-group>
+        </el-form-item>
+      </template>
+    </el-form>
 
     <!-- 操作按钮 -->
     <div class="flex-c-c">