Merge branch 'dev' into 'master'

Dev

See merge request !105

src/api/podUsOrder.ts

@@ -85,6 +85,23 @@ export function getCardOrderList(
     },
     },
   )
   )
 }
 }
+
+export function uploadPRNFile(
+  id: number,
+  data: FormData,
+) {
+  return axios.post<never, BaseRespData<string>>(
+    `/factory/podBatchDownload/uploadPRNFile?id=${id}`,
+    data
+  )
+}
+export function updatePRNDownloadStatus(
+  id: number
+) {
+  return axios.get<never, BaseRespData<string>>(
+    `/factory/podBatchDownload/updatePRNDownloadStatus?id=${id}`
+  )
+}
 export function confirmOrderApi(
 export function confirmOrderApi(
   data: number[],
   data: number[],
   productionClient: string,
   productionClient: string,

src/api/supplier/supplierManagement.ts

+import { BasePaginationData, BaseRespData } from '@/types/api'
+import axios from './../axios'
+import {
+  IListPage,
+  IsupplierType,
+} from '@/views/supply/supplierManagement/types/index'
+
+//供应商分页查询
+export function getSupplierListApi(params: IListPage) {
+  return axios.get<never, BasePaginationData<never>>(
+    '/factory/supplier/list_page',
+    { params },
+  )
+}
+
+// 删除供应商
+export function deleteSupplierApi(params: { ids: string }) {
+  return axios.get<never, BaseRespData<never>>('/factory/supplier/delete', {
+    params,
+  })
+}
+
+// 编辑回显接口
+export function getSupplierDetailApi(id: string | number) {
+  return axios.get<never, BaseRespData<never>>('factory/supplier/get', {
+    params: { id },
+  })
+}
+
+// 根据分类id获取属性信息
+export function getPropertyByCateIdApi(cateId: string | number) {
+  return axios.get<never, BaseRespData<never>>(
+    '/factory/supplier/getPropertyByCateId',
+    {
+      params: { cateId },
+    },
+  )
+}
+// 根据spu获取商品信息
+export function getProductInfoBySpuApi(spu: string | number) {
+  return axios.get<never, BaseRespData<never>>(
+    '/factory/supplier/getProductInfoBySpu',
+    {
+      params: { spu },
+    },
+  )
+}
+// 获取币种接口
+export function getBaseCurrencyInfoApi() {
+  return axios.get<never, BaseRespData<never>>(
+    'factory/supplier/getBaseCurrencyInfo',
+  )
+}
+//新增
+export function addSupplierApi(params: IsupplierType) {
+  return axios.post<never, BaseRespData<never>>('/factory/supplier/add', params)
+}
+//修改
+export function updateSupplierApi(params: IsupplierType) {
+  return axios.post<never, BaseRespData<never>>(
+    '/factory/supplier/update',
+    params,
+  )
+}

src/components/CustomizeForm.tsx

@@ -16,7 +16,7 @@ type SimpleFormData = Record<string, unknown>
 // 定义表单项配置接口
 // 定义表单项配置接口
 export interface IFormConfig {
 export interface IFormConfig {
   fixed?: string
   fixed?: string
-  title?: string
+  title?: string | boolean
   prop?: string
   prop?: string
   label?: string
   label?: string
   type?: string
   type?: string
@@ -190,17 +190,19 @@ export default defineComponent({
                 flexWrap: 'wrap',
                 flexWrap: 'wrap',
               }}
               }}
             >
             >
-              <div
-                style={{
-                  width: '100%',
-                  textAlign: 'center',
-                  fontWeight: 700,
-                  marginBottom: '20px',
-                  fontSize: '16px',
-                }}
-              >
-                {item.title}
-              </div>
+              {typeof item.title === 'string' && item.title !== '' && (
+                <div
+                  style={{
+                    width: '100%',
+                    textAlign: 'center',
+                    fontWeight: 700,
+                    marginBottom: '20px',
+                    fontSize: '16px',
+                  }}
+                >
+                  {item.title}
+                </div>
+              )}
               {item.render && item.render(item, this.formData)}
               {item.render && item.render(item, this.formData)}
             </div>
             </div>
           ) : (
           ) : (

src/components/VxeTable.tsx

@@ -110,6 +110,13 @@ export default defineComponent({
         emit('getCheckboxRecords', selectRecords)
         emit('getCheckboxRecords', selectRecords)
       }
       }
     }
     }
+    //获取设置多选框
+    const setCheckboxRow = (row: TableRowData, checked: boolean) => {
+      const $table = tableRef.value
+      if ($table) {
+        $table.setCheckboxRow(row, checked)
+      }
+    }
     //设置高亮行
     //设置高亮行
     const selectRowEvent = (row: TableRowData) => {
     const selectRowEvent = (row: TableRowData) => {
       const $table = tableRef.value
       const $table = tableRef.value
@@ -129,6 +136,7 @@ export default defineComponent({
       editConfig,
       editConfig,
       getSelectEvent,
       getSelectEvent,
       selectRowEvent,
       selectRowEvent,
+      setCheckboxRow,
       attrs,
       attrs,
     }
     }
   },
   },

src/router/index.ts

@@ -131,7 +131,7 @@ const router = createRouter({
           meta: {
           meta: {
             title: '下载生产客户端',
             title: '下载生产客户端',
           },
           },
-          component: () => { },
+          component: () => {},
           beforeEnter() {
           beforeEnter() {
             // 假设你的下载链接是这个
             // 假设你的下载链接是这个
             const downloadLink = '/exeFiles/JomallProductionAssistantSetup.exe'
             const downloadLink = '/exeFiles/JomallProductionAssistantSetup.exe'
@@ -317,6 +317,15 @@ const router = createRouter({
           name: 'MyDownloads',
           name: 'MyDownloads',
           component: () => import('@/views/MyDownloads.vue'),
           component: () => import('@/views/MyDownloads.vue'),
         },
         },
+        {
+          path: '/supply/supplierManagement',
+          meta: {
+            title: '供应商管理',
+          },
+          name: 'supplierManagement',
+          component: () =>
+            import('@/views//supply/supplierManagement/index.vue'),
+        },
       ],
       ],
     },
     },
     // 登录
     // 登录

src/router/menu.ts

@@ -150,6 +150,18 @@ const menu: MenuItem[] = [
   },
   },
 
 
   {
   {
+    index: '12',
+    id: 4,
+    label: '供应',
+    children: [
+      {
+        index: '/supply/supplierManagement',
+        id: 1,
+        label: '供应商管理',
+      },
+    ],
+  },
+  {
     index: '11',
     index: '11',
     id: 3,
     id: 3,
     label: '对账单',
     label: '对账单',

src/types/api/podUsOrder.ts

@@ -48,8 +48,11 @@ export interface SearchForm {
 export interface PodUsOrderListData {
 export interface PodUsOrderListData {
   id: number
   id: number
   thirdOrderNumber?: string
   thirdOrderNumber?: string
+  prnUrl?: string
   factoryOrderNumber?: string
   factoryOrderNumber?: string
+  prnDownloadStatus?: boolean
   shopNumber?: string
   shopNumber?: string
+  isUpload?: boolean
   factoryOnlineId?: number | null
   factoryOnlineId?: number | null
   factoryNo?: number | null
   factoryNo?: number | null
   factoryCode?: string | null
   factoryCode?: string | null

src/views/order/podCN/index.vue

@@ -997,7 +997,8 @@
                     style="display: flex; flex-direction: column"
                     style="display: flex; flex-direction: column"
                   >
                   >
                     <div
                     <div
-                      v-for="img in item.productMark !== 'normal'
+                      v-for="img in item.productMark !== 'normal' &&
+                      item.productMark !== 'custom_normal'
                         ? item.previewImgs
                         ? item.previewImgs
                         : [{ url: item.variantImage }]"
                         : [{ url: item.variantImage }]"
                       :key="img"
                       :key="img"

src/views/supply/supplierManagement/components/dialog.tsx

+import { defineComponent, ref } from 'vue'
+import { ElDialog } from 'element-plus'
+
+export default defineComponent({
+  name: 'CustomizeForm',
+  props: {
+    modelValue: {
+      type: Boolean,
+      default: false,
+    },
+
+    title: {
+      type: String,
+      default: '',
+    },
+    dialogWidth: {
+      type: String,
+      default: '600px',
+    },
+  },
+  emits: ['update:modelValue', 'close'],
+  setup(props, { emit, attrs, slots }) {
+    const formRef = ref<InstanceType<typeof ElDialog> | null>(null)
+    const isShow = ref(false)
+    watch(
+      () => props.modelValue,
+      (val) => {
+        isShow.value = val
+      },
+      { immediate: true },
+    )
+
+    return () => {
+      return (
+        <div>
+          <ElDialog
+            ref={formRef}
+            v-model={isShow.value}
+            title={props.title}
+            width={props.dialogWidth}
+            onClose={() => {
+              emit('close')
+            }}
+            destroy-on-close={true}
+            close-on-click-modal={false}
+            {...attrs}
+          >
+            <div class="dialog-form">
+              {slots.default?.()}
+              {slots.footer?.()}
+            </div>
+          </ElDialog>
+        </div>
+      )
+    }
+  },
+})

src/views/supply/supplierManagement/types/index.ts

+export interface IListPage {
+  pageSize: number | string
+  currentPage: number | string
+}
+export interface IgoodsType {
+  imgUrl?: string
+  productImage?: string
+  sku?: string
+  productSpu?: string
+  productNo?: string
+  id?: string
+  productId?: string
+  categoryId?: string
+  currencyCode?: string
+  currencyName?: string
+  name?: string
+  productName?: string
+  createTime?: string
+  updateTime?: string
+  customProductItemList?: Iprice[]
+  supplierPriceItemList?: Iprice[]
+  customProductInfo?: IgoodsType
+  propertyList?: []
+  supplyPriceRange?: string
+}
+export interface IsupplierType {
+  supplierName?: string
+  contacts?: string
+  contactsNumber?: string
+  address?: string
+  id?: string
+  supplierProductInfoList?: IgoodsType[]
+  remark?: string
+}
+export interface IcurrencyCode {
+  currencyName?: string
+  currencyCode?: string
+  id?: string
+}
+
+export interface IcolorType {
+  bgColor?: string
+  code?: string
+  fontColor?: string
+  cnname?: string
+  enname?: string
+
+  id?: string | number
+}
+export interface IsizeType {
+  code?: string
+  cnname?: string
+  id?: string | number
+}
+export interface IPropertyResponseItem {
+  id: string | number
+  valueList: IcolorType[] | IsizeType[]
+}
+
+export interface Iprice {
+  productItemSku?: string
+  productItemImage?: string
+  sku?: string
+  id?: string
+  image?: string
+  supplyPrice?: string | number
+  propertyCode1?: string
+  propertyCode2?: string
+  productItemId?: string
+}
+export interface IListPage {
+  pageSize: number | string
+  currentPage: number | string
+}