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

src/views/purchase/workSpace/index.vue

@@ -93,10 +93,12 @@
           highlight-current-row
           style="font-size: 12px;"
         >
-          <el-table-column label="序号" type="index" align="center" width="50px"/>
+          <el-table-column v-if="cols.length !== 0" label="序号" type="index" align="center" width="50px"/>
             <el-table-column v-for="(col,index) in cols" :key="index"
+              align="center"
               :prop="col.prop"
               :label="col.label"
+              :width="col.width"
               :formatter="col.formatter"
             >
             </el-table-column>
@@ -145,19 +147,7 @@ export default {
         billCode: '',
         type: ''
       },
-      cols: [
-        {label: '物料编码',  prop: 'materialCode'},
-        {label: '物料名称',  prop: 'materialName'},
-        {label: '规格',  prop: 'specification'},
-        {label: '型号',  prop: 'model'},
-        {label: '单位',  prop: 'unitName'},
-        {label: '生产厂家/代理人',  prop: 'manufacturerName'},
-        {label: '调出仓库',  prop: 'deliveryWarehouseName'},
-        {label: '调出货位',  prop: 'deliveryAllocationName'},
-        {label: '数量',  prop: 'qty'},
-        {label: '调入仓库',  prop: 'storageWarehouseName'},
-        {label: '调入货位',  prop: 'storageAllocationName'},
-      ],
+      cols: [],
       // 记录点击行的下标
       recordIndex: '',
     }
@@ -211,39 +201,39 @@ export default {
       // 采购需求单
       if(row.type == 'PU_DEMAND_RULE') {
         this.cols = [
-          {label: '物料编码',  prop: 'materialCode'},
+          {label: '物料编码',  prop: 'materialCode',width: 120},
           {label: '物料名称',  prop: 'materialName'},
           {label: '规格',  prop: 'specification'},
-          {label: '型号',  prop: 'model'},
-          {label: '单位',  prop: 'unitName'},
-          {label: '生产厂家/代理人',  prop: 'manufacturerName'},
-          {label: '实际（业务）需求量',  prop: 'qty'},
-          {label: '月均销量',  prop: 'averageQtyMonth'},
+          {label: '单位',  prop: 'unitName',width: 50},
+          {label: '生产厂家/代理人',  prop: 'manufacturerName', width: 150},
+          {label: '实际(业务)需求量',  prop: 'qty'},
+          {label: '月均销量',  prop: 'averageQtyMonth', width: 80},
           {label: '需求可用周期',  prop: 'demandPeriod'},
           {label: '业务备注',  prop: 'remark'},
           {label: '紧急标识',  prop: 'isUrgency',
             formatter: function(row, column, cellValue, index) {
               return row.isUrgency == 'Y' ? '是' : '否'
-            }
+            },
+            width: 80
           },
           {label: '补单标识',  prop: 'isReplenishment',
             formatter: function(row, column, cellValue, index) {
               return row.isReplenishment == 'Y' ? '是' : '否'
-            }
+            },
+            width: 80
           },
         ]
         // 调拨订单
       } else if (row.type == 'ALLOT_RULE') {
         this.cols = [
-          {label: '物料编码',  prop: 'materialCode'},
+          {label: '物料编码',  prop: 'materialCode', width: 120},
           {label: '物料名称',  prop: 'materialName'},
           {label: '规格',  prop: 'specification'},
-          {label: '型号',  prop: 'model'},
-          {label: '单位',  prop: 'unitName'},
-          {label: '生产厂家/代理人',  prop: 'manufacturerName'},
+          {label: '单位',  prop: 'unitName', width: 50},
+          {label: '生产厂家/代理人',  prop: 'manufacturerName', width: 150},
           {label: '调出仓库',  prop: 'deliveryWarehouseName'},
           {label: '调出货位',  prop: 'deliveryAllocationName'},
-          {label: '数量',  prop: 'qty'},
+          {label: '数量',  prop: 'qty', width: 50},
           {label: '调入仓库',  prop: 'storageWarehouseName'},
           {label: '调入货位',  prop: 'storageAllocationName'},
         ]
@@ -253,56 +243,63 @@ export default {
           {label: '物料一级分类',  prop: 'classOneName'},
           {label: '物料基本分类',  prop: 'classifyName'},
           {label: '物料名称',  prop: 'materialName'},
-          {label: '型号',  prop: 'model'},
           {label: '规格',  prop: 'specification'},
-          {label: '生产厂家/代理人',  prop: 'manufacturerName'},
+          {label: '生产厂家/代理人',  prop: 'manufacturerName', width: 150},
           {label: '注册证号',  prop: 'registrationNo'},
-          {label: '注册人',  prop: 'registrant'},
+          {label: '注册人',  prop: 'registrant', width: 80},
           {label: '存储条件',  prop: 'storageCondition'},
-          {label: '运输条件',  prop: 'transportationCondition'},
-          {label: '是否医药物料',  prop: 'isMedicine',
-            formatter: function(row, column, cellValue, index) {
-              return row.isMedicine == '0' ? '是' : '否'
-            }
-          },
+          {label: '运输条件',  prop: 'transportationCondition', width: 80},
+          // {label: '是否医药物料',  prop: 'isMedicine',
+          //   formatter: function(row, column, cellValue, index) {
+          //     return row.isMedicine == '0' ? '是' : '否'
+          //   }
+          // },
           {label: '是否药品',  prop: 'isDrug',
             formatter: function(row, column, cellValue, index) {
               return row.isDrug == '0' ? '是' : '否'
-            }
+            },
+            width: 80
           },
         ]
         // 价格申报单
       } else if (row.type == 'PU_PRICE_APPLY_RULE') {
         this.cols = [
-          {label: '物料编码',  prop: 'materialCode'},
+          {label: '物料编码',  prop: 'materialCode',width: 120},
           {label: '物料名称',  prop: 'materialName'},
-          {label: '型号',  prop: 'model'},
           {label: '规格',  prop: 'specification'},
-          {label: '生产厂家/代理人',  prop: 'manufacturerName'},
-          {label: '含税单价',  prop: 'taxPrice'},
-          {label: '最近价格',  prop: 'recentlyPrice'},
-          {label: '单价差',  prop: 'priceDiffer'},
+          {label: '生产厂家/代理人',  prop: 'manufacturerName', width: 150},
+          {label: '含税单价',  prop: 'taxPrice', width: 80, 
+            formatter: function(row, column, cellValue, index) {
+              return row.taxPrice ? parseFloat(row.taxPrice).toFixed(2) : '0.00'
+            },
+          },
+          {label: '最近价格',  prop: 'recentlyPrice', width: 80},
+          {label: '单价差',  prop: 'priceDiffer', width: 80},
           {label: '客户',  prop: 'customerName'},
           {label: '供应商名称1',  prop: 'supplierName1'},
-          {label: '单价1',  prop: 'unitPrice1'},
+          {label: '单价1',  prop: 'unitPrice1', width: 80},
         ]
         // 采购订单
       } else if (row.type == 'PU_ORDER_RULE') {
         this.cols = [
           {label: '收货客户',  prop: 'customerName'},
-          {label: '物料编码',  prop: 'materialCode'},
+          {label: '物料编码',  prop: 'materialCode', width: 120},
           {label: '物料名称',  prop: 'materialName'},
-          {label: '生产厂家',  prop: 'manufacturerName'},
-          {label: '医药物料',  prop: 'isMedcine'},
-          {label: '数量',  prop: 'qty'},
-          {label: '含税单价',  prop: 'taxPrice'},
-          {label: '价税合计',  prop: 'money'},
-          {label: '赠品',  prop: 'isGift',
+          {label: '生产厂家',  prop: 'manufacturerName', width: 150},
+          // {label: '医药物料',  prop: 'isMedcine'},
+          {label: '数量',  prop: 'qty', width: 80,},
+          {label: '含税单价',  prop: 'taxPrice', width: 80,
+            formatter: function(row, column, cellValue, index) {
+              return row.taxPrice ? parseFloat(row.taxPrice).toFixed(2) : '0.00'
+            },
+          },
+          {label: '价税合计',  prop: 'money', width: 80,},
+          {label: '赠品',  prop: 'isGift', width: 50,
             formatter: function(row, column, cellValue, index) {
               return row.isGift == 'Y' ? '是' : '否'
             }        
           },
-          {label: '折扣%',  prop: 'nitemdiscountrate'},
+          {label: '折扣%',  prop: 'nitemdiscountrate', width: 50,},
           {label: '价格类型',  prop: 'priceType'},
         ]
       }