Merge remote-tracking branch 'origin/master_hella' into master_hella

src/api/wms/expectout/index.ts

@@ -45,6 +45,11 @@ export const deleteExpectout = async (id: number) => {
   return await request.delete({ url: `/wms/expectout/delete?id=` + id })
 }
 
+// 批量删除预计出库存
+export const deleteExpectoutIds = async (ids: String) => {
+  return await request.delete({ url: `/wms/expectout/delete?ids=` + ids })
+}
+
 // 导出预计出库存 Excel
 export const exportExpectout = async (params) => {
   if (params.isSearch) {

src/utils/disposition/defaultButtons.ts

@@ -980,6 +980,19 @@ export function mainLisSelectiontPointBtn(option:any) {
     hasPermi: ''
   })
 }
+// 主列表-批量删除
+export function mainLisSelectiontDeleteBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.批量删除`).replace('ts.', ''),
+    name: 'selection_delete',
+    hide: false,
+    type: 'primary',
+    icon: 'ep:download',
+    color: '',
+    float:'left',
+    hasPermi: ''
+  })
+}
 // 主列表-生成采购收货申请
 export function mainListGenerateApplicationBtn(option:any) {
   return __defaultBtnOption(option,{

src/views/wms/inventoryManage/expectin/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Expectin.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="Expectin.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -16,7 +16,9 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table ref="tableRef"
+      :selection="true" 
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -26,6 +28,7 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      @getSelectionRows="getSelectionRows"
     >
       <template #jobNumber="{row}">
         <el-button type="primary" link @click="openDetail(row, '任务号', row.jobNumber)">
@@ -96,6 +99,8 @@ const HeadButttondata = [
   defaultButtons.defaultFreshBtn(null),//刷新
   defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.mainLisSelectiontDeleteBtn(null), // 批量删除
+
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -123,10 +128,42 @@ const buttonBaseClick = (val, item) => {
       getList()
     }
   } else if (val == 'filtrate') { // 筛选
+  } else if (val == 'selection_delete') { // 批量删除
+    handleSelectionDelete()
   } else { // 其他按钮 
     console.log('其他按钮', item)
   }
 }
+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 handleSelectionDelete = async ()=>{
+  let rows:any = []
+  selectionRows.value.forEach(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
+  })
+  if(rows.length==0){
+    return
+  }
+  console.log('批量删除',rows)
+  // await ExpectoutApi.deleteExpectoutIds(rows.join(',')) //换入库接口
+  getList()
+}
 
 // 列表-操作按钮
 const butttondata = [

src/views/wms/inventoryManage/expectout/index.vue

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="Expectout.allSchemas.searchSchema" @search="setSearchParams" @reset="setSearchParams" />
+    <Search :schema="Expectout.allSchemas.searchSchema" @search="searchList" @reset="searchList" />
   </ContentWrap>
 
   <!-- 列表头部 -->
@@ -16,7 +16,9 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table ref="tableRef"
+      :selection="true" 
+      v-clientTable
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -26,6 +28,8 @@
       v-model:pageSize="tableObject.pageSize"
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
+      @getSelectionRows="getSelectionRows"
+
     >
       <template #jobNumber="{row}">
         <el-button type="primary" link @click="openDetail(row, '任务号', row.jobNumber)">
@@ -96,6 +100,7 @@ const HeadButttondata = [
   defaultButtons.defaultFreshBtn(null),//刷新
   defaultButtons.defaultFilterBtn(null), //筛选
   defaultButtons.defaultSetBtn(null), // 设置
+  defaultButtons.mainLisSelectiontDeleteBtn(null), // 批量删除
   // {
   //   label: '自定义扩展按钮',
   //   name: 'zdy',
@@ -122,12 +127,44 @@ const buttonBaseClick = (val, item) => {
     } else {
       getList()
     }
+  } else if (val == 'selection_delete') { // 批量删除
+    handleSelectionDelete()
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮 
     console.log('其他按钮', item)
   }
 }
-
+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 handleSelectionDelete = async ()=>{
+  let rows:any = []
+  selectionRows.value.forEach(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
+  })
+  if(rows.length==0){
+    return
+  }
+  console.log('批量删除',rows)
+  await ExpectoutApi.deleteExpectoutIds(rows.join(','))
+  getList()
+  
+}
 // 列表-操作按钮
 const butttondata = [
   // defaultButtons.mainListEditBtn({hasPermi:'wms:expectout:update'}), // 编辑

src/views/wms/issueManage/productionreceipt/productionreceiptJobMain/index.vue

@@ -157,7 +157,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
     defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
-    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 

src/views/wms/productionManage/productputawayAssemble/productputawayAssembleJobMain/index.vue

@@ -159,7 +159,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
     defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
-    defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
+    // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
 

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -223,14 +223,12 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 0,
         precision: 6,
         disabled: true,
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 0,
       precision: 6,
     }
   },
@@ -291,14 +289,12 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 0,
         precision: 6,
         disabled: true,
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 0,
       precision: 6,
     }
   },