叫料标签页面修改

src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts

@@ -20,6 +20,10 @@ import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/prod
 import * as WorkStationApi from '@/api/wms/workstation'
 import { Workstation } from '@/views/wms/basicDataManage/factoryModeling/workstation/workstation.data'
 
+import * as confgiApi  from '@/api/infra/config'
+
+const confgiDataOne = await confgiApi.queryByKey("WorkStation-IN")
+
 // 表单校验
 export const CallmaterialsRules = reactive({
   itemCode: [required],
@@ -55,8 +59,8 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '库位',
-    field: 'location',
+    label: '包装规格',
+    field: 'packUnit',
     sort: 'custom',
     table: {
       width: 150
@@ -65,17 +69,16 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
       // labelMessage: '信息提示说明！！！',
       componentProps: {
         isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '库位信息', // 查询弹窗标题
-        searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
-        searchPage: LocationApi.getLocationPage, // 查询弹窗所需分页方法
+        searchTitle: '包装规格信息', // 查询弹窗标题
+        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
+        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
+      }
     }
-    },
-    isSearch: true
   },
   {
-    label: '数量',
+    label: '包装数量',
     field: 'qty',
     sort: 'custom',
     table: {
@@ -91,9 +94,9 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     }
   },
   {
-    label: '计量单位',
+    label: '包装单位',
     field: 'uom',
-    dictType: DICT_TYPE.UOM,
+    dictType: DICT_TYPE.PACK_UNIT,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',
@@ -110,34 +113,15 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
-    label: '批次',
-    field: 'batch',
-    sort: 'custom',
-    isSearch: true,
-    table: {
-      width: 120
-    }
-  },
-  {
-    label: '包装规格',
-    field: 'packUnit',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装规格代码', // 输入框占位文本
-        searchField: 'code', // 查询弹窗赋值字段
-        searchTitle: '包装规格信息', // 查询弹窗标题
-        searchAllSchemas: Packageunit.allSchemas, // 查询弹窗所需类
-        searchPage: PackageunitApi.getPackageunitPage, // 查询弹窗所需分页方法
-      }
-    }
-  },
+  // {
+  //   label: '批次',
+  //   field: 'batch',
+  //   sort: 'custom',
+  //   isSearch: true,
+  //   table: {
+  //     width: 120
+  //   }
+  // },
   {
     label: '仓库代码',
     field: 'warehouseCode',
@@ -258,6 +242,42 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
         }] 
     },
   },
+  {
+    label: '库位',
+    field: 'location',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isForm:false,
+    // form: {
+    //   // labelMessage: '信息提示说明！！！',
+    //   componentProps: {
+    //     isSearchList: true, // 开启查询弹窗
+    //     searchListPlaceholder: '请选择库位代码', // 输入框占位文本
+    //     searchField: 'code', // 查询弹窗赋值字段
+    //     searchTitle: '库位信息', // 查询弹窗标题
+    //     searchAllSchemas: Location.allSchemas, // 查询弹窗所需类
+    //     searchPage: WorkstationApi.selectAreaTypeToLocation, // 查询弹窗所需分页方法
+    //     searchCondition: [{
+    //       key:'workStationCode',
+    //       value:'workStationCode',
+    //       message: '请填写工位代码！',
+    //       isMainValue: true
+    //     },{
+    //       key: 'available',
+    //       value: 'TRUE',
+    //       isMainValue: false
+    //     },
+    //     {
+    //       key: 'areaType',
+    //       value: confgiDataOne.areaType,
+    //       isMainValue: false
+    //     }]
+    //   }
+    // },
+    isSearch: true
+  },
   {
     label: '是否确认接收',
     field: 'isRecive',
@@ -268,14 +288,15 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
-    form: {
-      component: 'Switch',
-      value: 'FALSE',
-      componentProps: {
-        inactiveValue: 'FALSE',
-        activeValue: 'TRUE'
-      }
-    }
+    isForm:false
+    // form: {
+    //   component: 'Switch',
+    //   value: 'FALSE',
+    //   componentProps: {
+    //     inactiveValue: 'FALSE',
+    //     activeValue: 'TRUE'
+    //   }
+    // }
   },
   {
     label: '创建者id',

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

@@ -84,8 +84,10 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     const setV = {}
     if (formField == 'itemCode') {
       setV['itemCode'] = val[0]['code']
-      setV['uom'] = val[0]['uom']
-    } else {
+    } else  if (formField == 'packUnit') {
+      setV['uom'] = val[0]['unit']
+      setV['packUnit'] = val[0]['code']
+    }else {
       setV[formField] = val[0][searchField]
     }
     formRef.setValues(setV)
@@ -164,9 +166,9 @@ const openForm = (type: string, row?: any) => {
   
   basicFormRef.value.open(type, row)
   if (type == 'create') {
-    nextTick(() => {
-      basicFormRef.value.formRef.formModel.batch = formatTime(new Date(), 'yyyyMMdd')
-    })
+    // nextTick(() => {
+    //   basicFormRef.value.formRef.formModel.batch = formatTime(new Date(), 'yyyyMMdd')
+    // })
   }
 }
 

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

@@ -485,7 +485,7 @@ export const SupplierdeliverRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false,
     table: {
-      width: 300,
+      width: 330,
       fixed: 'right'
     },
   }