From 33032d320cb75854def7391026b0401f1bfb8360 Mon Sep 17 00:00:00 2001
From: 黎星凯 <13949086503@163.com>
Date: 星期六, 11 五月 2024 17:26:02 +0800
Subject: [PATCH] 20240511修改: 分发单优化， 分类，物品，分发单明细，采购单明细数据导入
---
admin-web/src/views/stock/procure/purchaseOrder/index.vue | 56 ++++++++++++++++++++++++++------------------------------
1 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/admin-web/src/views/stock/procure/purchaseOrder/index.vue b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
index 12f33ee..aa59722 100644
--- a/admin-web/src/views/stock/procure/purchaseOrder/index.vue
+++ b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
@@ -10,8 +10,9 @@
<el-col>
<!--鍒楄〃-->
<div class="table-tool-bar" style="margin-bottom: 15px">
+<!-- <my-button name="鏂板" check-permission="procure:order:add" @click="handleAdd" site="tools" size="medium" />-->
<my-button name="鏂板" @click="handleAdd" site="tools" size="medium" />
- <my-button name="瀵煎叆" @click="importSetting.dialogShow = true" site="tools" size="medium" />
+ <my-button name="瀵煎叆" @click="openImport()" site="tools" size="medium" />
</div>
<div v-loading="loading" style="margin-bottom: 15px">
<div :style="{ 'overflow-y': 'auto', height: 'calc(100vh - 352px)' }">
@@ -40,7 +41,7 @@
>
</template>
<template v-if="item.states != 1">
- <el-button site="form" type="success" size="mini" @click="handleExport(item)"
+ <el-button site="form" type="success" size="mini" @click="handleExport('procureExport',`閲囪喘鍏ュ簱鍗�-${item.businessFormCode}`,{id:item.id})"
>瀵煎嚭鍏ュ簱鍗�</el-button
>
</template>
@@ -50,7 +51,7 @@
</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.agencyName }}</div>
<div class="box"><span class="span-two">鎿嶄綔浜猴細</span>{{ item.buyerName }}</div>
<div class="box">
<span class="span-two">閲囪喘鏃堕棿锛�</span>{{ item.procureTime | formatTime }}
@@ -116,14 +117,14 @@
</template>
<script>
-import { procureList, procureDel, procureIncome } from '@/api/stock/procure/purchaseOrder';
+import {procureDel, procureIncome, procureList} from '@/api/stock/procure/purchaseOrder';
import MyButton from '@/components/myButton/myButton';
import SettingIplatform from '@/utils/settingIplatform';
import myImport from '@/views/components/myImport';
import edit from './edit';
import detail from './detail';
-import { getBaseUrl } from '@/utils/base';
-import listPage from '../../../mixins/listPage';
+import {getBaseUrl} from '@/utils/base';
+import listPage from '@/views/mixins/listPage';
export default {
name: 'index',
@@ -151,6 +152,16 @@
// defaultValue: '',
// },
{
+ type: 'cascader',
+ dataIndex: 'agencyId',
+ label: '鏈烘瀯',
+ placeholder: '璇烽�夋嫨',
+ optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
+ cascader: [{key:'goodsTemplateId',queryKey: 'agencyId'}],
+ defaultValue: '',
+ options: [],
+ },
+ {
type: 'select',
dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
@@ -162,15 +173,6 @@
value: 'id',
url: SettingIplatform.apiBaseURL + '/pc/base/goods/template/query/goodsTemplate',
},
- },
- {
- type: 'cascader',
- dataIndex: 'agencyId',
- label: '鏈烘瀯',
- placeholder: '璇烽�夋嫨',
- optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
- defaultValue: '',
- options: [],
},
{
type: 'text',
@@ -202,13 +204,13 @@
},
{
type: 'date-picker',
- dataIndex: 'incomeTimeStart',
+ dataIndex: 'startTime',
label: '鍏ュ簱鏃堕棿',
defaultValue: '',
},
{
type: 'date-picker',
- dataIndex: 'incomeTimeEnd',
+ dataIndex: 'endTime',
label: '鑷�',
defaultValue: '',
},
@@ -221,15 +223,15 @@
dialogShow: false,
fileSettings: {
data: {},
- uploadUrl: getBaseUrl() + '/pc/fin/sys/tenant/import', // 涓婁紶鍦板潃
+ uploadUrl: getBaseUrl() + '/pc/whForm/procure/import', // 涓婁紶鍦板潃
accept: '.xls', // 鏍煎紡
type: 'text', // 鍥炴樉褰㈠紡
- loading: false, // 瀵煎叆鏁堟灉
+ loading: true, // 瀵煎叆鏁堟灉
},
/* 妯℃澘涓嬭浇 */
templateSettings: {
templateName: '瀵煎叆妯℃澘.xls', // 鍚嶇О
- templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate', // 涓嬭浇鍦板潃
+ templateUrl: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/getImportTemplate?type=procure', // 涓嬭浇鍦板潃
},
onSuccess: null,
},
@@ -298,16 +300,10 @@
.catch(() => {});
});
},
- 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);
- },
+ openImport(){
+ this.importOrg();
+ }
+
},
};
</script>
--
Gitblit v1.9.1