Browse Source

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

master_hella_20240701
zhaoxuebing 8 months ago
parent
commit
a08ee77887
  1. 4
      src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts
  2. 14
      src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts

4
src/views/wms/basicDataManage/customerManage/customeritem/customeritem.data.ts

@ -109,8 +109,8 @@ export const Customeritem = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '客户包装单位',
field: 'packUnit',
// dictType: DICT_TYPE.PACK_UNIT,
// dictClass: 'string',
dictType: DICT_TYPE.PACK_UNIT,
dictClass: 'string',
isTable: true,
sort: 'custom',
table: {

14
src/views/wms/basicDataManage/itemManage/packageunit/packageunit.data.ts

@ -2,7 +2,9 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
import { dateFormatter } from '@/utils/formatTime'
import { fa } from 'element-plus/es/locale'
import * as PackageunitApi from '@/api/wms/packageunit'
import { Select } from '@element-plus/icons-vue/dist/types'
//新增时针对父包装代码copy出的实体
export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
{
label: '包装代码',
@ -81,6 +83,12 @@ export const PackageunitCopy = useCrudSchemas(reactive<CrudSchema[]>([
label: '单位',
field: 'unit',
sort: 'custom',
dictType: DICT_TYPE.PACK_UNIT,
dictClass: 'string',
isSearch: true,
table: {
width: 150
},
},
{
label: '是否可用',
@ -363,6 +371,12 @@ export const Packageunit = useCrudSchemas(reactive<CrudSchema[]>([
label: '单位',
field: 'unit',
sort: 'custom',
dictType: DICT_TYPE.PACK_UNIT,
dictClass: 'string',
isSearch: true,
table: {
width: 150
},
},
{
label: '是否可用',

Loading…
Cancel
Save