From ce1d9926ff986e195fd4a58cb5159fc8f45b32a5 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期五, 01 十二月 2023 16:06:59 +0800
Subject: [PATCH] feat: 部门物品 1、报废单列表 2、报废明细 3、退回单列表 4、退回明细
---
admin-web/src/api/exportExcel.js | 9 ++++
admin-web/src/api/deptGoods/scrap.js | 2
admin-web/src/views/departmentitem/itemscr/scrapping/index.vue | 57 ++++++++++++++++++----------
admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue | 2
admin-web/src/views/departmentitem/itemret/returnNote/index.vue | 13 +++++-
admin-web/src/layout/components/Sidebar/SidebarItem.vue | 4 +
admin-web/src/views/departmentitem/itemdis/distribution/index.vue | 6 --
7 files changed, 61 insertions(+), 32 deletions(-)
diff --git a/admin-web/src/api/deptGoods/scrap.js b/admin-web/src/api/deptGoods/scrap.js
index a75f649..1c64327 100644
--- a/admin-web/src/api/deptGoods/scrap.js
+++ b/admin-web/src/api/deptGoods/scrap.js
@@ -29,7 +29,7 @@
// 鍒楄〃
export function scrappedList(params) {
return request({
- url: '/pc/l/wh/form/scrapped/list',
+ url: '/pc/l/wh/form/scrapped/deptList',
method: 'get',
params,
});
diff --git a/admin-web/src/api/exportExcel.js b/admin-web/src/api/exportExcel.js
index 49a60dc..0ed95f1 100644
--- a/admin-web/src/api/exportExcel.js
+++ b/admin-web/src/api/exportExcel.js
@@ -47,3 +47,12 @@
params,
});
}
+// 閮ㄩ棬鐗╁搧鎶ュ簾鍗曞鍑�
+export function deptScrappedExport(params) {
+ return request({
+ url: '/pc/l/wh/form/scrapped/deptList/export',
+ responseType: 'blob', // 鎸囧畾鍝嶅簲鏁版嵁绫诲瀷涓築lob
+ method: 'get',
+ params,
+ });
+}
diff --git a/admin-web/src/layout/components/Sidebar/SidebarItem.vue b/admin-web/src/layout/components/Sidebar/SidebarItem.vue
index b5b8a95..5f53724 100644
--- a/admin-web/src/layout/components/Sidebar/SidebarItem.vue
+++ b/admin-web/src/layout/components/Sidebar/SidebarItem.vue
@@ -142,7 +142,9 @@
background: #fff;
color: #0d997c;
}
-
+::v-deep .el-submenu .el-menu-item{
+ min-width: 0;
+}
.cur-icon {
display: inline-block;
width: 10px;
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
index 6ded764..4cd1a5a 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
@@ -179,11 +179,7 @@
this.total = res.totalRows;
this.loading = false;
});
- },
- fifterForm(params) {
- this.filterFrom = Object.assign(this.filterFrom, params);
- this.search(1);
- },
+ }
},
};
</script>
diff --git a/admin-web/src/views/departmentitem/itemret/returnNote/index.vue b/admin-web/src/views/departmentitem/itemret/returnNote/index.vue
index 85cfa78..28cd385 100644
--- a/admin-web/src/views/departmentitem/itemret/returnNote/index.vue
+++ b/admin-web/src/views/departmentitem/itemret/returnNote/index.vue
@@ -34,12 +34,12 @@
</div>
</div>
<div class="card-end">
- <div v-for="(just, index) in item.formOutputTemplateInfoList" :key="index" class="item">
- <div class="name">{{ just.goodsName }}</div>
+ <div v-for="(just, index) in item.goods" :key="index" class="item">
+ <div class="name">{{ just.baseGoodsTemplateName }}</div>
<div class="value-box">
<div class="value-box-item">
<span class="label">鏁伴噺锛�</span>
- <span class="value">{{ just.count }}</span>
+ <span class="value">{{ just.totalCount }}</span>
<span class="unit">{{ just.unit }}</span>
</div>
</div>
@@ -124,6 +124,13 @@
},
},
{
+ type: 'text',
+ dataIndex: 'operatorName',
+ label: '鍒涘缓浜�',
+ placeholder: '璇疯緭鍏�',
+ defaultValue: '',
+ },
+ {
type: 'date-picker',
dataIndex: 'startTime',
label: '閫�鍥炴椂闂�',
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
index 969e3f5..42f1f36 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/edit.vue
@@ -229,7 +229,7 @@
<script>
import {departmentListAll} from '@/api/system/deptment';
import {goodsTemplate} from '@/api/baseSetting/finsystenant';
-import {scrappedAdd} from '@/api/stock/deptScrap';
+import {scrappedAdd} from '@/api/deptGoods/scrap';
import {getTree} from '@/api/foudation/classification';
import MyButton from '@/components/myButton/myButton';
import winMd from '@/components/win/win-md';
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
index e33b8fb..1317463 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
@@ -10,7 +10,7 @@
<el-col>
<!--鍒楄〃-->
<div class="table-tool-bar" style="margin-bottom: 15px;">
- <my-button name="鏂板" @click="handleAdd" site="tools" size="medium" />
+ <my-button name="鏂板" @click="handleAdd" site="tools" size="medium"/>
</div>
<div :style="{ 'overflow-y': 'auto', height: 'calc(100vh - 352px)' }" v-loading="loading">
<el-row v-if="list.length" class="card" :gutter="5">
@@ -23,11 +23,14 @@
<span class="value">{{ item.businessFormCode }}</span>
</div>
<div class="card-header-right">
- <el-button site="form" type="success" size="mini" @click="handleExport(item)"
- >瀵煎嚭鎶ュ簾鐧昏鍗�</el-button
- >
+ <el-button site="form" type="success" size="mini"
+ @click="handleExport('deptScrappedExport',`閮ㄩ棬鐗╁搧鎶ュ簾鐧昏鍗�-${item.businessFormCode}`,{id:item.id})"
+ >瀵煎嚭鎶ュ簾鐧昏鍗�
+ </el-button
+ >
<el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)"
- >鏌ョ湅璇︽儏</el-button
+ >鏌ョ湅璇︽儏
+ </el-button
>
</div>
</div>
@@ -39,12 +42,12 @@
</div>
</div>
<div class="card-end">
- <div v-for="(just, index) in item.formOutputTemplateInfoList" :key="index" class="item">
- <div class="name">{{ just.goodsName }}</div>
+ <div v-for="(just, index) in item.goods" :key="index" class="item">
+ <div class="name">{{ just.baseGoodsTemplateName }}</div>
<div class="value-box">
<div class="value-box-item">
<span class="label">鏁伴噺锛�</span>
- <span class="value">{{ just.count }}</span>
+ <span class="value">{{ just.totalCount }}</span>
<span class="unit">{{ just.unit }}</span>
</div>
</div>
@@ -57,27 +60,28 @@
<el-empty v-else description="鏆傛棤鏁版嵁"></el-empty>
</div>
<el-pagination
- :small="false"
- :current-page="pageNum"
- :page-sizes="[5, 10, 20, 50, 100, 200, 300, 400, 500]"
- :page-size="pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="total"
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
+ :small="false"
+ :current-page="pageNum"
+ :page-sizes="[5, 10, 20, 50, 100, 200, 300, 400, 500]"
+ :page-size="pageSize"
+ layout="total, sizes, prev, pager, next, jumper"
+ :total="total"
+ @size-change="handleSizeChange"
+ @current-change="handleCurrentChange"
/>
</el-col>
</el-row>
</el-card>
</el-container>
<!--娣诲姞/缂栬緫寮圭獥-->
- <edit v-if="editSetting.show" :setting="editSetting" ref="editRef" @close="editSetting.show=false" @search="refreshData"></edit>
- <detail v-if="detailSetting.show" :setting="detailSetting" @close="detailSetting.show=false" ref="detailRef"></detail>
+ <edit v-if="editSetting.show" :setting="editSetting" ref="editRef" @close="editSetting.show=false"
+ @search="refreshData"></edit>
+ <detail v-if="detailSetting.show" :setting="detailSetting" @close="detailSetting.show=false"
+ ref="detailRef"></detail>
</div>
</template>
<script>
-import {outputList} from '@/api/stock/accessStock';
import MyButton from '@/components/myButton/myButton';
import myImport from '@/views/components/myImport';
import edit from './edit';
@@ -85,11 +89,12 @@
import listPage from '@/views/mixins/listPage'
import {getUserDetail} from "@/utils/auth";
import SettingIplatform from "@/utils/settingIplatform";
+import {scrappedList} from '@/api/deptGoods/scrap';
export default {
name: 'index',
mixins: [listPage],
- components: { MyButton, myImport, edit, detail },
+ components: {MyButton, myImport, edit, detail},
data() {
return {
list: [],
@@ -129,6 +134,13 @@
},
},
{
+ type: 'text',
+ dataIndex: 'operatorName',
+ label: '鍒涘缓浜�',
+ placeholder: '璇疯緭鍏�',
+ defaultValue: '',
+ },
+ {
type: 'date-picker',
dataIndex: 'startTime',
label: '鎶ュ簾鏃堕棿',
@@ -143,10 +155,13 @@
],
};
},
+ created() {
+ this.fetchData()
+ },
methods: {
fetchData() {
this.loading = true;
- outputList({
+ scrappedList({
pageNum: this.pageNum,
pageSize: this.pageSize,
...this.filterFrom,
--
Gitblit v1.9.1