Merge branch 'master' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui

8 months ago · b50b1f31d3
7 changed files with 88 additions and 56 deletions
--- a/src/api/wms/customerdock/index.ts
+++ b/src/api/wms/customerdock/index.ts
@ -63,7 +63,7 @@ export const importTemplate = () => {
  return request.download({ url: '/wms/customerdock/get-import-template' })
 }

-// 查询客户月台列表
+// 查询客户月台发货口列表
 export const pageCustomerCodeToCustomerDock = async (params) => {
  if (params.isSearch) {
    delete params.isSearch
@ -73,3 +73,14 @@ export const pageCustomerCodeToCustomerDock = async (params) => {
    return await request.get({ url: `/wms/customerdock/pageCustomerCodeToCustomerDock`, params })
  }
 }
+
+// 查询客户月台收货口列表
+export const pageCustomerCodeToCustomerDockReceiving = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return request.post({ url: '/wms/customerdock/pageCustomerCodeToCustomerDockReceivingSenior', data })
+  } else {
+    return await request.get({ url: `/wms/customerdock/pageCustomerCodeToCustomerDockReceiving`, params })
+  }
+}
--- a/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
+++ b/src/views/wms/basicDataManage/customerManage/customerdock/customerdock.data.ts
@ -4,6 +4,9 @@ import { dateFormatter } from '@/utils/formatTime'
 import * as CustomerApi from '@/api/wms/customer'
 import { Customer } from '../customer/customer.data'

+import * as DockApi from '@/api/wms/dock'
+import { Dock } from '../../factoryModeling/dock/dock.data'
+
 import * as WarehouseApi from '@/api/wms/warehouse'
 import { Warehouse } from '../../factoryModeling/warehouse/warehouse.data'

@ -26,7 +29,50 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150,
      fixed: 'left'
    },
-    isSearch: true
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择月台代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '月台基础信息', // 查询弹窗标题
+        searchAllSchemas: Dock.allSchemas, // 查询弹窗所需类
+        searchPage: DockApi.getDockPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
+  },
+  {
+    label: '客户代码',
+    field: 'customerCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
+        searchField: 'code', // 查询弹窗赋值字段
+        searchTitle: '客户基础信息', // 查询弹窗标题
+        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
+        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
+        searchCondition: [{
+          key: 'available',
+          value: 'TRUE',
+          action: '==',
+          isSearch: true,
+          isMainValue: false
+        }]
+      }
+    }
  },
  {
    label: '名称',
@ -77,32 +123,6 @@ export const Customerdock = useCrudSchemas(reactive<CrudSchema[]>([
      width: 150
    },
  },
-  {
-    label: '客户代码',
-    field: 'customerCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '客户基础信息', // 查询弹窗标题
-        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
-        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
-        searchCondition: [{
-          key: 'available',
-          value: 'TRUE',
-          action: '==',
-          isSearch: true,
-          isMainValue: false
-        }]
-      }
-    }
-  },
  {
    label: '仓库',
    field: 'warehouseCode',
--- a/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
+++ b/src/views/wms/basicDataManage/customerManage/customeritem/index.vue
@ -183,7 +183,7 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
    const setV = {}
    if(formField == 'itemCode'){
      console.log(val);
-      setV['cusotmerUom'] = val[0]['uom']
+      setV['customerUom'] = val[0]['uom']
    }
    setV[formField] = val[0][searchField]
    formRef.setValues(setV)
--- a/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data.ts
@ -68,6 +68,10 @@ export const Supplieritem = useCrudSchemas(reactive<CrudSchema[]>([
          key: 'available',
          value: 'TRUE',
          isMainValue: false
+        },{
+          key: 'isPhantom', // 不能是虚拟件
+          value: 'FALSE',
+          isMainValue: false
        }]
      }
    }
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@ -61,12 +61,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
-    form: {
-      value: '1',
-      componentProps: {
-        disabled: true
-      }
-    },
+    isForm: false,
    isSearch: true,
  },
  {
@ -89,24 +84,14 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
          key: 'available',
          value: 'TRUE',
          isMainValue: false
+        },{
+          key: 'customerCode',
+          value: 'customerCode',
+          isMainValue: false
        }]
      }
    }
  },
-  {
-    label: '发货计划单号',
-    field: 'deliverPlanNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isSearch: true,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
  {
    label: '客户代码',
    field: 'customerCode',
@ -121,7 +106,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
        isSearchList: true, // 开启查询弹窗
        searchListPlaceholder: '请选择客户代码', // 输入框占位文本
        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '客户月台信息', // 查询弹窗标题
+        searchTitle: '客户信息', // 查询弹窗标题
        searchAllSchemas: Customer.allSchemas, // 查询弹窗所需类
        searchPage: CustomerApi.getCustomerPage, // 查询弹窗所需分页方法
        searchCondition: [{
@ -132,6 +117,20 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
      }
    }
  },
+  {
+    label: '发货计划单号',
+    field: 'deliverPlanNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
  {
    label: '客户月台代码',
    field: 'customerDockCode',
@ -147,7 +146,7 @@ export const CustomerreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
        searchField: 'code', // 查询弹窗赋值字段
        searchTitle: '客户月台信息', // 查询弹窗标题
        searchAllSchemas: Customerdock.allSchemas, // 查询弹窗所需类
-        searchPage: CustomerdockApi.getCustomerdockPage, // 查询弹窗所需分页方法
+        searchPage: CustomerdockApi.pageCustomerCodeToCustomerDockReceiving, // 查询弹窗所需分页方法
        searchCondition: [{
          key: 'available',
          value: 'TRUE',
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@ -125,6 +125,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
          }]
      }
    })
+
    console.log(128, customerCode.value)
    if (type == 'tableForm') {
      if(formField == 'packingNumber') {
@ -411,10 +412,8 @@ const handleDelete = async (id: number) => {
  try {
    // 删除的二次确认
    await message.delConfirm()
-    tableObject.loading = true
    // 发起删除
    await CustomerreturnRequestMainApi.deleteCustomerreturnRequestMain(id)
-    tableObject.loading = false
    message.success(t('common.delSuccess'))
    // 刷新列表
    await getList()
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@ -135,19 +135,18 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
    },
  },
  {
-    label: '从仓库代码',
+    label: '供应商发货仓库代码',
    field: 'fromWarehouseCode',
    sort: 'custom',
    table: {
      width: 150
    },
    form: {
-      value: 'T1',
      componentProps: {
        disbaled: true
      }
    },
-    isForm: false
+    isForm: true
  },
  {
    label: '到仓库代码',