Merge branch 'feat_Integrate-with-Logistics' of…

Merge branch 'feat_Integrate-with-Logistics' of http://47.122.114.111:9999/qinjianhui/factory_front into feat_Integrate-with-Logistics

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

@@ -46,7 +46,7 @@
           <b v-else-if="!row.status" style="color: red">失败</b>
           <b v-else-if="!row.status" style="color: red">失败</b>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="预计运费（$）" align="center" prop="payFreight">
+      <el-table-column label="预计运费（￥）" align="center" prop="payFreight">
       </el-table-column>
       </el-table-column>
     </el-table>
     </el-table>
     <template #footer>
     <template #footer>
@@ -114,6 +114,7 @@ const cancelWayDialog = () => {
   changeWayRow.value = {} as LogisticsData
   changeWayRow.value = {} as LogisticsData
   changeWayRef.value?.setCurrentRow()
   changeWayRef.value?.setCurrentRow()
   isChangeWay.value = false
   isChangeWay.value = false
+  logisticsWayData.value = []
 }
 }
 //确认物流
 //确认物流
 const changeWaySubmit = async (title: string) => {
 const changeWaySubmit = async (title: string) => {
@@ -157,6 +158,7 @@ const changeWaySubmit = async (title: string) => {
     console.log(error)
     console.log(error)
   } finally {
   } finally {
     isChangeWayLoading.value = false
     isChangeWayLoading.value = false
+    logisticsWayData.value = []
   }
   }
 }
 }
 const showDialog = async () => {
 const showDialog = async () => {
@@ -169,6 +171,7 @@ const showDialog = async () => {
       isChangeWay.value = true
       isChangeWay.value = true
       isChangeWayLoading.value = true
       isChangeWayLoading.value = true
       const { data } = await getTableFn(rowData.id as number)
       const { data } = await getTableFn(rowData.id as number)
+
       logisticsWayData.value = data
       logisticsWayData.value = data
     }
     }
   } catch (error) {
   } catch (error) {

src/views/order/podCN/index.vue

@@ -2512,11 +2512,11 @@
   </ElDialog>
   </ElDialog>
   <ChangeWayDialog
   <ChangeWayDialog
     ref="changeWayDialogRef"
     ref="changeWayDialogRef"
-    :rowData="currentItem"
-    :getTableFn="getLogisticsCalculation"
-    :submitFn="createLogisticsOrdersApi"
-    :changeLogisticsApi="changeLogisticsApi"
-    :confirm="
+    :row-data="currentItem"
+    :get-table-fn="getLogisticsCalculation"
+    :submit-fn="createLogisticsOrdersApi"
+    :change-logistics-api="changeLogisticsApi"
+    @confirm="
       () => {
       () => {
         search()
         search()
         loadTabData()
         loadTabData()