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

src/components/Table/src/Table.vue

@@ -200,7 +200,7 @@ export default defineComponent({
       const { selection, reserveSelection, align, headerAlign,border } = unref(getProps)
       // 渲染多选
       return selection ? (
-        <ElTableColumn
+        <ElTableColumn fixed="left"
           type="selection"
           reserveSelection={reserveSelection}
           align={align}

src/views/wms/basicDataManage/itemManage/relegate/relegateRecord/relegateRecordMain.data.ts

@@ -257,6 +257,14 @@ export const RelegateRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '到包装号',
     field: 'toPackingNumber',

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue

@@ -141,12 +141,12 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => {
           key: 'available',
           value: 'TRUE',
           isMainValue: false
-        },{
+      },{
-          message: '请选择从仓库代码！',
+        message: '请选择从仓库代码！',
-          key: 'warehouseCode',
+        key: 'warehouseCode',
-          value: 'fromWarehouseCode',
+        value: 'fromWarehouseCode',
-          isMainValue: true
+        isMainValue: true
-        }
+      }
     ]
     item.form.componentProps.searchCondition = [
       {
@@ -255,12 +255,12 @@ const butttondata = (row, $index) => {
     return []
   }
   return [
-  defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:relegate-request-main:close'}), // 关闭
+    defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:relegate-request-main:close'}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:relegate-request-main:reAdd'}), //重新添加
+    defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:relegate-request-main:reAdd'}), //重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:submit'}), // 提交审批
+    defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:submit'}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:refused'}), // 驳回
+    defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:refused'}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), // 审批通过
+    defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), // 审批通过
-        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), // 处理
+    defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), // 处理
     defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:relegate-request-main:update' }), // 编辑
     // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:relegate-request-main:delete' }), // 删除
   ]

src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts

@@ -13,6 +13,10 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data'
 
 import * as LocationApi  from '@/api/wms/location'
 import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data'
+
+import * as ItempackageApi from '@/api/wms/itempackage'
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+
 import * as confgiApi  from '@/api/infra/config'
 // 获取自动提交自动通过自动执行，跳过任务直接删生成记录的默认值
 const queryParams = {
@@ -293,6 +297,7 @@ export const RelegateRequestDetailRules = reactive({
   available: [required],
   departmentCode: [required],
   concurrencyStamp: [required],
+  packUnit: [required],
 })
 
 export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
@@ -531,6 +536,60 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 120
     },
   },
+  {
+    label: '到库位代码',
+    field: 'toLocationCode',
+    sort: 'custom',
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择到库位代码',
+      searchField: 'code',
+      searchTitle: '库位信息',
+      searchAllSchemas: Location.allSchemas,
+      searchPage: LocationApi.selectBusinessTypeToLocation,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择到库位代码',
+        searchField: 'code',
+        searchTitle: '库位信息',
+        searchAllSchemas: Location.allSchemas,
+        searchPage: LocationApi.selectBusinessTypeToLocation,
+      }
+    },
+    table: {
+      width: 120
+    },
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    sort: 'custom',
+    tableForm:{
+      isInpuFocusShow: true, // 开启查询弹窗
+      searchListPlaceholder: '请选择包装规格',
+      searchField: 'packUnit',
+      searchTitle: '包装规格',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItempackageApi.getItempackagingPage,
+    },
+    form: {
+      // labelMessage: '信息提示说明！！！',
+      componentProps: {
+        isSearchList: true, // 开启查询弹窗
+        searchListPlaceholder: '请选择包装规格',
+        searchField: 'packUnit',
+        searchTitle: '包装规格',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItempackageApi.getItempackagingPage,
+      }
+    },
+    table: {
+      width: 120
+    },
+  },
   {
     label: '到库区类型',
     field: 'toAreaTypes',

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts

@@ -28,6 +28,24 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '领用代码',
+    field: 'usageCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '领用描述',
+    field: 'usageDescription',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '申请单号',
     field: 'requestNumber',
@@ -172,6 +190,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     form: {
       component: 'InputNumber',
     }
@@ -183,6 +202,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
     form: {
       component: 'InputNumber',
     }
@@ -194,6 +214,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '部门',
@@ -202,11 +223,13 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    isTable:false,
   },
   {
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -216,7 +239,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -235,7 +258,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -254,7 +277,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -273,7 +296,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -292,7 +315,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -311,7 +334,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -330,7 +353,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -349,7 +372,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -368,7 +391,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -387,7 +410,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -404,6 +427,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
   {
     label: '承接时间',
     field: 'acceptTime',
+    isTable:false,
     formatter: dateFormatter,
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -425,6 +449,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '承接人',
     field: 'acceptUserId',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -437,6 +462,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
+    isTable:false,
     table: {
       width: 180
     },
@@ -453,6 +479,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '完成人',
     field: 'completeUserId',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -468,6 +495,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable:false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -481,6 +509,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建者',
     field: 'creator',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -493,6 +522,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
+    isTable:false,
     table: {
       width: 180
     },
@@ -509,6 +539,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '最后更新者',
     field: 'updater',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -585,6 +616,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 180
     },
@@ -686,10 +718,27 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '成本中心代码',
+    field: 'costcentreCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '科目代码',
+    field: 'qadProjectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '货主代码',
     field: 'ownerCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -698,6 +747,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts

@@ -171,6 +171,24 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
   },
+  {
+    label: '领用代码',
+    field: 'usageCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm: false,
+    isTable:false,
+  },
+  {
+    label: '领用描述',
+    field: 'usageDescription',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '出库事务类型',
     field: 'outTransactionType',
@@ -460,6 +478,22 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
+  {
+    label: '成本中心代码',
+    field: 'costcentreCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
+  {
+    label: '科目代码',
+    field: 'qadProjectCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+  },
   {
     label: '货主代码',
     field: 'ownerCode',

src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue

@@ -17,7 +17,8 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <Table v-clientTable
+    <Table ref="tableRef" v-clientTable
+      :selection="true"
       :columns="tableColumns"
       :data="tableObject.tableList"
       :loading="tableObject.loading"
@@ -27,6 +28,7 @@
       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)">
@@ -54,6 +56,7 @@
     @searchTableSuccess="searchTableSuccess"
   />
 
+
   <!-- 详情 -->
   <Detail
     ref="detailRef"
@@ -161,6 +164,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultExportBtn({hasPermi:'wms:putaway-job-main:export'}), // 导出
+  defaultButtons.mainLisSelectiontPointBtn(null), // 批量标签打印
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -186,12 +190,51 @@ const buttonBaseClick = (val, item) => {
     } else {
       getList()
     }
+  } else if (val=='selection_point'){// 批量打印
+    handleSelectionPoint()
   } else if (val == 'filtrate') { // 筛选
   } else { // 其他按钮
     console.log('其他按钮', item)
   }
 }
 
+watch(
+  () => tableObject.tableList,
+  () => {
+    const currentRows = selectionRows.value.find(item=>item.currentPage==tableObject.currentPage)
+    if(currentRows){
+      nextTick(() => {
+        currentRows.selectionRows.forEach(item=>{
+          tableRef.value.toggleRowSelection(item,true)
+        })
+      })
+    }
+  }
+)
+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 handleSelectionPoint = async ()=>{
+  let rows:any = []
+  selectionRows.value.forEach(item=>{
+    rows = [...rows,...item.selectionRows.map(item1=>item1.packingNumber)]
+  })
+  console.log('批量打印',rows.join(','))
+  
+  // window.open(srcPoint.value+'&relateNumber='+rows.join(','))
+}
 // 根据状态返回该按钮是否显示
 const isShowMainButton = (row,val) => {
   if (val.indexOf(row.status) > -1) {
@@ -208,6 +251,7 @@ const butttondata = (row,$index) => {
     return []
   }
   return [
+    defaultButtons.mainListDocumentPrintBtn(null), // 单据打印
     // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
     defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchasereceipt-job-main:close'}), // 关闭
     // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
@@ -225,9 +269,14 @@ const buttonTableClick = async (val, row) => {
     handleClose(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
     console.log('列表-操作按钮事件-承接')
+  } else if (val == 'documentPrint') {
+    // 单据打印
+    handleDocumentPrint(row.masterId)
   }
 }
-
+const handleDocumentPrint = async (id) => {
+  alert('单据打印')
+}
 // 子包装数据
 const detailParenPackingRef = ref()
 const { tableObject: packingDetatableData, tableMethods: packDetatableMethods } = useTable({

src/views/wms/purchasereceiptManage/putaway/putawayJobMain/putawayJobMain.data.ts

@@ -560,7 +560,7 @@ export const PutawayJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 120,
+      width: 180,
       fixed: 'right'
     },
   }