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/itemdis/disDetails/index.vue | 66 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue b/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
index e8cdc6b..1a49feb 100644
--- a/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
@@ -28,9 +28,8 @@
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',
@@ -41,59 +40,67 @@
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: '',
},
@@ -138,7 +145,7 @@
// 鍒椾俊鎭�
columns: [
{title: '鍗曞彿', field: 'businessFormCode', align: 'center', width: 130},
- {title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'left', minWidth: 140},
+ {title: '鐗╁搧鍚嶇О', field: 'goodsName', align: 'left', minWidth: 140},
{
title: '绫诲埆', field: 'type', align: 'center', formatter: (row) => {
return {value: row.type + '绫�'};
@@ -146,7 +153,7 @@
},
{title: '瑙勬牸鍨嬪彿', field: 'goodsModelName', align: 'left', minWidth: 130},
{title: '鍒嗗彂鏁伴噺', field: 'goodsCount', align: 'center'},
- {title: '鎵�灞炴満鏋�', field: 'tenantName', align: 'left', minWidth: 130},
+ /*{title: '鎵�灞炴満鏋�', field: 'tenantName', align: 'left', minWidth: 130},*/
{title: '閮ㄩ棬', field: 'departmentName', align: 'left', minWidth: 130},
{title: '鍒嗗彂浜�', field: 'operatorName', align: 'center'},
{
@@ -165,6 +172,9 @@
{
title: '浣跨敤浜�',
type: 'primary',
+ hidden: (row) => {
+ return row.type !== 'A'
+ },
events: (row) => {
this.handleEdit(row);
},
--
Gitblit v1.9.1