From b8dc4ccc6ee580b084aa860e64af2d90d1cb5979 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 29 十一月 2023 10:11:52 +0800
Subject: [PATCH] feat: 1、首页接口对接 2、部门物品分发
---
admin-web/src/views/departmentitem/itemdis/distribution/index.vue | 52 +++++++++++++++++++++++-----------------------------
1 files changed, 23 insertions(+), 29 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
index 5dfbca1..4f55539 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/index.vue
@@ -27,15 +27,15 @@
</div>
</div>
<div class="one-hed">
- <div class="box"><span class="span-two">閮ㄩ棬锛�</span>{{ item.agencyId }}</div>
- <div class="box"><span class="span-two">鍒嗗彂浜猴細</span>{{ item.buyerName }}</div>
+ <div class="box"><span class="span-two">閮ㄩ棬锛�</span>{{ item.inWarehouseName }}</div>
+ <div class="box"><span class="span-two">棰嗗彇浜猴細</span>{{ item.inOperatorName }}</div>
<div class="box">
- <span class="span-two">鍒嗗彂鏃堕棿锛�</span>{{ item.procureTime | formatTime }}
+ <span class="span-two">棰嗗彇鏃堕棿锛�</span>{{ item.createTime | formatTime }}
</div>
</div>
<div class="card-end">
- <div v-for="(just, index) in item.fromProcureTemplateInfoList" :key="index" class="item">
- <div class="name">{{ just.goodsTemplateName }}</div>
+ <div v-for="(just, index) in item.fromTransferTemplateInfoList" :key="index" class="item">
+ <div class="name">{{ just.goodsName }}</div>
<div class="value-box">
<div class="value-box-item">
<span class="label">鏁伴噺锛�</span>
@@ -49,7 +49,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"
@@ -83,7 +83,7 @@
</template>
<script>
-import { procureList, procureDel, procureIncome } from '@/api/stock/procure/purchaseOrder';
+import { transferList} from '@/api/stock/transfer';
import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
import myImport from '@/views/components/myImport';
@@ -111,6 +111,15 @@
defaultValue: '',
},
{
+ type: 'cascader',
+ dataIndex: 'agencyId',
+ label: '鍒嗗彂閮ㄩ棬',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+ defaultValue: '',
+ options: [],
+ },
+ {
type: 'select',
dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
@@ -124,30 +133,21 @@
},
},
{
- type: 'cascader',
- dataIndex: 'agencyId',
- label: '鍒嗗彂閮ㄩ棬',
- placeholder: '璇烽�夋嫨',
- optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
- defaultValue: '',
- options: [],
- },
- {
type: 'text',
- dataIndex: 'createName',
- label: '鍒嗗彂浜�',
+ dataIndex: 'operatorName',
+ label: '棰嗗彇浜�',
placeholder: '璇疯緭鍏�',
defaultValue: '',
},
{
type: 'date-picker',
- dataIndex: 'incomeTimeStart',
- label: '鍒嗗彂鏃堕棿',
+ dataIndex: 'startTime',
+ label: '棰嗗彇鏃堕棿',
defaultValue: '',
},
{
type: 'date-picker',
- dataIndex: 'incomeTimeEnd',
+ dataIndex: 'endTime',
label: '鑷�',
defaultValue: '',
},
@@ -162,7 +162,8 @@
methods: {
fetchData() {
this.loading = true;
- procureList({
+ transferList({
+ qryType: 1,
pageNum: this.pageNum,
pageSize: this.pageSize,
...this.filterFrom,
@@ -170,17 +171,10 @@
this.list = res.datas;
this.total = res.totalRows;
this.loading = false;
- console.log(this.list);
});
},
fifterForm(params) {
this.filterFrom = Object.assign(this.filterFrom, params);
- if (this.filterFrom.incomeTimeStart) {
- this.filterFrom.incomeTimeStart = this.filterFrom.incomeTimeStart.replace(/\-/g, '');
- }
- if (this.filterFrom.incomeTimeEnd) {
- this.filterFrom.incomeTimeEnd = this.filterFrom.incomeTimeEnd.replace(/\-/g, '');
- }
this.search(1);
},
},
--
Gitblit v1.9.1