Merge branch 'dev' of http://47.122.114.111:9999/qinjianhui/factory_front into dev

components.d.ts

@@ -32,6 +32,7 @@ declare module 'vue' {
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']

src/components/NavMenu.vue

@@ -35,6 +35,9 @@
         </template>
       </el-menu>
       <div v-if="userInfo" class="user-info">
+        <span class="user-avatar" style="color: #fff; font-size: 14px">
+          工厂： {{ userInfo.factoryCode }}
+        </span>
         <span class="user-avatar">
           <el-icon><User /></el-icon>
         </span>
@@ -530,4 +533,8 @@ onUnmounted(() => {
     border: none !important;
   }
 }
+.user-info {
+  display: flex;
+  align-items: center;
+}
 </style>

src/types/api/podUsOrder.ts

@@ -86,6 +86,8 @@ export interface ProductList {
   templatePrice?: number
   variantImage?: string
   craftPrice?: number
+  craftCode: string
+  platform: string
   imageAry?: string
   designImages?: string
   categoryId?: number

src/views/logistics/components/LogisticsWaySelect.tsx

@@ -21,6 +21,7 @@ const styles = {
     display: 'flex',
     padding: '10px',
     justifyContent: 'flex-start',
+    flexWrap: 'wrap',
     backgroundColor: '#efefef',
   },
 } as const

src/views/logistics/logisticsMethod.vue

@@ -42,7 +42,7 @@
       v-model="editForm"
       :config="formConfig"
       form-item-width="100%"
-      labelWidth="125"
+      labelWidth="110"
     >
     </CustomizeForm>
 
@@ -98,9 +98,9 @@ import { IFormConfig } from '@/components/CustomizeForm.tsx'
 import usePageList from '@/utils/hooks/usePageList'
 import { useValue } from './hooks/useValue'
 import { showConfirm } from '@/utils/ui'
-import { Edit, Delete, List } from '@element-plus/icons-vue'
+import { Edit, Delete, List, WarningFilled } from '@element-plus/icons-vue'
 import { debounce } from 'lodash-es'
-
+import UPARCELImage from '@/assets/images/UPARCEL物流编码.png'
 const [searchForm] = useValue({})
 const [editForm, resetEditForm] = useValue<LogisticsMethod>({
   platformList: [{ platform: '', logisticsName: '', showPlatform: [] }],
@@ -131,6 +131,13 @@ const dialogVisible = ref(false)
 const logDialogVisible = ref(false)
 const editFormRef = ref<InstanceType<typeof CustomizeForm> | null>(null)
 const selection = ref([])
+
+interface ImageList {
+  [key: string]: string
+}
+const imgeList = ref<ImageList>({
+  UPARCEL: UPARCELImage,
+})
 const searchConfig = ref<ISeachFormConfig[]>([
   {
     prop: 'name',
@@ -173,41 +180,6 @@ const logisticsCompanyList = ref([])
 const formConfig = computed<IFormConfig[]>(() => [
   { title: '物流基础信息' },
   {
-    prop: 'name',
-    type: 'input',
-    label: '物流名称',
-    attrs: {
-      placeholder: '请输入物流名称',
-    },
-    rules: [
-      {
-        required: true,
-        message: '请输入物流名称',
-      },
-    ],
-  },
-  {
-    prop: 'warehouseId',
-    type: 'select',
-    label: '仓库名称',
-    attrs: {
-      placeholder: '请选择仓库名称',
-      label: 'name',
-      value: 'id',
-      options: [...(warehouseList.value || [])],
-      onChange: (value: { name: string; id: string | number }) => {
-        editForm.value.warehouseName = value.name
-      },
-    },
-    rules: [
-      {
-        required: true,
-        message: '请选择仓库名称',
-      },
-    ],
-  },
-
-  {
     prop: 'companyId',
     type: 'select',
     label: '物流公司',
@@ -282,15 +254,51 @@ const formConfig = computed<IFormConfig[]>(() => [
       },
     ],
   },
-
   {
     prop: 'serviceCode',
-    type: 'input',
+
     label: '物流编码',
     fixed: 'last',
-    attrs: {
-      placeholder: '请输入物流编码',
+    render: () => {
+      const company = editForm.value.company
+      return (
+        <div style="display: flex; width:100%;height: 100%">
+          <el-input
+            v-model={editForm.value.serviceCode}
+            placeholder="请输入物流编码"
+          />
+          <el-popover
+            placement="bottom-end"
+            width={1050}
+            v-slots={{
+              default: () => (
+                <div style="width: 100%; height: 100%;">
+                  <div style="font-size: 20px; font-weight: bold;margin-bottom: 10px;">
+                    {company ? `${company}物流编码来源图:` : '请先选择物流公司'}
+                  </div>
+                  {company && imgeList.value[company] && (
+                    <img
+                      src={imgeList.value[company]}
+                      style={{ width: '100%' }}
+                      alt={`${company}物流编码图`}
+                    />
+                  )}
+                </div>
+              ),
+              reference: () => (
+                <el-icon
+                  style={{ marginLeft: '10px', height: '100%' }}
+                  size={25}
+                >
+                  <WarningFilled />
+                </el-icon>
+              ),
+            }}
+          ></el-popover>
+        </div>
+      )
     },
+
     rules: [
       {
         required: true,
@@ -299,6 +307,31 @@ const formConfig = computed<IFormConfig[]>(() => [
     ],
   },
   {
+    prop: 'name',
+    type: 'input',
+    label: '物流名称',
+    fixed: 'last',
+    attrs: {
+      placeholder: '请输入物流名称',
+    },
+    rules: [
+      {
+        required: true,
+        message: '请输入物流名称',
+      },
+    ],
+  },
+  {
+    prop: 'warehouseId',
+    type: 'input',
+    label: '仓库名称',
+    fixed: 'last',
+    attrs: {
+      placeholder: '请输入仓库名称',
+    },
+  },
+
+  {
     prop: 'siteUrl',
     type: 'input',
     label: '查询网址',
@@ -376,7 +409,7 @@ const formConfig = computed<IFormConfig[]>(() => [
                 placeholder="请输入物流名称"
               />
             </el-form-item>
-            <div style="display: flex;flex:20%">
+            <div style="display: flex;flex:17%">
               {(formData?.platformList as platformObj[])?.length - 1 ===
                 index && (
                 <el-button