Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!508

src/api/business/purchase/purchase-order.js

@@ -189,6 +189,15 @@ export function oaBack(data) {
   });
 }
 
+// 转派
+export function modifyBuyer(data) {
+  return request({
+    url: "/pu/order/modifyBuyer",
+    method: "PUT",
+    data: data,
+  });
+}
+
 
 export default {
   list,
@@ -211,5 +220,7 @@ export default {
   orderExport,
   orderImport,
   downloadFailData,
-  oaBack
+  oaBack,
+  modifyBuyer,
+  
 }

src/api/business/purchase/task.js

@@ -72,3 +72,12 @@ export function PRINT(params) {
     params: params,
   });
 }
+
+export function ROWClOSE(data) {
+  return request({
+    url: "/pu/order/generate/rowClose",
+    method: "PUT",
+    data: data,
+  });
+}
+

src/views/purchase/DemandSummary/add.vue

@@ -26,6 +26,13 @@
           ref="table"
         >
         <el-table-column show-overflow-tooltip type="selection" fixed="left"/>
+        <el-table-column show-overflow-tooltip label="默认采购组织" align="center" prop="orgName" width="250px">
+          <template slot-scope="scope">
+              <el-input clearable :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.orgName" @clear="clean(scope.row, '默认采购组织')" @focus="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')">
+                <el-button size="mini" :disabled="scope.row.status !== '1' || lineDisable" slot="append" icon="el-icon-more" @click="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')"></el-button>
+              </el-input>
+          </template>
+        </el-table-column>
         <el-table-column show-overflow-tooltip label="需求单号" align="center" prop="code" width="100"/>
         <!-- <el-table-column show-overflow-tooltip label="序号" align="center" type="index" width="55" fixed="left"/> -->
         <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowNo">
@@ -106,13 +113,6 @@
         </el-table-column>
         <el-table-column show-overflow-tooltip label="供应仓库" align="center" prop="lastWarehouseName" width="100"/>
         <el-table-column show-overflow-tooltip label="供应货位" align="center" prop="lastAllocationName" width="120"/>
-        <el-table-column show-overflow-tooltip label="默认采购组织" align="center" prop="orgName" width="250px">
-          <template slot-scope="scope">
-              <el-input clearable :disabled="scope.row.status !== '1' || lineDisable" size="mini" v-model="scope.row.orgName" @clear="clean(scope.row, '默认采购组织')" @focus="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')">
-                <el-button size="mini" :disabled="scope.row.status !== '1' || lineDisable" slot="append" icon="el-icon-more" @click="chooseMxHW(scope.$index, 'ORG_PARAM', true, '默认采购组织')"></el-button>
-              </el-input>
-          </template>
-        </el-table-column>
         <el-table-column show-overflow-tooltip label="业务类型" align="center" prop="billType" width="120" :formatter="formatterBillType"/>
         <el-table-column show-overflow-tooltip label="行状态" align="center" prop="status" width="100px" :formatter="hangStatus"/>
         <el-table-column show-overflow-tooltip label="收货仓库" align="center" prop="deliveryWarehouseName" width="200">

src/views/purchase/PurchaseDemandList/add.vue

@@ -1344,6 +1344,11 @@ export default {
         this.adjust.csFlag = selection[0].csFlag
         this.adjust.allocation = ''
         this.adjust.allocationName = ''
+        this.adjust.deliveryAddressName = ''
+        this.adjust.deliveryAddress = ''
+        this.adjust.contacts = ''
+        this.adjust.contactsPhone = ''
+        this.adjust.address = ''
       }
       if(this.referCondition.type == 'ALLOCATION_PARAM' && this.referCondition.title == '收货货位') {
         this.adjust.allocation = selection[0].id
@@ -1367,6 +1372,11 @@ export default {
         this.basicForm.puDemandItemList[this.tableIndex].csFlag = selection[0].csFlag
         this.basicForm.puDemandItemList[this.tableIndex].deliveryAllocation = null
         this.basicForm.puDemandItemList[this.tableIndex].deliveryAllocationName = null
+        this.basicForm.puDemandItemList[this.tableIndex].deliveryAddressName = null
+        this.basicForm.puDemandItemList[this.tableIndex].deliveryAddress = null
+        this.basicForm.puDemandItemList[this.tableIndex].contacts = null
+        this.basicForm.puDemandItemList[this.tableIndex].contactsPhone = null
+        this.basicForm.puDemandItemList[this.tableIndex].address = null
       }
       if(this.referCondition.title == '选择收货货位') {
         this.basicForm.puDemandItemList[this.tableIndex].deliveryAllocation = selection[0].id

src/views/purchase/purchase-order/add/column.js

@@ -849,6 +849,19 @@ const CauseColumns =[
     require: true,
     isShow:true,
   },
+  { 
+    key: "customerName",
+    title: "收货客户", 
+    inputType: "PopoverSelect",
+    valueKey: "id",
+    referName: "CUSTOMER_PARAM",
+    width: 180,
+    dataMapping:{
+      customer:'id',
+      customerName:'name',
+    },
+    isShow:true,
+  },
   { key: "isBack", title: "退货", inputType: "Input", inputType: "Checkbox",  isShow:true,},
   { key: "freezeCause", title: "冻结原因", inputType: "Checkbox", isShow:true, },
   {

src/views/purchase/purchase-order/column.js

@@ -87,6 +87,7 @@ export const TableColumns = [
       isHidden:true,
     },
   },
+  
   // { 
   //   item:{key: "customerName", title: "收货客户" ,width:100,},
   //   attr:{
@@ -148,7 +149,18 @@ export const TableColumns = [
       isHidden:true,
       isSummary:true,
     },
- },
+  },
+  {
+    item: { 
+      key: "isUrgency", 
+      title: "紧急程度",
+      width:100,
+    },
+    attr: { 
+      is: "el-dict-tag", 
+      dictName: "urgency_degree"
+    },
+  },
   // {
   //   key: "isMarketing",
   //   title: "已协同生成销售订单",
@@ -1308,6 +1320,28 @@ export const SearchColumns = [
       dictName: "order_delivery_status",
     },
   },
+  {
+    item: { 
+      key: "isUrgency", 
+      title: "紧急标识",
+    },
+    attr: { 
+      clearable: true,
+      is: "el-select", 
+      dictName: "sys_yes_no" 
+    },
+  },
+  {
+    item: { 
+      key: "isReplenishment", 
+      title: "补单标识",
+    },
+    attr: { 
+      clearable: true,
+      is: "el-select", 
+      dictName: "sys_yes_no" 
+    },
+  },
   
   // {
   //   item:{

src/views/purchase/purchase-order/index.vue

@@ -28,6 +28,7 @@ export default {
     ElSuperTable: () => import("@/components/super-table/index.vue"),
     ElSuperSearch: () => import("@/components/super-search/index.vue"),
     Retrieve: () => import("@/components/Retrieve/index.vue"),
+    ZpButton: () => import("./zhuan-pai/index.vue"),
     },
   data() {
     const initTabColumns = () => TabColumns;
@@ -52,6 +53,7 @@ export default {
       primaryResource:{},
       timer:300,
       timeOut:null,
+      size:'mini',
     };
   },
 
@@ -691,17 +693,17 @@ export default {
     <!-- 操作 -->
     <el-row :gutter="24" type="flex" justify="end" style="margin: 20px 0;">
       <el-col :span="24" style="text-align: right;">
-        <el-button size="mini" type="primary" @click="handleOpenAddDrawer"
+        <el-button :size="size" type="primary" @click="handleOpenAddDrawer"
           v-hasPermi="['material:order:add']">新增</el-button>
        
         <el-button-group style="margin-left: 10px">
-          <el-button type="primary" size="mini" :disabled="checkedList.length != 1" @click="handleCopy">复制</el-button>
-          <el-button type="primary" size="mini" @click="handleBatchSubmit">批量提交</el-button>
+          <el-button type="primary" :size="size" :disabled="checkedList.length != 1" @click="handleCopy">复制</el-button>
+          <el-button type="primary" :size="size" @click="handleBatchSubmit">批量提交</el-button>
         </el-button-group>
 
         <el-button-group style="margin-left: 10px" :key="checkedList.length + 1">
-          <el-button type="primary" size="mini" @click="handleAllReturn" :disabled="judgeIsAllReturn()">整单退回</el-button>
-          <!-- <el-button type="primary" size="mini" @click="handleAllClose" :disabled="judgeIsAllClose()">整单关闭</el-button> -->
+          <el-button type="primary" :size="size" @click="handleAllReturn" :disabled="judgeIsAllReturn()">整单退回</el-button>
+          <!-- <el-button type="primary" :size="size" @click="handleAllClose" :disabled="judgeIsAllClose()">整单关闭</el-button> -->
         </el-button-group>
 
         <el-button-group style="margin:0 10px">
@@ -718,7 +720,14 @@ export default {
           >批量导出</el-button>
           
         </el-button-group>
-        
+        <el-button-group>
+          <zp-button
+            :size="size"
+            :select-data="checkedList"
+            @success="handleQueryList"
+          >
+          </zp-button>
+        </el-button-group>
 
 
       </el-col>

src/views/purchase/purchase-order/print/index.vue

@@ -38,7 +38,7 @@
         position: relative;
         width: 210mm;
         font-size: 12px;
-        line-height: 1.5;
+        line-height: 1.0;
         font-family: '宋体';
         z-index: -1;
       "

src/views/purchase/purchase-order/zhuan-pai/index.vue

@@ -0,0 +1,155 @@
+<script>
+import { modifyBuyer } from "@/api/business/purchase/purchase-order";
+export default {
+  name: "ModifyBuyerDialog",
+  props: {
+    selectData: {
+      type: [Array],
+      require: true,
+    },
+  },
+  components: {
+    ElPopoverSelectV2: () => import("@/components/popover-select-v2/index.vue"),
+  },
+  data() {
+    return {
+      title: "转 派",
+      visible: false,
+      loading: false,
+      // params: { id: "", buyer: "", buyerName: "" },
+      params:[],
+      buyerModel:{buyer: "", buyerName: ""},
+    };
+  },
+  computed: {
+    disabled: {
+      get() {
+        // return this.selectData.length !== 1;
+        // add by wjie
+        return this.selectData.length < 1;
+      },
+      set() {},
+    },
+  },
+  watch: {},
+  methods: {
+    //
+    open(prop) {
+      // let arr = prop.filter((element) => element.status != '0' && element.status != '3');
+      // let arr = prop.filter((element) => element.status != '0' || (element.status === '0' && element.source === '3'));
+
+      // if(arr.length > 0){
+      //   this.$modal.notifyWarning("您所选的单据中存在非自由态或手工单,无法进行操作，请确认数据！");
+      //   return;
+      // }
+      this.params = prop;
+      this.visible = true;
+    },
+    //
+    hide() {
+      this.visible = false;
+      // this.params.id = "";
+      // this.params.buyer = "";
+      // this.params.buyerName = "";
+      this.params = [];
+      this.buyerModel = {buyer: "", buyerName: ""};
+    },
+    //
+    async submit(prop) {
+      try {
+        // try
+        this.loading = true;
+        const { buyer, buyerName } = prop;
+        // for(let i in this.selectData){
+        //   this.selectData[i].buyer = buyer;
+        //   this.selectData[i].buyerName = buyerName;
+        // }
+
+        let params = {
+          puOrderIds:[...this.selectData.map(item => item.id)],
+          buyer,
+          buyerName
+        }
+
+        console.log(params,'params');
+        const { msg, code } = await modifyBuyer(params);
+        if (code === 200) {
+          this.hide();
+          this.$emit("success");
+          this.$notify.success({ title: msg });
+        }
+      } catch (err) {
+        // catch
+      } finally {
+        // finally
+        this.loading = false;
+      }
+    },
+  },
+  created() {},
+  mounted() {},
+  destroyed() {},
+};
+</script>
+
+<template>
+  <el-button
+    v-bind="$attrs"
+    v-on="$listeners"
+    :disabled="disabled"
+    @click="open(selectData)"
+  >
+    {{ title }}
+    <el-dialog
+      :title="title"
+      :visible.sync="visible"
+      width="25%"
+      append-to-body
+      @close="hide"
+    >
+      <div slot="footer">
+        <el-button
+          :size="$attrs.size"
+          :loading="loading"
+          @click="visible = false"
+          >取 消</el-button
+        >
+        <el-button
+          type="primary"
+          :size="$attrs.size"
+          :loading="loading"
+          @click="submit(buyerModel)"
+          >确 认</el-button
+        >
+      </div>
+      <!-- <el-alert
+        title="转派后，采购任务将会从您的采购任务清单中删除，转移到转派目标人员的已受理采购任务清单中，您确定要转派吗？"
+        type="info"
+        show-icon
+        :closable="false"
+        style="margin-bottom: 10px"
+      >
+      </el-alert> -->
+      <el-form
+        :size="$attrs.size"
+        :model="buyerModel"
+        label-width="0px"
+        label-position="right"
+        style="padding: 0"
+      >
+        <el-form-item prop="" label="">
+          <el-popover-select-v2
+            v-model="buyerModel.buyerName"
+            :source.sync="buyerModel"
+            :data-mapping="{ buyer: 'code', buyerName: 'name' }"
+            valueKey="name"
+            referName="CONTACTS_PARAM"
+          >
+          </el-popover-select-v2>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
+  </el-button>
+</template>
+
+<style scoped></style>

src/views/purchase/task/columns.js

@@ -40,6 +40,12 @@ export default function useColumns() {
         isSummary:true,
       },
     },
+    {
+      item: { key: "closeQty", title: "关闭数量",width :100 },
+      attr: {
+        isSummary:true,
+      },
+    },
     { item: { key: "buyerName", title: "采购员",width :100 }, attr: {} },
     {
       item: { key: "customerName", title: "收货客户",width :100 },
@@ -72,6 +78,17 @@ export default function useColumns() {
       attr: {},
     },
     // {
+    //   item: { 
+    //     key: "isUrgency", 
+    //     title: "紧急程度",
+    //     width :100 ,
+    //   },
+    //   attr: { 
+    //     is: "el-dict-tag", 
+    //     dictName: "sys_yes_no" 
+    //   },
+    // },
+    // {
     //   item: { key: "materialDesc", title: "物料描述",width :100 },
     //   attr: {},
     // },
@@ -236,26 +253,28 @@ export default function useColumns() {
         valueKey: "name",
       },
     },
-    // {
-    //   item: { 
-    //     key: "", 
-    //     title: "紧急标识",
-    //   },
-    //   attr: { 
-    //     is: "el-select", 
-    //     dictName: "sys_yes_no" 
-    //   },
-    // },
-    // {
-    //   item: { 
-    //     key: "", 
-    //     title: "补单标识",
-    //   },
-    //   attr: { 
-    //     is: "el-select", 
-    //     dictName: "sys_yes_no" 
-    //   },
-    // },
+    {
+      item: { 
+        key: "isUrgency", 
+        title: "紧急标识",
+      },
+      attr: { 
+        clearable: true,
+        is: "el-select", 
+        dictName: "sys_yes_no" 
+      },
+    },
+    {
+      item: { 
+        key: "isReplenishment", 
+        title: "补单标识",
+      },
+      attr: { 
+        clearable: true,
+        is: "el-select", 
+        dictName: "sys_yes_no" 
+      },
+    },
     {
       item: {
         key: "documentsCodes",

src/views/purchase/task/index.vue

@@ -12,6 +12,7 @@ export default {
     ZpButton: () => import("./zhuan-pai/index.vue"),
     ThxqButton: () => import("./tui-hui-xu-qiu/index.vue"),
     XyzcButton: () => import("./xie-yi-zhi-cai/index.vue"),
+    lcButton: () => import("./line-close/index.vue"),
     ElSuperTable: () => import("@/components/super-table/index.vue"),
     ElSuperSearch: () => import("@/components/super-search/index.vue"),
   },
@@ -154,6 +155,12 @@ export default {
           @success="useQuery(params, page)"
         >
         </zp-button>
+        <lc-button
+          :size="size"
+          :select-data="selectData"
+          @success="useQuery(params, page)"
+        >
+        </lc-button>
       </el-button-group>
       <!-- <el-button-group>
         <dc-button

src/views/purchase/task/line-close/index.vue

@@ -0,0 +1,75 @@
+
+<script>
+import { ROWClOSE } from "@/api/business/purchase/task";
+export default {
+  name:'lineClose',
+  props:{
+    selectData: {
+      type: [Array],
+      require: true,
+    },
+  },
+  data(){
+    return {
+      title:'行关闭',
+    }
+  },
+  computed:{
+    disabled:{
+      get(){
+        return this.selectData.length < 1;
+      },
+      set(){},
+    }
+  },
+  watch: {},
+  methods: {
+     open(prop){
+      console.log(prop);
+
+      this.$confirm('是否继续进行行关闭操作?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async() => {
+
+          try {
+            let documentIds = this.selectData.map(item => item.id);
+            
+            let { code, msg } = await ROWClOSE(documentIds);
+
+            if (code === 200) {
+              this.$emit("success");
+              this.$notify.success({ title: msg });
+            }
+
+          } catch (error) {
+            
+          }
+          
+        }).catch(() => {
+               
+        });
+
+
+    
+    }
+  },
+  created() {},
+  mounted() {},
+  destroyed() {},
+
+}
+</script>
+
+<template>
+  <el-button
+    v-bind="$attrs"
+    v-on="$listeners"
+    :disabled="disabled"
+    @click="open(selectData)"
+  >
+    {{ title }}
+   
+  </el-button>
+</template>

src/views/purchase/task/xie-yi-zhi-cai/index.vue

@@ -153,6 +153,8 @@ export default {
         >
         
       </template>
+
+      
       <div v-for="(item, index) in data" :key="index" class="m-4">
         
         <el-descriptions>

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'},
         ]
       }