diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue index 8c6e87c6..f6706ca4 100644 --- a/jshERP-web/src/views/bill/SaleOrderList.vue +++ b/jshERP-web/src/views/bill/SaleOrderList.vue @@ -242,17 +242,18 @@ }, methods: { getSystemConfig() { + let statusIndex = 0 + for(let i=0; i { if(res.code === 200 && res.data){ let purchaseBySaleFlag = res.data.purchaseBySaleFlag - let statusIndex = 0 - for(let i=0; i0) { + //移除采购进度列 this.columns.splice(statusIndex, 1) } } else { @@ -260,9 +261,15 @@ let purchaseStatusObj = { title: '采购进度', dataIndex: 'purchaseStatus', width: 70, align: "center", scopedSlots: { customRender: 'customRenderPurchaseStatus' } } - this.columns.splice(8, 0, purchaseStatusObj) + //添加采购进度列 + this.columns.splice(statusIndex-1, 0, purchaseStatusObj) } } + } else { + if(statusIndex>0) { + //移除采购进度列 + this.columns.splice(statusIndex, 1) + } } }) }, diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index 68f8d387..b5a00aa6 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -211,7 +211,7 @@ prefixNo: 'CGDD', fileList:[], rowCanEdit: true, - purchaseBySaleFlag: true, + purchaseBySaleFlag: false, model: {}, labelCol: { xs: { span: 24 },