制造件标签修改

src/views/wms/basicDataManage/labelManage/manufacturePackage/index.vue

@@ -66,7 +66,7 @@ import * as BarbasicApi from '@/api/wms/barbasic'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as PackageApi from '@/api/wms/package'
 import { formatTime } from '@/utils/index'
-import * as Itempackaging from '@/api/wms/itempackage'
+import * as itembasicApi from '@/api/wms/itembasic'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
@@ -110,17 +110,21 @@ const searchTableSuccess = (formField, searchField, val, basicFormRef, type, row
         setV['produceDate'] = ''
         setV['expireDate'] = ''
         setV['validityDays'] = val[0]['validityDays']
-        await Itempackaging.getItempackagingPage({
+        await itembasicApi.getItembasicPage({
-          itemCode: val[0]['code']
+          code: val[0]['code']
         }).then(res => {
           if (res) {
             if (res.list.length > 0) {
-              setV['packQty'] = res.list[0].packQty
+              setV['packQty'] = res.list[0].defaultPackQty
-              setV['packUnit'] = res.list[0].packUnit
+              setV['packUnit'] = res.list[0].defaultPackUnit
             }
           }
         })
       }
+      if(formField == 'packUnit') {
+        setV['packUnit'] = val[0].packUnit
+        setV['packQty'] = val[0].packQty
+      }
       basicFormRef.setValues(setV)
   })
 }

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

@@ -7,6 +7,9 @@ import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplie
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
 import { validatePositiveNumber } from "@/utils/validator";
+
+import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data'
+import * as ItemPackageApi from '@/api/wms/itempackage/index'
 /**
  * @returns {Array} 库存余额
  */
@@ -902,22 +905,109 @@ export const BalancePackage = useCrudSchemas(reactive<CrudSchema[]>([
       min: 0
     }
   },
-  {
+  // {
-    label: '包装规格',
+  //   label: '包装规格',
-    field: 'packUnit',
+  //   field: 'packUnit',
-    sort: 'custom',
+  //   sort: 'custom',
-    tableForm: {
+  //   tableForm: {
-      disabled: true
+  //     disabled: true
-    }
+  //   }
-  },
+  // },
-  {
+  // {
-    label: '标包数量',
+  //   label: '标包数量',
-    field: 'packQty',
+  //   field: 'packQty',
-    sort: 'custom',
+  //   sort: 'custom',
-    tableForm: {
+  //   tableForm: {
-      disabled: true
+  //     disabled: true
-    }
+  //   }
-  },
+  // },
+   {
+          label: '包装规格',
+          field: 'packUnit',
+          sort: 'custom',
+          isSearch: false,
+          table: {
+            width: 120
+          },
+          isTable: false,
+          isTableForm: true,
+          isForm: true,
+          tableForm: {
+            enterSearch: true,
+            isInpuFocusShow: true,
+            isSearchList: true, // 开启查询弹窗
+            searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+            searchField: 'packUnit', // 查询弹窗赋值字段
+            searchTitle: '物料包装信息', // 查询弹窗标题
+            searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+            searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
+            searchCondition: [
+              {
+                key: 'available',
+                value: 'TRUE',
+                isMainValue: false
+              },
+              {
+                key: 'itemCode',
+                value: 'itemCode',
+                message: '请先选择物料代码！',
+                isMainValue: true
+              }
+            ],
+            verificationParams: [
+              {
+                key: 'packUnit',
+                action: '==',
+                value: '',
+                isMainValue: false,
+                isSearch: true,
+                isFormModel: true
+              }
+            ] // 失去焦点校验参数
+          },
+          form: {
+            // labelMessage: '信息提示说明！！！',
+            componentProps: {
+              isSearchList: true, // 开启查询弹窗
+              searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+              searchField: 'packUnit', // 查询弹窗赋值字段
+              searchTitle: '物料包装信息', // 查询弹窗标题
+              searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+              searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
+              searchCondition: [
+                {
+                  key: 'available',
+                  value: 'TRUE',
+                  isMainValue: false
+                },
+                {
+                  key: 'itemCode',
+                  value: 'itemCode',
+                  message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+                  isMainValue: true
+                }
+              ],
+              verificationParams: [
+                {
+                  key: 'packUnit',
+                  action: '==',
+                  value: '',
+                  isMainValue: false,
+                  isSearch: true,
+                  isFormModel: true
+                }
+              ] // 失去焦点校验参数
+            }
+          }
+        },
+        {
+          label: '包装数量',
+          field: 'packQty',
+          sort: 'custom',
+          table: {
+            width: 150
+          }
+        },
   {
     label: '计量单位',
     field: 'uom',

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

@@ -475,7 +475,11 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
 const searchTableSuccessLabel = async (formField, searchField, val, formRef, type, row) => {
   console.log('批量打印',val)
   if (type == 'tableForm') {
-    row[formField] = val[0][searchField]
+    // row[formField] = val[0][searchField]
+    if (formField === 'packUnit') {
+        row['packUnit'] = val[0]['packUnit']
+        row['packQty'] = val[0]['packQty']
+      }
   } else {
       const setV = {}
       setV[formField] = val[0][searchField]

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -1706,7 +1706,6 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     table: {
       width: 150,
       componentProps: {
-        disabled: true,
         isSearchList: true,
         searchListPlaceholder: '请选择包装',
         searchField: 'packUnit',
@@ -1731,7 +1730,6 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     },
     tableForm: {
       enterSearch:true,
-      disabled: true,
       isInpuFocusShow: true,
       searchListPlaceholder: '请选择包装',
       searchField: 'packUnit',
@@ -1760,14 +1758,6 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     table: {
       width: 150
     },
-    form: {
-      componentProps: {
-        disabled: true,
-      }
-    },
-    tableForm: {
-      disabled: true,
-    }
   },
   {
     label: '标签生产线代码',

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@@ -1790,74 +1790,93 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
+   {
-    label: '包装规格',
+        label: '包装规格',
-    field: 'packUnit',
+        field: 'packUnit',
-    sort: 'custom',
+        sort: 'custom',
-    table: {
+        isSearch: false,
-      width: 150,
+        table: {
-      componentProps: {
+          width: 120
-        disabled: true,
-        isSearchList: true,
-        searchListPlaceholder: '请选择包装',
-        searchField: 'packUnit',
-        searchTitle: '物品包装信息',
-        searchAllSchemas: Itempackaging.allSchemas,
-        searchPage: ItemPackageApi.getItemPackagingPageByItemCode,
-        searchCondition: [
-          {
-            key: 'itemCode',
-            value: 'itemCode',
-            message: '请选择订单行',
-            isMainValue: true
-          },
-          {
-            key: 'available',
-            value: 'TRUE',
-            isMainValue: false
-          }
-        ]
-
-      }
-    },
-    tableForm: {
-      disabled: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择包装',
-      searchField: 'packUnit',
-      searchTitle: '物品包装信息',
-      searchAllSchemas: Itempackaging.allSchemas,
-      searchPage: ItemPackageApi.getItemPackagingPageByItemCode,
-      searchCondition: [
-        {
-          key: 'itemCode',
-          value: 'itemCode',
-          message: '请选择订单行',
-          isMainValue: true
         },
-        {
+        isTable: false,
-          key: 'available',
+        isTableForm: true,
-          value: 'TRUE',
+        isForm: true,
-          isMainValue: false
+        tableForm: {
-        }]
+          enterSearch: true,
-    },
+          isInpuFocusShow: true,
-  },
+          isSearchList: true, // 开启查询弹窗
-  {
+          searchListPlaceholder: '请选择包装规格', // 输入框占位文本
-    label: '包装数量',
+          searchField: 'packUnit', // 查询弹窗赋值字段
-    field: 'packQty',
+          searchTitle: '物料包装信息', // 查询弹窗标题
-    sort: 'custom',
+          searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
-    table: {
+          searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
-      width: 150
+          searchCondition: [
-    },
+            {
-    form: {
+              key: 'available',
-      componentProps: {
+              value: 'TRUE',
-        disabled: true
+              isMainValue: false
-      }
+            },
-    },
+            {
-    tableForm: {
+              key: 'itemCode',
-      disabled: true,
+              value: 'itemCode',
-    }
+              message: '请先选择物料代码！',
-  },
+              isMainValue: true
+            }
+          ],
+          verificationParams: [
+            {
+              key: 'packUnit',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
+        },
+        form: {
+          // labelMessage: '信息提示说明！！！',
+          componentProps: {
+            isSearchList: true, // 开启查询弹窗
+            searchListPlaceholder: '请选择包装规格', // 输入框占位文本
+            searchField: 'packUnit', // 查询弹窗赋值字段
+            searchTitle: '物料包装信息', // 查询弹窗标题
+            searchAllSchemas: Itempackaging.allSchemas, // 查询弹窗所需类
+            searchPage: ItemPackageApi.getItempackagingPage, // 查询弹窗所需分页方法
+            searchCondition: [
+              {
+                key: 'available',
+                value: 'TRUE',
+                isMainValue: false
+              },
+              {
+                key: 'itemCode',
+                value: 'itemCode',
+                message: '请先选择物料代码！', // 当前置条件为空时 弹出信息提示
+                isMainValue: true
+              }
+            ],
+            verificationParams: [
+              {
+                key: 'packUnit',
+                action: '==',
+                value: '',
+                isMainValue: false,
+                isSearch: true,
+                isFormModel: true
+              }
+            ] // 失去焦点校验参数
+          }
+        }
+      },
+      {
+        label: '包装数量',
+        field: 'packQty',
+        sort: 'custom',
+        table: {
+          width: 150
+        }
+      },
   {
     label: '标签生产线代码',
     field: 'productionLineCodePackage',
@@ -2159,5 +2178,11 @@ export const ProductreceiptRequestLabelRules = reactive({
   batch: [
     { required: true, message: '请选择批次', trigger: ['change','blur'] }
   ],
+  packUnit: [
+    { required: true, message: '请选择包装规格', trigger: ['change','blur'] }
+  ],
+  packQty: [
+    { required: true, message: '请输入包装数量', trigger: ['change','blur'] }
+  ],
 })