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

src/components/TableHead/src/TableHead.vue

@@ -34,7 +34,7 @@
     :isHighExcludePrimary="false"
     :primarySearchCustomButton="[]"
     :highSearchCustomButton="[]"
-    :allSchemas="detailAllSchemas||allSchemas"
+    :allSchemas="mainAndDetaillSchemas||detailAllSchemas||allSchemas"
   />
 </template>
 <script setup>
@@ -67,6 +67,10 @@ import rowDrop from "@/components/rowDrop/index.vue"
       type: Object,
       default: null
     },
+    mainAndDetaillSchemas: {
+      type: Object,
+      default: null
+    },
   })
   const buttonsLeft = ref([])
   const buttonsRight = ref([])

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

@@ -14,9 +14,10 @@ export const DeliverRecordMain = useCrudSchemas(
       label: '单据号',
       field: 'number',
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 180,
-        fixed: 'left'
+        fixed: 'left',
       },
       isSearch: true,
       isForm: false,
@@ -27,6 +28,7 @@ export const DeliverRecordMain = useCrudSchemas(
       sort: 'custom',
       isSearch: false,
       isTable: true,
+      hiddenSearchHigh: true,
       dictType: DICT_TYPE.DELIVER_METHOD,
       dictClass: 'string',
       table: {
@@ -51,6 +53,7 @@ export const DeliverRecordMain = useCrudSchemas(
       isTable: true,
       isForm: false,
       isSearch: true,
+      hiddenSearchHigh: true,
       search: {
         component: 'Input',
         componentProps: {
@@ -62,6 +65,7 @@ export const DeliverRecordMain = useCrudSchemas(
       label: '客户代码',
       field: 'customerCode',
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -105,6 +109,7 @@ export const DeliverRecordMain = useCrudSchemas(
       label: '客户月台代码',
       field: 'customerDockCode',
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -116,6 +121,7 @@ export const DeliverRecordMain = useCrudSchemas(
       label: '承运商',
       field: 'carrierCode',
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -128,6 +134,7 @@ export const DeliverRecordMain = useCrudSchemas(
       field: 'transferMode',
       dictType: DICT_TYPE.TRANSFER_MODE,
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -139,6 +146,7 @@ export const DeliverRecordMain = useCrudSchemas(
       label: '车牌号',
       field: 'vehiclePlateNumber',
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -150,6 +158,7 @@ export const DeliverRecordMain = useCrudSchemas(
       label: '申请时间',
       field: 'requestTime',
       formatter: dateFormatter,
+      hiddenSearchHigh: true,
       detail: {
         dateFormat: 'YYYY-MM-DD HH:mm:ss'
       },
@@ -192,6 +201,7 @@ export const DeliverRecordMain = useCrudSchemas(
     {
       label: '生产线项',
       field: 'productionLine',
+      hiddenSearchHigh: true,
       sort: 'custom',
       table: {
         width: 150
@@ -224,6 +234,7 @@ export const DeliverRecordMain = useCrudSchemas(
     {
       label: '执行时间',
       field: 'executeTime',
+      hiddenSearchHigh: true,
       formatter: dateFormatter,
       detail: {
         dateFormat: 'YYYY-MM-DD HH:mm:ss'
@@ -246,6 +257,7 @@ export const DeliverRecordMain = useCrudSchemas(
     {
       label: '生效日期',
       field: 'activeDate',
+      hiddenSearchHigh: true,
       formatter: dateFormatter2,
       detail: {
         dateFormat: 'YYYY-MM-DD'
@@ -270,6 +282,7 @@ export const DeliverRecordMain = useCrudSchemas(
       label: '从仓库代码',
       field: 'fromWarehouseCode',
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -280,6 +293,7 @@ export const DeliverRecordMain = useCrudSchemas(
       label: '到仓库代码',
       field: 'toWarehouseCode',
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -293,6 +307,7 @@ export const DeliverRecordMain = useCrudSchemas(
       dictClass: 'string',
       isTable: false,
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -305,6 +320,7 @@ export const DeliverRecordMain = useCrudSchemas(
       dictClass: 'string',
       isTable: false,
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -314,6 +330,7 @@ export const DeliverRecordMain = useCrudSchemas(
       label: '从库区代码范围',
       field: 'fromAreaCodes',
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -324,6 +341,7 @@ export const DeliverRecordMain = useCrudSchemas(
       label: '到库区代码范围',
       field: 'toAreaCodes',
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -334,6 +352,7 @@ export const DeliverRecordMain = useCrudSchemas(
       label: '从月台代码',
       field: 'fromDockCode',
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -344,6 +363,7 @@ export const DeliverRecordMain = useCrudSchemas(
       label: '出库事务类型',
       field: 'outTransactionType',
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -354,6 +374,7 @@ export const DeliverRecordMain = useCrudSchemas(
       label: '入库事务类型',
       field: 'inTransactionType',
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -364,6 +385,7 @@ export const DeliverRecordMain = useCrudSchemas(
       label: '部门',
       field: 'departmentCode',
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -377,6 +399,7 @@ export const DeliverRecordMain = useCrudSchemas(
       dictClass: 'string',
       isTable: false,
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -386,6 +409,7 @@ export const DeliverRecordMain = useCrudSchemas(
       label: '备注',
       field: 'remark',
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -399,6 +423,7 @@ export const DeliverRecordMain = useCrudSchemas(
         dateFormat: 'YYYY-MM-DD HH:mm:ss'
       },
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 180
       },
@@ -426,6 +451,7 @@ export const DeliverRecordMain = useCrudSchemas(
       label: '创建者',
       field: 'creator',
       sort: 'custom',
+      hiddenSearchHigh: true,
       table: {
         width: 150
       },
@@ -448,6 +474,7 @@ export const DeliverRecordMain = useCrudSchemas(
       isSearch: false,
       isTable: false,
       isForm: false,
+      hiddenSearchHigh: true,
       sort: 'custom',
       table: {
         width: 150

src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue

@@ -13,6 +13,7 @@
       @searchFormClick="searchFormClick"
       :allSchemas="DeliverRecordMain.allSchemas"
       :detailAllSchemas="DeliverRecordDetail.allSchemas"
+      :mainAndDetaillSchemas="mainAndDetaillSchemas"
     />
 
   <!-- 列表 -->
@@ -99,6 +100,7 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { cloneDeep } from 'lodash-es'
 const { loadStart, loadDone } = usePageLoading()
 // 发货记录主
 defineOptions({ name: 'InducedProduct1' })
@@ -114,7 +116,9 @@ const importFileName = ref()
 const tableData = ref([])
 const formRef = ref()
 console.log(99 ,  routeName.value)
-const tableColumns = ref([...DeliverRecordMain.allSchemas.tableColumns,...DeliverRecordDetail.allSchemas.tableMainColumns])
+const tableColumns = ref([...DeliverRecordMain.allSchemas.tableColumns, ...DeliverRecordDetail.allSchemas.tableMainColumns])
+const mainAndDetaillSchemas = ref(cloneDeep(DeliverRecordMain.allSchemas))
+mainAndDetaillSchemas.value.tableColumns = [...DeliverRecordMain.allSchemas.tableColumns,...DeliverRecordDetail.allSchemas.tableMainColumns]
 
 const { tableObject, tableMethods } = useTable({
   getListApi: DeliverRecordDetailApi.getDeliverRecordDetailPage // 分页接口

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

@@ -548,6 +548,22 @@ const butttondata = (row, $index) => {
     //   hasPermi: '',
     //   link: true // 文本展现按钮
     // }, // 上传履历表
+    defaultButtons.mainListPointBtn({
+      hide: isShowMainButton(row, ['3', '8']),
+      hasPermi: 'wms:supplierdeliver-request-main:printLabel'
+    }), // 标签打印
+    //defaultButtons.mainListDocumentPrintBtn({ hide: isShowMainButton(row, ['3','8']) }), // 单据打印
+    // 生成记录
+    {
+      label: t('ts.发货'),
+      name: 'genRecords',
+      hide: isShowMainButton(row, ['3']),
+      type: 'primary',
+      icon: '',
+      color: '',
+      hasPermi: 'wms:supplierdeliver-request-main:genRecords',
+      link: true // 文本展现按钮
+    },
     defaultButtons.mainListPlanSubBtn({
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:supplierdeliver-request-main:sub'
@@ -585,22 +601,7 @@ const butttondata = (row, $index) => {
       hasPermi: 'wms:supplierdeliver-request-main:genLabels',
       link: true // 文本展现按钮
     },
-    defaultButtons.mainListPointBtn({
-      hide: isShowMainButton(row, ['3', '8']),
-      hasPermi: 'wms:supplierdeliver-request-main:printLabel'
-    }), // 标签打印
-    //defaultButtons.mainListDocumentPrintBtn({ hide: isShowMainButton(row, ['3','8']) }), // 单据打印
-    // 生成记录
-    {
-      label: t('ts.发货'),
-      name: 'genRecords',
-      hide: isShowMainButton(row, ['3']),
-      type: 'primary',
-      icon: '',
-      color: '',
-      hasPermi: 'wms:supplierdeliver-request-main:genRecords',
-      link: true // 文本展现按钮
-    },
+    
     defaultButtons.mainListPurchasePlanCloBtn({
       hide: isShowMainButton(row, ['1', '2', '4', '3']),
       hasPermi: 'wms:supplierdeliver-request-main:close'

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -73,7 +73,8 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '单据号',
     field: 'number',
     sort: 'custom',
-    isForm:false,
+    isForm: false,
+    sortSearchDefault: 1,
     table: {
       width: 180,
       fixed: 'left'
@@ -87,6 +88,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '发货单号',
     field: 'asnNumber',
     sort: 'custom',
+    sortSearchDefault:2,
     table: {
       width: 180,
       fixed: 'left'
@@ -176,12 +178,14 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '要货计划单号',
     field: 'ppNumber',
     sort: 'custom',
-    isTable:true,
+    isTable: true,
+    isSearch:true,
     table: {
-      width: 150
+      width: 200
     },
     // sortTableDefault:9,
     sortTableDefault: 4,
+    sortSearchDefault: 3,
     form: {
       // labelMessage: '信息提示说明！！！', 
       componentProps: {