|
|
|
|
@ -57,8 +57,8 @@ |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-form> |
|
|
|
|
<div> |
|
|
|
|
<el-button class="register" @click="handleAdd">登记入库</el-button> |
|
|
|
|
<el-button v-if="multipleSelection.length != 0" class="register" @click="batchDeletion">批量删除</el-button> |
|
|
|
|
<el-button class="register" @click="handleAdd" v-if="vaildData(permission.goods_storage, false)">登记入库</el-button> |
|
|
|
|
<el-button v-if="multipleSelection.length != 0 && vaildData(permission.goods_remove, false)" class="register" @click="batchDeletion">批量删除</el-button> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="content-main"> |
|
|
|
|
@ -91,6 +91,10 @@ |
|
|
|
|
prop="code" |
|
|
|
|
label="物品编号"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column |
|
|
|
|
prop="deptName" |
|
|
|
|
label="所属部门"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column |
|
|
|
|
prop="brand" |
|
|
|
|
label="品牌"> |
|
|
|
|
@ -112,6 +116,10 @@ |
|
|
|
|
label="入库日期" |
|
|
|
|
width="100"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column |
|
|
|
|
prop="source" |
|
|
|
|
label="来源"> |
|
|
|
|
</el-table-column> |
|
|
|
|
<el-table-column |
|
|
|
|
prop="num" |
|
|
|
|
label="库存"> |
|
|
|
|
@ -143,12 +151,12 @@ |
|
|
|
|
width="150" |
|
|
|
|
trigger="hover"> |
|
|
|
|
<div class="more-box"> |
|
|
|
|
<div class="item" @click="handleOperation('view', scope.row)">查看</div> |
|
|
|
|
<div class="item" @click="handleOperation('edit', scope.row)">编辑</div> |
|
|
|
|
<div class="item" @click="handleOperation('change', scope.row)">库存变更</div> |
|
|
|
|
<div class="item" @click="handleOperation('detail', scope.row)">操作明细</div> |
|
|
|
|
<div class="item" @click="handleOperation('delete', scope.row)">删除</div> |
|
|
|
|
<div class="item" @click="handleOperation('apply', scope.row)">申领</div> |
|
|
|
|
<div v-if="vaildData(permission.goods_view, false)" class="item" @click="handleOperation('view', scope.row)">查看</div> |
|
|
|
|
<div v-if="vaildData(permission.goods_edit, false)" class="item" @click="handleOperation('edit', scope.row)">编辑</div> |
|
|
|
|
<div v-if="vaildData(permission.goods_change, false)" class="item" @click="handleOperation('change', scope.row)">库存变更</div> |
|
|
|
|
<div v-if="vaildData(permission.goods_detail, false)" class="item" @click="handleOperation('detail', scope.row)">操作明细</div> |
|
|
|
|
<div v-if="vaildData(permission.goods_remove, false)" class="item" @click="handleOperation('delete', scope.row)">删除</div> |
|
|
|
|
<div v-if="vaildData(permission.goods_apply, false)" class="item" @click="handleOperation('apply', scope.row)">申领</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="more" slot="reference">更多</div> |
|
|
|
|
</el-popover> |
|
|
|
|
@ -244,6 +252,27 @@ |
|
|
|
|
/> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="8"> |
|
|
|
|
<el-form-item |
|
|
|
|
label="所属部门" |
|
|
|
|
prop="brand" |
|
|
|
|
> |
|
|
|
|
<el-select |
|
|
|
|
class="search_select" |
|
|
|
|
v-model="registerForm.deptId" |
|
|
|
|
placeholder="请选择所属部门" |
|
|
|
|
filterable |
|
|
|
|
:disabled="dialogFormDisabled" |
|
|
|
|
> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in deptListData" |
|
|
|
|
:key="item.id" |
|
|
|
|
:label="item.deptName" |
|
|
|
|
:value="item.id"> |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="8"> |
|
|
|
|
<el-form-item |
|
|
|
|
label="品牌" |
|
|
|
|
@ -383,10 +412,31 @@ |
|
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
|
type="date" |
|
|
|
|
placeholder="选择日期时间" |
|
|
|
|
:disabled="dialogFormDisabled"> |
|
|
|
|
:disabled="dialogFormDisabled && dialogFormType != 'change'"> |
|
|
|
|
</el-date-picker> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="8"> |
|
|
|
|
<el-form-item |
|
|
|
|
label="来源" |
|
|
|
|
prop="source" |
|
|
|
|
> |
|
|
|
|
<el-select |
|
|
|
|
class="search_select" |
|
|
|
|
v-model="registerForm.source" |
|
|
|
|
placeholder="请选择来源" |
|
|
|
|
filterable |
|
|
|
|
:disabled="dialogFormDisabled && dialogFormType != 'change'" |
|
|
|
|
> |
|
|
|
|
<el-option |
|
|
|
|
v-for="item in sourceList" |
|
|
|
|
:key="item.dictValue" |
|
|
|
|
:label="item.dictKey" |
|
|
|
|
:value="item.dictValue"> |
|
|
|
|
</el-option> |
|
|
|
|
</el-select> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col |
|
|
|
|
:span="8" |
|
|
|
|
v-if="dialogFormType == 'apply'" |
|
|
|
|
@ -409,7 +459,7 @@ |
|
|
|
|
<el-input |
|
|
|
|
v-model="registerForm.remarks" |
|
|
|
|
placeholder="请输入备注" |
|
|
|
|
:disabled="dialogFormDisabled" |
|
|
|
|
:disabled="dialogFormType == 'apply' ? false : dialogFormDisabled && dialogFormType != 'change'" |
|
|
|
|
/> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
@ -433,72 +483,80 @@ |
|
|
|
|
size="35%" |
|
|
|
|
:before-close="handleClose"> |
|
|
|
|
<!-- <span>我来啦!</span> --> |
|
|
|
|
<div class="message"> |
|
|
|
|
<div class="title">物品信息</div> |
|
|
|
|
<el-divider></el-divider> |
|
|
|
|
<div class="box"> |
|
|
|
|
<div class="item"> |
|
|
|
|
<div class="label">物品大类：</div> |
|
|
|
|
<div class="value">{{ registerForm.bigClass }}</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="item"> |
|
|
|
|
<div class="label">物品名称：</div> |
|
|
|
|
<div class="value">{{ registerForm.name }}</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="item"> |
|
|
|
|
<div class="label">物品编号：</div> |
|
|
|
|
<div class="value">{{ registerForm.code }}</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="item"> |
|
|
|
|
<div class="label">品牌：</div> |
|
|
|
|
<div class="value">{{ registerForm.brand }}</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="item"> |
|
|
|
|
<div class="label">型号：</div> |
|
|
|
|
<div class="value">{{ registerForm.model }}</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="item"> |
|
|
|
|
<div class="label">规格：</div> |
|
|
|
|
<div class="value">{{ registerForm.standard }}</div> |
|
|
|
|
<div class="message-history"> |
|
|
|
|
<div class="message"> |
|
|
|
|
<div class="title">物品信息</div> |
|
|
|
|
<el-divider></el-divider> |
|
|
|
|
<div class="box"> |
|
|
|
|
<div class="item"> |
|
|
|
|
<div class="label">物品大类：</div> |
|
|
|
|
<div class="value">{{ registerForm.bigClass }}</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="item"> |
|
|
|
|
<div class="label">物品名称：</div> |
|
|
|
|
<div class="value">{{ registerForm.name }}</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="item"> |
|
|
|
|
<div class="label">物品编号：</div> |
|
|
|
|
<div class="value">{{ registerForm.code }}</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="item"> |
|
|
|
|
<div class="label">所属部门：</div> |
|
|
|
|
<div class="value">{{ registerForm.deptName }}</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="item"> |
|
|
|
|
<div class="label">品牌：</div> |
|
|
|
|
<div class="value">{{ registerForm.brand }}</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="item"> |
|
|
|
|
<div class="label">型号：</div> |
|
|
|
|
<div class="value">{{ registerForm.model }}</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="item"> |
|
|
|
|
<div class="label">规格：</div> |
|
|
|
|
<div class="value">{{ registerForm.standard }}</div> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="history"> |
|
|
|
|
<div class="title">历史记录</div> |
|
|
|
|
<el-divider></el-divider> |
|
|
|
|
<el-collapse |
|
|
|
|
v-model="activeNames" |
|
|
|
|
@change="handleChange" |
|
|
|
|
> |
|
|
|
|
<el-collapse-item |
|
|
|
|
v-for="(item, index) in historyDetailList" |
|
|
|
|
:key="index" |
|
|
|
|
:name="index" |
|
|
|
|
<div class="history"> |
|
|
|
|
<div class="title">历史记录</div> |
|
|
|
|
<el-divider></el-divider> |
|
|
|
|
<el-collapse |
|
|
|
|
class="history-detail" |
|
|
|
|
v-model="activeNames" |
|
|
|
|
@change="handleChange" |
|
|
|
|
> |
|
|
|
|
<template slot="title"> |
|
|
|
|
<div class="title-time">{{ item.createTime }}</div> |
|
|
|
|
<div class="title-text">{{ item.type }}</div> |
|
|
|
|
<div class="title-num" :class="item.type == '申领出库' ? 'red' : 'green'">（{{ item.type == '申领出库' ? '-' : '+' }}{{ item.num }}）</div> |
|
|
|
|
</template> |
|
|
|
|
<div class="name-time" v-if="item.type == '申领出库'"> |
|
|
|
|
<div class="name">申领提交人：{{ item.applyName }}</div> |
|
|
|
|
<div class="time">提交时间：{{ item.applyTime }}</div> |
|
|
|
|
<div class="dept">所属部门：{{ item.deptName }}</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="name-time"> |
|
|
|
|
<div class="name">{{ item.type == '申领出库' ? '申领审核人' : '登记入库人' }}：{{ item.type == '申领出库' ? item.approveName : item.inName }}</div> |
|
|
|
|
<div class="time">提交时间：{{ item.type == '申领出库' ? item.approveTime : item.inTime }}</div> |
|
|
|
|
</div> |
|
|
|
|
</el-collapse-item> |
|
|
|
|
</el-collapse> |
|
|
|
|
<el-collapse-item |
|
|
|
|
v-for="(item, index) in historyDetailList" |
|
|
|
|
:key="index" |
|
|
|
|
:name="index" |
|
|
|
|
> |
|
|
|
|
<template slot="title"> |
|
|
|
|
<div class="title-time">{{ item.createTime }}</div> |
|
|
|
|
<div class="title-text">{{ item.type }}</div> |
|
|
|
|
<div class="title-num" :class="item.type == '申领出库' ? 'red' : 'green'">（{{ item.type == '申领出库' ? '-' : '+' }}{{ item.num }}）</div> |
|
|
|
|
</template> |
|
|
|
|
<div class="name-time" v-if="item.type == '申领出库'"> |
|
|
|
|
<div class="name">申领提交人：{{ item.applyName }}</div> |
|
|
|
|
<div class="time">提交时间：{{ item.applyTime }}</div> |
|
|
|
|
<div class="dept">所属部门：{{ item.deptName }}</div> |
|
|
|
|
</div> |
|
|
|
|
<div class="name-time"> |
|
|
|
|
<div class="name">{{ item.type == '申领出库' ? '申领审核人' : '登记入库人' }}：{{ item.type == '申领出库' ? item.approveName : item.inName }}</div> |
|
|
|
|
<div class="time">提交时间：{{ item.type == '申领出库' ? item.approveTime : item.inTime }}</div> |
|
|
|
|
</div> |
|
|
|
|
</el-collapse-item> |
|
|
|
|
</el-collapse> |
|
|
|
|
</div> |
|
|
|
|
</div> |
|
|
|
|
</el-drawer> |
|
|
|
|
</basic-container> |
|
|
|
|
</template> |
|
|
|
|
|
|
|
|
|
<script> |
|
|
|
|
import { findPage, detail, save, goodsApplySave, remove, historyDetail, check } from "@/api/itemManagement/itemList"; |
|
|
|
|
import { findPage, detail, save, goodsApplySave, remove, historyDetail, check, deptList } from "@/api/itemManagement/itemList"; |
|
|
|
|
import {getDictionary} from '@/api/system/dictbiz' |
|
|
|
|
import {mapGetters} from "vuex"; |
|
|
|
|
export default { |
|
|
|
|
data() { |
|
|
|
|
return { |
|
|
|
|
@ -509,6 +567,7 @@ |
|
|
|
|
}, |
|
|
|
|
typeList: [], |
|
|
|
|
brandList: [], |
|
|
|
|
sourceList: [], |
|
|
|
|
tableData: [], |
|
|
|
|
multipleSelection: [], |
|
|
|
|
currentPage: 1, |
|
|
|
|
@ -531,8 +590,10 @@ |
|
|
|
|
unit: '', |
|
|
|
|
useTo: '', |
|
|
|
|
inDate: '', |
|
|
|
|
source: '', |
|
|
|
|
applyNum: '', |
|
|
|
|
remarks: '', |
|
|
|
|
deptId: '', |
|
|
|
|
}, |
|
|
|
|
rules: { |
|
|
|
|
bigClass: [ |
|
|
|
|
@ -544,6 +605,9 @@ |
|
|
|
|
code: [ |
|
|
|
|
{ required: true, message: '请输入物品编号', trigger: 'blur' }, |
|
|
|
|
], |
|
|
|
|
deptId: [ |
|
|
|
|
{ required: true, message: '请选择部门名称', trigger: 'blur' }, |
|
|
|
|
], |
|
|
|
|
brand: [ |
|
|
|
|
{ required: true, message: '请选择品牌', trigger: 'blur' }, |
|
|
|
|
], |
|
|
|
|
@ -594,6 +658,9 @@ |
|
|
|
|
inDate: [ |
|
|
|
|
{ required: true, message: '请选择入库时间', trigger: 'blur' }, |
|
|
|
|
], |
|
|
|
|
source: [ |
|
|
|
|
{ required: true, message: '请选择来源', trigger: 'blur' }, |
|
|
|
|
], |
|
|
|
|
applyNum: [ |
|
|
|
|
{ |
|
|
|
|
validator: (rule, value, callback) => { |
|
|
|
|
@ -612,10 +679,12 @@ |
|
|
|
|
}, |
|
|
|
|
drawer: false, |
|
|
|
|
activeNames: [], |
|
|
|
|
historyDetailList: [] |
|
|
|
|
historyDetailList: [], |
|
|
|
|
deptListData: [], |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
computed: { |
|
|
|
|
...mapGetters(["userInfo", "permission"]), |
|
|
|
|
registerTitle() { |
|
|
|
|
if(this.dialogFormType == 'add') { |
|
|
|
|
return '登记入库' |
|
|
|
|
@ -647,6 +716,12 @@ |
|
|
|
|
await getDictionary({code: 'brand'}).then(res => { |
|
|
|
|
this.brandList = res.data.data.filter(item => item.parentId != '0') |
|
|
|
|
}) |
|
|
|
|
await getDictionary({code: 'goods_source'}).then(res => { |
|
|
|
|
this.sourceList = res.data.data.filter(item => item.parentId != '0') |
|
|
|
|
}) |
|
|
|
|
await deptList().then(res => { |
|
|
|
|
this.deptListData = res.data.data[0].children |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
// 查询列表数据 |
|
|
|
|
findPage() { |
|
|
|
|
@ -723,7 +798,7 @@ |
|
|
|
|
} else if(type == 'detail') { |
|
|
|
|
this.drawer = true |
|
|
|
|
this.detail(row.id) |
|
|
|
|
historyDetail({code: row.code}).then(res => { |
|
|
|
|
historyDetail({code: row.code, deptId: row.deptId}).then(res => { |
|
|
|
|
// console.log(res) |
|
|
|
|
this.historyDetailList = res.data.data |
|
|
|
|
}) |
|
|
|
|
@ -763,13 +838,16 @@ |
|
|
|
|
detail({id}).then(res => { |
|
|
|
|
console.log(res) |
|
|
|
|
this.registerForm = res.data.data |
|
|
|
|
if(this.dialogFormType == 'apply') { |
|
|
|
|
this.registerForm.remarks = '' |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
}, |
|
|
|
|
// 弹窗按钮点击 |
|
|
|
|
registerHandleClick(type) { |
|
|
|
|
if(type == 'confirm') { |
|
|
|
|
if(this.dialogFormType == 'add') { |
|
|
|
|
check({code: this.registerForm.code}).then(res => { |
|
|
|
|
check({code: this.registerForm.code, deptId: this.registerForm.deptId}).then(res => { |
|
|
|
|
if(!res.data) { |
|
|
|
|
this.$message({ |
|
|
|
|
message: '该编号已存在', |
|
|
|
|
@ -777,11 +855,18 @@ |
|
|
|
|
}); |
|
|
|
|
return; |
|
|
|
|
} else { |
|
|
|
|
const fieldsToValidate = ['bigClass','name','code','brand','model','standard','price','allocation','inNum','unit','useTo','inDate','remarks'] |
|
|
|
|
const fieldsToValidate = ['bigClass','name','code','brand','model','standard','price','allocation','inNum','unit','useTo','inDate','source','remarks','deptId'] |
|
|
|
|
this.$refs.registerForm.validate((valid) => { |
|
|
|
|
if (valid) { |
|
|
|
|
this.registerForm.num = 0 |
|
|
|
|
save(this.registerForm).then(res => { |
|
|
|
|
let params = this.registerForm |
|
|
|
|
this.deptListData.forEach(item => { |
|
|
|
|
if(item.id == params.deptId) { |
|
|
|
|
params.deptName = item.deptName |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
// console.log(params) |
|
|
|
|
save(params).then(res => { |
|
|
|
|
this.$message({ |
|
|
|
|
message: '入库成功', |
|
|
|
|
type: 'success' |
|
|
|
|
@ -803,11 +888,17 @@ |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
} else if(this.dialogFormType == 'edit') { |
|
|
|
|
const fieldsToValidate = ['bigClass','name','brand','model','standard','price','allocation','unit','useTo','inDate','remarks'] |
|
|
|
|
const fieldsToValidate = ['bigClass','name','brand','model','standard','price','allocation','unit','useTo','inDate','source','remarks','deptId'] |
|
|
|
|
this.$refs.registerForm.validate((valid) => { |
|
|
|
|
if (valid) { |
|
|
|
|
this.registerForm.num = this.registerForm.inNum |
|
|
|
|
save(this.registerForm).then(res => { |
|
|
|
|
let params = this.registerForm |
|
|
|
|
this.deptListData.forEach(item => { |
|
|
|
|
if(item.id == params.deptId) { |
|
|
|
|
params.deptName = item.deptName |
|
|
|
|
} |
|
|
|
|
}) |
|
|
|
|
save(params).then(res => { |
|
|
|
|
this.$message({ |
|
|
|
|
message: '修改成功', |
|
|
|
|
type: 'success' |
|
|
|
|
@ -827,7 +918,7 @@ |
|
|
|
|
} |
|
|
|
|
}, fieldsToValidate); |
|
|
|
|
} else if(this.dialogFormType == 'change') { |
|
|
|
|
const fieldsToValidate = ['inNum'] |
|
|
|
|
const fieldsToValidate = ['inNum', 'inDate', 'source', 'remarks'] |
|
|
|
|
this.$refs.registerForm.validate((valid) => { |
|
|
|
|
if (valid) { |
|
|
|
|
save(this.registerForm).then(res => { |
|
|
|
|
@ -851,6 +942,13 @@ |
|
|
|
|
}, fieldsToValidate); |
|
|
|
|
} else if(this.dialogFormType == 'apply') { |
|
|
|
|
const fieldsToValidate = ['applyNum'] |
|
|
|
|
if (this.registerForm.applyNum > this.registerForm.num) { |
|
|
|
|
this.$message({ |
|
|
|
|
message: '申领数量不能大于库存数量', |
|
|
|
|
type: 'error' |
|
|
|
|
}); |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
this.$refs.registerForm.validate((valid) => { |
|
|
|
|
if (valid) { |
|
|
|
|
let params = { |
|
|
|
|
@ -905,8 +1003,10 @@ |
|
|
|
|
unit: '', |
|
|
|
|
useTo: '', |
|
|
|
|
inDate: '', |
|
|
|
|
source: '', |
|
|
|
|
applyNum: '', |
|
|
|
|
remarks: '', |
|
|
|
|
deptId: '', |
|
|
|
|
} |
|
|
|
|
}, |
|
|
|
|
// 重置表单 |
|
|
|
|
@ -1005,12 +1105,20 @@ |
|
|
|
|
.el-input-number{ |
|
|
|
|
width: 100%; |
|
|
|
|
} |
|
|
|
|
::v-deep .el-date-editor.el-input, .el-date-editor.el-input__inner { |
|
|
|
|
width: 100%; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
.dialog-footer{ |
|
|
|
|
height: 40px; |
|
|
|
|
display: flex; |
|
|
|
|
justify-content: flex-end; |
|
|
|
|
} |
|
|
|
|
.message-history{ |
|
|
|
|
display: flex; |
|
|
|
|
flex-direction: column; |
|
|
|
|
height: 100%; |
|
|
|
|
} |
|
|
|
|
.message{ |
|
|
|
|
// padding: 0 20px; |
|
|
|
|
margin: 0 20px 0px 20px; |
|
|
|
|
@ -1046,6 +1154,10 @@ |
|
|
|
|
flex-direction: column; |
|
|
|
|
border: 1px solid #D1D1D1; |
|
|
|
|
border-top: none; |
|
|
|
|
height: calc(91vh - 300px); |
|
|
|
|
// flex: 1; |
|
|
|
|
// display: flex; |
|
|
|
|
// flex-direction: column; |
|
|
|
|
.title{ |
|
|
|
|
height: 40px; |
|
|
|
|
background: #FFFFFF; |
|
|
|
|
@ -1055,9 +1167,11 @@ |
|
|
|
|
margin: 0 20px 0px 20px; |
|
|
|
|
} |
|
|
|
|
.el-collapse{ |
|
|
|
|
flex: 1; |
|
|
|
|
margin: 0 20px; |
|
|
|
|
border: none !important; |
|
|
|
|
margin-bottom: 20px; |
|
|
|
|
overflow: auto; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
.title-text{ |
|
|
|
|
|
guanxiaohan
2 years ago