Merge branch 'purchaseDev' of http://172.16.100.139/new-business/drp-web into purchaseDev

src/views/purchase/workSpace/columns.js

@@ -52,10 +52,43 @@ const ALLOT_RULE = [
 const MATERIAL_APPLY_RULE = [
   { prop: 'name', label: '物料名称', },
   { prop: 'code', label: '物料编码', },
-  { prop: 'version', label: '版本号', },
-  { prop: 'orgName', label: '所属组织', },
   { prop: 'specification', label: '规格' },
+  { prop: 'model', label: '型号', },
+  { prop: 'unitName', label: '计量单位', },
+  { prop: 'manufacturerName', label: '生产厂家/代理人', },
+  { prop: 'registrant', label: '注册人/上市许可持有人', },
+  { prop: 'productionPermit', label: '生产许可证', },
+  {
+    prop: 'storageCondition',
+    label: '存储条件',
+    attr: {
+      is: "el-dict-tag",
+      dictName: "sys_storage_condition",
+    },
+  },
+  {
+    prop: 'transportationCondition',
+    label: '运输条件',
+    attr: {
+      is: "el-dict-tag",
+      dictName: "sys_conditions_carriage",
+    },
+  },
+  { prop: 'originPlaceName', label: '产地', },
+  { prop: 'serviceLife', label: '使用期限/次数', },
+  { prop: 'brand', label: '品牌', },
   { prop: 'classifyName', label: '四级分类', },
+  { prop: 'packExplain', label: '包装说明', },
+  { prop: 'deliveryPeriod', label: '交货周期', },
+  { prop: 'minOrderQty', label: '最小起订量', },
+  { prop: 'minPackQty', label: '最小包装量', },
+  { prop: 'minBatchQty', label: '最小批量', },
+  { prop: 'diCode', label: 'DI码', },
+  { prop: 'healthCode', label: '医保代码', },
+  { prop: 'manufacturersMaterialCode', label: '厂家物料编码', },
+  { prop: 'purchasingOrganizationName', label: '默认采购组织', },
+  { prop: 'puPersonnelName', label: '负责采购员', },
+  { prop: 'version', label: '版本号', },
   {
     prop: 'isMedicine',
     label: '医药物料',
@@ -64,9 +97,6 @@ const MATERIAL_APPLY_RULE = [
       dictName: "sys_number_yes_no",
     },
   },
-  { prop: 'failCause', label: '同步失败原因', },
-  { prop: 'model', label: '型号', },
-  { prop: 'packExplain', label: '包装说明', },
   {
     prop: 'serialNoManager',
     label: '序列号管理',
@@ -75,9 +105,6 @@ const MATERIAL_APPLY_RULE = [
       dictName: "sys_number_yes_no",
     },
   },
-  { prop: 'barCode', label: '条形码', },
-  { prop: 'unitName', label: '计量单位', },
-  { prop: 'deliveryPeriod', label: '交货周期', },
   {
     prop: 'isInventoryStatus',
     label: '批号及库存状态管理',
@@ -86,9 +113,6 @@ const MATERIAL_APPLY_RULE = [
       dictName: "sys_number_yes_no",
     },
   },
-  { prop: 'height', label: '高度', },
-  { prop: 'manufacturerName', label: '生产厂家/代理人', },
-  { prop: 'minOrderQty', label: '最小起订量', },
   {
     prop: 'expiryDateManagerment',
     label: '效期管理',
@@ -97,9 +121,6 @@ const MATERIAL_APPLY_RULE = [
       dictName: "sys_number_yes_no",
     },
   },
-  { prop: 'width', label: '宽度', },
-  { prop: 'registrant', label: '注册人/上市许可持有人', },
-  { prop: 'minPackQty', label: '最小包装量', },
   {
     prop: 'expiryUnitId',
     label: '效期单位',
@@ -108,20 +129,7 @@ const MATERIAL_APPLY_RULE = [
       dictName: "period_unit",
     },
   },
-  { prop: 'length', label: '长度', },
-  { prop: 'productionPermit', label: '生产许可证', },
-  { prop: 'minBatchQty', label: '最小批量', },
   { prop: 'usefulLife', label: '有效期', },
-  { prop: 'oneClass', label: '一级分类', },
-  {
-    prop: 'storageCondition',
-    label: '存储条件',
-    attr: {
-      is: "el-dict-tag",
-      dictName: "sys_storage_condition",
-    },
-  },
-  { prop: 'diCode', label: 'DI码', },
   {
     prop: 'usefulLifeUnitId',
     label: '有效期至单位',
@@ -130,16 +138,6 @@ const MATERIAL_APPLY_RULE = [
       dictName: "expiry_date",
     },
   },
-  { prop: 'twoClass', label: '二级分类', },
-  {
-    prop: 'transportationCondition',
-    label: '运输条件',
-    attr: {
-      is: "el-dict-tag",
-      dictName: "sys_conditions_carriage",
-    },
-  },
-  { prop: 'healthCode', label: '医保代码', },
   {
     prop: 'nearOnsetManagerment',
     label: '近效期管理',
@@ -148,26 +146,62 @@ const MATERIAL_APPLY_RULE = [
       dictName: "sys_number_yes_no",
     },
   },
-  { prop: 'threeClass', label: '三级分类', },
-  { prop: 'originPlaceName', label: '产地', },
-  { prop: 'manufacturersMaterialCode', label: '厂家物料编码', },
   { prop: 'recentWarningPeriod', label: '近效期预警天数', },
+  { prop: 'materialRateName', label: '物料税类', },
+  { prop: 'failCause', label: '同步失败原因', },
   {
-    prop: 'isEnable',
-    label: '启用状态',
+    prop: 'isDrug',
+    label: '是否药品', 
     attr: {
       is: "el-dict-tag",
-      dictName: "material_enable",
+      dictName: "sys_number_yes_no",
     },
   },
-  { prop: 'serviceLife', label: '使用期限/次数', },
-  { prop: 'purchasingOrganizationName', label: '默认采购组织', },
-  { prop: 'materialRateName', label: '物料税类', },
-  { prop: 'remark', label: '备注', },
-  { prop: 'brand', label: '品牌', },
-  { prop: 'puPersonnelName', label: '负责采购员', },
-  { prop: 'proposerName', label: '物料申请人', },
-  { prop: 'serviceClass', label: '服务类', },
+  { prop: 'ratifyBatchNo', label: '批准文号', },
+  { prop: 'registrationNo', label: '注册证号/备案凭证编号', },
+  { prop: 'dosageFrom', label: '剂型', },
+  { prop: 'medicalInstruments',
+    label: '管理类别', 
+    attr: {
+      is: "el-dict-tag",
+      dictName: "medical_instruments",
+    },  
+  },
+  { prop: 'oriRegistrationNo', label: '旧注册证号', },
+  { prop: 'curingType',
+    label: '养护类型',
+    attr: {
+      is: "el-dict-tag",
+      dictName: "curing_type",
+    },   
+  },
+  { prop: 'drugCode', label: '药品类别编码', },
+  { prop: 'drugName', label: '药品类别名称', },
+
+  // { prop: 'orgName', label: '所属组织', },
+  // { prop: 'barCode', label: '条形码', },
+  // { prop: 'height', label: '高度', },
+  // { prop: 'width', label: '宽度', },
+
+  // { prop: 'length', label: '长度', },
+  // { prop: 'oneClass', label: '一级分类', },
+
+
+  // { prop: 'twoClass', label: '二级分类', },
+
+
+  // { prop: 'threeClass', label: '三级分类', },
+  // {
+  //   prop: 'isEnable',
+  //   label: '启用状态',
+  //   attr: {
+  //     is: "el-dict-tag",
+  //     dictName: "material_enable",
+  //   },
+  // },
+  // { prop: 'remark', label: '备注', },
+  // { prop: 'proposerName', label: '物料申请人', },
+  // { prop: 'serviceClass', label: '服务类', },
 ];
 
 // 价格申报单
@@ -175,46 +209,14 @@ const PU_PRICE_APPLY_RULE = [
   { label: "物料编码", prop: "materialCode", width: 120 },
   { label: "物料名称", prop: "materialName" },
   { label: "规格", prop: "specification" },
+  { label: "型号", prop: "model" },
   { label: "生产厂家/代理人", prop: "manufacturerName" },
-  { label: "含税单价", prop: "taxPrice", width: 80 },
-  { label: "最近价格", prop: "recentlyPrice", width: 80 },
-  { label: "单价差", prop: "priceDiffer", width: 80 },
-  { label: "申请理由", prop: "explainStr" },
   { label: "客户", prop: "customerName" },
-  { label: "供应商名称1", prop: "supplierName1" },
-  { label: "单价1", prop: "unitPrice1", width: 70 },
-  { label: "供应商名称2", prop: "supplierName2" },
-  { label: "单价2", prop: "unitPrice2", width: 70 },
-  { label: "供应商名称3", prop: "supplierName3" },
-  { label: "单价3", prop: "unitPrice3", width: 70 },
-  { label: "型号", prop: "model" },
-  {
-    label: "价格类型",
-    prop: "priceType",
-    attr: {
-      is: "el-dict-tag",
-      dictName: "sys_price_type",
-    },
-  },
-  {
-    label: "配送价",
-    prop: "isDistributionPrice",
-    attr: {
-      is: "el-dict-tag",
-      dictName: "sys_number_yes_no",
-    },
-    // formatter: function (row, column, cellValue, index) {
-    //   return row.isDistributionPrice == "Y" ? "是" : "否";
-    // },
-  },
+  { label: "主单位", prop: "unitName" },
+  { label: "含税单价", prop: "taxPrice", width: 80 },
+  { label: "税率", prop: "tax" },
   { label: "价格有效期（起）", prop: "periodBegin" },
   { label: "价格有效期（止）", prop: "periodEnd" },
-  { label: "币种名称", prop: "currencyName" },
-  { label: "无税单价", prop: "price" },
-  { label: "采购换算率", prop: "conversionRate" },
-  { label: "采购单位名称", prop: "puUnitName" },
-  { label: "单位名称", prop: "unitName" },
-  { label: "调整类型", prop: "isPriceAdjustment" },
   {
     label: "首次报批",
     prop: "isApprovalFirst",
@@ -226,18 +228,56 @@ const PU_PRICE_APPLY_RULE = [
     //   return row.isApprovalFirst == "Y" ? "是" : "否";
     // },
   },
-  { label: "预计年采购量", prop: "yPurchaseQuantity" },
-  { label: "预计年影响量", prop: "yAffectedAmount" },
+  { label: "调整类型", prop: "isPriceAdjustment" },
+  { label: "最近价格", prop: "recentlyPrice", width: 80 },
+  { label: "单价差", prop: "priceDiffer", width: 80 },
   { label: "涨幅", prop: " increase" },
+  { label: "预计年采购量", prop: "yPurchaseQuantity" },
+  { label: "预计年影响金额", prop: "yAffectedAmount" },
+  {
+    label: "价格类型",
+    prop: "priceType",
+    attr: {
+      is: "el-dict-tag",
+      dictName: "sys_price_type",
+    },
+  },
+
+
+  { label: "申请理由", prop: "explainStr" },
+  // { label: "供应商名称1", prop: "supplierName1" },
+  // { label: "单价1", prop: "unitPrice1", width: 70 },
+  // { label: "供应商名称2", prop: "supplierName2" },
+  // { label: "单价2", prop: "unitPrice2", width: 70 },
+  // { label: "供应商名称3", prop: "supplierName3" },
+  // { label: "单价3", prop: "unitPrice3", width: 70 },
+  // {
+  //   label: "配送价",
+  //   prop: "isDistributionPrice",
+  //   attr: {
+  //     is: "el-dict-tag",
+  //     dictName: "sys_number_yes_no",
+  //   },
+  //   // formatter: function (row, column, cellValue, index) {
+  //   //   return row.isDistributionPrice == "Y" ? "是" : "否";
+  //   // },
+  // },
+  // { label: "币种名称", prop: "currencyName" },
+  // { label: "无税单价", prop: "price" },
+  // { label: "采购换算率", prop: "conversionRate" },
+  // { label: "采购单位名称", prop: "puUnitName" },
+  // { label: "单位名称", prop: "unitName" },
+  // { label: "预计年影响量", prop: "yAffectedAmount" },
 ];
 
 // 采购订单
 const PU_ORDER_RULE = [
-  { label: "收货客户", prop: "customerName" },
   { label: "物料编码", prop: "materialCode", width: 120 },
   { label: "物料名称", prop: "materialName" },
+  { label: "规格", prop: "specification" },
   { label: "生产厂家", prop: "manufacturerName" },
   // {label: '医药物料',  prop: 'isMedcine'},
+  { label: "单位", prop: "unitName" },
   { label: "数量", prop: "qty", width: 60 },
   { label: "含税单价", prop: "taxPrice", width: 80 },
   {
@@ -248,6 +288,8 @@ const PU_ORDER_RULE = [
       return row.money ? parseFloat(row.money).toFixed(2) : "0.00";
     },
   },
+  { label: "收货客户", prop: "customerName" },
+  { label: "税率", prop: "tax" },
   {
     label: "赠品",
     prop: "isGift",
@@ -260,12 +302,8 @@ const PU_ORDER_RULE = [
     //   return row.isGift == "Y" ? "是" : "否";
     // },
   },
-  { label: "折扣%", prop: "nitemdiscountrate", width: 70 },
   { label: "价格类型", prop: "priceType", width: 80 },
-
-  { label: "规格", prop: "specification" },
-  { label: "单位", prop: "unitName" },
-  { label: "税率", prop: "tax" },
+  { label: "折扣%", prop: "nitemdiscountrate", width: 70 },
   { label: "注册证号", prop: "registration" },
   { label: "需求单号", prop: "demandCode" },
 ];