提交补充创建时间搜索条件时冲突

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

@@ -120,7 +120,7 @@ const { getList, setSearchParams } = tableMethods
 // 列表头部按钮
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({hasPermi:'wms:package:create'}), // 新增
-  defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:package:import'}), // 导入
   defaultButtons.defaultExportBtn({hasPermi:'wms:package:export'}), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
@@ -259,7 +259,12 @@ const BASE_URL = getJmreportBaseUrl()
 
 // form表单提交
 const formsSuccess = async (formType,data) => {
+  if(!data.productionLineCode&&!data.supplierCode){
+    message.error(t('供应商代码 和 生产线代码至少填一个！'))
+    return
+  }
   basicFormRef.value.formLoading = true
+  
   try {
     if (formType === 'create') {
       await PackageApi.createPackage(data)

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

@@ -307,7 +307,7 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
           isMainValue: false
         },{
           key:'itemCode', // 查询列表中字段
-          value:'itemCode', // 指主表某字段 
+          value:'itemCode', // 指主表某字段
           message: '请选择物料代码！', // 当前置条件为空时 弹出信息提示
           isMainValue: true, // 表示查询条件是主表的字段的值
           action: '==', // 查询拼接条件
@@ -498,6 +498,23 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '标签数量',
+    field: 'count',
+    sort: 'custom',
+    isTable: true,
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        min: 1,
+        precision: 0,
+        max: 100,
+      }
+    }
+  },
   // {
   //   label: '采购订单号',
   //   field: 'poNumber',
@@ -546,14 +563,14 @@ export const Package = useCrudSchemas(reactive<CrudSchema[]>([
   //     width: 150,
   //   },
   // },
-  // {
+  {
-  //   label: '生产线代码',
+    label: '生产线代码',
-  //   field: 'productionLineCode',
+    field: 'productionLineCode',
-  //   sort: 'custom',
+    sort: 'custom',
-  //   table: {
+    table: {
-  //     width: 150,
+      width: 150,
-  //   },
+    },
-  // },
+  },
   // {
   //   label: '班组代码',
   //   field: 'teamCode',

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

@@ -15,14 +15,14 @@ export const PackageoverRetrospect = useCrudSchemas(reactive<CrudSchema[]>([
       width: 180
     },
   },
-  {
+  // {
-    label: '申请单号',
+  //   label: '申请单号',
-    field: 'requestNumber',
+  //   field: 'requestNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 180
+  //     width: 180
-    },
+  //   },
-  },
+  // },
   {
     label: '任务单据号',
     field: 'jobNumber',

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@@ -233,7 +233,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
     field: 'toAreaTypes',
     dictType: DICT_TYPE.AREA_TYPE,
     dictClass: 'string',
-    isSearch: true,
+    isSearch: false,
     isTable: false,
     sort: 'custom',
     table: {
@@ -431,7 +431,7 @@ export const ProductionreturnRequestMain = useCrudSchemas(reactive<CrudSchema[]>
       }
     },
     isForm: false,
-    isSearch: true,
+    isSearch: false,
     search: {
       component: 'DatePicker',
       componentProps: {
@@ -1027,7 +1027,7 @@ export const ProductionreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[
     label: '包装规格',
     field: 'packUnit',
     sort: 'custom',
-    isSearch: true,
+    isSearch: false,
     table: {
       width: 120
     },

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

@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <Search :schema="[...InventorymoveRecordMainNew.allSchemas.searchSchema,...InventorymoveRecordDetailNew.allSchemas.searchSchema]" @search="setSearchParams({'business_type':'Move'})" @reset="setSearchParams({'business_type':'Move'})" />
+    <Search :schema="[...InventorymoveRecordMainNew.allSchemas.searchSchema,...InventorymoveRecordDetailNew.allSchemas.searchSchema]" @search="setSearchParams({'businessType':'Move'})" @reset="setSearchParams({'businessType':'Move'})" />
   </ContentWrap>
 
     <!-- 列表头部 -->
@@ -117,7 +117,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  defaultParams:{'business_type':'Move'},
+  defaultParams:{'businessType':'Move'},
   getListApi: InventorymoveRecordDetailApi.getInventorymoveRecordDetailPage // 分页接口
 })
 
@@ -133,7 +133,7 @@ const { getList, setSearchParams } = tableMethods
 const HeadButttondata = [
   defaultButtons.defaultAddBtn(null), // 新增
   defaultButtons.defaultExportBtn({hasPermi:'wms:inventorymove-record-main:export'}), // 导出
-  defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-record-main:import'}), // 导入
+  // defaultButtons.defaultImportBtn({hasPermi:'wms:inventorymove-record-main:import'}), // 导入
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null), // 设置
@@ -198,19 +198,28 @@ const BASE_URL = getJmreportBaseUrl()
 // 标签打印
 const searchTableRef = ref()
 const labelType = ref('') // 标签类别 采购还是制造等
-const labelPrint = async (row) => {
+//获取类型
-  tableObject.loading = true
+const getLabelType = async (row,useToPackingNumber)=>{
-  //获取类型
+  let resType = await PackageApi.getPackagePage(useToPackingNumber?{
-  let resType = await PackageApi.getPackagePage({
+    number: row.toPackingNumber
+  }:{
     requestNumber:  row.number
   })
+  console.log('resType',resType)
   if(resType.list.length > 0){
     if (resType.list[0].productionLineCode != null) {
       labelType.value = 'zz'
     } else {
       labelType.value = 'cg'
     }
+  }else{
+    getLabelType(row,true)
   }
+}
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  //获取类型
+  await getLabelType(row,false)
   const defaultParams = {'moduleName':'productreceipt_predict','tableName':'record_productreceipt_main','recordNumber':row.number}
   const {tableObject:tableObjectPrint ,tableMethods} = useTable({
     defaultParams,

src/views/wms/moveManage/inventorymove/inventorymoveRecordMainNew/inventorymoveRecordMainNew.data.ts

@@ -149,6 +149,8 @@ export const InventorymoveRecordMainNew = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:22
+
   },
   {
     label: '到仓库代码',
@@ -157,6 +159,7 @@ export const InventorymoveRecordMainNew = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:23
   },
   // {
   //   label: '从库区类型范围',
@@ -203,6 +206,7 @@ export const InventorymoveRecordMainNew = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:24
   },
   {
     label: '入库事务类型',
@@ -211,6 +215,7 @@ export const InventorymoveRecordMainNew = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:25
   },
   {
     label: '业务类型',
@@ -219,6 +224,7 @@ export const InventorymoveRecordMainNew = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:36
   },
 
   // {
@@ -276,6 +282,7 @@ export const InventorymoveRecordMainNew = useCrudSchemas(reactive<CrudSchema[]>(
         defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
       }
     },
+    sortTableDefault:34
   },
   {
     label: '创建者',
@@ -284,6 +291,7 @@ export const InventorymoveRecordMainNew = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    sortTableDefault:35
   },
   {
     label: '最后更新时间',
@@ -434,6 +442,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:10,
   },
   {
     label: '物料名称',
@@ -442,6 +451,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:27
   },
   {
     label: '物料描述1',
@@ -450,6 +460,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:28
   },
   {
     label: '物料描述2',
@@ -458,6 +469,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:29
   },
   // {
   //   label: '在途库库位',
@@ -474,6 +486,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:18
   },
   {
     label: '到批次',
@@ -482,6 +495,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:19
   },
   {
     label: '从包装号',
@@ -490,6 +504,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:11
   },
   {
     label: '到包装号',
@@ -498,6 +513,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:12
   },
   // {
   //   label: '从器具号',
@@ -524,7 +540,8 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     },
     form: {
       component: 'InputNumber',
-    }
+    },
+    sortTableDefault:17
   },
   {
     label: '计量单位',
@@ -536,6 +553,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:30
   },
   {
     label: '从库位代码',
@@ -544,6 +562,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:13
   },
   {
     label: '到库位代码',
@@ -552,6 +571,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:14
   },
   {
     label: '从库存状态',
@@ -563,6 +583,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:15
   },
   {
     label: '到库存状态',
@@ -574,6 +595,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:16
   },
   {
     label: '从库位组代码',
@@ -582,6 +604,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:31
   },
   {
     label: '到库位组代码',
@@ -590,6 +613,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:32
   },
   {
     label: '从库区代码',
@@ -598,6 +622,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:20
   },
   {
     label: '到库区代码',
@@ -606,6 +631,7 @@ export const InventorymoveRecordDetailNew = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
+    sortTableDefault:21
   },
   // {
   //   label: '项目代码',