From f75031d68076a00fdc4e2aa04bbb255452ff7f7f Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期六, 02 十二月 2023 13:35:45 +0800
Subject: [PATCH] fix: 物品退回接口对接
---
admin-web/src/views/departmentitem/itemscr/scrapping/index.vue | 106 +++++++++++++++++++++++++++++------------------------
1 files changed, 58 insertions(+), 48 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
index 5d7c4d9..77d7694 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,28 +23,31 @@
<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>
<div class="one-hed">
- <div class="box"><span class="span-two">閮ㄩ棬锛�</span>{{ item.agencyName }}</div>
+ <div class="box"><span class="span-two">閮ㄩ棬锛�</span>{{ item.departmentName }}</div>
<div class="box"><span class="span-two">鎿嶄綔浜猴細</span>{{ item.operatorName }}</div>
<div class="box">
<span class="span-two">鎶ュ簾鏃堕棿锛�</span>{{ item.dealTime | formatTime }}
</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>
@@ -54,40 +57,44 @@
</el-card>
</el-col>
</el-row>
- <div class="no-data" v-else>鏆傛棤鏁版嵁</div>
+ <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';
import detail from './detail';
-import listPage from '../../../mixins/listPage'
+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: [],
@@ -102,23 +109,34 @@
},
{
type: 'select',
- dataIndex: 'businessFormCode',
+ dataIndex: 'inAgencyId',
label: '鍒嗗彂閮ㄩ棬',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: {
+ url: `/pc/fin/sys/tenant/department/list/all?tenantId=${getUserDetail().tenantId}`,
+ label: 'name',
+ value: 'id',
+ },
+ defaultValue: '',
+ options: [],
+ },
+ {
+ type: 'select',
+ dataIndex: 'goodsTemplateId',
+ label: '鐗╁搧鍚嶇О',
placeholder: '璇疯緭鍏�',
defaultValue: '',
- options:[]
+ options: [],
+ optionsConfig: {
+ label: 'goodsName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + `/pc/base/goods/template/query/goodsTemplate?tenantId=${getUserDetail().tenantId}`,
+ },
},
{
type: 'text',
- dataIndex: 'goodsName',
- label: '鐗╁搧鍚嶇О',
- placeholder: '鍙ā绯婃悳绱�',
- defaultValue: '',
- },
- {
- type: 'text',
- dataIndex: 'createName',
- label: '鎶ュ簾浜�',
+ dataIndex: 'operatorName',
+ label: '鍒涘缓浜�',
placeholder: '璇疯緭鍏�',
defaultValue: '',
},
@@ -137,10 +155,13 @@
],
};
},
+ created() {
+ this.fetchData()
+ },
methods: {
fetchData() {
this.loading = true;
- outputList({
+ scrappedList({
pageNum: this.pageNum,
pageSize: this.pageSize,
...this.filterFrom,
@@ -148,20 +169,9 @@
this.list = res.datas;
this.total = res.totalRows;
this.loading = false;
+ }).catch(()=>{
+ this.loading = false;
});
- },
- fifterForm(params) {
- this.filterFrom = Object.assign(this.filterFrom, params);
- if (this.filterFrom.startTime) {
- this.filterFrom.startTime = this.filterFrom.startTime.replace(/\-/g, '');
- }
- if (this.filterFrom.endTime) {
- this.filterFrom.endTime = this.filterFrom.endTime.replace(/\-/g, '');
- }
- if (this.filterFrom.agencyId&&this.filterFrom.agencyId.length) {
- this.filterFrom.agencyId = this.filterFrom.agencyId[this.filterFrom.agencyId.length - 1];
- }
- this.search(1);
},
},
};
--
Gitblit v1.9.1