导出api筛选导出方法补充，

7 months ago · 0afa8fda6c
9 changed files with 206 additions and 17 deletions
--- a/src/api/wms/productputawayRecordMain/index.ts
+++ b/src/api/wms/productputawayRecordMain/index.ts
@ -61,7 +61,13 @@ export const deleteProductputawayRecordMain = async (id: number) => {

 // 导出制品上架记录主 Excel
 export const exportProductputawayRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productputaway-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productputaway-record-main/export-excel`, params })
+  }
 }

 // 下载用户导入模板
--- a/src/api/wms/productreceiptRecordMain/index.ts
+++ b/src/api/wms/productreceiptRecordMain/index.ts
@ -60,7 +60,13 @@ export const deleteProductreceiptRecordMain = async (id: number) => {

 // 导出制品收货记录主 Excel
 export const exportProductreceiptRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productreceipt-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productreceipt-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productreceipt-record-main/export-excel`, params })
+  }
 }

 // 下载用户导入模板
--- a/src/api/wms/productrepairRecordMain/index.ts
+++ b/src/api/wms/productrepairRecordMain/index.ts
@ -58,7 +58,13 @@ export const deleteProductrepairRecordMain = async (id: number) => {

 // 导出制品返修记录主 Excel
 export const exportProductrepairRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productrepair-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productrepair-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productrepair-record-main/export-excel`, params })
+  }
 }

 // 下载用户导入模板
--- a/src/api/wms/productscrapRecordMain/index.ts
+++ b/src/api/wms/productscrapRecordMain/index.ts
@ -57,7 +57,13 @@ export const deleteProductscrapRecordMain = async (id: number) => {

 // 导出制品报废记录主 Excel
 export const exportProductscrapRecordMain = async (params) => {
-  return await request.download({ url: `/wms/productscrap-record-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productscrap-record-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productscrap-record-main/export-excel`, params })
+  }
 }

 // 下载用户导入模板
--- a/src/api/wms/productscrapRequestMain/index.ts
+++ b/src/api/wms/productscrapRequestMain/index.ts
@ -54,7 +54,13 @@ export const deleteProductscrapRequestMain = async (id: number) => {

 // 导出制品报废申请主 Excel
 export const exportProductscrapRequestMain = async (params) => {
-  return await request.download({ url: `/wms/productscrap-request-main/export-excel`, params })
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/productscrap-request-main/export-excel-senior', data })
+  } else {
+    return await request.download({ url: `/wms/productscrap-request-main/export-excel`, params })
+  }
 }

 // 下载用户导入模板
--- a/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
+++ b/src/views/wms/basicDataManage/factoryModeling/workstation/index.vue
@ -210,10 +210,11 @@ const formsSuccess = async (formType,data) => {
 Workstation.allSchemas.tableFormColumns.map(item => {
  if(item.field == 'rawLocationCode') {
      item.form.componentProps.searchCondition = [
+      // {
+      //   key: 'areaType',
+      //   value: 'RAW',
+      // },
      {
-        key: 'areaType',
-        value: 'RAW',
-      },{
          key: 'available',
          value: 'TRUE',
        }
@ -221,10 +222,11 @@ Workstation.allSchemas.tableFormColumns.map(item => {
    }
    if(item.field == 'fgLocationCode') {
      item.form.componentProps.searchCondition = [
+      // {
+      //   key: 'areaType',
+      //   value: 'FG',
+      // },
      {
-        key: 'areaType',
-        value: 'FG',
-      },{
          key: 'available',
          value: 'TRUE',
        }
--- a/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/index.vue
@ -27,10 +27,11 @@
      v-model:currentPage="tableObject.currentPage"
      v-model:sort="tableObject.sort"
    >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #itemCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.itemCode)">
+          <span>{{ row.itemCode }}</span>
        </el-button>
+        
      </template>
      <template #action="{ row }">
        <ButtonBase :Butttondata="butttondata" @button-base-click="buttonTableClick($event,row)" />
--- a/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itemarea/itemarea.data.ts
@ -318,6 +318,162 @@ export const Itemarea = useCrudSchemas(reactive<CrudSchema[]>([
      }
    },
  },
+  {
+    label: '出库后剩余库存自动转换为出库包装规格',
+    field: 'surplusToOutpackunit',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '超过高储是否允许叫料',
+    field: 'allowIssueRequest',
+    sort: 'custom',
+    isSearch: true,
+  },
+  {
+    label: '优先空库位',
+    field: 'emptyLocationFirst',
+    sort: 'custom',
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '优先非空库位',
+    field: 'notEmptyLocationFirst',
+    sort: 'custom',
+    form: {
+      component: 'Switch',
+      value: 'FALSE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可以混批次',
+    field: 'enableMixLot',
+    sort: 'custom',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可以混物品',
+    field: 'enableMixItem',
+    sort: 'custom',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '可以混状态',
+    field: 'enableMixStatus',
+    sort: 'custom',
+    form: {
+      component: 'Switch',
+      value: 'TRUE',
+      componentProps: {
+        inactiveValue: 'FALSE',
+        activeValue: 'TRUE'
+      }
+    },
+  },
+  {
+    label: '巷道排序方向',
+    field: 'aisleOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '货架排序方向',
+    field: 'sheIfOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '行排序方向',
+    field: 'rowOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '列排序方向',
+    field: 'columOrder',
+    sort: 'custom',
+    dictType: DICT_TYPE.BATCH_DIRECTION,
+    dictClass: 'string',
+    // colorType: 'danger',
+    isTable: true,
+    form: {
+      component: 'Select',
+      value: 'ASC',
+      componentProps: {
+        inactiveValue: 'DESC',
+        activeValue: 'ASC'
+      }
+    },
+    table: {
+      width: 150
+    },
+  },
  {
    label: '生效时间',
    field: 'activeTime',
--- a/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
+++ b/src/views/wms/basicDataManage/itemManage/itemwarehouse/index.vue
@ -27,9 +27,9 @@
      v-model:currentPage="tableObject.currentPage"
      v-model:sort="tableObject.sort"
    >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #itemCode="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.itemCode)">
+          <span>{{ row.itemCode }}</span>
        </el-button>
      </template>
      <template #action="{ row }">