修改问题

src/views/order/podCN/components/ChangeWayDialog.vue

@@ -128,11 +128,9 @@ const changeWaySubmit = async (title: string) => {
   }
   }
   let Fn
   let Fn
   if (title !== '创建物流订单') {
   if (title !== '创建物流订单') {
-    // if (
-    //   changeWayRow.value.logisticsWayId === selection.value[0]?.logisticsWayId
-    // ) {
-    //   return ElMessage.warning('更改的物流方式不能相同')
-    // }
+    if (changeWayRow.value.logisticsWayId === props.rowData?.logisticsWayId) {
+      return ElMessage.warning('更改的物流方式不能相同')
+    }
     Fn = changeLogisticsApi
     Fn = changeLogisticsApi
   } else {
   } else {
     Fn = submitFn
     Fn = submitFn
@@ -163,7 +161,9 @@ const showDialog = async () => {
   const { rowData, getTableFn } = props
   const { rowData, getTableFn } = props
   try {
   try {
     if (rowData) {
     if (rowData) {
-      wayDialogTitle.value = `切换物流(当前物流方式：${rowData.logisticsWayName})`
+      wayDialogTitle.value = `切换物流(当前物流方式：${
+        rowData.logisticsWayName || '空'
+      })`
       isChangeWay.value = true
       isChangeWay.value = true
       const { data } = await getTableFn(rowData.id as number)
       const { data } = await getTableFn(rowData.id as number)
       logisticsWayData.value = data
       logisticsWayData.value = data

src/views/order/podCN/index.vue

@@ -2514,8 +2514,8 @@
     ref="changeWayDialogRef"
     ref="changeWayDialogRef"
     :rowData="currentItem"
     :rowData="currentItem"
     :getTableFn="getLogisticsCalculation"
     :getTableFn="getLogisticsCalculation"
-    :submitFn="changeLogisticsApi"
-    :changeLogisticsApi="createLogisticsOrdersApi"
+    :submitFn="createLogisticsOrdersApi"
+    :changeLogisticsApi="changeLogisticsApi"
     :confirm="
     :confirm="
       () => {
       () => {
         search()
         search()