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

src/api/wms/inventorymoveRecordDetail/index.ts

@@ -45,6 +45,16 @@ export const getInventorymoveRecordDetailPage = async (params) => {
   }
 }
 
+// 查询库存转移记录子列表
+export const getInventorymoveRecordDetailSettlePage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/inventorymove-record-detail/seniorSettle', data })
+  } else {
+    return await request.get({ url: `/wms/inventorymove-record-detail/pageSettle`, params })
+  }
+}
 
 // 查询库存转移记录子列表（备件专用）
 export const getInventorymoveRecordDetailPageSparePart = async (params) => {

src/api/wms/inventorymoveRecordMain/index.ts

@@ -70,6 +70,17 @@ export const exportInventorymoveRecordMain = async (params) => {
   }
 }
 
+// 导出库存转移记录主 Excel
+export const exportInventorymoveRecordMainSettle = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/inventorymove-record-main/export-excel-senior-settle', data })
+  } else {
+    return await request.download({ url: `/wms/inventorymove-record-main/export-excel-settle`, params })
+  }
+}
+
 
 // 导出库存转移记录主 Excel
 export const exportInventorymoveRecordMainSparePart = async (params) => {

src/api/wms/settlementReport/index.ts

@@ -38,6 +38,11 @@ export const exportSettlementInfoReportScpPage = async (params) => {
   return await request.download({ url: `/wms/onlinesettlement-info/export-excel-scp`, params })
 }
 
+// 导出发料申请主 Excel
+export const exportOnlinesettlementInfoReportExcel = async (params) => {
+  return await request.download({ url: `/wms/onlinesettlement-info/export-excel-report`, params })
+}
+
 // 查询上线结算配置列表
 export const getSettlementReportBalance = async (params) => {
   // if (params.isSearch) {

src/views/wms/deliversettlementManage/deliverplan/saleMain/saleMain.data.ts

@@ -872,11 +872,11 @@ export const SaleDetailAndMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
+  // {
-    label: '批次',
+  //   label: '批次',
-    field: 'batch',
+  //   field: 'batch',
-    sort: 'custom',
+  //   sort: 'custom',
-  },
+  // },
   {
     label: '客户库位',
     field: 'fromLocationCode',

src/views/wms/issueManage/onlinesettlement/settlementReport/index.vue

@@ -80,7 +80,9 @@ import * as WarehouseApi from '@/api/wms/warehouse'
 import * as LocationApi from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
 import { tableFormBlurVer, FormBlur, getListByBottonInput } from '@/api/wms/business/inputBlur'
-
+import { formatDate } from '@/utils/formatTime'
+import { usePageLoading } from '@/hooks/web/usePageLoading'
+const { loadStart, loadDone } = usePageLoading()
 
 // 上线结算配置管理
 defineOptions({ name: 'SettlementReport' })
@@ -108,6 +110,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultFreshBtn(null), // 刷新
+  defaultButtons.defaultExportBtn({hasPermi:'wms:onlinesettlement-info:export'}), // 导出
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -123,7 +126,9 @@ const buttonBaseClick = (val, item) => {
   if (val == 'refresh') { // 刷新
     getList()
   } else if (val == 'filtrate') { // 筛选
-  } else { // 其他按钮
+  } else if (val == 'export') { // 导出
+    handleExport()
+  }else { // 其他按钮
     console.log('其他按钮', item)
   }
 }
@@ -283,4 +288,19 @@ onMounted(async () => {
   // importTemplateData.templateUrl = await SettlementConfigurationApi.importTemplate()
 })
 
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    loadStart()
+    const excelTitle = ref(route.meta.title)
+    const data = await SettlementtReportApi.exportOnlinesettlementInfoReportExcel(tableObject.params)
+    download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
+  } catch {
+  } finally {
+    loadDone()
+  }
+}
 </script>

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@@ -1421,7 +1421,8 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
       searchCondition:[{
         key: 'itemCode',
         value: 'itemCode',
-        isMainValue: true
+        isTableRowValue: true, 
+        isMainValue:false
       }]
     }
   },
@@ -1444,7 +1445,8 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
         key: 'itemCode',
         value: 'itemCode',
         message: '请填写物料代码！',
-        isMainValue: true
+        isTableRowValue: true, 
+        isMainValue:false
       }]
     }
   },

src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts

@@ -757,7 +757,8 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
         key:'itemCode',
         value:'itemCode',
         message: '请填写物料代码！',
-        isMainValue: true
+        isTableRowValue: true, 
+        isMainValue:false
       },{
         key: 'available',
         value: 'TRUE',

src/views/wms/moveManage/inventorymove/inventorymoveRecordMainSettlement/index.vue

@@ -72,7 +72,7 @@
     :allSchemas="InventorymoveRecordMainNew.allSchemas"
     :detailAllSchemas="InventorymoveRecordDetailNew.allSchemas"
     :detailAllSchemasRules="InventorymoveRecordDetailNewRules"
-    :apiPage="InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage"
+    :apiPage="InventorymoveRecordDetailApi.getInventorymoveRecordDetailSettlePage"
   />
   <!-- 标签打印 -->
   <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccessLabel" />
@@ -122,9 +122,8 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage // 分页接口
+  getListApi: InventorymoveRecordDetailApi.getInventorymoveRecordDetailSettlePage // 分页接口
 })
-tableObject.params.businessType = 'onlineSettleMove'
 
 // 判断 路由名称 进行条件过滤
 console.log(146 , fromInventoryStatus.value)
@@ -137,7 +136,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   //defaultButtons.defaultAddBtn(null), // 新增
-  defaultButtons.defaultExportBtn({hasPermi:`wms:${routeName.value}:export`}), // 导出
+  defaultButtons.defaultExportBtn({hasPermi:`wms:onlinesettlement-info:export`}), // 导出
   // defaultButtons.defaultImportBtn({hasPermi:`wms:${routeName.value}:import`}), // 导入
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -296,7 +295,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await InventorymoveRecordMainApi.exportInventorymoveRecordMain(tableObject.params)
+    const data = await InventorymoveRecordMainApi.exportInventorymoveRecordMainSettle(tableObject.params)
       download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts

@@ -405,15 +405,16 @@ export const PurchasereturnRecordMain = useCrudSchemas(
       table: {
         width: 180
       },
-      isTable: true,
+      isTable: false,
-      form: {
+      isForm: false,
-        component: 'DatePicker',
+      // form: {
-        componentProps: {
+      //   component: 'DatePicker',
-          type: 'datetime',
+      //   componentProps: {
-          dateFormat: 'YYYY-MM-DD HH:mm:ss',
+      //     type: 'datetime',
-          valueFormat: 'x'
+      //     dateFormat: 'YYYY-MM-DD HH:mm:ss',
-        }
+      //     valueFormat: 'x'
-      },
+      //   }
+      // },
       isSearch: true,
       search: {
         component: 'DatePicker',
@@ -431,7 +432,7 @@ export const PurchasereturnRecordMain = useCrudSchemas(
       table: {
         width: 150
       },
-      isTable: true
+      isTable: false
     },
     {
       label: '操作',