Merge branch 'dev' of 47.122.114.111:qinjianhui/factory_front into wq

b5e9caca · wuqian · 15e919c3 · e1a021c3 · b5e9caca · b5e9caca
Commit b5e9caca authored Jun 07, 2025 by wuqian
11 changed files
--- a/components.d.ts
+++ b/components.d.ts
@@ -51,6 +51,7 @@ declare module 'vue' {
    ElTag: typeof import('element-plus/es')['ElTag']
    ElTooltip: typeof import('element-plus/es')['ElTooltip']
    ElTree: typeof import('element-plus/es')['ElTree']
+    ElUpload: typeof import('element-plus/es')['ElUpload']
    Icon: typeof import('./src/components/Icon.vue')['default']
    ImageView: typeof import('./src/components/ImageView.vue')['default']
    LogList: typeof import('./src/components/LogList.vue')['default']

--- a/src/api/logistics.ts
+++ b/src/api/logistics.ts
@@ -193,6 +193,12 @@ export function deleteAddressByIds(params: { ids: string }) {
    },
  )
 }
+//获取国家名称及代码
+export function getAllCountryApi() {
+  return axios.get<never, BaseRespData<never>>(
+    '/logisticsAddress/getAllCountry',
+  )
+}
 /**
 * @description 物流报价

--- a/src/api/podUsOrder.ts
+++ b/src/api/podUsOrder.ts
@@ -16,6 +16,7 @@ export interface LogisticsData {
  status: boolean
  logisticsWayCode: string // 物流编码
  partition: string // 所在分区
+  logisticsWayId?: number | null
 }
 export function getOrderTabData() {
  return axios.get<never, BaseRespData<Tab[]>>(
@@ -270,3 +271,29 @@ export function cancelLogisticsOrderApi(orderIds: (string | number)[]) {
    orderIds,
  )
 }
+// 更改物流
+export function changeLogisticsApi(params: {
+  updateByIdParam: {
+    id: string | number
+    dataVersion: number
+  }
+  logisticsTrialCalculation: LogisticsData
+}) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/changeLogistics',
+    params,
+  )
+}
+// 创建物流
+export function createLogisticsOrderApi(params: {
+  updateByIdParam: {
+    id: string | number
+    dataVersion: number
+  }
+  logisticsTrialCalculation: LogisticsData
+}) {
+  return axios.post<never, BaseRespData<never>>(
+    'factory/podJomallOrderUs/createLogisticsOrder',
+    params,
+  )
+}
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
-@import './common.scss';
+@use './common.scss';
-@import './element.scss';
+@use './element.scss';
\ No newline at end of file
--- a/src/types/api/podUsOrder.ts
+++ b/src/types/api/podUsOrder.ts
@@ -57,6 +57,8 @@ export interface PodUsOrderListData {
  version?: number
  productList?: ProductList[]
  orderNumber?: string
+  logisticsWayId?: number | null
+  logisticsWayName?: string
 }
 export interface ProductList {
  id: number

--- a/src/views/logistics/logisticsCompany.vue
+++ b/src/views/logistics/logisticsCompany.vue
@@ -292,12 +292,12 @@ getLogisticsList()
              <span>{{ item.description }}</span>
            </div>
          </LogDialog>
-          <el-dialog v-model="createData.show" :close-on-click-modal="false" width="700px" :title="createData.title">
+          <el-dialog v-model="createData.show" :close-on-click-modal="false" width="900px" :title="createData.title">
-            <el-form v-if="createData.show" ref="formRef" label-width="110px" :rules="rules" :model="form">
+            <el-form v-if="createData.show" ref="formRef" style="padding: 30px" label-width="110px" :rules="rules" :model="form" class="el-row">
-              <el-form-item label="物流公司编码" prop="code">
+              <el-form-item class="el-col-12" label="物流公司编码" prop="code">
                <el-select v-model="form.code" clearable filterable @change="codeChange">
                  <el-option
-                    v-for="it in logisticsList" :key="it.code" :label="it.basicsName"
+                    v-for="it in logisticsList" :key="it.code" :label="it.code"
                    :value="it.code">
                    {{ it.code }}
                    <span style="font-size: 14px; color: #999; line-height: 24px">
@@ -306,22 +306,22 @@ getLogisticsList()
                  </el-option>
                </el-select>
              </el-form-item>
-              <el-form-item label="名称" prop="name">
+              <el-form-item class="el-col-12" label="名称" prop="name">
                <el-input v-model="form.name" clearable placeholder="请输入名称"></el-input>
              </el-form-item>
-              <el-form-item label="联系人" prop="contact">
+              <el-form-item class="el-col-12" label="联系人" prop="contact">
                <el-input v-model="form.contact" clearable placeholder="请输入联系人"></el-input>
              </el-form-item>
-              <el-form-item label="电话/手机" prop="phone">
+              <el-form-item class="el-col-12" label="电话/手机" prop="phone">
                <el-input v-model="form.phone" clearable placeholder="请输入电话/手机"></el-input>
              </el-form-item>
-              <el-form-item label="网址" prop="siteUrl">
+              <el-form-item class="el-col-12" label="网址" prop="siteUrl">
                <el-input v-model="form.siteUrl" clearable placeholder="请输入网址"></el-input>
              </el-form-item>
-              <el-form-item label="地址" prop="address">
+              <el-form-item class="el-col-12" label="地址" prop="address">
                <el-input v-model="form.address" clearable placeholder="请输入地址"></el-input>
              </el-form-item>
-              <el-form-item v-for="o in otherFields" :key="o" required :label="o" :prop="`apiData.${o}`">
+              <el-form-item v-for="o in otherFields" :key="o" class="el-col-12" required :label="o" :prop="`apiData.${o}`">
                <el-input v-model="form.apiData[o]" clearable :placeholder="`请输入${o}`"></el-input>
              </el-form-item>
            </el-form>

--- a/src/views/logistics/shippingAddress.vue
+++ b/src/views/logistics/shippingAddress.vue
@@ -43,36 +43,11 @@
                  </el-tag>
                </div>
                <p
-                  :title="
+                  style="white-space: pre"
-                    [
+                  :title="getJosn(item)"
-                      item.countryName,
-                      // item.countryCode,
-                      item.stateProvince,
-                      // item.stateProvinceAbbr,
-                      item.district,
-                      // item.districtCode,
-                      item.city,
-                      // item.cityCode,
-                    ]
-                      .filter((el) => el != null && el !== '')
-                      .join(' ')
-                  "
                  class="address"
                >
-                  {{
+                  {{ getJosn(item) }}
-                    [
-                      item.countryName,
-                      // item.countryCode,
-                      item.stateProvince,
-                      // item.stateProvinceAbbr,
-                      item.district,
-                      // item.districtCode,
-                      item.city,
-                      // item.cityCode,
-                    ]
-                      .filter((el) => el != null && el !== '')
-                      .join(' ')
-                  }}
                </p>
                <p
                  :title="
@@ -187,6 +162,7 @@ import {
  updateAddress,
  getLogisticsLog,
  deleteAddressByIds,
+  getAllCountryApi,
 } from '@/api/logistics'
 import { IFormConfig } from '@/components/CustomizeForm.tsx'
@@ -196,7 +172,7 @@ import CustomizeForm from '@/components/CustomizeForm.tsx'
 import { Edit, Delete, List } from '@element-plus/icons-vue'
 import { debounce } from 'lodash-es'
-import { ShippingAddressObj } from './types/shippingAddress.ts'
+import { ShippingAddressObj, ICountryObj } from './types/shippingAddress.ts'
 import usePageList from '@/utils/hooks/usePageList'
 import { useValue } from './hooks/useValue'
 import { showConfirm } from '@/utils/ui'
@@ -205,6 +181,7 @@ const [editForm, resetEditForm] = useValue<ShippingAddressObj>({
  swDefault: false,
 })
 const {
+  loading,
  currentPage,
  pageSize,
  total,
@@ -225,8 +202,9 @@ const {
 const dialogVisible = ref(false)
 const logDialogVisible = ref(false)
 const editFormRef = ref<InstanceType<typeof CustomizeForm> | null>(null)
+const countryList = ref([])
-const formConfig = ref<IFormConfig[]>([
+const formConfig = computed<IFormConfig[]>(() => [
  {
    prop: 'shipperName',
    type: 'input',
@@ -265,88 +243,103 @@ const formConfig = ref<IFormConfig[]>([
    },
  },
  {
-    prop: 'city',
+    prop: 'countryCode',
-    type: 'input',
+    type: 'select',
-    label: '城市',
+    label: '国家代码',
    attrs: {
-      // options: [],
+      options: countryList.value,
-      placeholder: '请输入城市',
+      label: 'countryCode',
+      value: 'countryCode',
+      filterable: true,
+      placeholder: '请选择国家代码',
+      onChange: (val: ICountryObj) => {
+        editForm.value.countryName = val.nameCn
+      },
    },
-    rules: [{ required: true, message: '请输入城市' }],
+    rules: [{ required: true, message: '请选择国家代码' }],
  },
  {
-    prop: 'cityCode',
+    prop: 'countryName',
-    type: 'input',
+    type: 'select',
-    label: '城市编码',
+    label: '国家名称',
    attrs: {
-      // options: [],
+      options: countryList.value,
-      placeholder: '请输入城市编码',
+      label: 'nameCn',
+      value: 'nameCn',
+      filterable: true,
+      placeholder: '请选择国家名称',
+      onChange: (val: ICountryObj) => {
+        editForm.value.countryCode = val.countryCode
+      },
    },
+    rules: [{ required: true, message: '请选择国家名称' }],
  },
  {
-    prop: 'district',
+    prop: 'stateProvince',
    type: 'input',
-    label: '区',
+    label: '州/省',
    attrs: {
      // options: [],
-      placeholder: '请选择区',
+      placeholder: '请输入州/省',
    },
  },
  {
-    prop: 'districtCode',
+    prop: 'stateProvinceAbbr',
    type: 'input',
-    label: '区编码',
+    label: '州/省简称',
    attrs: {
      // options: [],
-      placeholder: '请选择区',
+      placeholder: '请输入州/省简称',
    },
  },
  {
-    prop: 'postalCode',
+    prop: 'cityCode',
    type: 'input',
-    label: '邮编',
+    label: '城市编码',
    attrs: {
-      placeholder: '请输入邮编',
+      // options: [],
+      placeholder: '请输入城市编码',
    },
  },
  {
-    prop: 'stateProvince',
+    prop: 'city',
    type: 'input',
-    label: '州/省',
+    label: '城市',
    attrs: {
      // options: [],
-      placeholder: '请输入州/省',
+      placeholder: '请输入城市',
    },
+    rules: [{ required: true, message: '请输入城市' }],
  },
  {
-    prop: 'stateProvinceAbbr',
+    prop: 'districtCode',
    type: 'input',
-    label: '州/省简称',
+    label: '区编码',
    attrs: {
      // options: [],
-      placeholder: '请输入州/省简称',
+      placeholder: '请选择区',
    },
  },
  {
-    prop: 'countryName',
+    prop: 'district',
    type: 'input',
-    label: '国家名称',
+    label: '区',
    attrs: {
      // options: [],
-      placeholder: '请输入国家名称',
+      placeholder: '请选择区',
    },
-    rules: [{ required: true, message: '请输入国家名称' }],
  },
  {
-    prop: 'countryCode',
+    prop: 'postalCode',
    type: 'input',
-    label: '国家代码',
+    label: '邮编',
    attrs: {
-      // options: [],
+      placeholder: '请输入邮编',
-      placeholder: '请输入国家代码',
    },
+    rules: [{ required: true, message: '请输入邮编' }],
  },
  {
    prop: 'phoneNumber',
@@ -364,7 +357,36 @@ const formConfig = ref<IFormConfig[]>([
  },
 ])
-const loading = ref(false)
+async function getCountryList() {
+  try {
+    const { data } = await getAllCountryApi()
+    countryList.value = data
+    console.log(372, countryList.value)
+  } catch (error) {
+    console.log(error)
+  }
+}
+function getJosn(item: ShippingAddressObj) {
+  return [
+    [item.countryName, item.countryCode],
+    [item.stateProvince, item.stateProvinceAbbr],
+    [item.district, item.districtCode],
+    [item.city, item.cityCode],
+  ]
+    .map(([value, code]) => {
+      if (value && code) return `${value} (${code})`
+      if (value) return value
+      if (code) return code // 当 value 不存在但 code 存在时，不使用括号
+      return null
+    })
+    .filter(Boolean)
+    .join(`   `) // 使用三个空格作为分隔符增大间距
+}
+onMounted(() => {
+  getCountryList()
+})
 /**
 * @description: 取消按钮

--- a/src/views/logistics/types/shippingAddress.ts
+++ b/src/views/logistics/types/shippingAddress.ts
@@ -22,3 +22,13 @@ export interface ShippingAddressObj {
  updateTime?: string
  checked?: boolean
 }
+export interface ICountryObj {
+  aeCountryCode: string
+  continentCode: string
+  countryCode: string
+  id: number
+  nameCn: string
+  nameEn: string
+  needProviceAbbr: number
+}
--- a/src/views/order/podUs/PodMakeOrder.vue
+++ b/src/views/order/podUs/PodMakeOrder.vue
@@ -11,7 +11,7 @@
    @opened="handleOpened"
    @close="onClose"
  >
-    <template #title>
+    <template #header>
      <div class="title">
        <span>POD打单</span>
        <span v-if="socketConnect === 'online'" class="online">[在线]</span>
@@ -300,7 +300,6 @@ const boxChange = ref<boolean>(false)
 const boxIndex = ref<number | null>(null)
 const orderStore = useOrderStore()
 const isLock = ref<boolean>(false)
-const renderLock = ref<boolean>(false)
 const productionOrderRef = ref()
 const socketConnect = computed(() => orderStore.socketConnect)
 const podBoxList = computed(() => orderStore.podBoxList)
@@ -372,6 +371,9 @@ watch(
  { deep: true },
 )
 const podBoxIndex = computed(() => orderStore.podBoxIndex)
+let renderLock = false
 const renderItemBox = (bool: boolean) => {
  if (
    !podBoxList.value ||
@@ -380,13 +382,13 @@ const renderItemBox = (bool: boolean) => {
    (bool && boxIndex.value !== podBoxIndex.value)
  )
    return
-  if (renderLock.value) return
+  if (renderLock) return
-  renderLock.value = true
+  renderLock = true
  let boxItem = podBoxList.value.find((item) => item.box === boxIndex.value)
  if (!boxItem) boxItem = { data: { productList: [] } }
  const { data } = boxItem
  if (!data) {
-    renderLock.value = false
+    renderLock = false
    currentCode = ''
    podOrderDetailsData.value = {}
    return
@@ -416,9 +418,12 @@ const renderItemBox = (bool: boolean) => {
  }
  podOrderDetailsData.value = data
  if (productList.every((item) => item.power)) {
-    print(data)
+    print(data, false, () => {
+      renderLock = false
+    })
+  } else {
+    renderLock = false
  }
-  renderLock.value = false
 }
 const messageChange = (data: WebSocketMessage) => {
  if (!data) return
@@ -443,7 +448,7 @@ const setPodBoxList = (data: WebSocketMessage) => {
  const obj = data.txt
  if (obj && typeof obj === 'string') {
    const parsedData = JSON.parse(obj)
-    useOrderStore().setPodBoxList(parsedData)
+    orderStore.setPodBoxList(parsedData)
  }
 }
 const initPrintDevice = () => {
@@ -511,6 +516,8 @@ const userStore = useUserStore()
 const getPackingData = async (code: string) => {
  const loading = ElLoading.service({
    fullscreen: true,
+    text: '加载中...',
+    background: 'rgba(0, 0, 0, 0.3)',
  })
  currentCode = code
  try {
@@ -587,6 +594,8 @@ const initOrderDetailBox = async () => {
  }
  const loading = ElLoading.service({
    fullscreen: true,
+    text: '加载中...',
+    background: 'rgba(0, 0, 0, 0.3)',
  })
  try {
    const res = await getPodBoxListApi(factoryNo, warehouseId.value)
@@ -657,7 +666,7 @@ const initOrderDetailBox = async () => {
      })
    }
-    renderLock.value = false
+    renderLock = false
    productionOrder.value = ''
    isLock.value = false
    productionOrderRef.value.focus()
@@ -792,12 +801,16 @@ const handlePrinterChange = (value: string) => {
  emit('set-printer', value)
 }
-const print = (data: OrderData, forcePrint = false) => {
+const print = (data: OrderData, forcePrint = false, callback?: () => void) => {
  const _boxIndex = boxIndex.value
-  if (!forcePrint && data.printResult) return
+  if (!forcePrint && data.printResult) {
+    callback && callback()
+    return
+  }
  props.printOrder(data, (status: boolean) => {
+    callback && callback()
    const item = podBoxList.value?.find((item) => item.box === _boxIndex)
    if (item && item.data) {
      if (status) {

--- a/src/views/order/podUs/index.vue
+++ b/src/views/order/podUs/index.vue
--- a/src/views/system/UserPage.vue
+++ b/src/views/system/UserPage.vue
@@ -119,6 +119,14 @@
              >
                <Edit />
              </el-icon>
+              <el-icon
+                size="24"
+                title="重置密码"
+                color="#67C23A"
+                style="cursor: pointer; vertical-align: middle"
+                @click.stop="resetPwd(scope.row)"
+                ><RefreshLeft
+              /></el-icon>
            </template>
          </ElTableColumn>
        </ElTable>
@@ -202,13 +210,14 @@ import {
  deleteUserApi,
  getDetailsByIdApi,
  changeUserStatusApi,
+  resetPasswordApi,
 } from '@/api/auth'
 import Icon from '@/components/Icon.vue'
 import { UserEditForm, userData, userSearchForm } from '@/types/api/user'
 import usePageList from '@/utils/hooks/usePageList'
 import { useValue } from '@/utils/hooks/useValue'
 import { showConfirm } from '@/utils/ui'
-import { Edit } from '@element-plus/icons-vue'
+import { Edit, RefreshLeft } from '@element-plus/icons-vue'
 import type { FormRules } from 'element-plus'
 import { reactive, ref } from 'vue'
 const [searchForm, resetSearchForm] = useValue<userSearchForm>({})
@@ -347,6 +356,27 @@ const onChangeStatus = async (value: number, item: userData) => {
    //showError(e)
  }
 }
+const resetPwd = async (row: userData) => {
+  try {
+    await showConfirm(`确认要重置用户${row.account}的密码?`, {
+      confirmButtonText: '确认',
+      cancelButtonText: '取消',
+      type: 'warning',
+    })
+  } catch {
+    return
+  }
+  try {
+    const res = await resetPasswordApi(row.id)
+    await ElMessageBox.alert('重置成功\n\r 新密码为：' + res.data.passWord, {
+      confirmButtonText: '确定',
+      type: 'warning',
+    })
+    search()
+  } catch (e) {
+    search()
+  }
+}
 </script>
 <style lang="scss" scoped>