bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

二级库1

This commit is contained in:
zhouzy062 2024-02-29 18:24:06 +08:00
parent 0467efb452
commit 1f5869efe5
5 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sgzb-ui/src/api/claimAndRefund/secondStore.js
View File

@ -9,6 +9,15 @@ export function secondaryWarehouseList(query) {
}) })
} }
// 获取操作记录
export function getOperateList(query) {
return request({
url: '/material/secondaryWarehouse/getOperateList',
method: 'get',
params: query
})
}
@ -29,8 +38,6 @@ export function secondaryWarehouseList(query) {

2
sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
View File

@ -701,7 +701,7 @@ export default {
}, },
getDialogList() { getDialogList() {
let params = { let params = {
id: this.rowObj.id, taskId: this.rowObj.taskId,
agreementId: this.rowObj.agreementId, agreementId: this.rowObj.agreementId,
pageNum: this.dialogQueryParams.pageNum, pageNum: this.dialogQueryParams.pageNum,
pageSize: this.dialogQueryParams.pageSize, pageSize: this.dialogQueryParams.pageSize,

11
sgzb-ui/src/views/claimAndRefund/secondStore/inStoreBook.vue
View File

@ -62,10 +62,10 @@
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="dictId" /> <el-table-column label="序号" align="center" prop="dictId" />
<el-table-column label="单位名称" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="单位名称" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="类型名称" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" />
<el-table-column label="退库数量" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="退库数量" align="center" prop="num" :show-overflow-tooltip="true" />
<el-table-column label="退料人员" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="退料人员" align="center" prop="dictName" :show-overflow-tooltip="true" />
<el-table-column label="退库人员" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="退库人员" align="center" prop="dictName" :show-overflow-tooltip="true" />
<el-table-column label="退库时间" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="退库时间" align="center" prop="dictName" :show-overflow-tooltip="true" />
@ -83,8 +83,9 @@
</template> </template>
<script> <script>
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type"; import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import { getOperateList } from "@/api/claimAndRefund/secondStore";
export default { export default {
name: "InStoreBook", name: "InStoreBook",

3
sgzb-ui/src/views/claimAndRefund/secondStore/outStoreBook.vue
View File

@ -83,9 +83,8 @@
</template> </template>
<script> <script>
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type"; import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import { getOperateList } from "@/api/claimAndRefund/secondStore";
export default { export default {
name: "OutStoreBook", name: "OutStoreBook",
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],

29
sgzb-ui/src/views/claimAndRefund/secondStore/secondStore.vue
View File

@ -59,18 +59,18 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="deviceList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="dictId" /> <el-table-column label="序号" align="center" prop="dictId" />
<el-table-column label="单位名称" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="单位名称" align="center" prop="unitName" :show-overflow-tooltip="true" />
<el-table-column label="类型名称" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="类型名称" align="center" prop="typeName" :show-overflow-tooltip="true" />
<el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="规格型号" align="center" prop="modelName" :show-overflow-tooltip="true" />
<el-table-column label="进场数量" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="进场数量" align="center" prop="jcNum" :show-overflow-tooltip="true" />
<el-table-column label="退场数量" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="退场数量" align="center" prop="tcNUm" :show-overflow-tooltip="true" />
<el-table-column label="场内库存量" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="场内库存量" align="center" prop="kcNum" :show-overflow-tooltip="true" />
<el-table-column label="已出库数量" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="已出库数量" align="center" prop="ckNum" :show-overflow-tooltip="true" />
<el-table-column label="在库数量" align="center" prop="dictName" :show-overflow-tooltip="true" /> <el-table-column label="在库数量" align="center" prop="zkNum" :show-overflow-tooltip="true" />
<el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" /> <el-table-column label="计量单位" align="center" prop="nuitName" :show-overflow-tooltip="true" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@ -164,9 +164,8 @@
</template> </template>
<script> <script>
import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type"; import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
import { secondaryWarehouseList } from "@/api/claimAndRefund/secondStore";
export default { export default {
name: "SecondStore", name: "SecondStore",
dicts: ['sys_normal_disable'], dicts: ['sys_normal_disable'],
@ -185,7 +184,7 @@ export default {
// 总条数 // 总条数
total: 0, total: 0,
// 字典表格数据 // 字典表格数据
typeList: [], deviceList: [],
// 弹出层标题 // 弹出层标题
title: "", title: "",
// 是否显示弹出层 // 是否显示弹出层
@ -229,8 +228,8 @@ export default {
/** 查询字典类型列表 */ /** 查询字典类型列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => { secondaryWarehouseList(this.queryParams).then(response => {
this.typeList = response.rows; this.deviceList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
} }