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

src/components/SearchTable/src/SearchTable.vue

@@ -93,7 +93,7 @@ const open = (titleName: any, allSchemas: any,getApiPage: any, formField: any, s
   HeadButttondata.value = [
     defaultButtons.defaultFilterBtn(null), // 筛选
   ] 
-debugger
+
   searchDialogVisible.value = true
   formFieldRef.value = formField
   searchFieldRef.value = searchField

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/buttMesManage/mesBarCode/mesBarCode.data.ts

@@ -4,6 +4,8 @@ import { dateFormatter } from '@/utils/formatTime'
 // 表单校验
 export const MesBarCodeRules = reactive({
   available: [required],
+  lowerLim: [required],
+  partNumber: [required],
 })
 
 export const MesBarCode = useCrudSchemas(reactive<CrudSchema[]>([

src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/transferissueRequestMain.data.ts

@@ -534,6 +534,9 @@ export const TransferissueRequestMainRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  dueTime: [
+    { required: true, message: '请选择截止时间', trigger: 'change' }
+  ],
 })
 
 /**

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnJobMain/purchasereturnJobMain.data.ts

@@ -837,21 +837,21 @@ export const PurchasereturnJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     sortTableDefault: 18,
     hiddenInMain:true,
   },
-  {
+  // {
-    label: '数量',
+  //   label: '数量',
-    field: 'qty',
+  //   field: 'qty',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    form: {
+  //   form: {
-      component: 'InputNumber',
+  //     component: 'InputNumber',
-    },
+  //   },
-    sortTableDefault: 12,
+  //   sortTableDefault: 12,
-  },
+  // },
   {
     label: '退货数量',
-    field: 'returnedQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRecordMain/purchasereturnRecordMain.data.ts

@@ -484,7 +484,7 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
   },
   {
     label: '退货数量',
-    field: 'returnedQty',
+    field: 'qty',
     sort: 'custom',
     table: {
       width: 150
@@ -733,19 +733,19 @@ export const PurchasereturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     sortSearchDefault: 7,
     hiddenInMain: true
   },
-  {
+  // {
-    label: '数量',
+  //   label: '数量',
-    field: 'qty',
+  //   field: 'qty',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isTable:true,
+  //   isTable:true,
-    sortTableDefault: 1005,
+  //   sortTableDefault: 1005,
-    form: {
+  //   form: {
-      component: 'InputNumber',
+  //     component: 'InputNumber',
-    }
+  //   }
-  },
+  // },
   {
     label: '计量单位',
     field: 'uom',