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/departmentitem/itemdis/disDetails/index.vue | 108 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 65 insertions(+), 43 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue b/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
index edd496a..3dc5876 100644
--- a/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
@@ -10,12 +10,12 @@
<el-row style="margin-top: 15px">
<el-col>
<!--鍒楄〃-->
- <my-table-v2 ref="myTable" :filter="filterFrom" :table="table" />
+ <my-table-v2 ref="myTable" :filter="filterFrom" :table="table"/>
</el-col>
</el-row>
<!--娣诲姞/缂栬緫寮圭獥-->
- <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false" @search="search" />
- <detail v-if="detailSetting.show" :setting="detailSetting" @close="detailSetting.show = false" />
+ <edit v-if="editSetting.show" :setting="editSetting" @close="editSetting.show = false" @search="search"/>
+ <detail v-if="detailSetting.show" :setting="detailSetting" @close="detailSetting.show = false"/>
</el-card>
</el-container>
</el-container>
@@ -28,71 +28,79 @@
import SettingIplatform from '@/utils/settingIplatform';
import edit from './edit';
import detail from '../distribution/detail';
-import * as finsystenant from '@/api/baseSetting/finsystenant';
-import { getBaseUrl } from '@/utils/base';
+import * as DateFormatter from "@/utils/DateFormatter";
+import {getUserDetail} from "@/utils/auth";
export default {
name: 'index',
- components: { MyButton, MyTableV2, edit, detail },
+ components: {MyButton, MyTableV2, edit, detail},
data() {
return {
// 鎼滅储妗�
items: [
{
type: 'text',
- dataIndex: 'name',
+ dataIndex: 'businessFormCode',
label: '鍗曞彿',
placeholder: '璇疯緭鍏�',
defaultValue: '',
},
{
- type: 'text',
- dataIndex: 'name',
+ type: 'select',
+ dataIndex: 'goodsTemplateId',
label: '鐗╁搧鍚嶇О',
+ placeholder: '璇烽�夋嫨',
+ defaultValue: '',
+ options: [],
+ cascader: [{key: 'goodsModelId', queryKey: 'goodsTemplatesId'}],
+ optionsConfig: {
+ label: 'goodsName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + `/pc/base/goods/template/query/goodsTemplate?tenantId=${getUserDetail().tenantId}`,
+ },
+ },
+ {
+ type: 'select',
+ dataIndex: 'goodsModelId',
+ label: '瑙勬牸鍨嬪彿',
placeholder: '璇疯緭鍏�',
defaultValue: '',
+ options: [],
+ optionsConfig: {
+ label: 'modelName',
+ value: 'id',
+ url: SettingIplatform.apiBaseURL + '/pc/base/goods/models/query/goodsModel',
+ },
},
{
type: 'select',
- dataIndex: 'name',
- label: '瑙勬牸鍨嬪彿',
- placeholder: '璇烽�夋嫨',
- defaultValue: '',
- options: [],
- },
- {
- type: 'cascader',
- dataIndex: 'agencyId',
- label: '鏈烘瀯',
- placeholder: '璇烽�夋嫨',
- optionsConfig: { url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null },
- defaultValue: '',
- options: [],
- },
- {
- type: 'select',
- dataIndex: 'name',
+ dataIndex: 'departmentId',
label: '閮ㄩ棬',
placeholder: '璇烽�夋嫨',
+ optionsConfig: {
+ url: `/pc/fin/sys/tenant/department/list/all?tenantId=${getUserDetail().tenantId}`,
+ label: 'name',
+ value: 'id',
+ },
defaultValue: '',
options: [],
},
{
type: 'text',
- dataIndex: 'name',
+ dataIndex: 'operatorName',
label: '鍒涘缓浜�',
placeholder: '璇疯緭鍏�',
defaultValue: '',
},
{
type: 'date-picker',
- dataIndex: 'incomeTimeStart',
+ dataIndex: 'startTime',
label: '鏃堕棿',
defaultValue: '',
},
{
type: 'date-picker',
- dataIndex: 'incomeTimeEnd',
+ dataIndex: 'endTime',
label: '鑷�',
defaultValue: '',
},
@@ -120,7 +128,7 @@
table: {
showIndex: true, // 鏄惁鏄剧ず搴忓彿
expand: false, // 鏄惁鏄剧ず璇︽儏鏁版嵁
- url: SettingIplatform.apiBaseURL + '/pc/fin/sys/tenant/select/list', // 璇锋眰鍦板潃
+ url: SettingIplatform.apiBaseURL + '/pc/l/wh/form/transfer/department/list', // 璇锋眰鍦板潃
// 宸ュ叿鏉�
tools: {
columnsCtrl: {
@@ -136,24 +144,37 @@
},
// 鍒椾俊鎭�
columns: [
- { title: '鍗曞彿', field: 'code', align: 'center' },
- { title: '鐗╁搧鍚嶇О', field: 'lv', align: 'center' },
- { title: '绫诲埆', field: 'lv', align: 'center' },
- { title: '瑙勬牸鍨嬪彿', field: 'lv', align: 'center' },
- { title: '鍒嗗彂鏁伴噺', field: 'summary', align: 'left' },
- { title: '鎵�灞炴満鏋�', field: 'summary', align: 'left' },
- { title: '閮ㄩ棬', field: 'summary', align: 'left' },
- { title: '鍒嗗彂浜�', field: 'summary', align: 'left' },
- { title: '鎿嶄綔鏃堕棿', field: 'summary', align: 'left' },
+ {title: '鍗曞彿', field: 'businessFormCode', align: 'center', width: 130},
+ {title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'left', minWidth: 140},
+ {
+ title: '绫诲埆', field: 'type', align: 'center', formatter: (row) => {
+ return {value: row.type + '绫�'};
+ },
+ },
+ {title: '瑙勬牸鍨嬪彿', field: 'goodsModelName', align: 'left', minWidth: 130},
+ {title: '鍒嗗彂鏁伴噺', field: 'goodsCount', align: 'center'},
+ /*{title: '鎵�灞炴満鏋�', field: 'tenantName', align: 'left', minWidth: 130},*/
+ {title: '閮ㄩ棬', field: 'departmentName', align: 'left', minWidth: 130},
+ {title: '鍒嗗彂浜�', field: 'operatorName', align: 'center'},
+ {
+ title: '鎿嶄綔鏃堕棿', field: 'createTime', align: 'center',
+ width: 160,
+ formatter: (row) => {
+ return {value: DateFormatter.LongToDateTime(row.createTime)};
+ },
+ },
],
// 鎿嶄綔淇℃伅
operation: {
show: true, // 鏄剧ず鎿嶄綔鍒�
- width: '200', // 鍒楀
+ width: 160, // 鍒楀
attr: [
{
title: '浣跨敤浜�',
type: 'primary',
+ hidden: (row) => {
+ return row.type !== 'A'
+ },
events: (row) => {
this.handleEdit(row);
},
@@ -180,7 +201,8 @@
},
};
},
- created() {},
+ created() {
+ },
methods: {
handleEdit(row) {
this.editSetting.id = row.id;
@@ -197,7 +219,7 @@
// 鏌ヨtable鍒楄〃
search(pageNum) {
if (pageNum != undefined) {
- this.$refs.myTable.search(pageNum);
+ this.$refs.myTable.search({pageNum});
} else {
this.$refs.myTable.search();
}
--
Gitblit v1.9.1