product_platform/oms-ui-admin
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

完善采购订单

Browse Source
This commit is contained in:
guoxing
2024-07-29 13:36:42 +08:00
parent 981db9b0cd
commit 72643a116a
9 changed files with 496 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/api/Common/dictcommons.js
View File

@@ -21,8 +21,9 @@ export function getTypeValueList(data) {
export function selAllByOrgSidPath(data) {
return request({
url: '/oms/apiadmin/sysstafforg/selAllByOrgSidPath',
method: 'post',
params: data
method: 'get',
params: data,
})
}
@@ -68,7 +69,10 @@ export function choiceSupplierInfo(data) {
return request({
url: '/oms/apiadmin/supplierinfo/choiceSupplierInfo',
method: 'get',
params: data
params: data,
headers: {
'Content-Type': 'application/json'
}
})
}
@@ -84,7 +88,7 @@ export function getWareHouse(params) {
// 查询所有仓库
export function getWarehouses(params) {
return request({
url: '/oms/apiadmin/base/wmswarehouseinfo/listAll',
url: '/oms/apiadmin/warehouseinfo/listAll',
method: 'post',
data: params,
headers: {
@@ -103,4 +107,17 @@ export function getWarehouseareas(data) {
'Content-Type': 'application/json'
}
})
}
// 查询商品分页列表
export function getGoodsListAllByOrg(params) {
return request({
url: '/oms/apiadmin/basegoodssku/listAllByOrg',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json'
}
})
}

25
src/api/purchase/purchaseOrder.js
View File

@@ -5,7 +5,7 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/oms/apiadmin/pmspurchasebill/listPage',
url: '/oms/apiadmin/purchasebill/listPage',
method: 'post',
data: params,
headers: {
@@ -18,7 +18,7 @@ export default {
// 获取添加商品列表
chooseproducts: function(params) {
return request({
url: '/oms/apiadmin/pmspurchasebill/purGoodsListPage',
url: '/oms/apiadmin/purchasebill/purGoodsListPage',
method: 'post',
data: params,
headers: {
@@ -30,7 +30,7 @@ export default {
// 新增采购订单
save: function(data) {
return request({
url: '/oms/apiadmin/pmspurchasebill/save',
url: '/oms/apiadmin/purchasebill/save',
method: 'POST',
data: data,
headers: {
@@ -42,7 +42,7 @@ export default {
// 详情
fetchDetailsBySid: function(data) {
return request({
url: '/oms/apiadmin/pmspurchasebill/fetchDetailsBySid/' + data,
url: '/oms/apiadmin/purchasebill/fetchDetailsBySid/' + data,
method: 'get',
data: data,
headers: {
@@ -55,7 +55,7 @@ export default {
// 采购订单- 删除
deleteBySids: function(data) {
return request({
url: '/oms/apiadmin/pmspurchasebill/delBySids',
url: '/oms/apiadmin/purchasebill/delBySids',
method: 'DELETE',
data: data,
headers: {
@@ -65,4 +65,19 @@ export default {
})
},
// 采购订单- 提交
submit: function(data) {
return request({
url: '/oms/apiadmin/purchasebill/submit',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
},
}

58
src/api/purchase/purchaseReview.js Normal file
View File

@@ -0,0 +1,58 @@
import request from '@/utils/request'
let tokens = window.sessionStorage.getItem('token');
export default {
// 查询分页列表
listPage: function(params) {
return request({
url: '/oms/apiadmin/purchasebill/exlistPage',
method: 'post',
data: params,
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
},
// 采购明细
fetchDetailsBySid: function(data) {
return request({
url: '/oms/apiadmin/purchasebill/fetchDetailsBySid/' + data,
method: 'get',
data: data,
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
},
// 查询操作记录信息
operationrecordDetails: function(data) {
return request({
url: '/oms/apiadmin/purchaseflownode/listPage',
method: 'post',
params: data,
headers: {
'Content-Type': 'application/json'
}
});
},
// 采购订单- 审核
examine: function(data) {
return request({
url: '/oms/apiadmin/purchasebill/examine',
method: 'post',
params: data,
headers: {
'Content-Type': 'application/json',
'token': tokens
}
})
},
}

136
src/views/purchase/purchaseOrder/index.vue
View File

@@ -51,7 +51,7 @@
</el-form-item>
<el-form-item label="商品">
<el-select v-model="queryParams.params.goodsSid" placeholder="请选择" style="width: 220px;">
<el-option v-for="(item,i) in goodsList" :key="i" :label="item.name" :value="item.sid">
<el-option v-for="(item,i) in goodsList" :key="i" :label="item.title" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
@@ -101,7 +101,7 @@
</template>
</el-table-column>
<el-table-column prop="createTime" label="业务日期" width="120" align="center" />
<el-table-column prop="billNo" label="单据编号" width="120" align="center" />
<el-table-column prop="billNo" label="单据编号" width="150" align="center" />
<el-table-column prop="supplierName" label="供应商" width="150" align="center" />
<el-table-column prop="purchaserName" label="业务员" width="120" align="center" />
<el-table-column prop="wareHouseName" label="收货仓库" width="150" align="center" />
@@ -113,15 +113,15 @@
<el-table-column prop="prepayment" label="总税额" width="120" align="center" />
<el-table-column prop="logisticsNum" label="物流单号" width="120" align="center" />
<el-table-column prop="productProgress" label="生产进度" width="120" align="center" />
<el-table-column prop="productProgress" label="未含税总额" width="120" align="center" />
<el-table-column prop="unTaxTotalAmount" label="未含税总额" width="120" align="center" />
<el-table-column prop="countTotal" label="总采购数量" width="120" align="center" />
<el-table-column prop="countTotal" label="总入库数量" width="120" align="center" />
<el-table-column prop="countTotal" label="总入库金额" width="120" align="center" />
<!-- <el-table-column prop="receiveStateValue" label="收货状态" align="center" /> -->
<el-table-column prop="deliveryStateValue" label="发货状态" width="120" align="center" />
<el-table-column prop="remarks" label="备注" width="200" align="center" />
<el-table-column prop="createByName" label="创建人" align="center" />
<el-table-column prop="remarks" label="最后修改时间" width="150" align="center" />
<el-table-column prop="remarks" label="备注" :min-width="200" align="center" />
<el-table-column prop="createByName" label="创建人" width="150" align="center" />
<el-table-column prop="modifyTime" label="最后修改时间" width="200" align="center" />
</el-table>
</div>
<!-- End 项目列表 -->
@@ -131,7 +131,7 @@
<!-- <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
</div> -->
<!--
<el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect"
text-color="#666" active-text-color="white">
@@ -143,16 +143,29 @@
<div v-show="activeIndex=='1'" style="margin-bottom: 50px;">
<el-table :data="formobj.purchaseBillDetailList" border style="width: 100%">
<el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="goodsSpuName" label="商品名称" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格型号" align="center" />
<el-table-column prop="goodsName" label="商品名称" width="120" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" width="120" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格型号" width="120" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="count" label="采购数量" align="center" />
<el-table-column prop="cost" label="单价" align="center" />
<el-table-column prop="discountRate" label="折扣率(%)" align="center" />
<el-table-column prop="discountPrice" label="折扣单价" align="center" />
<el-table-column prop="shareAmount" label="分摊金额" align="center" />
<el-table-column prop="amount" label="总价" align="center" />
<el-table-column prop="count" label="采购数量" width="120" align="center" />
<el-table-column label="数量(pcs)" prop="pcsNum" align="center" width="150" />
<el-table-column label="吊牌价" prop="tagPrice" width="120" align="center" />
<el-table-column label="单价" prop="cost" width="120" align="center" />
<el-table-column prop="discountRate" label="折扣率(%)" width="120" align="center" />
<el-table-column prop="discountPrice" label="折扣单价" width="120" align="center" />
<el-table-column prop="shareAmount" label="分摊金额" width="150" align="center" />
<el-table-column prop="amount" label="总价" width="120" align="center" />
<el-table-column prop="taxRate" label="税率" width="120" align="center" />
<el-table-column prop="notTaxPprice" label="未含税价" width="120" align="center" />
<el-table-column prop="totalTax" label="总税额" width="120" align="center" />
<el-table-column prop="totalNotTaxPprice" label="未含总税价" width="120" align="center" />
<el-table-column prop="purchaseCycle" label="采购周期" width="120" align="center" />
<el-table-column prop="deliveryDate" label="预计到货日期" width="180" align="center" />
<el-table-column prop="manufactureDate" label="生产日期" width="180" align="center" />
<el-table-column prop="overdueDate" label="过期日期" width="120" align="center" />
<el-table-column prop="batchNumber" label="批次号" width="200" align="center" />
<el-table-column prop="itemNumber" label="货号" width="120" align="center" />
<el-table-column prop="remarks" label="备注" width="120" align="center" />
</el-table>
</div>
@@ -207,7 +220,7 @@
</el-popover>
</span>
</div>
</div> -->
</div>
</div>
@@ -227,10 +240,10 @@
import divAdd from './purchaseOrderAdd.vue'
import divInfo from './purchaseOrderInfo.vue'
import {
getOrgSidByPath,
getTypeValueList,
typeValues,
choiceSupplierInfo,
getWarehouses
getWarehouses,
getGoodsListAllByOrg
} from '@/api/Common/dictcommons'
export default {
components: {
@@ -322,7 +335,6 @@
warehouseList: [],
supplierList: [],
goodsList: [],
createOrgSid: "",
rowItemData: [],
}
},
@@ -330,23 +342,14 @@
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('orgSid')
}).then((res) => {
if (res.success) {
this.createOrgSid = res.data
this.init()
}
})
this.init()
this.loadList()
},
methods: {
init() {
getTypeValueList({
typeValues({
type: 'receiveState'
}).then((res) => {
if (res.success) {
@@ -354,7 +357,7 @@
}
})
getTypeValueList({
typeValues({
type: 'deliveryState'
}).then((res) => {
if (res.success) {
@@ -363,7 +366,7 @@
})
choiceSupplierInfo({
createOrgSid: this.createOrgSid
createOrgSid: window.sessionStorage.getItem('orgSid')
}).then((resp) => {
if (resp.success) {
this.supplierList = resp.data
@@ -371,7 +374,7 @@
}
})
getWarehouses({
orgPath: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('orgSidPath'),
}).then((res) => {
if (res.success) {
this.warehouseList = res.data
@@ -380,6 +383,17 @@
}
})
getGoodsListAllByOrg({
orgPath: window.sessionStorage.getItem('orgSidPath'),
}).then((res) => {
if (res.success) {
this.goodsList = res.data
console.log("aaaaaa", this.goodsList);
}
})
},
// 合计
@@ -484,25 +498,25 @@
rowItemClick(row) {
console.log("row", row);
this.rowItemData = [row];
// this.rowItemData = [row];
req.fetchDetailsBySid(row.sid).then((resp) => {
if (resp.success) {
this.formobj = resp.data
} else {
this.$message({
type: 'warning',
message: "数据异常。",
showClose: true
})
}
}).catch(() => {
this.$message({
type: 'warning',
message: "数据异常。",
showClose: true
})
})
// req.fetchDetailsBySid(row.sid).then((resp) => {
// if (resp.success) {
// this.formobj = resp.data
// } else {
// this.$message({
// type: 'warning',
// message: "数据异常。",
// showClose: true
// })
// }
// }).catch(() => {
// this.$message({
// type: 'warning',
// message: "数据异常。",
// showClose: true
// })
// })
},
handleSelect(val) {
@@ -630,6 +644,22 @@
toSubmit() {
if (this.sids.length > 0) {
req.submit(this.sids).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.loadList()
} else {
// 根据resp.code进行异常情况处理
}
}).catch(e => {
loading.close()
})
} else {
this.$message({
type: 'warning',

146
src/views/purchase/purchaseOrder/purchaseOrderAdd.vue
View File

@@ -114,7 +114,7 @@
</template>
</el-table-column>
<el-table-column label="商品编码" prop="goodsSkuCode" width="150" align="center" />
<el-table-column label="商品名称" prop="goodsName" width="150" align="center" />
<el-table-column label="商品名称" prop="goodsSkuTitle" width="150" align="center" />
<el-table-column label="商品规格" prop="goodsSkuOwnSpec" width="150" align="center" />
<el-table-column label="单位" prop="unit" width="120" align="center" />
<el-table-column label="采购数量" align="center" prop="count" width="150">
@@ -123,9 +123,9 @@
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" @input="calculation(scope.row,'count',$event)" />
</template>
</el-table-column>
<el-table-column label="数量(pcs)" prop="pcsNum" align="center" width="150">
<el-table-column label="数量(pcs)" prop="pcsCount" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.pcsNum" clearable placeholder=""
<el-input v-model="scope.row.pcsCount" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
@@ -157,13 +157,13 @@
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</template>
</el-table-column>
<el-table-column prop="notTaxPprice" label="未含税价" width="120" align="center" />
<el-table-column prop="totalTax" label="总税额" width="120" align="center" />
<el-table-column prop="totalNotTaxPprice" label="未含总税价" width="120" align="center" />
<!-- <el-table-column prop="purchaseCycle" label="采购周期" width="120" align="center" /> -->
<el-table-column prop="unTaxPrice" label="未含税价" width="120" align="center" />
<el-table-column prop="taxAmount" label="总税额" width="120" align="center" />
<el-table-column prop="unTaxTotalAmount" label="未含总税价" width="120" align="center" />
<!-- <el-table-column prop="cycle" label="采购周期" width="120" align="center" /> -->
<el-table-column label="采购周期" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.purchaseCycle" clearable placeholder="" @input="computeDate(scope.row)"
<el-input v-model="scope.row.cycle" clearable placeholder="" @input="computeDate(scope.row)"
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" /> </template>
</el-table-column>
<el-table-column prop="deliveryDate" label="预计到货日期" width="180" align="center" />
@@ -176,13 +176,13 @@
<!-- <el-table-column prop="manufactureDate" label="生产日期" width="120" align="center" /> -->
<el-table-column label="生产日期" align="center" min-width="250">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.manufactureDate" type="date" value-format="yyyy-MM-dd"
placeholder="选择日期" @change="manufactureDateChange(scope.row)" />
<el-date-picker v-model="scope.row.madeDate" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
@change="manufactureDateChange(scope.row)" />
</template>
</el-table-column>
<el-table-column prop="overdueDate" label="过期日期" width="120" align="center" />
<el-table-column prop="expireDate" label="过期日期" width="120" align="center" />
<el-table-column prop="batchNumber" label="批次号" width="200" align="center" />
<el-table-column prop="itemNumber" label="货号" width="120" align="center" />
<el-table-column prop="goodsNum" label="货号" width="120" align="center" />
<el-table-column label="备注" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" clearable placeholder="" />
@@ -224,9 +224,8 @@
<el-row>
<el-col :span="8">
<div class="span-sty">其他费用</div>
<el-form-item prop="otherAmountName"> <el-input class="addinputw addinputInfo"
v-model="formobj.purchaseBillAmount.otherAmountName" clearable placeholder=""
@change="computeShareAmount"
<el-form-item prop="otherAmount"> <el-input class="addinputw addinputInfo"
v-model="formobj.purchaseBillAmount.otherAmount" clearable placeholder="" @change="computeShareAmount"
oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
</el-form-item>
@@ -274,7 +273,6 @@
import req from '@/api/purchase/purchaseOrder.js'
import chooseproducts from './relation/chooseproducts'
import {
getOrgSidByPath,
choiceSupplierInfo,
getWarehouses,
selAllByOrgSidPath,
@@ -318,10 +316,10 @@
"deliveryDate": "",
"wareHouseSid": "",
"wareHouseName": "",
"deptSid": window.sessionStorage.getItem('departmentSid'),
"deptName": window.sessionStorage.getItem('departmentName'),
"deptSid": window.sessionStorage.getItem('defaultDeptSid'),
"deptName": window.sessionStorage.getItem('defaultDeptName'),
"useOrgSid": window.sessionStorage.getItem('orgSid'),
"createOrgSid": window.sessionStorage.getItem('departmentSid'),
"createOrgSid": window.sessionStorage.getItem('defaultDeptSid'),
"orgPath": window.sessionStorage.getItem('orgSidPath'),
"purchaseBillAmount": {
"sid": "",
@@ -332,7 +330,7 @@
"freight": "",
"freightShareTypeKey": "",
"freightShareTypeValue": "",
"otherAmountName": "",
"otherAmount": "",
"otherShareTypeKey": "",
"otherShareTypeValue": "",
"settleAccountKey": "",
@@ -405,19 +403,9 @@
methods: {
init() {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
}
})
// 供应商
choiceSupplierInfo({
deptSid: window.sessionStorage.getItem('departmentSid')
createOrgSid: window.sessionStorage.getItem('orgSidPath')
}).then((resp) => {
if (resp.success) {
this.supplierList = resp.data
@@ -426,7 +414,7 @@
// 仓库
getWarehouses({
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
orgPath: window.sessionStorage.getItem('orgSidPath'),
}).then((res) => {
if (res.success) {
this.warehouseList = res.data
@@ -435,7 +423,7 @@
// 业务员
selAllByOrgSidPath({
orgSidPath: window.sessionStorage.getItem('defaultOrgPath')
orgSidPath: window.sessionStorage.getItem('orgSidPath')
}).then((res) => {
if (res.success) {
this.allOrgperList = res.data
@@ -444,7 +432,7 @@
// 货币
typeValues({
type: 'wms_busType'
type: 'currencyType'
}).then((res) => {
if (res.success) {
this.currencyTypeList = res.data
@@ -453,7 +441,7 @@
// 结算账户
typeValues({
type: 'wms_busType'
type: 'settlementAccount'
}).then((res) => {
if (res.success) {
this.settlementList = res.data
@@ -462,15 +450,13 @@
// 分摊方式
typeValues({
type: 'wms_busType'
type: 'shareType'
}).then((res) => {
if (res.success) {
this.shareTypeList = res.data
}
})
},
// 合计
@@ -534,7 +520,7 @@
}
}, 0)
sums[index] += ''
} else if (column.property === 'notTaxPprice') { //未含税价
} else if (column.property === 'unTaxPrice') { //未含税价
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
@@ -546,7 +532,7 @@
}
}, 0)
sums[index] += ''
} else if (column.property === 'totalTax') { //总税额
} else if (column.property === 'taxAmount') { //总税额
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
@@ -558,7 +544,7 @@
}
}, 0)
sums[index] += ''
} else if (column.property === 'totalNotTaxPprice') { //未含税总价
} else if (column.property === 'unTaxTotalAmount') { //未含税总价
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
@@ -579,7 +565,7 @@
calculation(row, updateProp, event) {
this.formobj.purchaseBillAmount.freight = 0.00
this.formobj.purchaseBillAmount.otherAmountName = 0.00
this.formobj.purchaseBillAmount.otherAmount = 0.00
// 重新计算
// 除去修改单价时 修改其他字段都先计算出单价 然后其他价格数据在计算一次
@@ -647,34 +633,34 @@
// console.log("calculation》》》》", row.amount)
// 总税额 = 总价/(1+税率)*税率
row.totalTax = (Number(row.amount) / (1 + Number(row.taxRate) / 100) * Number(row.taxRate) / 100)
row.taxAmount = (Number(row.amount) / (1 + Number(row.taxRate) / 100) * Number(row.taxRate) / 100)
.toFixed(2)
// console.log("calculation2》》》》", row.totalTax)
// console.log("calculation2》》》》", row.taxAmount)
// 未含税价 =(总价-总税额)/数量
row.notTaxPprice = ((Number(row.amount) - Number(row.totalTax)) / row.count).toFixed(2)
// console.log("calculation2》》》》", row.notTaxPprice)
row.unTaxPrice = ((Number(row.amount) - Number(row.taxAmount)) / row.count).toFixed(2)
// console.log("calculation2》》》》", row.unTaxPrice)
// 未含税总价 = 总价-总税额
row.totalNotTaxPprice = (Number(row.amount) - Number(row.totalTax)).toFixed(2)
// console.log("calculation2》》》》", row.totalNotTaxPprice)
row.unTaxTotalAmount = (Number(row.amount) - Number(row.taxAmount)).toFixed(2)
// console.log("calculation2》》》》", row.unTaxTotalAmount)
},
computeDate(row) {
// 预计到货日期 = 当前日期+采购周期
row.deliveryDate = this.addDate(getCurrentDate(), Number(row.purchaseCycle))
row.deliveryDate = this.addDate(getCurrentDate(), Number(row.cycle))
},
manufactureDateChange(row) {
console.log("manufactureDateChange》》》》", row.manufactureDate)
console.log("manufactureDateChange》》》》", row.madeDate)
console.log("manufactureDateChange》》》》", row.shelfLife)
row.overdueDate = this.addDate(row.manufactureDate, Number(row.shelfLife))
row.expireDate = this.addDate(row.madeDate, Number(row.shelfLife))
let reg = new RegExp('-', 'g') //g代表全部
row.batchNumber = row.manufactureDate.replace(reg, '') + " - " + row.overdueDate.replace(reg, '')
row.batchNumber = row.madeDate.replace(reg, '') + " - " + row.expireDate.replace(reg, '')
},
// days 只能是int
@@ -699,7 +685,7 @@
// 分摊金额 = (采购运费+其他费用)*单价*数量/所有商品总价
var price = Number(this.formobj.purchaseBillAmount.freight) + Number(this.formobj.purchaseBillAmount
.otherAmountName)
.otherAmount)
var all = 0 // 除去最后一个的分摊总和
var totalAmount = 0 // 原所有商品总价
@@ -709,7 +695,8 @@
totalAmount = (Number(totalAmount) + Number(Number(item.cost1) * Number(item.count1))).toFixed(2)
}
console.log("price》》》》", price)
console.log("totalAmount》》》》", totalAmount)
// 分摊金额 = (采购运费+其他费用)*单价*数量/ 原所有商品总价
for (var i = 0; i < this.formobj.purchaseBillDetailList.length; i++) {
@@ -778,31 +765,31 @@
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 : '',
"goodsSkuTitle": value[i].goodsName != null ? value[i].goodsName : '',
"goodsSN": 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',
"count1": value[i].count != null ? value[i].count1 : '0',
"pcsCount": 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 : '',
"cost1": value[i].cost != null ? value[i].cost1 : '',
"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 : '',
"unTaxPrice": value[i].notTaxPprice != null ? value[i].notTaxPprice : '',
"taxAmount": value[i].totalTax != null ? value[i].totalTax : '',
"unTaxTotalAmount": value[i].totalNotTaxPprice != null ? value[i].totalNotTaxPprice : '',
"cycle": value[i].purchaseCycle != null ? value[i].purchaseCycle : '',
"deliveryDate": value[i].deliveryDate != null ? value[i].deliveryDate : '',
"manufactureDate": value[i].manufactureDate != null ? value[i].manufactureDate : '',
"madeDate": value[i].manufactureDate != null ? value[i].manufactureDate : '',
"shelfLife": value[i].shelfLife != null ? value[i].shelfLife : '',
"overdueDate": value[i].overdueDate != null ? value[i].overdueDate : '',
"expireDate": value[i].overdueDate != null ? value[i].overdueDate : '',
"batchNumber": value[i].batchNumber != null ? value[i].batchNumber : '',
"itemNumber": value[i].itemNumber != null ? value[i].itemNumber : '',
"goodsNum": value[i].itemNumber != null ? value[i].itemNumber : '',
"remarks": value[i].remarks != null ? value[i].remarks : ''
}
@@ -902,10 +889,10 @@
"deliveryDate": "",
"wareHouseSid": "",
"wareHouseName": "",
"deptSid": window.sessionStorage.getItem('departmentSid'),
"deptName": window.sessionStorage.getItem('departmentName'),
"deptSid": window.sessionStorage.getItem('defaultDeptSid'),
"deptName": window.sessionStorage.getItem('defaultDeptName'),
"useOrgSid": window.sessionStorage.getItem('orgSid'),
"createOrgSid": window.sessionStorage.getItem('departmentSid'),
"createOrgSid": window.sessionStorage.getItem('defaultDeptSid'),
"orgPath": window.sessionStorage.getItem('orgSidPath'),
"purchaseBillAmount": {
"sid": "",
@@ -916,7 +903,7 @@
"freight": "",
"freightShareTypeKey": "",
"freightShareTypeValue": "",
"otherAmountName": "",
"otherAmount": "",
"otherShareTypeKey": "",
"otherShareTypeValue": "",
"settleAccountKey": "",
@@ -1020,16 +1007,29 @@
},
selectCurrency(val) {
const choose = this.currencyTypeList.filter((item) => item.dictKey == val)
console.log('>>>>>>>>>selectCurrency', choose)
this.formobj.purchaseBillAmount.currencyValue = choose[0].dictValue
this.formobj.purchaseBillAmount.currencyKey = choose[0].dictKey
},
selectFreightShareType(val) {
const choose = this.shareTypeList.filter((item) => item.dictKey == val)
console.log('>>>>>>>>>selectFreightShareType', choose)
this.formobj.purchaseBillAmount.freightShareTypeValue = choose[0].dictValue
this.formobj.purchaseBillAmount.freightShareTypeKey = choose[0].dictKey
},
selectSettleAccount(val) {
const choose = this.settlementList.filter((item) => item.dictKey == val)
console.log('>>>>>>>>>selectSettleAccount', choose)
this.formobj.purchaseBillAmount.settleAccountValue = choose[0].dictValue
this.formobj.purchaseBillAmount.settleAccountKey = choose[0].dictKey
},
selectOtherShareType(val) {
const choose = this.shareTypeList.filter((item) => item.dictKey == val)
console.log('>>>>>>>>>selectOtherShareType', choose)
this.formobj.purchaseBillAmount.otherShareTypeValue = choose[0].dictValue
this.formobj.purchaseBillAmount.otherShareTypeKey = choose[0].dictKey
}
}
}

26
src/views/purchase/purchaseOrder/purchaseOrderInfo.vue
View File

@@ -75,12 +75,12 @@
</div>
<el-table v-loading="listLoading" :data="formobj.purchaseBillDetailList" border style="width: 100%;">
<el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="goodsName" label="商品名称" width="120" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" width="120" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格型号" width="120" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" width="150" align="center" />
<el-table-column label="商品名称" prop="goodsSkuTitle" width="150" align="center" />
<el-table-column label="商品规格" prop="goodsSkuOwnSpec" width="150" align="center" />
<el-table-column label="单位" prop="unit" width="120" align="center" />
<el-table-column prop="count" label="采购数量" width="120" align="center" />
<el-table-column label="数量(pcs)" prop="pcsNum" align="center" width="150" />
<el-table-column label="数量(pcs)" prop="pcsCount" align="center" width="150" />
<el-table-column label="吊牌价" prop="tagPrice" width="120" align="center" />
<el-table-column label="单价" prop="cost" width="120" align="center" />
<el-table-column prop="discountRate" label="折扣率(%)" width="120" align="center" />
@@ -88,15 +88,15 @@
<el-table-column prop="shareAmount" label="分摊金额" width="150" align="center" />
<el-table-column prop="amount" label="总价" width="120" align="center" />
<el-table-column prop="taxRate" label="税率" width="120" align="center" />
<el-table-column prop="notTaxPprice" label="未含税价" width="120" align="center" />
<el-table-column prop="totalTax" label="总税额" width="120" align="center" />
<el-table-column prop="totalNotTaxPprice" label="未含总税价" width="120" align="center" />
<el-table-column prop="purchaseCycle" label="采购周期" width="120" align="center" />
<el-table-column prop="unTaxPrice" label="未含税价" width="120" align="center" />
<el-table-column prop="taxAmount" label="总税额" width="120" align="center" />
<el-table-column prop="unTaxTotalAmount" label="未含总税价" width="120" align="center" />
<el-table-column prop="cycle" label="采购周期" width="120" align="center" />
<el-table-column prop="deliveryDate" label="预计到货日期" width="180" align="center" />
<el-table-column prop="manufactureDate" label="生产日期" width="180" align="center" />
<el-table-column prop="overdueDate" label="过期日期" width="120" align="center" />
<el-table-column prop="madeDate" label="生产日期" width="180" align="center" />
<el-table-column prop="expireDate" label="过期日期" width="120" align="center" />
<el-table-column prop="batchNumber" label="批次号" width="200" align="center" />
<el-table-column prop="itemNumber" label="货号" width="120" align="center" />
<el-table-column prop="goodsNum" label="货号" width="120" align="center" />
<el-table-column prop="remarks" label="备注" width="120" align="center" />
</el-table>
<el-row class="first_row" style="margin-top: 10px;">
@@ -120,7 +120,7 @@
<el-col :span="8">
<div class="span-sty">其他费用</div>
<el-form-item><span
class="addinputInfo">{{ formobj.purchaseBillAmount.otherAmountName }}</span></el-form-item>
class="addinputInfo">{{ formobj.purchaseBillAmount.otherAmount }}</span></el-form-item>
</el-col>
<el-col :span="8">

315
src/views/purchase/purchaseReview/index.vue
View File

@@ -51,7 +51,7 @@
</el-form-item>
<el-form-item label="商品">
<el-select v-model="queryParams.params.goodsSid" placeholder="请选择" style="width: 220px;">
<el-option v-for="(item,i) in goodsList" :key="i" :label="item.name" :value="item.sid">
<el-option v-for="(item,i) in goodsList" :key="i" :label="item.title" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
@@ -103,23 +103,16 @@
<el-table-column prop="billNo" label="单据编号" width="120" align="center" />
<el-table-column prop="supplierName" label="供应商" width="150" align="center" />
<el-table-column prop="purchaserName" label="业务员" width="120" align="center" />
<el-table-column prop="wareHouseName" label="收货仓库" width="150" align="center" />
<el-table-column prop="receiveStateValue" label="状态" width="120" align="center" />
<el-table-column prop="wareHouseName" label="仓库" width="150" align="center" />
<el-table-column prop="nodeState" label="状态" width="120" align="center" />
<el-table-column prop="state" label="审核进度" width="120" align="center" />
<el-table-column prop="amountTotal" label="商品总额" width="120" align="center" />
<el-table-column prop="freight" label="采购运费" width="120" align="center" />
<el-table-column prop="otherAmount" label="其他费用" width="120" align="center" />
<el-table-column prop="prepayment" label="预付金额" width="120" align="center" />
<el-table-column prop="prepayment" label="总税额" width="120" align="center" />
<el-table-column prop="logisticsNum" label="物流单号" width="120" align="center" />
<el-table-column prop="productProgress" label="生产进度" width="120" align="center" />
<el-table-column prop="productProgress" label="未含税总额" width="120" align="center" />
<el-table-column prop="countTotal" label="总采购数量" width="120" align="center" />
<el-table-column prop="countTotal" label="总入库数量" width="120" align="center" />
<el-table-column prop="countTotal" label="总入库金额" width="120" align="center" />
<el-table-column prop="deliveryStateValue" label="发货状态" width="120" align="center" />
<el-table-column prop="thisPayAmount" label="本次付款" width="120" align="center" />
<el-table-column prop="taxAmount" label="税额汇总" width="120" align="center" />
<el-table-column prop="countTotal" label="商品数量" width="120" align="center" />
<el-table-column prop="remarks" label="备注" width="200" align="center" />
<el-table-column prop="createByName" label="创建人" align="center" />
<el-table-column prop="remarks" label="最后修改时间" width="150" align="center" />
<el-table-column prop="modifyTime" label="最后修改时间" width="150" align="center" />
</el-table>
</div>
<!-- End 项目列表 -->
@@ -140,81 +133,69 @@
</el-menu>
<div v-show="activeIndex=='1'" style="margin-bottom: 50px;">
<el-table :data="formobj.purchaseBillDetailList" border style="width: 100%">
<el-table :data="goodsDetailList" border style="width: 100%">
<el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="goodsSpuName" label="商品名称" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格型号" align="center" />
<el-table-column prop="goodsSkuTitle" label="商品名称" width="120" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" width="120" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格型号" width="120" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="count" label="采购数量" align="center" />
<el-table-column prop="cost" label="单价" align="center" />
<el-table-column prop="discountRate" label="折扣率(%)" align="center" />
<el-table-column prop="discountPrice" label="折扣单价" align="center" />
<el-table-column prop="shareAmount" label="分摊金额" align="center" />
<el-table-column prop="amount" label="总价" align="center" />
<el-table-column prop="count" label="数量" width="120" align="center" />
<el-table-column label="数量(pcs)" prop="pcsCount" align="center" width="150" />
<el-table-column label="已入库数量" prop="pcsNum" align="center" width="150" />
<el-table-column label="已发货数量" prop="pcsNum" align="center" width="150" />
<el-table-column label="已入库(pcs)" prop="pcsNum" align="center" width="150" />
<el-table-column label="待入库数量" prop="pcsNum" align="center" width="150" />
<el-table-column label="待入库(pcs)" prop="pcsNum" align="center" width="150" />
<el-table-column label="吊牌价" prop="tagPrice" width="120" align="center" />
<el-table-column label="单价" prop="cost" width="120" align="center" />
<el-table-column prop="discountRate" label="折扣率(%)" width="120" align="center" />
<el-table-column prop="discountPrice" label="折扣单价" width="120" align="center" />
<el-table-column prop="shareAmount" label="分摊金额" width="150" align="center" />
<el-table-column prop="amount" label="总价" width="120" align="center" />
<el-table-column prop="taxRate" label="税率" width="120" align="center" />
<el-table-column prop="unTaxPrice" label="未含税价" width="120" align="center" />
<el-table-column prop="taxAmount" label="总税额" width="120" align="center" />
<el-table-column prop="unTaxTotalAmount" label="未含总税价" width="120" align="center" />
<el-table-column prop="cycle" label="采购周期" width="120" align="center" />
<el-table-column prop="deliveryDate" label="预计到货日期" width="180" align="center" />
<el-table-column prop="madeDate" label="生产日期" width="180" align="center" />
<el-table-column prop="expireDate" label="过期日期" width="120" align="center" />
<el-table-column prop="batchNumber" label="批次号" width="200" align="center" />
<el-table-column label="3天" align="center">
<el-table-column prop="realCount" label="平均销量" align="center" width="100" />
<el-table-column prop="realAmount" label="剩余天数" align="center" width="100" />
<el-table-column prop="realAmount" label="销售总览" align="center" width="100" />
</el-table-column>
<el-table-column label="7天" align="center">
<el-table-column prop="realCount" label="平均销量" align="center" width="100" />
<el-table-column prop="realAmount" label="剩余天数" align="center" width="100" />
<el-table-column prop="realAmount" label="销售总览" align="center" width="100" />
</el-table-column>
<el-table-column label="15天" align="center">
<el-table-column prop="realCount" label="平均销量" align="center" width="100" />
<el-table-column prop="realAmount" label="剩余天数" align="center" width="100" />
<el-table-column prop="realAmount" label="销售总览" align="center" width="100" />
</el-table-column>
<el-table-column label="30天" align="center">
<el-table-column prop="realCount" label="平均销量" align="center" width="100" />
<el-table-column prop="realAmount" label="剩余天数" align="center" width="100" />
<el-table-column prop="realAmount" label="销售总览" align="center" width="100" />
</el-table-column>
<el-table-column prop="itemNumber" label="实际库存" width="120" align="center" />
<el-table-column prop="itemNumber" label="可用库存" width="120" align="center" />
<el-table-column prop="itemNumber" label="在途库存" width="120" align="center" />
<el-table-column prop="itemNumber" label="货号" width="120" align="center" />
<el-table-column prop="remarks" label="备注" width="120" align="center" />
</el-table>
</div>
<div v-show="activeIndex=='2'" style="margin-bottom: 50px;">
<el-form ref="dataForm" class="formaddcopy02" :model="formobj.purchaseBillAmount">
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">采购运费</div>
<el-form-item> <span class="addinputInfo">{{ formobj.purchaseBillAmount.freight }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">分摊方式</div>
<el-form-item> <span
class="addinputInfo">{{ formobj.purchaseBillAmount.freightShareTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">结算账户</div>
<el-form-item> <span
class="addinputInfo">{{ formobj.purchaseBillAmount.settleAccount }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">其他费用</div>
<el-form-item> <span
class="addinputInfo">{{ formobj.purchaseBillAmount.otherAmountName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">分摊方式</div>
<el-form-item> <span
class="addinputInfo">{{ formobj.purchaseBillAmount.otherShareTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">预付金额</div>
<el-form-item> <span
class="addinputInfo">{{ formobj.purchaseBillAmount.prepayment }}</span></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
<div v-show="activeIndex=='3'" style="margin-bottom: 50px;">
<span v-for="(item,index) in formobj.purchaseAppendixList" :key="index" class="addinputInfo"
style="margin-top: 10px;">
<el-popover placement="left" trigger="click" width="300">
<img :src="item.url" width="100%" />
<img slot="reference" :src="item.url" :alt="item.url"
style="max-height: 70px;max-width: 70px; padding: 5px" />
</el-popover>
</span>
</div>
<div v-show="activeIndex=='4'" style="margin-bottom: 50px;">
<el-table :data="formobj.purchaseBillDetailList" border style="width: 100%">
<el-table :data="operateList" border style="width: 100%">
<el-table-column width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="goodsSpuName" label="操作时间" width="250" align="center" />
<el-table-column prop="goodsSkuCode" label="操作账号" width="180" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="操作类型" width="180" align="center" />
<el-table-column prop="unit" label="操作结果" align="center" />
<el-table-column prop="createTime" label="操作时间" width="250" align="center" />
<el-table-column prop="createByName" label="操作账号" width="180" align="center" />
<el-table-column prop="nodeName" label="操作类型" width="180" align="center" />
<el-table-column prop="result" label="操作结果" align="center" />
</el-table>
</div>
@@ -224,20 +205,50 @@
<!-- 新增修改部分组件 -->
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
<el-dialog title="审核信息" :visible="dialogVisible" width="50%">
<el-form ref="" :model="orderInfo" class="formaddcopy02">
<el-row class="first_row">
<el-col :span="24">
<div class="span-sty">审核意见</div>
<el-form-item>
<el-radio-group v-model="orderInfo.state" size="small" style="margin-left: 120px;">
<el-radio :label="2">审核通过</el-radio>
<el-radio :label="3">审核不通过</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty"> 备注</div>
<el-form-item>
<el-input v-model="orderInfo.remarks" placeholder="" class="addinputw addinputInfo" clearable />
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" size="small" @click="handleSave()">保存</el-button>
<el-button type="info" size="small" @click="dialogVisible = false">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/purchase/purchaseOrder.js'
import req from '@/api/purchase/purchaseReview.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divInfo from './purchaseOrderInfo.vue'
import {
getOrgSidByPath,
getTypeValueList,
typeValues,
choiceSupplierInfo,
getWarehouses
getWarehouses,
getGoodsListAllByOrg
} from '@/api/Common/dictcommons'
export default {
components: {
@@ -249,6 +260,7 @@
data() {
return {
activeIndex: '1',
dialogVisible: false,
btndisabled: false,
viewState: 1, // 1、列表 2、添加 3、修改 4、查看
isSearchShow: false,
@@ -262,6 +274,7 @@
purchaseAppendixList: [],
purchaseBillDetailList: {}
},
orderInfo: {},
btnList: [{
type: 'primary',
size: 'small',
@@ -308,8 +321,10 @@
warehouseList: [],
supplierList: [],
goodsList: [],
createOrgSid: "",
rowItemData: [],
rowItemSid: '',
goodsDetailList: [],
operateList: [],
}
},
mounted() {
@@ -317,14 +332,7 @@
},
created() {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('orgSid')
}).then((res) => {
if (res.success) {
this.createOrgSid = res.data
this.init()
}
})
this.init()
this.loadList()
},
@@ -332,7 +340,7 @@
init() {
getTypeValueList({
typeValues({
type: 'receiveState'
}).then((res) => {
if (res.success) {
@@ -340,7 +348,7 @@
}
})
getTypeValueList({
typeValues({
type: 'deliveryState'
}).then((res) => {
if (res.success) {
@@ -349,7 +357,7 @@
})
choiceSupplierInfo({
createOrgSid: this.createOrgSid
createOrgSid: window.sessionStorage.getItem('orgSid')
}).then((resp) => {
if (resp.success) {
this.supplierList = resp.data
@@ -357,7 +365,7 @@
}
})
getWarehouses({
orgPath: window.sessionStorage.getItem('orgSid'),
orgPath: window.sessionStorage.getItem('orgSidPath'),
}).then((res) => {
if (res.success) {
this.warehouseList = res.data
@@ -366,6 +374,18 @@
}
})
getGoodsListAllByOrg({
orgPath: window.sessionStorage.getItem('orgSidPath'),
}).then((res) => {
if (res.success) {
this.goodsList = res.data
console.log("aaaaaa", this.goodsList);
}
})
},
// 合计
@@ -377,7 +397,7 @@
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计：'
sums[index] = '总计：'
return
}
const values = data.map(item => Number(item[column.property]))
@@ -466,34 +486,31 @@
return sums
},
rowItemClick(row) {
console.log("row", row);
this.rowItemData = [row];
req.fetchDetailsBySid(row.sid).then((resp) => {
if (resp.success) {
this.formobj = resp.data
} else {
this.$message({
type: 'warning',
message: "数据异常。",
showClose: true
})
}
}).catch(() => {
this.$message({
type: 'warning',
message: "数据异常。",
showClose: true
})
})
this.rowItemSid = row.sid
this.handleSelect(this.activeIndex)
},
handleSelect(val) {
console.log("val", val);
this.activeIndex = val
if (val == '1') { // 采购明细
req.fetchDetailsBySid(this.rowItemSid).then((resp) => {
this.goodsDetailList = resp.data.purchaseBillDetailList
}).catch(() => {})
}
if (val == '4') { // 操作记录
var parpams = {
sid: this.rowItemSid
}
req.operationrecordDetails(parpams).then((resp) => {
this.operateList = resp.data
}).catch(() => {})
}
},
selectionLineChangeHandle(val) {
console.log("val", val);
@@ -547,25 +564,8 @@
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
req.fetchDetailsBySid(this.dataList[0].sid).then((resp) => {
if (resp.success) {
this.formobj = resp.data
} else {
this.$message({
type: 'warning',
message: "数据异常。",
showClose: true
})
}
}).catch(() => {
this.$message({
type: 'warning',
message: "数据异常。",
showClose: true
})
})
this.rowItemSid = data.records[0].sid
this.handleSelect('1')
} else {
// 根据resp.code进行异常情况处理
this.dataList = []
@@ -615,12 +615,12 @@
},
toSubmit() {
if (this.sids.length > 0) {
this.dialogVisible = true
} else {
this.$message({
type: 'warning',
showClose: true,
message: '请至少选择一条记录进行操作'
message: '请选择一条记录进行操作'
})
}
},
@@ -692,6 +692,25 @@
resetState() {
this.viewState = 1
},
handleSave() {
this.orderInfo.sid = this.sids[0]
req.examine(this.orderInfo).then((resp) => {
if (resp.success) {
this.$message({
type: 'success',
message: resp.msg,
showClose: true
})
this.dialogVisible = false
this.loadList()
} else {
// 根据resp.code进行异常情况处理
}
}).catch(e => {})
}
}
}
@@ -730,6 +749,12 @@
align-items: center;
}
.el-radio /deep/ .el-radio__label {
font-size: 14px !important;
}
.el-menu-item.is-active {
background-color: #3370ff !important;
color: #fff;

61
src/views/purchase/purchaseReview/purchaseOrderInfo.vue
View File

@@ -63,8 +63,43 @@
class="addinputInfo">{{ formobj.purchaseBillAmount.currencyValue }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne" style="margin-top: 10px;">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.purchaseBillDetailList" border style="width: 100%;">
<el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" width="150" align="center" />
<el-table-column label="商品名称" prop="goodsSkuTitle" width="150" align="center" />
<el-table-column label="商品规格" prop="goodsSkuOwnSpec" width="150" align="center" />
<el-table-column label="单位" prop="unit" width="120" align="center" />
<el-table-column prop="count" label="采购数量" width="120" align="center" />
<el-table-column label="数量(pcs)" prop="pcsCount" align="center" width="150" />
<el-table-column label="吊牌价" prop="tagPrice" width="120" align="center" />
<el-table-column label="单价" prop="cost" width="120" align="center" />
<el-table-column prop="discountRate" label="折扣率(%)" width="120" align="center" />
<el-table-column prop="discountPrice" label="折扣单价" width="120" align="center" />
<el-table-column prop="shareAmount" label="分摊金额" width="150" align="center" />
<el-table-column prop="amount" label="总价" width="120" align="center" />
<el-table-column prop="taxRate" label="税率" width="120" align="center" />
<el-table-column prop="unTaxPrice" label="未含税价" width="120" align="center" />
<el-table-column prop="taxAmount" label="总税额" width="120" align="center" />
<el-table-column prop="unTaxTotalAmount" label="未含总税价" width="120" align="center" />
<el-table-column prop="cycle" label="采购周期" width="120" align="center" />
<el-table-column prop="deliveryDate" label="预计到货日期" width="180" align="center" />
<el-table-column prop="madeDate" label="生产日期" width="180" align="center" />
<el-table-column prop="expireDate" label="过期日期" width="120" align="center" />
<el-table-column prop="batchNumber" label="批次号" width="200" align="center" />
<el-table-column prop="goodsNum" label="货号" width="120" align="center" />
<el-table-column prop="remarks" label="备注" width="120" align="center" />
</el-table>
<el-row class="first_row" style="margin-top: 10px;">
<el-col :span="8">
<div class="span-sty">采购运费</div>
<el-form-item><span class="addinputInfo">{{ formobj.purchaseBillAmount.freight }}</span></el-form-item>
@@ -108,30 +143,6 @@
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>商品列表</div>
</div>
<el-table v-loading="listLoading" :data="formobj.purchaseBillDetailList" border style="width: 100%;">
<el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column prop="goodsSpuName" label="商品名称" align="center" />
<el-table-column prop="goodsSkuCode" label="商品编码" align="center" />
<el-table-column prop="goodsSkuOwnSpec" label="规格型号" align="center" />
<el-table-column prop="unit" label="单位" align="center" />
<el-table-column prop="count" label="采购数量" align="center" />
<el-table-column prop="cost" label="单价" align="center" />
<el-table-column prop="discountRate" label="折扣率(%)" align="center" />
<el-table-column prop="discountPrice" label="折扣单价" align="center" />
<el-table-column prop="shareAmount" label="分摊金额" align="center" />
<el-table-column prop="amount" label="总价" align="center" />
</el-table>
</el-form>

40
src/views/system/menuManage/menuManage.vue
View File

@@ -63,8 +63,8 @@
</template>
</el-table-column>-->
<el-table-column prop="menuTypeValue" width="120" label="类型" align="center" />
<el-table-column prop="pageUrl" label="路由路径" align="center" />
<el-table-column prop="menuUrl" label="路由名称" align="center" />
<el-table-column prop="pageUrl" label="路由路径" align="center" />
<el-table-column prop="pageName" label="组件路径" align="center" />
<el-table-column prop="cid" label="权限标识" align="center" />
<el-table-column prop="isShow" label="状态" align="center">
@@ -119,13 +119,13 @@
</td>
</tr>
<tr>
<td>路由路径</td>
<td>路由名称</td>
<td>
<el-input v-model="form.menuUrl" />
</td>
</tr>
<tr>
<td>路由名称</td>
<td>路由路径</td>
<td>
<el-input v-model="form.pageUrl" />
</td>
@@ -234,18 +234,18 @@
<el-input v-model="form.name" style="width:300px" />
</td>
</tr>
<tr>
<td>路由路径</td>
<td>
<el-input v-model="form.pageUrl" style="width:300px" />
</td>
</tr>
<tr>
<td>路由名称</td>
<td>
<el-input v-model="form.menuUrl" style="width:300px" />
</td>
</tr>
<tr>
<td>路由路径</td>
<td>
<el-input v-model="form.pageUrl" style="width:300px" />
</td>
</tr>
<tr>
<td>菜单图片</td>
<td>
@@ -336,9 +336,9 @@
remarks: '',
sortNo: 0,
cid: '',
sourceName: 'oms',
sourceName: 'wms',
phoneFunction: "0",
sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44'
sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33'
},
tableData: [],
page: {
@@ -348,8 +348,8 @@
params: {
name: '',
psid: '',
sourceName: 'oms',
sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44'
sourceName: 'wms',
sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33'
}
},
rank: '1',
@@ -389,8 +389,11 @@
checkchange(data, checked) {
console.log("checkchange", data);
console.log("checkchange", checked);
if (checked) {
if (data.sid === 'd936f1ba-03c3-11ec-bf08-48452053aa44') {
if (data.sid == 'd936f1ba-03c3-11ec-bf08-48452053aa44') {
this.form.psid = '0'
this.form.pname = '顶级菜单'
} else {
@@ -456,6 +459,7 @@
// 资源名称
getsourceList() {
const params = {}
console.log()
sourceList(params).then(res => {
this.sourceNameData = res.data
this.loading = false
@@ -467,8 +471,8 @@
this.form.isShow = '1'
this.form.menuType = '0'
// this.form.psid = row.sid || 0
this.form.sourceName = 'oms'
this.form.sourceSid = 'd936f1ba-03c3-11ec-bf08-48452053aa44'
this.form.sourceName = 'wms'
this.form.sourceSid = 'd936f1ba-03c3-11ec-bf08-48452053aa33'
this.form.pname = ''
this.form.psid = '0'
// this.sourceMenus()
@@ -550,9 +554,9 @@
remarks: '',
cid: '',
sortNo: 0,
sourceName: 'oms',
sourceName: 'wms',
phoneFunction: "0",
sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44'
sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33'
}
},
deleteRow(row) {