From 9cf4b513cfc65d641d46be6ea424a9f45e4d48f7 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 12 十二月 2023 11:43:24 +0800
Subject: [PATCH] feat: bug修复 12564
---
admin-web/src/views/stock/procure/purchaseOrder/index.vue | 41 ++++++++++++++++-------------------------
1 files changed, 16 insertions(+), 25 deletions(-)
diff --git a/admin-web/src/views/stock/procure/purchaseOrder/index.vue b/admin-web/src/views/stock/procure/purchaseOrder/index.vue
index 814d1d5..0f58df4 100644
--- a/admin-web/src/views/stock/procure/purchaseOrder/index.vue
+++ b/admin-web/src/views/stock/procure/purchaseOrder/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="鏂板" check-permission="procure:order:add" @click="handleAdd" site="tools" size="medium" />
<my-button name="瀵煎叆" @click="importSetting.dialogShow = true" site="tools" size="medium" />
</div>
<div v-loading="loading" style="margin-bottom: 15px">
@@ -40,7 +40,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 +50,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 }}
@@ -123,7 +123,7 @@
import edit from './edit';
import detail from './detail';
import {getBaseUrl} from '@/utils/base';
-import listPage from '../../../mixins/listPage';
+import listPage from '@/views/mixins/listPage';
export default {
name: 'index',
@@ -151,6 +151,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 +172,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 +203,13 @@
},
{
type: 'date-picker',
- dataIndex: 'incomeTimeStart',
+ dataIndex: 'startTime',
label: '鍏ュ簱鏃堕棿',
defaultValue: '',
},
{
type: 'date-picker',
- dataIndex: 'incomeTimeEnd',
+ dataIndex: 'endTime',
label: '鑷�',
defaultValue: '',
},
@@ -297,16 +298,6 @@
})
.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);
},
},
};
--
Gitblit v1.9.1