Merge remote-tracking branch 'origin/dev' into linjinhong

8a5843c4 · linjinhong · dd96c2b2 · 648dee64 · 8a5843c4 · 8a5843c4
Commit 8a5843c4 authored Jun 17, 2025 by linjinhong
Show whitespace changes
Inline Side-by-side

Showing with 66 additions and 22 deletions

components.d.ts
+1 -0

src/views/order/podUs/components/updateAddress.vue
+65 -22

No files found.
--- a/components.d.ts
+++ b/components.d.ts
@@ -66,6 +66,7 @@ declare module 'vue' {
    ShipmentOrderDetail: typeof import('./src/components/ShipmentOrderDetail.vue')['default']
    SplitDiv: typeof import('./src/components/splitDiv/splitDiv.vue')['default']
    'Switch ': typeof import('./src/components/Form/Switch .vue')['default']
+    TableRightClickMenu: typeof import('./src/components/TableRightClickMenu.vue')['default']
    TableView: typeof import('./src/components/TableView.vue')['default']
    UploadExcel: typeof import('./src/components/UploadExcel.vue')['default']
    UploadImage: typeof import('./src/components/UploadImage.vue')['default']

--- a/src/views/order/podUs/components/updateAddress.vue
+++ b/src/views/order/podUs/components/updateAddress.vue
 <script setup lang="ts">
 import { defineModel } from 'vue'
-import { updateAddressApi,AddressInfo } from '@/api/podUsOrder.ts'
+import { updateAddressApi, AddressInfo } from '@/api/podUsOrder.ts'
 const emits = defineEmits(['success'])
 defineProps<{
  countryList: { countryCode: string }[]
@@ -24,10 +24,16 @@ const rules = {
  receiverName: [{ required: true, message: '请输入姓名', trigger: 'blur' }],
  receiverPhone: [{ required: true, message: '请输入电话', trigger: 'blur' }],
  receiverCountry: [{ required: true, message: '请输入国家', trigger: 'blur' }],
-  receiverProvince: [{ required: true, message: '请输入省/州', trigger: 'blur' }],
+  receiverProvince: [
+    { required: true, message: '请输入省/州', trigger: 'blur' },
+  ],
  receiverCity: [{ required: true, message: '请输入市', trigger: 'blur' }],
-  receiverAddress1: [{ required: true, message: '请输入地址1', trigger: 'blur' }],
+  receiverAddress1: [
-  receiverPostCode: [{ required: true, message: '请输入邮政编码', trigger: 'blur' }],
+    { required: true, message: '请输入地址1', trigger: 'blur' },
+  ],
+  receiverPostCode: [
+    { required: true, message: '请输入邮政编码', trigger: 'blur' },
+  ],
 }
 const submitForm = async () => {
@@ -36,12 +42,16 @@ const submitForm = async () => {
      await updateAddressApi(form.value as never)
      visible.value = false
      emits('success')
-      await ElMessageBox.alert('请修改/刷新地址后取消物流重新创建物流订单、获取跟踪号、获取打印面单。', '提示', {
+      await ElMessageBox.alert(
+        '请修改/刷新地址后取消物流重新创建物流订单、获取跟踪号、获取打印面单。',
+        '提示',
+        {
          type: 'warning',
-        confirmButtonText:'确定',
+          confirmButtonText: '确定',
-        cancelButtonText:'取消',
+          cancelButtonText: '取消',
          showCancelButton: true,
-      })
+        },
+      )
    }
  })
 }
@@ -56,45 +66,78 @@ const submitForm = async () => {
  >
    <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
      <el-form-item label="姓名" prop="receiverName">
-        <el-input v-model="form.receiverName" clearable placeholder="请输入姓名" />
+        <el-input
+          v-model="form.receiverName"
+          clearable
+          placeholder="请输入姓名"
+        />
      </el-form-item>
      <el-form-item label="电话" prop="receiverPhone">
-        <el-input v-model="form.receiverPhone" clearable placeholder="请输入电话" />
+        <el-input
+          v-model="form.receiverPhone"
+          clearable
+          placeholder="请输入电话"
+        />
      </el-form-item>
      <el-form-item label="国家" prop="receiverCountry">
        <el-select v-model="form.receiverCountry" clearable filterable>
          <el-option
-                  v-for="it in countryList" :key="it.countryCode" :label="it.countryCode"
+            v-for="it in countryList"
-                     :value="it.countryCode"></el-option>
+            :key="it.countryCode"
+            :label="it.countryCode"
+            :value="it.countryCode"
+          ></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="省/州" prop="receiverProvince">
-        <el-input v-model="form.receiverProvince" clearable placeholder="请输入省/州" />
+        <el-input
+          v-model="form.receiverProvince"
+          clearable
+          placeholder="请输入省/州"
+        />
      </el-form-item>
      <el-form-item label="市" prop="receiverCity">
-        <el-input v-model="form.receiverCity" clearable placeholder="请输入市" />
+        <el-input
+          v-model="form.receiverCity"
+          clearable
+          placeholder="请输入市"
+        />
      </el-form-item>
      <el-form-item label="区/县" prop="receiverDistrict">
-        <el-input v-model="form.receiverDistrict" clearable placeholder="请输入区/县" />
+        <el-input
+          v-model="form.receiverDistrict"
+          clearable
+          placeholder="请输入区/县"
+        />
      </el-form-item>
      <el-form-item label="地址1" prop="receiverAddress1">
-        <el-input v-model="form.receiverAddress1" clearable placeholder="请输入地址1" />
+        <el-input
+          v-model="form.receiverAddress1"
+          clearable
+          placeholder="请输入地址1"
+        />
      </el-form-item>
      <el-form-item label="地址2" prop="receiverAddress2">
-        <el-input v-model="form.receiverAddress2" clearable placeholder="请输入地址2" />
+        <el-input
+          v-model="form.receiverAddress2"
+          clearable
+          placeholder="请输入地址2"
+        />
      </el-form-item>
      <el-form-item label="邮政编码" prop="receiverPostCode">
-        <el-input v-model="form.receiverPostCode" clearable placeholder="请输入邮政编码" />
+        <el-input
+          v-model="form.receiverPostCode"
+          clearable
+          placeholder="请输入邮政编码"
+        />
      </el-form-item>
    </el-form>
    <template #footer>
-      <el-button @click="visible=false">取消</el-button>
+      <el-button @click="visible = false">取消</el-button>
      <el-button type="primary" @click="submitForm">提交</el-button>
    </template>
  </el-dialog>
 </template>
-<style scoped lang="scss">
+<style scoped lang="scss"></style>
-</style>