diff --git a/src/api/Common/dictcommons.js b/src/api/Common/dictcommons.js index 8b46441..55e4512 100644 --- a/src/api/Common/dictcommons.js +++ b/src/api/Common/dictcommons.js @@ -17,6 +17,16 @@ export function getTypeValueList(data) { }) } +// 根据当前登录用户的全路径查询相应部门下的所有人 +export function selAllByOrgSidPath(data) { + return request({ + url: '/oms/apiadmin/sysstafforg/selAllByOrgSidPath', + method: 'post', + params: data + }) +} + + // 根据部门sid获取客户信息 export function chooseCustomerList(data) { return request({ diff --git a/src/router/index.js b/src/router/index.js index aef7a4a..beee66e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -51,17 +51,15 @@ export const constantRoutes = [ meta: { title: '客户管理' }, - children: [ - { - path: '/customerInformation/customerInformation', - component: () => import('@/views/customerManagement/customerInformation/customerInformation'), - name: 'CustomerInformation', - meta: { - title: '客户信息管理', - noCache: true - } + children: [{ + path: '/customerInformation/customerInformation', + component: () => import('@/views/customerManagement/customerInformation/customerInformation'), + name: 'CustomerInformation', + meta: { + title: '客户信息管理', + noCache: true } - ] + }] }, { path: '/salesOrder', @@ -112,6 +110,15 @@ export const constantRoutes = [ title: '采购订单', noCache: true } + }, + { + path: '/purchaseReview/index', + component: () => import('@/views/purchase/purchaseReview/index'), + name: 'PurchaseReview', + meta: { + title: '订单审核', + noCache: true + } } ] }, diff --git a/src/views/purchase/purchaseOrder/index.vue b/src/views/purchase/purchaseOrder/index.vue index ce31736..18e6862 100644 --- a/src/views/purchase/purchaseOrder/index.vue +++ b/src/views/purchase/purchaseOrder/index.vue @@ -9,10 +9,7 @@
- - - - + 至 @@ -20,24 +17,15 @@ format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;"> - - - - - - - - - - - - + + @@ -49,6 +37,34 @@ + + + + + + + + + + + + + + + + + + + +
采购订单列表
- +
- + @selection-change="selectionLineChangeHandle" @row-click="rowItemClick" show-summary + :summary-method="getSummaries"> + - + - - - - - - - - - - - + + + + + + + + + + + + + + - - - - + + + + + + +
-
-
- - +
--> + + + + - 采购明细 费用/预付款 - 附件 + 附 件
@@ -231,6 +257,12 @@ purchaseBillDetailList: {} }, btnList: [{ + type: 'primary', + size: 'small', + icon: 'submit', + btnKey: 'toSubmit', + btnLabel: '提交审核' + }, { type: 'primary', size: 'small', icon: 'plus', @@ -247,7 +279,7 @@ { type: 'danger', size: 'small', - icon: 'plus', + icon: 'del', btnKey: 'doDel', btnLabel: '删除' }, @@ -265,7 +297,9 @@ total: 0, params: { "supplierName": "", + "supplierSid": "", "wareHouseName": "", + "wareHouseSid": "", "receiveStateKey": "", "logisticsNum": "", "deliveryStateKey": "", @@ -275,6 +309,10 @@ "createStartTime": "", "createEndTime": "", "orgLevelKey": "", + "menuUrl": "", + "orgPath": "", + "userSid": "", + "goodsSid": "" } }, sids: [], @@ -283,6 +321,7 @@ deliveryStateList: [], warehouseList: [], supplierList: [], + goodsList: [], createOrgSid: "", rowItemData: [], } @@ -293,7 +332,7 @@ created() { getOrgSidByPath({ - orgPath: window.sessionStorage.getItem('defaultOrgPath') + orgPath: window.sessionStorage.getItem('orgSid') }).then((res) => { if (res.success) { this.createOrgSid = res.data @@ -332,7 +371,7 @@ } }) getWarehouses({ - orgPath: window.sessionStorage.getItem('defaultOrgPath'), + orgPath: window.sessionStorage.getItem('orgSid'), }).then((res) => { if (res.success) { this.warehouseList = res.data @@ -343,10 +382,109 @@ }) }, + // 合计 + getSummaries(param) { + const { + columns, + data + } = param + const sums = [] + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '合计：' + return + } + const values = data.map(item => Number(item[column.property])) + if (column.property === 'amountTotal') { //商品总额 + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' + } else if (column.property === 'freight') { //采购运费 + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' + } else if (column.property === 'otherAmount') { //其他费用 + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' + } else if (column.property === 'prepayment') { //总税额 + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' + } else if (column.property === 'productProgress') { //未含税总额 + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' + } else if (column.property === 'countTotal') { //总采购数量 + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' + } else if (column.property === 'countTotal') { // 已入库数量 + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' + } else if (column.property === 'countTotal') { //已入库金额 + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + return prev + curr + } else { + return prev + } + }, 0) + sums[index] += '' + } + }) + return sums + }, + + rowItemClick(row) { console.log("row", row); - // this.rowItemData = [row]; + this.rowItemData = [row]; req.fetchDetailsBySid(row.sid).then((resp) => { if (resp.success) { @@ -367,17 +505,6 @@ }) }, - isRed({ - row - }) { - // const checkIdList = this.rowItemData.map((item) => item.sid); - // if (checkIdList.includes(row.sid)) { - // return { - // backgroundColor: "#34A1DB", - // }; - // } - }, - handleSelect(val) { console.log("val", val); this.activeIndex = val @@ -404,6 +531,9 @@ }, btnHandle(btnKey) { switch (btnKey) { + case 'toSubmit': + this.toSubmit() + break case 'toAdd': this.toAdd() break @@ -423,7 +553,7 @@ loadList() { this.tableLoading = true this.queryParams.params.userSid = window.sessionStorage.getItem('userSid') - this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.queryParams.params.orgPath = window.sessionStorage.getItem('orgSidPath') this.queryParams.params.menuUrl = this.$route.path req.listPage(this.queryParams).then((resp) => { this.tableLoading = false @@ -477,7 +607,9 @@ total: 0, params: { "supplierName": "", + "supplierSid": "", "wareHouseName": "", + "wareHouseSid": "", "receiveStateKey": "", "logisticsNum": "", "deliveryStateKey": "", @@ -487,10 +619,25 @@ "createStartTime": "", "createEndTime": "", "orgLevelKey": "", + "menuUrl": "", + "orgPath": "", + "userSid": "", + "goodsSid": "" } } this.loadList() }, + toSubmit() { + if (this.sids.length > 0) { + + } else { + this.$message({ + type: 'warning', + showClose: true, + message: '请至少选择一条记录进行操作' + }) + } + }, toAdd() { this.viewState = 2 this.$refs['divadd'].showAdd() @@ -596,4 +743,18 @@ justify-content: space-between; align-items: center; } + + .el-menu-item.is-active { + background-color: #3370ff !important; + color: #fff; + + span { + color: #fff; + } + } + + .el-submenu__title.is-active { + background: #1c88cf !important; + color: #fff !important; + } diff --git a/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue b/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue index 64daacb..db44cba 100644 --- a/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue +++ b/src/views/purchase/purchaseOrder/purchaseOrderAdd.vue @@ -22,15 +22,15 @@ -
制单人
+
申请人
{{ formobj.createByName }} -
制单部门
+
申请部门
{{ formobj.deptName }} -
制单日期
+
申请日期
@@ -93,10 +93,108 @@ + +
备注
+ + + + +
+
商品列表
+ 添加 +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
采购运费
 @@ -128,6 +226,7 @@
其他费用
@@ -161,54 +260,6 @@ - - -
备注
- - - - -
-
商品列表
- 添加 -
- - - - - - - - - - - - - - - - - - - - - - - - @@ -270,8 +321,8 @@ "deptSid": window.sessionStorage.getItem('departmentSid'), "deptName": window.sessionStorage.getItem('departmentName'), "useOrgSid": window.sessionStorage.getItem('orgSid'), - "createOrgSid": window.sessionStorage.getItem('orgSid'), - "orgPath": window.sessionStorage.getItem('orgSid'), + "createOrgSid": window.sessionStorage.getItem('departmentSid'), + "orgPath": window.sessionStorage.getItem('orgSidPath'), "purchaseBillAmount": { "sid": "", "billSid": "", @@ -338,7 +389,14 @@ }], }, - imgList: [] + imgList: [], + allCount: 0, + allPcsNum: 0, + allShareAmount: 0, + allAmount: 0, + allNotTaxPprice: 0, + allTotalTax: 0, + allTotalNotTaxPprice: 0, } }, created() { @@ -415,10 +473,268 @@ }, - calculation(row) { + // 合计 + getSummaries(param) { + const { + columns, + data + } = param + const sums = [] + columns.forEach((column, index) => { + if (index === 0) { + sums[index] = '合计：' + return + } + const values = data.map(item => Number(item[column.property])) + if (column.property === 'count') { // 数量 + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + this.allCount = prev + curr + return (Number(prev) + Number(curr)).toFixed(2) + } else { + this.allCount = prev + return Number(prev).toFixed(2) + } + }, 0) + sums[index] += '' + } else if (column.property === 'pcsNum') { // 数量pcs + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + this.allPcsNum = prev + curr + return (Number(prev) + Number(curr)).toFixed(2) + } else { + this.allPcsNum = prev + return Number(prev).toFixed(2) + } + }, 0) + sums[index] += '' + } else if (column.property === 'shareAmount') { //分摊金额 + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + this.allShareAmount = prev + curr + return (Number(prev) + Number(curr)).toFixed(2) + } else { + this.allShareAmount = prev + return Number(prev).toFixed(2) + } + }, 0) + sums[index] += '' + } else if (column.property === 'amount') { //总价 + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + this.allAmount = prev + curr + return (Number(prev) + Number(curr)).toFixed(2) + } else { + this.allAmount = prev + return Number(prev).toFixed(2) + } + }, 0) + sums[index] += '' + } else if (column.property === 'notTaxPprice') { //未含税价 + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + this.allNotTaxPprice = prev + curr + return (Number(prev) + Number(curr)).toFixed(2) + } else { + this.allNotTaxPprice = prev + return Number(prev).toFixed(2) + } + }, 0) + sums[index] += '' + } else if (column.property === 'totalTax') { //总税额 + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + this.allTotalTax = prev + curr + return (Number(prev) + Number(curr)).toFixed(2) + } else { + this.allTotalTax = prev + return Number(prev).toFixed(2) + } + }, 0) + sums[index] += '' + } else if (column.property === 'totalNotTaxPprice') { //未含税总价 + sums[index] = values.reduce((prev, curr) => { + const value = Number(curr) + if (!isNaN(value)) { + this.allTotalNotTaxPprice = prev + curr + return (Number(prev) + Number(curr)).toFixed(2) + } else { + this.allTotalNotTaxPprice = prev + return Number(prev).toFixed(2) + } + }, 0) + sums[index] += '' + } + }) + return sums + }, + + // 清除分摊金额 并反算 + calculation(row, updateProp, event) { + + this.formobj.purchaseBillAmount.freight = 0.00 + this.formobj.purchaseBillAmount.otherAmountName = 0.00 + + // 重新计算 + // 除去修改单价时 修改其他字段都先计算出单价 然后其他价格数据在计算一次 + // 如果修改的是单价 则先把本条数据直接赋值单价 然后其他价格数据在计算一次 + // 后需要把列表其他数据先计算出单价字段 然后其他价格数据在计算一次 + for (var i = 0; i < this.formobj.purchaseBillDetailList.length; i++) { + + var item = this.formobj.purchaseBillDetailList[i] + + if (row.sid != item.sid) { + // 列表其他数据 先计算单价 + // item.cost = (Number(item.cost) - Number(item.shareAmount) / Number(item.count)).toFixed(2) + item.cost = Number(item.cost1) + this.calculation2(item) + + } else { + + // if (updateProp == 'count') { + // // 修改的是数量 + // item.cost = Number(item.cost1) + // this.calculation2(item) + // } + + if (updateProp == 'cost') { + // 修改的不是单价 + this.calculation2(item) + } else { + item.cost = Number(item.cost1) + this.calculation2(item) + } + + // if (updateProp == 'discountRate') { + // // 修改的是折扣率 + // item.cost = Number(item.cost1) + // this.calculation2(item) + // } + + // if (updateProp == 'taxRate') { + // // 修改的是税率 + // item.cost = Number(item.cost1) + // this.calculation2(item) + // } + + + + } + + // 最后把列表所有的分摊金额赋值成0 + item.shareAmount = 0.00 + item.cost1 = Number(item.cost) + item.count1 = Number(item.count) + + } + + }, + + calculation2(row) { + // 折后单价 = 单价*折扣率 / 100 row.discountPrice = (Number(row.cost) * Number(row.discountRate) / 100).toFixed(2) - row.amount = (Number(row.count) * Number(row.discountPrice)).toFixed(2) + // console.log("calculation》》》》", row.discountPrice) + + // 总价 = 单价* 数量*折扣率 / 100 + row.amount = (Number(row.count) * Number(row.cost) * Number(row.discountRate) / 100).toFixed(2) + // console.log("calculation》》》》", row.amount) + + // 总税额 = 总价/(1+税率)*税率 + row.totalTax = (Number(row.amount) / (1 + Number(row.taxRate) / 100) * Number(row.taxRate) / 100) + .toFixed(2) + // console.log("calculation2》》》》", row.totalTax) + + // 未含税价 =(总价-总税额)/数量 + row.notTaxPprice = ((Number(row.amount) - Number(row.totalTax)) / row.count).toFixed(2) + // console.log("calculation2》》》》", row.notTaxPprice) + + // 未含税总价 = 总价-总税额 + row.totalNotTaxPprice = (Number(row.amount) - Number(row.totalTax)).toFixed(2) + // console.log("calculation2》》》》", row.totalNotTaxPprice) + + }, + + computeDate(row) { + // 预计到货日期 = 当前日期+采购周期 + row.deliveryDate = this.addDate(getCurrentDate(), Number(row.purchaseCycle)) + + }, + manufactureDateChange(row) { + + console.log("manufactureDateChange》》》》", row.manufactureDate) + console.log("manufactureDateChange》》》》", row.shelfLife) + row.overdueDate = this.addDate(row.manufactureDate, Number(row.shelfLife)) + + let reg = new RegExp('-', 'g') //g代表全部 + + row.batchNumber = row.manufactureDate.replace(reg, '') + " - " + row.overdueDate.replace(reg, '') + + }, + // days 只能是int + addDate(date, days) { + var dates = new Date(date) + dates.setDate(dates.getDate() + days) + var year = dates.getFullYear() + var month = dates.getMonth() + 1 + var day = dates.getDate() + if (month < 9) { + month = "0" + month + } + if (day < 9) { + day = "0" + day + } + var time = year + '-' + month + '-' + day + return time + }, + + // 计算分摊金额 + computeShareAmount() { + // 分摊金额 = (采购运费+其他费用)*单价*数量/所有商品总价 + + var price = Number(this.formobj.purchaseBillAmount.freight) + Number(this.formobj.purchaseBillAmount + .otherAmountName) + + var all = 0 // 除去最后一个的分摊总和 + var totalAmount = 0 // 原所有商品总价 + for (var i = 0; i < this.formobj.purchaseBillDetailList.length; i++) { + + var item = this.formobj.purchaseBillDetailList[i] + totalAmount = (Number(totalAmount) + Number(Number(item.cost1) * Number(item.count1))).toFixed(2) + } + + + // 分摊金额 = (采购运费+其他费用)*单价*数量/ 原所有商品总价 + + for (var i = 0; i < this.formobj.purchaseBillDetailList.length; i++) { + + var item = this.formobj.purchaseBillDetailList[i] + + if (i == this.formobj.purchaseBillDetailList.length - 1) { + // 最后一条数据 + item.shareAmount = (Number(price) - Number(all)).toFixed(2) + item.cost = (Number(item.cost1) + (Number(item.shareAmount) / Number(item.count))).toFixed(2) + + } else { + + item.shareAmount = (Number(price) * Number(item.cost1) * Number(item.count) / Number(totalAmount)) + .toFixed(2) + item.cost = (Number(item.cost1) + (Number(item.shareAmount) / Number(item.count))).toFixed(2) + all += Number(item.shareAmount) + + + } + + // this.calculation(item) + this.calculation2(item) + + } }, @@ -456,35 +772,38 @@ this.viewState = 1 console.log('>>>>>>>>>backData', value) + for (var i = 0; i < value.length; i++) { - this.formobj.purchaseBillDetailList.push( - - { - - "sid": "", - "remarks": "", - "billSid": "", - "goodsSpuSid": value[i].sid, - "goodsSpuName": value[i].goodsName, - "goodsSkuSid": "", - "goodsSkuTitle": "", - "goodsSkuCode": value[i].goodsSkuCode, - "goodsSN": "", - "goodsNum": "", - "goodsSkuOwnSpec": value[i].goodsSkuOwnSpec, - "unit": value[i].unit, - "cost": value[i].cost, - "count": "0", - "discountRate": value[i].discountRate, - "discountPrice": "0.00", - "shareAmount": "0.00", - "shareRate": "0.00", - "amount": "0.00", - "cycle": "", - "deliveryDate": "", - "taxAmount": "0.00", - "taxPrice": "0.00" + this.formobj.purchaseBillDetailList.push({ + "sid": value[i].sid != null ? value[i].sid : '', + "goodsSkuCode": value[i].goodsSkuCode != null ? value[i].goodsSkuCode : '', + "goodsName": value[i].goodsName != null ? value[i].goodsName : '', + "barCode": value[i].barCode != null ? value[i].barCode : '', + "goodsSkuOwnSpec": value[i].goodsSkuOwnSpec != null ? value[i].goodsSkuOwnSpec : '', + "unit": value[i].unit != null ? value[i].unit : '', + "count": value[i].count != null ? value[i].count : '0', + "count1": value[i].count != null ? value[i].count : '0', + "pcsNum": value[i].pcsNum != null ? value[i].pcsNum : '0', + "tagPrice": value[i].tagPrice != null ? value[i].tagPrice : '', + "cost": value[i].cost != null ? value[i].cost : '', + "cost1": value[i].cost != null ? value[i].cost : '', + "discountRate": value[i].discountRate != null ? value[i].discountRate : '100', + "discountPrice": value[i].discountPrice != null ? value[i].discountPrice : '0.00', + "shareAmount": value[i].shareAmount != null ? value[i].shareAmount : '0.00', + "amount": value[i].amount != null ? value[i].amount : '0.00', + "taxRate": value[i].taxRate != null ? value[i].taxRate : '', + "notTaxPprice": value[i].notTaxPprice != null ? value[i].notTaxPprice : '', + "totalTax": value[i].totalTax != null ? value[i].totalTax : '', + "totalNotTaxPprice": value[i].totalNotTaxPprice != null ? value[i].totalNotTaxPprice : '', + "purchaseCycle": value[i].purchaseCycle != null ? value[i].purchaseCycle : '', + "deliveryDate": value[i].deliveryDate != null ? value[i].deliveryDate : '', + "manufactureDate": value[i].manufactureDate != null ? value[i].manufactureDate : '', + "shelfLife": value[i].shelfLife != null ? value[i].shelfLife : '', + "overdueDate": value[i].overdueDate != null ? value[i].overdueDate : '', + "batchNumber": value[i].batchNumber != null ? value[i].batchNumber : '', + "itemNumber": value[i].itemNumber != null ? value[i].itemNumber : '', + "remarks": value[i].remarks != null ? value[i].remarks : '' } ) @@ -585,9 +904,9 @@ "wareHouseName": "", "deptSid": window.sessionStorage.getItem('departmentSid'), "deptName": window.sessionStorage.getItem('departmentName'), - "useOrgSid": '', - "createOrgSid": '', - "orgPath": '', + "useOrgSid": window.sessionStorage.getItem('orgSid'), + "createOrgSid": window.sessionStorage.getItem('departmentSid'), + "orgPath": window.sessionStorage.getItem('orgSidPath'), "purchaseBillAmount": { "sid": "", "billSid": "", @@ -656,6 +975,7 @@ .then(resp => { if (resp.success) { this.formobj = resp.data + loading.close() this.imgList = [] for (var i = 0; i < resp.data.purchaseAppendixList.length; i++) { diff --git a/src/views/purchase/purchaseOrder/purchaseOrderInfo.vue b/src/views/purchase/purchaseOrder/purchaseOrderInfo.vue index fb5f03c..ec1055b 100644 --- a/src/views/purchase/purchaseOrder/purchaseOrderInfo.vue +++ b/src/views/purchase/purchaseOrder/purchaseOrderInfo.vue @@ -63,8 +63,43 @@ class="addinputInfo">{{ formobj.purchaseBillAmount.currencyValue }} - + +
备注
+ {{ formobj.remarks }} + + + +
+
商品列表
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
采购运费
{{ formobj.purchaseBillAmount.freight }} @@ -108,30 +143,6 @@ - - -
备注
- {{ formobj.remarks }} - - - -
-
商品列表
-
- - - - - - - - - - - - - - @@ -149,7 +160,7 @@ viewState: 1, listLoading: false, formobj: { - + purchaseBillAmount: {} }, } }, diff --git a/src/views/purchase/purchaseOrder/relation/chooseproducts.vue b/src/views/purchase/purchaseOrder/relation/chooseproducts.vue index 01968ca..aaf6efb 100644 --- a/src/views/purchase/purchaseOrder/relation/chooseproducts.vue +++ b/src/views/purchase/purchaseOrder/relation/chooseproducts.vue @@ -39,8 +39,24 @@ + - + + + + + + + + + +
diff --git a/src/views/purchase/purchaseReview/index.vue b/src/views/purchase/purchaseReview/index.vue new file mode 100644 index 0000000..766b147 --- /dev/null +++ b/src/views/purchase/purchaseReview/index.vue @@ -0,0 +1,746 @@ + + + + diff --git a/src/views/purchase/purchaseReview/purchaseOrderInfo.vue b/src/views/purchase/purchaseReview/purchaseOrderInfo.vue new file mode 100644 index 0000000..bf8c383 --- /dev/null +++ b/src/views/purchase/purchaseReview/purchaseOrderInfo.vue @@ -0,0 +1,225 @@ + + + +