|
@@ -15,8 +15,8 @@
|
|
|
advancedWidth="465">
|
|
|
<template slot="advanced-content">
|
|
|
<el-form ref="advancedForm" :model="advancedForm" label-width="90px">
|
|
|
- <el-form-item label="所属部门">
|
|
|
- <el-cascader v-model="advancedForm.dept_id" :options="deptList" :props="{
|
|
|
+ <el-form-item label="仓库">
|
|
|
+ <el-cascader v-model="advancedForm.dept_id" :options="warehouseList" :props="{
|
|
|
label: 'name',
|
|
|
value: 'id',
|
|
|
emitPath: false,
|
|
@@ -45,7 +45,7 @@
|
|
|
|
|
|
<template slot="table-columns">
|
|
|
<el-table-column type="selection" width="55" />
|
|
|
- <el-table-column prop="" label="仓库编号">
|
|
|
+ <el-table-column prop="warehouse.sn" label="仓库编号">
|
|
|
<!-- <template slot-scope="scope">
|
|
|
<router-link
|
|
|
v-if="checkPermission(['goodsLend'])"
|
|
@@ -56,11 +56,13 @@
|
|
|
<span v-else>{{scope.row.sn}}</span>
|
|
|
</template> -->
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="name" label="仓库名称">
|
|
|
+ <el-table-column prop="warehouse.name" label="仓库名称">
|
|
|
<!-- <template slot-scope="scope">{{ scope.row.lend_time | unixToDate }}</template> -->
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="code" label="库位号" />
|
|
|
- <el-table-column prop="type" label="仓库类型" />
|
|
|
+ <el-table-column prop="type" label="仓库类型">
|
|
|
+ <template slot-scope="scope">{{ statusFilter(scope.row.type) }}</template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column prop="intro" label="库位说明" />
|
|
|
<!-- <el-table-column prop="lend_person" label="借出人" />
|
|
|
<el-table-column prop="status" label="状态">
|
|
@@ -98,20 +100,26 @@
|
|
|
</el-dialog>
|
|
|
<el-dialog :title="title" :visible.sync="dialogVisibleForm" width="940px" center @close='addHandleCancle'>
|
|
|
<el-form ref="addLendForm" :model="addLendForm" :rules="rules" label-width="90px">
|
|
|
- <el-form-item label="仓库编号" prop="code">
|
|
|
+ <!-- <el-form-item label="仓库编号" prop="code">
|
|
|
<el-input v-model="addLendForm.code" placeholder="请输入仓库编号"></el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="仓库名称" prop="name">
|
|
|
<el-input v-model="addLendForm.name" placeholder="请输入仓库名称"></el-input>
|
|
|
+ </el-form-item> -->
|
|
|
+ <el-form-item label="仓库" prop="warehouse_id">
|
|
|
+ <el-select v-model="addLendForm.warehouse_id" clearable @change="selWarehouse">
|
|
|
+ <el-option v-for="item in warehouseList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
+ </el-select>
|
|
|
+ <span style="color: red;margin-left: 20px;cursor: pointer;" v-if="!warehouseList" @click="gowareHouse">请新增仓库</span>
|
|
|
</el-form-item>
|
|
|
- <el-form-item label="库位号" prop="create_time">
|
|
|
- <el-input v-model="addLendForm.create_time" placeholder="请输入库位号"></el-input>
|
|
|
+ <el-form-item label="库位号" prop="code">
|
|
|
+ <el-input v-model="addLendForm.code" maxlength="12" placeholder="请输入库位号" style="width: 270px;">
|
|
|
+ <template slot="prepend">{{ warehouseSn }}-</template>
|
|
|
+ </el-input>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="仓库类型" prop="type">
|
|
|
<el-select v-model="addLendForm.type" clearable>
|
|
|
- <el-option key="d" label="大型" value="大型" />
|
|
|
- <el-option key="z" label="中型" value="中型" />
|
|
|
- <el-option key="s" label="小型" value="小型" />
|
|
|
+ <el-option v-for="item in typeList" :key="item.id" :label="item.label" :value="item.value" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="库位说明">
|
|
@@ -141,7 +149,8 @@ export default {
|
|
|
name: 'goodsLend',
|
|
|
data() {
|
|
|
return {
|
|
|
- deptList: [],
|
|
|
+ warehouseSn:"",
|
|
|
+ warehouseList: [],
|
|
|
// 列表loading状态
|
|
|
loading: false,
|
|
|
// 列表参数
|
|
@@ -164,19 +173,20 @@ export default {
|
|
|
addLendForm:{
|
|
|
},
|
|
|
rules: {
|
|
|
- code: [
|
|
|
- { required: true, message: '请输入仓库编号', trigger: 'blur' },
|
|
|
+ warehouse_id: [
|
|
|
+ { required: true, message: '请选择仓库', trigger: 'change' },
|
|
|
],
|
|
|
name: [
|
|
|
{ required: true, message: '请选择输入仓库名称', trigger: 'blur' }
|
|
|
],
|
|
|
- create_time: [
|
|
|
+ code: [
|
|
|
{ required: true, message: '请选择输入库位号', trigger: 'blur' }
|
|
|
],
|
|
|
type: [
|
|
|
{ required: true, message: '请选择仓库类型', trigger: 'change' }
|
|
|
]
|
|
|
- }
|
|
|
+ },
|
|
|
+ typeList:[]
|
|
|
}
|
|
|
},
|
|
|
mounted() {
|
|
@@ -197,15 +207,28 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
+ gowareHouse(){
|
|
|
+ this.dialogVisibleForm=false
|
|
|
+ this.$router.push({ name: 'warehouseList'})
|
|
|
+ },
|
|
|
+ /* 选中仓库 */
|
|
|
+ selWarehouse(val){
|
|
|
+ const list=this.warehouseList.filter(el=>{
|
|
|
+ return el.id===val
|
|
|
+ })
|
|
|
+ let obj = list[0]
|
|
|
+ this.warehouseSn=obj.sn
|
|
|
+ },
|
|
|
// 确认提交
|
|
|
lendCommit(){
|
|
|
this.$refs.addLendForm.validate((valid) => {
|
|
|
if (valid) {
|
|
|
if(this.title==='新增'){
|
|
|
- this.addLendForm.create_time=Date.parse(new Date())
|
|
|
+ this.addLendForm.code=this.warehouseSn+"-"+this.addLendForm.code
|
|
|
API_GoodsLend.create(this.addLendForm).then(res=>{
|
|
|
this.$message.success('添加成功!')
|
|
|
this.dialogVisibleForm=false
|
|
|
+ this.warehouseSn=""
|
|
|
this.addLendForm={}
|
|
|
this.GET_GoodsLendList()
|
|
|
})
|
|
@@ -251,10 +274,10 @@ export default {
|
|
|
},
|
|
|
handleEditGoodsLend(row) {
|
|
|
console.log(row);
|
|
|
- // this.title="编辑"
|
|
|
- // this.addLendForm=row
|
|
|
- // this.dialogVisibleForm=true
|
|
|
- this.$router.push({ name: 'goodsLendEdit', params: { id: row.id }})
|
|
|
+ this.title="编辑"
|
|
|
+ this.addLendForm=row
|
|
|
+ this.dialogVisibleForm=true
|
|
|
+ // this.$router.push({ name: 'goodsLendEdit', params: { id: row.id }})
|
|
|
},
|
|
|
handleReturnGoodsLend(row) {
|
|
|
this.$confirm('确定要删除吗?', '提示', { type: 'warning' }).then(() => {
|
|
@@ -266,16 +289,15 @@ export default {
|
|
|
},
|
|
|
/** 状态 */
|
|
|
statusFilter(val) {
|
|
|
- switch (val) {
|
|
|
- case 'NEW':
|
|
|
- return '新创建'
|
|
|
- case 'CONFIRMED':
|
|
|
- return '已确认'
|
|
|
- case 'RETURNED':
|
|
|
- return '已归还'
|
|
|
- default:
|
|
|
- return ''
|
|
|
+ const obj=this.typeList.filter(el=>{
|
|
|
+ return el.value===val
|
|
|
+ })
|
|
|
+ if(obj.length !== 0){
|
|
|
+ return obj[0].label
|
|
|
+ }else{
|
|
|
+ return ""
|
|
|
}
|
|
|
+
|
|
|
},
|
|
|
handleConfirmGoodsLend() {
|
|
|
if (!this.multipleSelection || !this.multipleSelection.length) return this.$message.error('请先选择!')
|
|
@@ -287,8 +309,12 @@ export default {
|
|
|
},
|
|
|
/** 获取部门 */
|
|
|
GET_DeptList() {
|
|
|
- API_Setting.getDeptList().then(response => {
|
|
|
- this.deptList = Foundation.buildTree(response, '0')
|
|
|
+ API_Setting.getListAll().then(response => {
|
|
|
+ this.warehouseList = response
|
|
|
+ console.log(response);
|
|
|
+ })
|
|
|
+ API_Setting.getPage({dictType:"Warehouse_location_type",page_no: 1,page_size: 50}).then(res=>{
|
|
|
+ this.typeList=res.data
|
|
|
})
|
|
|
},
|
|
|
/** 打印对账详情 */
|
|
@@ -427,4 +453,11 @@ export default {
|
|
|
/deep/ .el-dialog__body {
|
|
|
padding: 10px 20px;
|
|
|
}
|
|
|
+/deep/.el-form{
|
|
|
+ .el-form-item__content{
|
|
|
+ display: flex;
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
+
|
|
|
</style>
|