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

src/utils/disposition/defaultButtons.ts

@@ -492,7 +492,19 @@ export function mainListOrderPubBtn(option:any) {
     hasPermi: ''
   })
 }
-
+// 主列表-订单流程-批量发布按钮
+export function mainListSelectionOrderPubBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.发布`).replace('ts.', ''),
+    name: 'mainOrderSelectionPub',
+    hide: false,
+    type: 'primary',
+    color: '',
+    float:'left',
+    link: false, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // 主列表-订单流程-关闭按钮
 export function mainListOrderCloBtn(option:any) {
   return __defaultBtnOption(option,{

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts

@@ -14,6 +14,9 @@ import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/item
 import * as OwnerApi  from '@/api/wms/owner'
 import { Owner } from '@/views/wms/basicDataManage/orderManage/owner/owner.data'
 
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
+
 const { t } = useI18n() // 国际化
 
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
@@ -747,6 +750,152 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       valueFormat: 'x',
     }
   },
+ 
+  {
+    label: '包装规格1',
+    field: 'packUnit',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPage,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'itemCode',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPage,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isTableRowValue: true, 
+          isMainValue:false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '包装数量1',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      }
+    },
+    tableForm: {
+    }
+  },
+  {
+    label: '包装规格2',
+    field: 'secondPackUnit',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packUnit',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPage,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+        ]
+
+      }
+    },
+    tableForm: {
+      clearable: true,
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packUnit',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPage,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isTableRowValue: true, 
+          isMainValue:false
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    }
+  },
+  {
+    label: '包装数量2',
+    field: 'secondPackQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+      }
+    },
+    tableForm: {
+    }
+  },
+  {
+    label: '入库存包装规格',
+    field: 'balancePackUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '备注',
     field: 'remark',

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...PurchasePlanMain.allSchemas.searchSchema,...PurchasePlanDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="[...PurchasePlanMain.allSchemas.searchSchema,...PurchasePlanDetail.allSchemas.searchSchema]" @search="setSearchParams" @reset="searchList" />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -11,10 +11,17 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable :columns="tableColumns" :data="tableObject.tableList" :loading="tableObject.loading" :pagination="{
+    <Table ref="tableRef" v-clientTable 
+    :selection="true"
+    :columns="tableColumns" 
+    :data="tableObject.tableList" 
+    :loading="tableObject.loading" 
+    :pagination="{
         total: tableObject.total
-      }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      }" 
-      v-model:sort="tableObject.sort">
+      v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage"
+      v-model:sort="tableObject.sort"
+      @getSelectionRows="getSelectionRows">
       <template #number="{row}">
         <el-button type="primary" link @click="openDetail(row, '单据号', row.number)">
           <span>{{ row.number }}</span>
@@ -241,6 +248,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
     defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-plan-main:create' }), // 新增
     defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // 导入
     defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出
+    defaultButtons.mainListSelectionOrderPubBtn(null), // 批量发布
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选
     defaultButtons.defaultSetBtn(null), // 设置
@@ -271,6 +279,8 @@ const getSearchTableData = async (number,formField,searchField)=>{
     } else {
       getList()
     }
+    } else if (val=='mainOrderSelectionPub'){// 批量发布
+      handleSelectionPublish()
     } else if (val == 'filtrate') { // 筛选
     } else { // 其他按钮
       console.log('其他按钮', item)
@@ -433,7 +443,45 @@ const { wsCache } = useCache()
       tableObject.loading = false
     }
   }
-
+  const searchList = (model)=>{
+    selectionRows.value = []
+    setSearchParams(model)
+  }
+  const selectionRows = ref<any>([])
+  const tableRef = ref()
+  const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+    console.log("getSelectionRows",currentPage,currentPageSelectionRows)
+    const currentRows = selectionRows.value.find(item=>item.currentPage==currentPage)
+    if(currentRows){
+      currentRows.selectionRows = currentPageSelectionRows
+    }else{
+      selectionRows.value.push({
+        currentPage,
+        selectionRows:currentPageSelectionRows
+      })
+    }
+  }
+  // 批量发布
+const handleSelectionPublish = async ()=>{
+  // 发布的二次确认
+  await message.confirm(t('ts.是否发布所选中数据？'))
+  tableObject.loading = true
+  let rows:any = []
+  selectionRows.value.map(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.masterId)]
+  })
+  tableObject.loading = true
+  Promise.all( rows.map(item=>PurchasePlanMainApi.publishPurchasePlanMain(item))).then((res) => {
+    console.log('发布',res)
+    if(res.every(item=>item==true)){
+      message.success(t('ts.发布成功!'))
+    }
+  }).finally(()=>{
+    tableObject.loading = false
+    // 刷新列表
+    getList()
+  })
+}
   /** 发布按钮操作 */
   const handlePublish = async (id : number) => {
     try {