|
@@ -14,6 +14,10 @@ export default function useColumns() {
|
|
|
attr: { is: "el-dict-tag", dictName: "sys_allot_billtype", },
|
|
|
},
|
|
|
{
|
|
|
+ item: { key: "allotType", title: "调拨方式", width: 100 },
|
|
|
+ attr: { is: "el-dict-tag", dictName: "sys_to_type", },
|
|
|
+ },
|
|
|
+ {
|
|
|
item: { key: "deliveryInventoryOrgName", title: "调出库存组织", },
|
|
|
attr: {},
|
|
|
},
|
|
@@ -30,23 +34,21 @@ export default function useColumns() {
|
|
|
attr: {},
|
|
|
},
|
|
|
{
|
|
|
- item: { key: "approveUser", title: "当前审批人", width: 100 },
|
|
|
+ item: { key: "customerName", title: "客户", },
|
|
|
attr: {},
|
|
|
},
|
|
|
{
|
|
|
- item: { key: "customerName", title: "客户", },
|
|
|
+ item: { key: "approveUser", title: "当前审批人", width: 100 },
|
|
|
attr: {},
|
|
|
},
|
|
|
-
|
|
|
{
|
|
|
item: { key: "createByName", title: "制单人", width: 100 },
|
|
|
attr: {},
|
|
|
},
|
|
|
{
|
|
|
- item: { key: "createTime", title: "制单日期" },
|
|
|
+ item: { key: "createTime", title: "制单日期", width: 100 },
|
|
|
attr: {},
|
|
|
},
|
|
|
-
|
|
|
].map(({ item, attr }) => ({
|
|
|
attr,
|
|
|
item: {
|
|
@@ -81,11 +83,11 @@ export default function useColumns() {
|
|
|
attr: {},
|
|
|
},
|
|
|
{
|
|
|
- item: { key: "qty", title: "数量", width: 120 },
|
|
|
+ item: { key: "deliveryCode", title: "调拨出库单号", },
|
|
|
attr: {},
|
|
|
},
|
|
|
{
|
|
|
- item: { key: "unitName", title: "单位", width: 120 },
|
|
|
+ item: { key: "storageCode", title: "调拨入库单号", },
|
|
|
attr: {},
|
|
|
},
|
|
|
{
|
|
@@ -93,19 +95,43 @@ export default function useColumns() {
|
|
|
attr: {},
|
|
|
},
|
|
|
{
|
|
|
+ item: { key: "manufacturer", title: "生产厂家/代理人", },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "originPlace", title: "产地", },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
item: { key: "model", title: "型号", width: 100 },
|
|
|
attr: {},
|
|
|
},
|
|
|
{
|
|
|
- item: { key: "manufacturer", title: "生产厂家/代理人", },
|
|
|
+ item: { key: "unitName", title: "单位", width: 60 },
|
|
|
attr: {},
|
|
|
},
|
|
|
{
|
|
|
- item: { key: "originPlace", title: "产地", },
|
|
|
+ item: { key: "qty", title: "数量", width: 100 },
|
|
|
attr: {},
|
|
|
},
|
|
|
{
|
|
|
- item: { key: "storageDeptName", title: "调入部门", },
|
|
|
+ item: { key: "mainUnit", title: "主单位", },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "equation", title: "换算率", width: 100 },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "mainQty", title: "主数量", width: 100 },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "rate", title: "税率", width: 100 },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "patchNo", title: "批次号", },
|
|
|
attr: {},
|
|
|
},
|
|
|
{
|
|
@@ -113,17 +139,64 @@ export default function useColumns() {
|
|
|
attr: {},
|
|
|
},
|
|
|
{
|
|
|
- item: { key: "deliveryAllocationName", title: "调出货位", },
|
|
|
- attr: {}
|
|
|
+ item: { key: "manufactureDate", title: "生产日期", },
|
|
|
+ attr: {},
|
|
|
},
|
|
|
{
|
|
|
- item: { key: "storageAllocationName", title: "调入货位", },
|
|
|
- attr: {}
|
|
|
+ item: { key: "periodEndDate", title: "有效期至/失效日期", },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "ratifyCode", title: "批准文号", },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "registration", title: "注册证号", },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "productCode", title: "商品名", width: 100 },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "commonCode", title: "通用名", },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "drug", title: "剂型", width: 120 },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "ruleDetail", title: "调入调出结算规则明细", },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "marketingApprovalPersonal", title: "上市许可持有人", },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "production", title: "生产许可证号/经营许可证号/备案凭证号", },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "pi", title: "pi码", width: 100 },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "classify", title: "类别", width: 100 },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "customerLogistic", title: "客户物料码", },
|
|
|
+ attr: {},
|
|
|
+ },
|
|
|
+ {
|
|
|
+ item: { key: "customerLogisticName", title: "客户物料名称", },
|
|
|
+ attr: {},
|
|
|
},
|
|
|
-
|
|
|
].map(({ item, attr }) => ({
|
|
|
attr,
|
|
|
- item: { ...item, width: item.width || 180 },
|
|
|
+ item: { ...item, width: item.width || 150 },
|
|
|
}))
|
|
|
},
|
|
|
// 收发货信息
|