|
|
|
@ -15,7 +15,7 @@ |
|
|
|
|
|
|
|
<div class="listconadd"> |
|
|
|
|
|
|
|
<el-form ref="form_obj" :model="formobj" class="formaddcopy02"> |
|
|
|
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02"> |
|
|
|
<div class="title"> |
|
|
|
<div>基础信息</div> |
|
|
|
</div> |
|
|
|
@ -23,7 +23,7 @@ |
|
|
|
|
|
|
|
<el-col :span="8"> |
|
|
|
<div class="span-sty">单据编号</div> |
|
|
|
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item> |
|
|
|
<el-form-item><span class="addinputw addinputInfo">{{ formobj.billNo }}</span></el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
<div class="span-sty">制单人</div> |
|
|
|
@ -31,9 +31,9 @@ |
|
|
|
clearable /></el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
<div class="span-sty">单据日期</div> |
|
|
|
<el-form-item> <el-date-picker v-model="formobj.createTime" type="date" class="addinputInfo" |
|
|
|
value-format="yyyy-MM-dd" placeholder="选择日期"> |
|
|
|
<div class="span-sty"><span class="must">*</span> 单据日期</div> |
|
|
|
<el-form-item prop="createTime"> <el-date-picker v-model="formobj.createTime" type="date" |
|
|
|
class="addinputw addinputInfo" value-format="yyyy-MM-dd" placeholder="选择日期"> |
|
|
|
</el-date-picker></el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
@ -42,13 +42,23 @@ |
|
|
|
|
|
|
|
<el-col :span="8"> |
|
|
|
<div class="span-sty">来源单号</div> |
|
|
|
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item> |
|
|
|
<el-form-item><span class="addinputw addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="16"> |
|
|
|
<el-col :span="8"> |
|
|
|
<div class="span-sty">单据状态</div> |
|
|
|
<el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item> |
|
|
|
<el-form-item><span class="addinputw addinputInfo">{{ formobj.billState }}</span></el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
<div class="span-sty"><span class="must">*</span> 上架人</div> |
|
|
|
<el-form-item prop="upShelfName"> |
|
|
|
<el-select v-model="formobj.upShelfName" filterable clearable placeholder="请选择" class="addinputw addinputInfo" |
|
|
|
@change="allOrgperSelect"> |
|
|
|
<el-option v-for="item in allOrgperList" :key="item.sid" :label="item.name" :value="item.sid"> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
|
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
|
|
|
|
<el-row> |
|
|
|
@ -65,18 +75,18 @@ |
|
|
|
<div>商品列表</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<el-table v-loading="listLoading" :data="formobj.pcList" border> |
|
|
|
<el-table v-loading="listLoading" :data="formobj.list" border> |
|
|
|
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" /> |
|
|
|
<el-table-column fixed label="操作" wid align="center" width="120"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-button type="primary" size="mini" @click="doGoodsDel(scope.row)">删除</el-button> |
|
|
|
<el-button type="primary" size="mini" @click="doGoodsDel(scope.row.goodsSkuSid)">删除</el-button> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" /> |
|
|
|
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" /> |
|
|
|
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" /> |
|
|
|
<el-table-column label="单位" prop="unit" align="center" width="120" /> |
|
|
|
<el-table-column label="仓库" align="center" width="180"> |
|
|
|
<el-table-column label="商品名称" prop="goodsSpuName" align="center" /> |
|
|
|
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" /> |
|
|
|
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" /> |
|
|
|
<el-table-column label="单位" prop="unit" align="center" /> |
|
|
|
<!-- <el-table-column label="仓库" align="center" width="180"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable |
|
|
|
@change="selectWarehouseName(scope.row,$event)"> |
|
|
|
@ -95,14 +105,14 @@ |
|
|
|
</el-select> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="批次号" prop="batchNumber" align="center" width="300" /> |
|
|
|
<el-table-column label="上架数量" align="center" width="180"> |
|
|
|
<el-table-column label="批次号" prop="batchNumber" align="center" width="300" /> --> |
|
|
|
<el-table-column label="需上架数量" align="center" > |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-input ref="focusAssumptionInput" v-model="scope.row.actualCount" clearable placeholder="" |
|
|
|
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" /> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column label="载具编号" align="center" width="180"> |
|
|
|
<el-table-column label="载具编号" align="center"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-input ref="focusAssumptionInput" v-model="scope.row.packageNo" clearable placeholder="" /> |
|
|
|
</template> |
|
|
|
@ -120,6 +130,13 @@ |
|
|
|
<script> |
|
|
|
import req from '@/api/storage/receivingGoods.js' |
|
|
|
import req2 from '@/api/storage/allocation.js' |
|
|
|
import { |
|
|
|
getCurrentDate |
|
|
|
} from '@/utils/index.js' |
|
|
|
import { |
|
|
|
selAllByOrgSidPath |
|
|
|
} from '@/api/Common/dictcommons' |
|
|
|
|
|
|
|
export default { |
|
|
|
components: {}, |
|
|
|
data() { |
|
|
|
@ -131,10 +148,12 @@ |
|
|
|
"billNo": "", |
|
|
|
"createBySid": window.sessionStorage.getItem('userSid'), |
|
|
|
"createByName": window.sessionStorage.getItem('name'), |
|
|
|
"createTime": "", |
|
|
|
"createTime": getCurrentDate(), |
|
|
|
"sourceBillNo": "", |
|
|
|
"sourceBillSid": "", |
|
|
|
"billState": "新建", |
|
|
|
"upShelfSid":"", |
|
|
|
"upShelfName":'', |
|
|
|
"list": [ |
|
|
|
|
|
|
|
], |
|
|
|
@ -152,10 +171,26 @@ |
|
|
|
], |
|
|
|
supplierList: [], |
|
|
|
warehouseList: [], |
|
|
|
warehouseRackList: [] |
|
|
|
warehouseRackList: [], |
|
|
|
allOrgperList: [], |
|
|
|
rules: { |
|
|
|
createTime: [{ |
|
|
|
required: true, |
|
|
|
message: '到货日期不能为空', |
|
|
|
trigger: 'change' |
|
|
|
}], |
|
|
|
upShelfName: [{ |
|
|
|
required: true, |
|
|
|
message: '请选择上架人员', |
|
|
|
trigger: 'change' |
|
|
|
}], |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
}, |
|
|
|
created() {}, |
|
|
|
created() { |
|
|
|
|
|
|
|
}, |
|
|
|
methods: { |
|
|
|
doGoodsDel(sid) { |
|
|
|
console.log("doGoodsDel》》》》", sid) |
|
|
|
@ -165,7 +200,7 @@ |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning' |
|
|
|
}).then(() => { |
|
|
|
const index = this.formobj.list.findIndex((item) => item.goodSpuSid === sid) |
|
|
|
const index = this.formobj.list.findIndex((item) => item.goodsSkuSid === sid) |
|
|
|
console.log("index》》》》", index) |
|
|
|
this.formobj.list.splice(index, 1) |
|
|
|
|
|
|
|
@ -179,36 +214,42 @@ |
|
|
|
console.log('>>>>>>>>>saveOrUpdate', this.formobj) |
|
|
|
|
|
|
|
this.submitdisabled = true |
|
|
|
req.saveUpShelf(this.formobj) |
|
|
|
.then(resp => { |
|
|
|
if (resp.success) { |
|
|
|
this.submitdisabled = false |
|
|
|
this.$message({ |
|
|
|
showClose: true, |
|
|
|
type: 'success', |
|
|
|
message: resp.msg |
|
|
|
this.$refs['form_obj'].validate((valid) => { |
|
|
|
if (valid) { |
|
|
|
req.saveUpShelf(this.formobj) |
|
|
|
.then(resp => { |
|
|
|
if (resp.success) { |
|
|
|
this.submitdisabled = false |
|
|
|
this.$message({ |
|
|
|
showClose: true, |
|
|
|
type: 'success', |
|
|
|
message: resp.msg |
|
|
|
}) |
|
|
|
this.handleReturn('true') |
|
|
|
} else { |
|
|
|
this.submitdisabled = false |
|
|
|
// 根据resp.code进行异常情况处理 |
|
|
|
} |
|
|
|
}) |
|
|
|
this.handleReturn('true') |
|
|
|
} else { |
|
|
|
this.submitdisabled = false |
|
|
|
// 根据resp.code进行异常情况处理 |
|
|
|
} |
|
|
|
}) |
|
|
|
.catch(() => { |
|
|
|
this.submitdisabled = false |
|
|
|
}) |
|
|
|
.catch(() => { |
|
|
|
this.submitdisabled = false |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
handleReturn(isreload) { |
|
|
|
if (isreload === 'true') this.$emit('reloadlist') |
|
|
|
this.formobj = { |
|
|
|
"sid": "", |
|
|
|
"billNo": "", |
|
|
|
"createBySid": "", |
|
|
|
"createByName": "", |
|
|
|
"createTime": "", |
|
|
|
"createBySid": window.sessionStorage.getItem('userSid'), |
|
|
|
"createByName": window.sessionStorage.getItem('name'), |
|
|
|
"createTime": getCurrentDate(), |
|
|
|
"sourceBillNo": "", |
|
|
|
"sourceBillSid": "", |
|
|
|
"billState": "新建", |
|
|
|
"upShelfSid":"", |
|
|
|
"upShelfName":'', |
|
|
|
"list": [ |
|
|
|
|
|
|
|
], |
|
|
|
@ -222,6 +263,7 @@ |
|
|
|
}, |
|
|
|
showEdit(row) { |
|
|
|
this.getWarehouseList() |
|
|
|
this.getAllOrgper() |
|
|
|
var params = { |
|
|
|
sid: row.sid |
|
|
|
} |
|
|
|
@ -236,6 +278,28 @@ |
|
|
|
this.formobj = {} |
|
|
|
}) |
|
|
|
}, |
|
|
|
getAllOrgper() { |
|
|
|
selAllByOrgSidPath({ |
|
|
|
orgSidPath: window.sessionStorage.getItem('defaultOrgPath') |
|
|
|
}).then((res) => { |
|
|
|
if (res.success) { |
|
|
|
this.allOrgperList = res.data |
|
|
|
|
|
|
|
console.log("aaaaaa", this.allOrgperList); |
|
|
|
|
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
allOrgperSelect(val) { |
|
|
|
console.log("allOrgperSelect", val); |
|
|
|
|
|
|
|
const choose = this.allOrgperList.filter((item) => item.sid == val) |
|
|
|
console.log('>>>>>>>>>selectWarehouseName', choose) |
|
|
|
this.formobj.upShelfName = choose[0].name |
|
|
|
this.formobj.upShelfSid = choose[0].sid |
|
|
|
|
|
|
|
}, |
|
|
|
|
|
|
|
getWarehouseList() { |
|
|
|
req2.getWarehouses().then((res) => { |
|
|
|
if (res.success) { |
|
|
|
@ -282,6 +346,14 @@ |
|
|
|
} |
|
|
|
</script> |
|
|
|
<style scoped> |
|
|
|
/deep/ .el-form-item__error { |
|
|
|
margin-left: 120px !important; |
|
|
|
} |
|
|
|
|
|
|
|
.must { |
|
|
|
color: #f00; |
|
|
|
} |
|
|
|
|
|
|
|
.span-sty { |
|
|
|
width: 130px !important; |
|
|
|
} |
|
|
|
@ -295,6 +367,10 @@ |
|
|
|
width: calc(100% - 115px); |
|
|
|
} |
|
|
|
|
|
|
|
.first_row { |
|
|
|
border-top: 1px solid #E0E3EB; |
|
|
|
} |
|
|
|
|
|
|
|
.titleOne { |
|
|
|
padding: 7px; |
|
|
|
display: flex; |
|
|
|
|
