From 0ff4be6c9cb9bc215acd4b4c78122da7e0d7140f Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期五, 01 十二月 2023 13:55:50 +0800
Subject: [PATCH] feat: 部门物品退回
---
admin-web/src/views/departmentitem/itemscr/scrapping/index.vue | 53 +++++++++++++++++++++++------------------------------
1 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue b/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
index d5a05bc..e33b8fb 100644
--- a/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
+++ b/admin-web/src/views/departmentitem/itemscr/scrapping/index.vue
@@ -24,7 +24,7 @@
</div>
<div class="card-header-right">
<el-button site="form" type="success" size="mini" @click="handleExport(item)"
- >瀵煎嚭鎶ュ簾鍗�</el-button
+ >瀵煎嚭鎶ュ簾鐧昏鍗�</el-button
>
<el-button name="鏌ョ湅璇︽儏" site="form" type="info" size="mini" @click="handleDetail(item)"
>鏌ョ湅璇︽儏</el-button
@@ -32,7 +32,7 @@
</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 }}
@@ -54,7 +54,7 @@
</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"
@@ -77,12 +77,14 @@
</template>
<script>
-import { outputList } from '@/api/stock/accessStock';
+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";
export default {
name: 'index',
@@ -102,25 +104,29 @@
},
{
type: 'select',
- dataIndex: 'businessFormCode',
+ dataIndex: 'inAgencyId',
label: '鍒嗗彂閮ㄩ棬',
- placeholder: '璇疯緭鍏�',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: {
+ url: `/pc/fin/sys/tenant/department/list/all?tenantId=${getUserDetail().tenantId}`,
+ label: 'name',
+ value: 'id',
+ },
defaultValue: '',
- options:[]
+ options: [],
},
{
- type: 'text',
- dataIndex: 'goodsName',
+ type: 'select',
+ dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
- placeholder: '鍙ā绯婃悳绱�',
- defaultValue: '',
- },
- {
- type: 'text',
- dataIndex: 'createName',
- label: '鎶ュ簾浜�',
placeholder: '璇疯緭鍏�',
defaultValue: '',
+ options: [],
+ optionsConfig: {
+ label: 'goodsName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + `/pc/base/goods/template/query/goodsTemplate?tenantId=${getUserDetail().tenantId}`,
+ },
},
{
type: 'date-picker',
@@ -149,19 +155,6 @@
this.total = res.totalRows;
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