From 1601a60a93aa1fd92807853d4a445643cfa09d08 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 12 Jul 2024 12:02:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=BD=A8=E8=BF=B9=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/distributionParcelList.js    |   8 +-
 src/api/distribution/packageNodeSearch.js     | 353 ++++++++++--------
 src/components/pric/tablePric.vue             |  41 +-
 .../Deliverymaintenancecosts.vue              | 151 ++++++--
 .../WarehouseTemplateHome.vue                 |   6 +-
 .../signdetail/packageNodeSearch.vue          |  12 +-
 6 files changed, 358 insertions(+), 213 deletions(-)

diff --git a/src/api/distribution/distributionParcelList.js b/src/api/distribution/distributionParcelList.js
index d489bc5b..b8dbae5f 100644
--- a/src/api/distribution/distributionParcelList.js
+++ b/src/api/distribution/distributionParcelList.js
@@ -139,11 +139,11 @@ export const getPackageList = params => {
   });
 };
 
-export const $_searchNode = (params) => {
+export const $_searchNode = (data) => {
   return request({
-    url: '/api/logpm-distribution/distributionParcelList/searchNode',
-    method: 'get',
-    params
+    url: '/api/logpm-warehouse/packageTrackLog/finaPackageTrackLogList',
+    method: 'post',
+    data
   });
 };
 
diff --git a/src/api/distribution/packageNodeSearch.js b/src/api/distribution/packageNodeSearch.js
index 84ccba74..d7e95197 100644
--- a/src/api/distribution/packageNodeSearch.js
+++ b/src/api/distribution/packageNodeSearch.js
@@ -1,163 +1,192 @@
-export const columnList = [
-    // {
-    //   prop: '',
-    //   label: '复选框',
-    //   type: 0,
-    //   width: 55,
-    //   fixed: true,
-    // },
-    {
-      prop: '',
-      label: '序号',
-      type: 12,
-      values: '', 
-      width: 55,
-      fixed: true,
-    },
-    {
-      prop: 'warehouseName',
-      label: '仓库名称',
-      type: 1,
-      values: '',
-      width: '100',
-      checkarr: [],
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'waybillNumber',
-      label: '运单号',
-      type: 1,
-      values: '',
-      width: '150',
-      checkarr: [],
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'orderCode',
-      label: '订单自编号',
-      type: 1,
-      values: '',
-      width: '150',
-      checkarr: [],
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'orderPackageCode',
-      label: '包条码',
-      type: 1,
-      values: '',
-      width: '180',
-      checkarr: [],
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'nodeName',
-      label: '操作名称',
-      type: 1,
-      values: '',
-      width: '100',
-      checkarr: [],
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'allocationName',
-      label: '所在库位',
-      type: 1,
-      values: '',
-      width: '100',
-      checkarr: [],
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'trayName',
-      label: '托盘名称',
-      type: 1,
-      values: '',
-      width: '100',
-      checkarr: [],
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-
-
-    {
-      prop: 'tranNumber',
-      label: '车次号',
-      type: 1,
-      values: '',
-      width: '140',
-      checkarr: [],
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'quantity',
-      label: '数量',
-      type: 1,
-      values: '',
-      width: '100',
-      checkarr: [],
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'nodeControlsUserName',
-      label: '操作人名称',
-      type: 1,
-      values: '',
-      width: '100',
-      checkarr: [],
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'nodeTime',
-      label: '操作时间',
-      type: 1,
-      values: '',
-      width: '150',
-      checkarr: [],
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
-    {
-      prop: 'description',
-      label: '操作描述',
-      type: 1,
-      values: '',
-      width: '200',
-      checkarr: [],
-      fixed: false,
-      sortable: true,
-      head: false,
-    },
 
-
-    // {
-    //   prop: 'createUserName',
-    //   label: '操作',
-    //   type: 6,
-    //   values: '',
-    //   width: '100',
-    //   checkarr: [],
-    //   fixed: 'right',
-    //   sortable: false,
-    // },
-  ]
\ No newline at end of file
+  /** 流转节点 */
+export const columnList = [
+  // {
+  //   prop: 'createUserName',
+  //   label: '复选框',
+  //   type: 0,
+  //   values: '',
+  //   width: '55',
+  //   checkarr: [],
+  //   fixed: false,
+  // },
+  {
+    prop: 'createUserName',
+    label: '序号',
+    type: 12,
+    values: '',
+    width: '55',
+    checkarr: [],
+    fixed: false,
+  },
+  {
+    prop: 'warehouseName',
+    label: '仓库',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  // {
+  //   prop: 'createTime',
+  //   label: '订单自编号',
+  //   type: 1,
+  //   values: '',
+  //   width: '150',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
+  {
+    prop: 'orderPackageCode',
+    label: '包条码',
+    type: 1,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'operator',
+    label: '操作人',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'content',
+    label: '描述',
+    type: 1,
+    values: '',
+    width: '250',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'createTime',
+    label: '操作时间',
+    type: 1,
+    values: '',
+    width: '250',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  {
+    prop: 'workNodeName',
+    label: '节点',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
+  // {
+  //   prop: 'createUserName',
+  //   label: '是否干仓配',
+  //   type: 1,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
+  // {
+  //   prop: 'createUserName',
+  //   label: '服务类型',
+  //   type: 1,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
+  // {
+  //   prop: 'createUserName',
+  //   label: '流转节点',
+  //   type: 1,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
+  // {
+  //   prop: 'createUserName',
+  //   label: '库位',
+  //   type: 1,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
+  // {
+  //   prop: 'createUserName',
+  //   label: '托盘码',
+  //   type: 1,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
+  // {
+  //   prop: 'createUserName',
+  //   label: '一级品名称',
+  //   type: 1,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
+  // {
+  //   prop: 'createUserName',
+  //   label: '二级品名称',
+  //   type: 1,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
+  // {
+  //   prop: 'createUserName',
+  //   label: '三级品名称',
+  //   type: 1,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
+  // {
+  //   prop: 'createUserName',
+  //   label: '物料名称',
+  //   type: 1,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
+  // {
+  //   prop: 'createUserName',
+  //   label: '物料编码',
+  //   type: 1,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
+];
\ No newline at end of file
diff --git a/src/components/pric/tablePric.vue b/src/components/pric/tablePric.vue
index a910a892..7c4e0b96 100644
--- a/src/components/pric/tablePric.vue
+++ b/src/components/pric/tablePric.vue
@@ -29,11 +29,11 @@
             remote-show-suffix
             :remote-method="categoriesearch"
             :placeholder="'请选择' + column.label"
-            :loading=scope.row.loading
-            loading-text='正在查询中...'
+            :loading="scope.row.loading"
+            loading-text="正在查询中..."
             @focus="categoriesSearchfocus(column, scope.row)"
-            :disabled=column.show
-            @change='selectChange'
+            :disabled="column.show"
+            @change="selectChange"
           >
             <el-option
               v-for="item in scope.row.options"
@@ -43,6 +43,24 @@
               :disabled="item.disabled"
             />
           </el-select>
+          <!-- 地区选择 -->
+          <el-cascader
+            v-if="column.type === 'cascader'"
+            pleceholder="请选择"
+            :options="scope.row.options"
+            style="width: 100%"
+            v-model="scope.row[column.prop]"
+            :props="{
+              checkStrictly: true,
+            }"
+            filterable
+            clearable
+          >
+            <template #default="{ node, data }">
+              <span>{{ data.label }}</span>
+              <span v-if="!node.isLeaf"> ({{ data.children.length }}) </span>
+            </template>
+          </el-cascader>
           <!-- 操作栏  -->
           <slot v-if="!column.type" :scope="scope"> </slot>
         </template>
@@ -54,22 +72,21 @@
 <script setup>
 import { ElTable, ElTableColumn, ElInputNumber } from 'element-plus';
 // 使用 defineProps 定义组件 props
-import { computed, defineComponent,ref } from 'vue';
-const SelectOpin=ref({})
+import { computed, defineComponent, ref } from 'vue';
 defineComponent({
   emits: ['focus', 'search'],
 });
 const emit = defineEmits(['focus', 'search']);
 function categoriesSearchfocus(column, row) {
-console.log(row.index,'row');
+  console.log(row.index, 'row');
   emit('focus', { column, row });
 }
 function categoriesearch(data) {
- emit('search', data);
+  emit('search', data);
 }
 
-function selectChange(data){
-    emit('change', data);
+function selectChange(data) {
+  emit('change', data);
 }
 const props = defineProps({
   SurchargeData: {
@@ -87,6 +104,4 @@ const props = defineProps({
 });
 </script>
 
-<style scoped lang='scss'>
-
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
index 458562b6..5c889a6c 100644
--- a/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
+++ b/src/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue
@@ -143,6 +143,12 @@
           <el-radio value="0" size="large">否</el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="是否附加费">
+        <el-radio-group v-model="formLoad.a" class="ml-4">
+          <el-radio value="1" size="large">是</el-radio>
+          <el-radio value="0" size="large">否</el-radio>
+        </el-radio-group>
+      </el-form-item>
     </el-form>
     <template #footer>
       <div class="dialog-footer">
@@ -212,16 +218,9 @@
       </div>
     </div>
     <div class="asurcharge">
-      <div class="el_asurcharge">
-        <span class="title">是否附加费</span>
-        <el-radio-group v-model="radio1" class="ml-4">
-          <el-radio value="0" size="large">否</el-radio>
-          <el-radio value="1" size="large">是</el-radio>
-        </el-radio-group>
-      </div>
       <!-- 附加费表格 -->
       <div class="el_category asurcharge_box">
-        <span class="title">品类按方计费</span>
+        <span class="title">是否附加费</span>
         <SurchargeTable
           :SurchargeData="form.asurcharge"
           :Surcharge="asurcharge"
@@ -237,22 +236,54 @@
     <div class="el_Kilometers">
       <div class="el_Kilometers_box">
         <span class="title">公里数单价</span>
-        <el-input-number v-model="form.num" :min="1" :max="10" />
+        <el-input-number
+          v-model="form.numa"
+          :min="0"
+          :controls="false"
+          :precision="2"
+          :value-on-clear="0"
+        />
       </div>
       <div class="el_Kilometers_box">
-        <span class="title">公里数单价</span>
-        <el-input-number v-model="form.num" :min="1" :max="10" />
+        <span class="title">补贴起步公里数(km)</span>
+        <el-input-number
+          v-model="form.numb"
+          :min="0"
+          :controls="false"
+          :precision="2"
+          :value-on-clear="0"
+        />
       </div>
       <div class="el_Kilometers_box">
-        <span class="title">公里数单价</span>
-        <el-input-number v-model="form.num" :min="1" :max="10" />
+        <span class="title">补贴单价(元/km)</span>
+        <el-input-number
+          v-model="form.numc"
+          :min="0"
+          :controls="false"
+          :precision="2"
+          :value-on-clear="0"
+        />
       </div>
     </div>
-
+    <div class="el_Oversizedbilling">
+      <span class="title">超区区域计费</span>
+      <SurchargeTable
+        :SurchargeData="form.Oversizedbilling"
+        :Surcharge="Oversizedbilling"
+        @focus="handleRowFocus"
+        @search="search"
+      >
+        <template #default="slotProps">
+          <template v-if="slotProps.scope.column.label === '操作'">
+            <el-text class="el_text_del">删除</el-text>
+          </template>
+        </template>
+      </SurchargeTable>
+    </div>
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="form.dialogVisible = false">取消</el-button>
-        <el-button type="primary" @click="Pricingrules = false"> 确定 </el-button>
+        <el-button type="primary" @click="Pricingrules"> 确定 </el-button>
       </div>
     </template>
   </el-dialog>
@@ -260,10 +291,14 @@
 <script setup>
 import { ref } from 'vue';
 import SurchargeTable from '@/components/pric/tablePric.vue';
+import { $_ObtainRegion } from '@/api/basicdata/basicdataWarehouse';
 const activeName = ref('Commercialdistribution');
 // 配置计价规则
 const formLoad = ref({});
 const form = ref({
+  numa: 0,
+  numb: 0,
+  numc: 0,
   dialogPricingrules: false, //配置车型规则
   dialogConfigure: false,
   dispatchSubjoinCategoryData: [
@@ -281,7 +316,6 @@ const form = ref({
       index: 1,
       Costsettlementcategory: '', //成本结算品类
       UnitPrice: '', //单价(元/件)
-      Setunitprice: '', //套单价(元/套)
       options: [],
       loading: false,
     },
@@ -298,7 +332,58 @@ const form = ref({
       loading: false,
     },
   ],
+  // 超区计费
+  Oversizedbilling: [
+    {
+      index: 1,
+      Costsettlementcategory: '', //成本结算品类
+      a: '', //省市区
+      b: '', //超区公里数
+      c: '', //超区后单价
+      options: [],
+      loading: false,
+    },
+  ],
 });
+const onLoad = () => {
+  $_ObtainRegion().then(res => {
+    console.log(res, '地区。。。');
+    console.log(form.value.Oversizedbilling, 'form.value.Oversizedbilling');
+    if (res.data.code === 200) {
+      form.value.Oversizedbilling.forEach(item => {
+        item['options'] = res.data.data;
+      });
+    }
+  });
+};
+onLoad();
+// 超区计费
+const Oversizedbilling = ref([
+  { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
+  {
+    label: '省市区',
+    prop: 'a',
+    type: 'cascader',
+    width: 'auto',
+    disabled: true,
+  },
+  {
+    label: '超区公里数',
+    prop: 'b',
+    type: 'number',
+    width: 'auto',
+    disabled: true,
+  },
+  {
+    label: '超区后单价',
+    prop: 'c',
+    type: 'number',
+    width: 'auto',
+    disabled: true,
+  },
+  { label: '操作', prop: '', type: '', width: 'auto', disabled: true },
+]);
+
 // 品类按件计费
 const Categorybyitembilling = ref([
   { label: '序号', prop: 'index', type: 'string', width: '50', disabled: true },
@@ -316,13 +401,6 @@ const Categorybyitembilling = ref([
     width: 'auto',
     disabled: true,
   },
-  {
-    label: '套单价(元/套)',
-    prop: 'Setunitprice',
-    type: 'number',
-    width: 'auto',
-    disabled: true,
-  },
 ]);
 
 // 附加费
@@ -414,7 +492,9 @@ const newlyadded = row => {
   form.value.dispatchSubjoinCategoryData.push(data);
 };
 // 编辑车型规则
-const Pricingrules = () => {};
+const Pricingrules = () => {
+  console.log(form.value);
+};
 </script>
 
 <style scoped lang="scss">
@@ -514,7 +594,6 @@ const Pricingrules = () => {};
   }
 }
 .asurcharge_box {
-  margin-top: 23px;
   width: 100%;
 }
 .el_Kilometers {
@@ -545,4 +624,26 @@ const Pricingrules = () => {};
     }
   }
 }
+.el_Oversizedbilling {
+  .title {
+    position: relative;
+    padding: 0 10px;
+    display: block;
+    margin-top: 20px;
+    margin-bottom: 10px;
+  }
+  .title::after {
+    content: '';
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 4px;
+    height: 100%;
+    background-color: #172e60;
+  }
+  .el_text_del {
+    color: #ff5722;
+    cursor: pointer;
+  }
+}
 </style>
diff --git a/src/views/cost/Deliverycostmanagement/WarehouseTemplateHome.vue b/src/views/cost/Deliverycostmanagement/WarehouseTemplateHome.vue
index 00e537f2..204a5ef5 100644
--- a/src/views/cost/Deliverycostmanagement/WarehouseTemplateHome.vue
+++ b/src/views/cost/Deliverycostmanagement/WarehouseTemplateHome.vue
@@ -4,9 +4,9 @@
     ><el-input v-model="input" style="width: 240px" placeholder="模板名称" disabled />
     <hr />
     <el-tabs v-model="activeName" type="card" class="demo-tabs" @tab-click="handleClick">
-      <el-tab-pane label="品类映射表" name="Categorymapping">
+      <!-- <el-tab-pane label="品类映射表" name="Categorymapping">
         <WarehouseTemplate></WarehouseTemplate>
-      </el-tab-pane>
+      </el-tab-pane> -->
       <el-tab-pane label="品类计价单位" name="Categorypricingunit">
         <Categorypricingunit></Categorypricingunit>
       </el-tab-pane>
@@ -32,7 +32,7 @@ const Deliverymaintenancecosts = defineAsyncComponent(() =>
   import('@/views/cost/Deliverycostmanagement/Deliverymaintenancecosts.vue')
 );
 
-const activeName = ref('Categorymapping')
+const activeName = ref('Categorypricingunit')
 const input = ref('')
 const handleClick = (tab, event) => {
   console.log(tab, event)
diff --git a/src/views/distribution/signdetail/packageNodeSearch.vue b/src/views/distribution/signdetail/packageNodeSearch.vue
index 616b29e8..68e47d44 100644
--- a/src/views/distribution/signdetail/packageNodeSearch.vue
+++ b/src/views/distribution/signdetail/packageNodeSearch.vue
@@ -17,10 +17,10 @@
               <!--              </el-select>-->
               <!--            </el-form-item>-->
               <el-form-item :label="title + ':'">
-                <el-input v-model="query.packageCode" :placeholder="'请输入' + title"></el-input>
+                <el-input v-model="query.orderPackageCode" :placeholder="'请输入' + title"></el-input>
               </el-form-item>
               <el-form-item :label="title + ':'" v-show="show">
-                <el-input v-model="query.packageCode" :placeholder="'请输入' + title"></el-input>
+                <el-input v-model="query.orderPackageCode" :placeholder="'请输入' + title"></el-input>
               </el-form-item>
               <el-form-item> </el-form-item>
             </div>
@@ -189,7 +189,7 @@ const showdrawer = _flag => {
   details.drawerShow = _flag;
 };
 const onload = () => {
-  if (!details.query.packageCode) {
+  if (!details.query.orderPackageCode) {
     return;
   }
   details.loadingObj.list = true;
@@ -220,12 +220,12 @@ const searchHide = () => {
 };
 console.log($route.query.orderPackageCode, '路由参数');
 // 响应路由参数变化
-details.query.packageCode = $route.query.orderPackageCode;
+details.query.orderPackageCode = $route.query.orderPackageCode;
 searchChange();
 watch($route, (newValue, oldValue) => {
   // 确保用户ID确实发生了变化
-  details.query.packageCode = $route.query.orderPackageCode;
-  if (!details.query.packageCode) {
+  details.query.orderPackageCode = $route.query.orderPackageCode;
+  if (!details.query.orderPackageCode) {
     return;
   }
   searchChange();