Browse Source

Merge remote-tracking branch 'origin/master'

master
djz236@163.com 2 years ago
parent
commit
155a2dd24a
  1. 87
      warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue
  2. 45
      warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseShow.vue
  3. 43
      warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue
  4. 228
      warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListShow.vue
  5. 26
      warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue

87
warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseAdd.vue

@ -17,36 +17,39 @@
<div style="margin-left: 15px;">主体信息</div>
</div>
<el-row>
<el-col :span="3" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">订单编号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item" prop="purchaseNo">
<el-input :disabled="true" v-model="purchaseForm.purchaseNo"></el-input>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">订单日期</span>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="8">
<el-form-item class="trightb_item">
<!-- <span>{{temp.bankName}}</span> -->
<el-date-picker v-model="purchaseForm.purchaseDate" type="date" style="width: 100%;"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="请选择" />
</el-form-item>
</el-col>
<el-col :span="3" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">订单编号</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="trightb_item" prop="purchaseNo">
<el-input :disabled="true" v-model="purchaseForm.purchaseNo"></el-input>
</el-form-item>
</el-col>
<el-col :span="3" class="trightb">
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">供货商名称</span>
<span slot="label">供货单位</span>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="8">
<el-form-item prop="supplier" class="trightb_item">
<el-select v-model="purchaseForm.supplierId" placeholder="请选择" >
<el-select v-model="purchaseForm.supplierId" placeholder="请选择" style="width: 100%;" >
<el-option
v-for="(supplier,i) in supplierList"
:key="i"
@ -56,27 +59,27 @@
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">采购申请人</span>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="8">
<el-form-item class="trightb_item">
<el-input v-model="purchaseForm.purchasePerson" placeholder="采购申请人" clearable />
</el-form-item>
</el-col>
</el-row>
<el-col :span="3" class="trightb">
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">客户名称</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item class="trightb_item">
<el-select v-model="purchaseForm.custId" placeholder="请选择" >
<el-select v-model="purchaseForm.custId" placeholder="请选择" style="width: 100%;" >
<el-option
v-for="(custName,i) in custList"
:key="i"
@ -87,14 +90,14 @@
</el-form-item>
</el-col>
<el-col :span="3" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">仓库名称</span>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="8">
<el-form-item class="trightb_item">
<el-select v-model="purchaseForm.storehouseId" placeholder="请选择" >
<el-select v-model="purchaseForm.storehouseId" placeholder="请选择" style="width: 100%;" >
<el-option
v-for="(storehouse,i) in storehouseList"
:key="i"
@ -109,13 +112,11 @@
<el-collapse v-model="activeNames">
<el-collapse-item name="1">
<template slot="title" >
<span style="margin-left: 15px;">商品信息</span><span class="span" @click.stop="add()">添加</span>
<span style="margin-left: 15px;">商品信息</span><div class="span" @click.stop="add()"><i class="el-icon-plus"></i>添加货物</div>
</template>
<el-table :data="purchaseForm.products" border style="width: 100%;"
:row-style="{height: '40px'}">
<!-- <el-table-column type="selection" align="center" width="50"/> -->
<el-table-column label="序号" type="index" width="60" align="center" />
<el-table-column label="商品名称" width="120" prop="proName" align="center">
<el-table-column label="质物名称" width="150" prop="proName" align="center">
<template slot-scope="scope">
<el-select v-model="scope.row.proId" placeholder="请选择" @change="selectPro(scope.row)" >
<el-option
@ -127,7 +128,7 @@
</el-select>
</template>
</el-table-column>
<el-table-column label="商品品类" width="120" prop="productTypeName" align="center">
<!-- <el-table-column label="商品品类" width="120" prop="productTypeName" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.productTypeName" placeholder="商品品类" clearable></el-input>
</template>
@ -136,8 +137,8 @@
<template slot-scope="scope">
<el-input v-model="scope.row.brandInfoName" placeholder="商品品牌" clearable></el-input>
</template>
</el-table-column>
<el-table-column label="规格(型号)" width="150" prop="proModel" align="center">
</el-table-column> -->
<el-table-column label="规格(型号)" width="120" prop="proModel" align="center">
<template slot-scope="scope">
<el-input v-model="scope.row.proModel" placeholder="" clearable></el-input>
</template>
@ -397,7 +398,15 @@
let arrList=this.purchaseForm.products
for(let i=0;i<arrList.length;i++){
if(arrList[i].estimateNum && arrList[i].estimateConfirmedPrice){
let newValue=parseFloat(arrList[i].estimateNum) * parseFloat(arrList[i].estimateConfirmedPrice) || 0
var res = 0;
var s1 = arrList[i].estimateNum.toString();
var s2 = arrList[i].estimateConfirmedPrice.toString();
if(s1.indexOf(".") != -1)
res += s1.split(".")[1].length;
if(s2.indexOf(".") != -1)
res += s2.split(".")[1].length;
let newValue= Number(s1.replace(".",""))*Number(s2.replace(".",""))/Math.pow(10,res);
let getValue=Math.floor(newValue*100)/100
this.$set(arrList[i], 'estimateCalculatedValue', getValue)
}else{
@ -452,9 +461,17 @@
}
.span {
margin-left: 50px;
width: 100px;
height: 30px;
border: 1px solid #ffffff;
margin-left: 81%;
font-size: 15px;
font-weight: 400;
line-height: 30px;
text-align: center;
}
.span i{
padding-right: 6px;
}
.formadd {
padding: 10px 40px 0 40px;

45
warehousing-system/project_web_ui/src/views/component/instorehouse/add/purchaseShow.vue

@ -14,66 +14,69 @@
<div style="margin-left: 15px;">主体信息</div>
</div>
<el-row>
<el-col :span="3" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">订单日期</span>
<span slot="label">订单编号</span>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="8">
<el-form-item class="trightb_item" prop="purchaseNo">
<span>{{purchaseForm.purchaseNo}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span>{{purchaseForm.purchaseDate}}</span>
<span slot="label">订单日期</span>
</el-form-item>
</el-col>
<el-col :span="3" class="trightb">
<el-col :span="8">
<el-form-item class="trightb_item">
<span slot="label">订单编号</span>
<span>{{purchaseForm.purchaseDate}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item class="trightb_item" prop="purchaseNo">
<span>{{purchaseForm.purchaseNo}}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="trightb">
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">供货商名称</span>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="8">
<el-form-item prop="supplier" class="trightb_item">
<span>{{purchaseForm.supplierName}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="3" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">采购申请人</span>
</el-form-item>
</el-col>
<el-col :span="4">
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{purchaseForm.purchasePerson}}</span>
</el-form-item>
</el-col>
</el-row>
<el-col :span="3" class="trightb">
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">客户名称</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{purchaseForm.custName}}</span>
</el-form-item>
</el-col>
<el-col :span="3" class="trightb">
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">仓库名称</span>
</el-form-item>
</el-col>
<el-col :span="5">
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{purchaseForm.storehouseName}}</span>
</el-form-item>

43
warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListAdd.vue

@ -50,7 +50,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="supplier" class="trightb_item">
<el-select v-model="purchaseForm.custerSid" placeholder="请选择" >
<el-select v-model="purchaseForm.custerSid" placeholder="请选择" style="width: 100%;">
<el-option
v-for="(custName,i) in custList"
:key="i"
@ -80,7 +80,7 @@
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<el-select v-model="purchaseForm.storeHouseSid" placeholder="请选择" >
<el-select v-model="purchaseForm.storeHouseSid" placeholder="请选择" style="width: 100%;">
<el-option
v-for="(storehouse,i) in storehouseList"
:key="i"
@ -106,7 +106,7 @@
<el-collapse v-model="activeNames">
<el-collapse-item name="1">
<template slot="title" >
<span style="margin-left: 15px;">出库商品明细</span><span class="span" @click.stop="add()">添加</span>
<span style="margin-left: 15px;">出库商品明细</span><div class="span" @click.stop="add()"><i class="el-icon-plus"></i>添加货物</div>
</template>
<el-table :data="purchaseForm.list" border style="width: 100%;"
:row-style="{height: '40px'}">
@ -268,13 +268,10 @@
}
})
this.custList.forEach((v, i) => {
// if(v.name == this.purchaseForm.custerSid){
// this.purchaseForm.custerName = v.name
// this.purchaseForm.custerSid = v.id
// }else if(v.id == this.purchaseForm.custerSid){
// this.purchaseForm.custerName = v.name
// }
if(v.sid == this.purchaseForm.custerSid){
if(v.enterpriseName == this.purchaseForm.custerSid){
this.purchaseForm.custerName = v.enterpriseName
this.purchaseForm.custerSid = v.sid
}else if(v.sid == this.purchaseForm.custerSid){
this.purchaseForm.custerName = v.enterpriseName
}
})
@ -290,12 +287,12 @@
},
async showEdit(row) {
this.viewTitle = "【修改】出库订单";
const { data: res } = await this.$http.get(`/purchasenew/fetchDetailsBySid/${row.sid}`)
const { data: res } = await this.$http.get(`/output/getOutStorehouse/${row.sid}`)
if (res.code==200) {
this.purchaseForm=res.data
this.supplierList.forEach((v, i) => {
if(v.id == res.data.custerSid){
this.custList.forEach((v, i) => {
if(v.enterpriseName == res.data.custerName){
this.purchaseForm.custerSid = res.data.custerName
}
})
@ -362,7 +359,15 @@
let arrList=this.purchaseForm.list
for(let i=0;i<arrList.length;i++){
if(arrList[i].estimateNum && arrList[i].estimateConfirmedPrice){
let newValue=parseFloat(arrList[i].estimateNum) * parseFloat(arrList[i].estimateConfirmedPrice) || 0
var res = 0;
var s1 = arrList[i].estimateNum.toString();
var s2 = arrList[i].estimateConfirmedPrice.toString();
if(s1.indexOf(".") != -1)
res += s1.split(".")[1].length;
if(s2.indexOf(".") != -1)
res += s2.split(".")[1].length;
let newValue= Number(s1.replace(".",""))*Number(s2.replace(".",""))/Math.pow(10,res);
let getValue=Math.floor(newValue*100)/100
this.$set(arrList[i], 'estimateCalculatedValue', getValue)
}else{
@ -424,9 +429,17 @@
}
.span {
margin-left: 50px;
width: 100px;
height: 30px;
border: 1px solid #ffffff;
margin-left: 78%;
font-size: 15px;
font-weight: 400;
line-height: 30px;
text-align: center;
}
.span i{
padding-right: 6px;
}
.formadd {
padding: 10px 40px 0 40px;

228
warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/add/outListShow.vue

@ -0,0 +1,228 @@
<template>
<div>
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="info" size="small" @click="handleReturn()"
>返回</el-button
>
</div>
</div>
<div class="listconadd">
<el-form ref="dataForm" :model="purchaseForm" label-position="top" label-width="190px" class="formadd">
<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
<div style="margin-left: 15px;">主体信息</div>
</div>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">订单编号</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item" prop="purchaseNo">
<span>{{purchaseForm.no}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">订单日期</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{purchaseForm.applicationDate}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">供货商名称</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item prop="supplier" class="trightb_item">
<span>{{purchaseForm.custerName}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">采购申请人</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{purchaseForm.creatorName}}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">客户名称</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{purchaseForm.custName}}</span>
</el-form-item>
</el-col>
<el-col :span="4" class="trightb">
<el-form-item class="trightb_item">
<span slot="label">仓库名称</span>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item class="trightb_item">
<span>{{purchaseForm.storehouseName}}</span>
</el-form-item>
</el-col>
</el-row>
<el-collapse v-model="activeNames">
<el-collapse-item name="1">
<template slot="title" >
<span style="margin-left: 15px;">商品信息</span>
</template>
<el-table :data="purchaseForm.list" border style="width: 100%;"
:row-style="{height: '40px'}">
<el-table-column label="序号" type="index" width="60" fixed align="center" />
<el-table-column label="质物名称" prop="proName" align="center">
</el-table-column>
<el-table-column label="规格(型号)" width="150" prop="proModel" align="center">
</el-table-column>
<el-table-column label="单价(元)" width="140" prop="estimateconfirmedPrice" align="center">
</el-table-column>
<el-table-column label="数量/重量" width="160" prop="estimateNum" align="center">
</el-table-column>
<el-table-column label="总价值(元)" width="150px" prop="estimateCalculatedValue" align="center">
</el-table-column>
<el-table-column label="库存价值(元)" width="130" prop="realityCalculatedValue" align="center">
</el-table-column>
<el-table-column label="生产厂家(产地)" width="150" prop="manufacturer" align="center">
</el-table-column>
<el-table-column label="货位号" width="150px" prop="locationNumber" align="center">
</el-table-column>
</el-table>
</el-collapse-item>
</el-collapse>
</el-form>
</div>
</div>
</template>
<script>
export default {
data() {
return {
viewTitle: "出库信息",
purchaseForm: {
purchaseId: '',
product: '',
barCode: '',
purchaseDate:'',
purchaseNo:'',
supplier: '',
storehouseName:'',
supplierName:'',
count: '',
storehouse: '',
status: '',
products:[]
},
activeNames: ['1'],
}
},
mounted() {
},
created() {},
methods: {
handleReturn() {
this.$emit("reloadlist");
this.$emit("doback");
},
async showEdit(row) {
const _this = this;
const { data: result } = await this.$http.get(`/output/getOutStorehouse/${row.sid}`)
if (result.code==200) {
_this.purchaseForm=result.data
}
}
},
};
</script>
<style scoped>
/deep/ .el-collapse-item__header {
height: 40px;
font-weight: bold;
font-size: 16px;
text-align: left;
color: #ffffff;
background-color: #0294d7;
}
/deep/ .el-collapse-item__content {
padding-bottom: 0;
}
.trightb {
display: flex;
align-items: center;
text-align: center;
justify-content: center;
}
.trightb_item {
padding-top: 5px;
}
.span {
margin-left: 50px;
font-size: 15px;
font-weight: 400;
}
.formadd {
padding: 10px 40px 0 40px;
font-size: 16px;
}
.formadd .title {
font-weight: bold;
font-size: 16px;
background-color: #0294d7;
text-align: left;
color: #ffffff;
}
.first_row{
border-top: 1px solid #e0e3eb;
}
.formadd .el-row {
display: flex;
flex-wrap: wrap;
border-left: 1px solid #e0e3eb;
}
.formadd .el-row .el-col {
border-right: 1px solid #e0e3eb;
border-bottom: 1px solid #e0e3eb;
padding: 0 15px;
min-height: 42px;
line-height: 1;
}
.formadd .el-row .el-col .el-form-item {
margin-bottom: 0;
line-height: 42px;
}
.addinputw {
width: 80%;
line-height: 42px;
}
.el-input__inner {
height: 36px;
}
</style>

26
warehousing-system/project_web_ui/src/views/component/outStorehouseManagement/outList.vue

@ -8,7 +8,7 @@
<div v-show="isSearchShow" class="search">
<el-form ref="queryInfo" :inline="true" :model="queryInfo" class="tab-header">
<el-form-item label="订单编号">
<el-input v-model="queryInfo.params.purchaseNo" placeholder="请输入订单编号" clearable />
<el-input v-model="queryInfo.params.no" placeholder="请输入订单编号" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -23,31 +23,25 @@
border>
<el-table-column label="序号" type="index" width="60" :index="indexMethod" align="center" />
<el-table-column
prop="custName"
prop="custerName"
label="客户名称"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="purchaseNo"
prop="no"
label="订单编号"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="purchaseDate"
prop="applicationDate"
label="订单日期"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="supplierName"
label="供应商名称"
align="center"
width="180">
</el-table-column>
<el-table-column
prop="purchasePerson"
prop="creatorName"
label="采购申请人"
align="center"
width="180">
@ -98,7 +92,7 @@
</div>
<divadd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="getPurchaseList" />
<storeShow v-show="viewState == 4" ref="storeAdd" @doback="resetState" @reloadlist="getPurchaseList" />
<outListShow v-show="viewState == 4" ref="storeAdd" @doback="resetState" @reloadlist="getPurchaseList" />
</div>
</template>
@ -108,14 +102,14 @@ import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divadd from '@/views/component/outStorehouseManagement/add/outListAdd.vue'
import storeShow from '@/views/component/outStorehouseManagement/add/outListAdd.vue'
import outListShow from '@/views/component/outStorehouseManagement/add/outListShow.vue'
export default {
components: {
ButtonBar,
Pagination,
pageye,
divadd,
storeShow
outListShow
},
data () {
return {
@ -127,7 +121,7 @@ data () {
current: 1,
size: 10,
params: {
purchaseNo:''
no:''
}
},
btnList: [
@ -203,7 +197,7 @@ methods: {
return pageindex
},
async getPurchaseList () {
const { data: result } = await this.$http.post('/purchasenew/listPage', this.queryInfo)
const { data: result } = await this.$http.post('/output/listPage', this.queryInfo)
if (result.code == 200){
this.queryInfo.total=result.data.total
this.purchaseList = result.data.records

Loading…
Cancel
Save