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

src/components/SearchTable/src/SearchTable.vue

@@ -10,6 +10,7 @@
       :HeadButttondata="HeadButttondata"
       :routeName="routeName"
       @searchFormClick="searchFormClick"
+      @buttonBaseClick="buttonBaseClick"
       :allSchemas="allSchemasRef"
     />
     <ContentWrap>
@@ -26,6 +27,7 @@
         v-model:sort="tableObjectRef.sort"
         :searchTableSelectionsList="searchTableSelectionsList"
         :selection="true"
+        :selectionTotal="multipleBol"
         :reserveSelection="true"
         row-key="id"
       />
@@ -53,10 +55,18 @@ routeName.value = route.name
 const searchDialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const multipleBol = ref(false)
+
 
 // 列表头部按钮
-const HeadButttondata = ref([
+const HeadButttondata = ref(multipleBol.value?
+[
+  defaultButtons.defaultWhenPageBtn(null), // 选择当页
+  defaultButtons.defaultUnselectPageBtn(null), // 反选当页
+  defaultButtons.defaultDeselectAllBtn(null), // 取消全选
   defaultButtons.defaultFilterBtn(null), // 筛选
+]:[
+  defaultButtons.defaultFilterBtn(null) // 筛选
 ])
 
 /** 打开弹窗 */
@@ -71,26 +81,37 @@ const searchFieldRef = ref()
 const typeRef = ref()
 const rowRef = ref()
 const allSchemasRef = ref()
-const multipleBol = ref(false)
 const searchConditionRef = ref()
 const searchTableSelectionsList = ref()//表格弹窗回显的列表
 
 const openData = (titleName: any, tableObject:any ,allSchemas: any,multiple: any) => {
   dialogWidth.value = '80%'
-  HeadButttondata.value = [
+  multipleBol.value = multiple
+  HeadButttondata.value = multiple?[
+    defaultButtons.defaultWhenPageBtn(null), // 选择当页
+    defaultButtons.defaultUnselectPageBtn(null), // 反选当页
+    defaultButtons.defaultDeselectAllBtn(null), // 取消全选
+    defaultButtons.defaultFilterBtn(null), // 筛选
+  ]:[
     defaultButtons.defaultFilterBtn(null), // 筛选
   ]
   dialogTitle.value = t(`ts.${titleName}`).replace('ts.','')
   tableObjectRef.value = tableObject
   searchDialogVisible.value = true
-  multipleBol.value = multiple
   allSchemasRef.value = allSchemas
   searchSchema.value = allSchemas.searchSchema
   tableColumns.value = allSchemas.tableColumns
 }
 const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, searchField: any,multiple: any, type: any, row: any, searchCondition:any , isCountRequestRe:any,isConcatDetailSchemas=false,detailSchemas: any, searchTableSelections:any) => {
   dialogWidth.value = '80%'
-  HeadButttondata.value = [
+  multipleBol.value = multiple
+  HeadButttondata.value = multiple?[
+    defaultButtons.defaultWhenPageBtn(null), // 选择当页
+    defaultButtons.defaultUnselectPageBtn(null), // 反选当页
+    defaultButtons.defaultDeselectAllBtn(null), // 取消全选
+    defaultButtons.defaultFilterBtn(null), // 筛选
+  ]:
+  [
     defaultButtons.defaultFilterBtn(null), // 筛选
   ]
   searchDialogVisible.value = true
@@ -108,7 +129,6 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
   getPage.value = getApiPage
   typeRef.value = type
   rowRef.value = row
-  multipleBol.value = multiple
   // dialogTitle.value = t('action.' + type)
   dialogTitle.value = t(`ts.${titleName}`).replace('ts.','')
   searchTableSelectionsList.value = searchTableSelections
@@ -175,6 +195,20 @@ const searchFormClick = (searchData) => {
   }
   getListRef.value() // 刷新当前列表
 }
+const buttonBaseClick = (val, item) => {
+  // 设置按钮 
+  if (val == 'DeselectAll') {
+    // 取消全选
+    searchTableRef.value.clearSelection()
+  } else if (val == 'UnselectPage') {
+    // 反选当页
+    searchTableRef.value.togglePageSelection()
+  } else if (val == 'WhenPage') {
+    // 选择当页
+    searchTableRef.value.toggleAllSelection(true)
+  }
+}
+
 
 defineExpose({ open,openData,hiddenFilterButton ,changeDialogWidth}) // 提供 open 方法，用于打开弹窗
 

src/components/Table/src/Table.vue

@@ -21,6 +21,8 @@ export default defineComponent({
     currentPage: propTypes.number.def(1),
     // 是否多选
     selection: propTypes.bool.def(false),
+    // 是否显示多选数量
+    selectionTotal: propTypes.bool.def(false),
     // 是否所有的超出隐藏，优先级低于schema中的showOverflowTooltip,
     showOverflowTooltip: propTypes.bool.def(true),
     // 表头
@@ -115,12 +117,36 @@ export default defineComponent({
 
     const selections = ref<Recordable[]>([])
     const sortRef = ref()
+    // 选中某行
     const selectRow  = ()=>{
       emit('getSelectionRows', currentPageRef.value,elTableRef.value?.getSelectionRows())
     }
-    const selectAll  = (val)=>{
+    //全选回调
+    const selectAll  = ()=>{
       emit('getSelectionRows', currentPageRef.value,elTableRef.value?.getSelectionRows())
     }
+    //反选
+    const togglePageSelection = ()=>{
+      unref(getProps).data.forEach(row=>{
+        elTableRef.value!.toggleRowSelection(row)
+      })
+    }
+    // 切换全选/不全选
+    const toggleAllSelection = (isAll)=>{
+      if(isAll){
+        //全选
+        if(elTableRef.value?.getSelectionRows().length<unref(getProps).data.length){
+          elTableRef.value!.toggleAllSelection()
+        }
+      }
+    }
+    
+    //清空选择
+    const clearSelection  = ()=>{
+      console.log('clearSelection')
+      elTableRef.value!.clearSelection()
+    }
+    
     const selectionChange = (selection: Recordable[]) => {
       selections.value = selection
     }
@@ -134,7 +160,11 @@ export default defineComponent({
       setProps,
       setColumn,
       selections,
-      toggleRowSelection
+      toggleRowSelection,
+      selectAll,
+      toggleAllSelection,
+      togglePageSelection,
+      clearSelection
     })
 
     const pagination = computed(() => {
@@ -358,13 +388,15 @@ export default defineComponent({
             append: () => getSlot(slots, 'append')
           }}
         </ElTable>
-        
+        {unref(getProps).selectionTotal ? (
+          <div class="mt-5px">已选{selections.value.length}条数据</div>
+        ):undefined}
         {unref(getProps).pagination ? (
           // update by 芋艿：保持和 Pagination 组件一致
             <ElPagination
               v-model:pageSize={pageSizeRef.value}
               v-model:currentPage={currentPageRef.value}
-              class="float-right mb-15px mt-15px"
+              class="float-right mt-15px"
               {...unref(pagination)}
             ></ElPagination>         
         ) : undefined}

src/layout/components/Menu/src/components/useRenderMenuTitle.tsx

@@ -9,7 +9,8 @@ export const useRenderMenuTitle = () => {
     return icon ? (
       <>
         <Icon icon={meta.icon}></Icon>
-        <span class="v-menu__title ellipsis">{t(`ts.${title}` as string).replace('ts.','')}</span>
+        {/* ellipsis */}
+        <span class="v-menu__title">{t(`ts.${title}` as string).replace('ts.','')}</span>
       </>
     ) : (
       <span class="v-menu__title">{t(`ts.${title}` as string).replace('ts.','')}</span>

src/locales/en-US.ts

@@ -864,6 +864,9 @@ export default {
     导出:'Export',
     刷新:'Refresh',
     筛选:'Filter',
+    选择当页:'As Page',
+    反选当页:'Unselect Page',
+    取消全选:'Deselect All',
     设置:'Settings',
     确定:'Confirm',
     '确 定':'Confirm',

src/locales/zh-CN.ts

@@ -864,6 +864,9 @@ export default {
     导出:'导出',
     刷新:'刷新',
     筛选:'筛选',
+    选择当页:'选择当页',
+    反选当页:'反选当页',
+    取消全选:'取消全选',
     设置:'设置',
     确定:'确定',
     '确 定':'确 定',

src/utils/disposition/defaultButtons.ts

@@ -159,7 +159,45 @@ export function defaultSearchResetBtn(option:any) {
     hasPermi: ''
   })
 }
-
+// 选择当页
+export function defaultWhenPageBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.选择当页`).replace('ts.', ''),
+    name: 'WhenPage',
+    hide: false,
+    type: 'primary',
+    color: '',
+    float:'right',
+    link: false, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 反选当页
+export function defaultUnselectPageBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.反选当页`).replace('ts.', ''),
+    name: 'UnselectPage',
+    hide: false,
+    type: 'primary',
+    color: '',
+    float:'right',
+    link: false, // 文本展现按钮
+    hasPermi: ''
+  })
+}
+// 取消全选
+export function defaultDeselectAllBtn(option:any) {
+  return __defaultBtnOption(option,{
+    label: t(`ts.取消全选`).replace('ts.', ''),
+    name: 'DeselectAll',
+    hide: false,
+    type: 'primary',
+    color: '',
+    float:'right',
+    link: false, // 文本展现按钮
+    hasPermi: ''
+  })
+}
 // form表单-保存按钮
 export function formSaveBtn(option:any) {
   return __defaultBtnOption(option,{

src/views/wms/basicDataManage/customerManage/customerDeliveryForecast/customerDeliveryForecast.data.ts

@@ -116,7 +116,15 @@ export const CustomerDeliveryForecast = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isForm: false
+    isForm: false,
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
   },
   {
     label: '是否可用',

src/views/wms/deliversettlementManage/deliver/deliverRecordMain/deliverRecordMain.data.ts

@@ -39,7 +39,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    isSearch: true,
+    isSearch: false,
   },
   // {
   //   label: '发货计划单号',
@@ -62,7 +62,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'status',
     dictType: DICT_TYPE.REQUEST_STATUS,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     isForm: false,
     sort: 'custom',
@@ -366,7 +366,7 @@ export const DeliverRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: false,
     sort: 'custom',
     table: {

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue

@@ -559,6 +559,10 @@ const importSuccess = () => {
 // 筛选提交
 const searchFormClick = (searchData) => {
   tableObject.params.isSearch = true
+  console.log('searchData',searchData.filters);
+  if(!searchData.filters){//重置的时候应用
+    searchData.filters = []
+  }
   let filters = [...searchData.filters]
   if(!filters.find(item=>item.column=='business_type')){
     if ( routeName.value == 'DeliverRequestMain') {

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

@@ -256,7 +256,7 @@ export const DeliverPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: false,
     sort: 'custom',
     table: {

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

@@ -249,7 +249,7 @@ export const SaleMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/inventoryManage/locationcapacity/locationcapacity.data.ts

@@ -20,7 +20,7 @@ export const Locationcapacity = useCrudSchemas(reactive<CrudSchema[]>([
     label: '已用容量百分比',
     field: 'usedCapacity',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
   },
   {
     label: '可用容量百分比',

src/views/wms/inventoryjobManage/containermanage/containerMainRequest/containerMainRequest.data.ts

@@ -95,7 +95,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     isTable: false
   },
   {

src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts

@@ -99,7 +99,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     isTable:false,
   },
   {

src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts

@@ -95,7 +95,7 @@ export const ContainerMainRequest = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     isTable: false
   },
   {

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRecordMain/index.vue

@@ -221,6 +221,9 @@ const handleSelectionPoint = async ()=>{
       const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
       window.open(src.value+'&asn_number='+res.cgLabel)
     }
+    if(!res.cgLabel&&!res.zzLabel){
+      message.error('包装不存在，无法打印')
+    }
   }).catch(err => {
     console.log(err)
     getLoading?.close()

src/views/wms/inventoryjobManage/packageManage/packagemergeMain/packagemergeMain.data.ts

@@ -154,7 +154,7 @@ export const PackagemergeMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
-    isSearch: true,
+    isSearch: false,
     sort: 'custom',
     table: {
       width: 150

src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts

@@ -867,6 +867,14 @@ export const PackageoverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        type: 'datetime',
+        dateFormat: 'YYYY-MM-DD HH:mm:ss',
+        valueFormat: 'x',
+      }
+    },
     isTableForm: false,
   },
   {

src/views/wms/inventoryjobManage/packageManage/packagesplitMain/packagesplitMain.data.ts

@@ -155,7 +155,7 @@ export const PackagesplitMain = useCrudSchemas(reactive<CrudSchema[]>([
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isTable: true,
-    isSearch: true,
+    isSearch: false,
     sort: 'custom',
     table: {
       width: 150

src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts

@@ -263,7 +263,7 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {

src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts

@@ -451,7 +451,7 @@ export const IssueRequestMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 200,
+      width: 230,
       fixed: 'right'
     },
   },
@@ -579,7 +579,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'packingNumber',
     sort: 'custom',
     table: {
-      width: 150
+      width: 180
     },
     isSearch: true,
     sortSearchDefault:4,
@@ -846,7 +846,7 @@ export const IssueRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'itemName',
     sort: 'custom',
     table: {
-      width: 150
+      width: 300
     },
     sortTableDefault:4,
     isTableForm: false,

src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts

@@ -205,7 +205,7 @@ export const InventorychangeRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: true,
     sort: 'custom',
     table: {

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

@@ -272,7 +272,7 @@ onMounted(async () => {
   if(routeName.value == "InventorymoveRecordMain"){
     importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplate()
   }else {
-    importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplateExceptMove()
+    //importTemplateData.templateUrl = await InventorymoveRecordMainApi.importTemplateExceptMove()
   }
 })
 </script>

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/sparereceiptRequestMain.data.ts

@@ -796,6 +796,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     },
     sortTableDefault:9,
     tableForm: {
+      disabled:true,
       type: 'InputNumber',
       min: 1,
       precision: 6

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue

@@ -165,6 +165,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
     console.log("type:",type)
     console.log("formField:",formField)
     console.log(formField, searchField, val, formRef, type, row)
+    
     if (type == 'tableForm') {
       // 明细查询页赋值
       // row[formField] = val[0][searchField]
@@ -185,18 +186,23 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         newRow['poLine'] = item['poLine']
         newRow['orderQty'] = item['orderQty']
         newRow['uom'] = item['uom']
+        if(tableData.value.find(item1=>item1['itemCode'] == item['itemCode']&&item1['poLine'] == item['poLine']&&item1['poNumber'] == item['poNumber'])) return
+
         itemCodes.push(item['itemCode'])
         tableData.value.push(newRow)
       })
-      //有效期
+      if(itemCodes.length>0){
-      ItembasicApi.getItembasicPage({
+        //有效期
-        code:itemCodes.join(',')
+        ItembasicApi.getItembasicPage({
-      }).then((res)=>{
+          code:itemCodes.join(',')
-        res.list.forEach((item,index)=>{
+        }).then((res)=>{
-          const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
+          res.list.forEach((item,index)=>{
-          findItem['expireTime'] = item['expireTime']
+            const findItem = tableData.value.find(item1=>item1['itemCode']==item['code'])
+            findItem['expireTime'] = item['expireTime']
+          })
         })
-      })
+      }
+      
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]