From 8eeafc1f4ad3905c4b3bbf80a588a5b6c503e76b Mon Sep 17 00:00:00 2001 From: 石广澎 <shiguangpeng@163.com> Date: 星期四, 30 十一月 2023 15:53:44 +0800 Subject: [PATCH] feat: 部门物品 物品分发查询加机构限制 --- admin-web/src/views/departmentitem/itemdis/disDetails/index.vue | 67 ++++++++++++++++++++++----------- 1 files changed, 45 insertions(+), 22 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..757bc2c 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,42 +40,63 @@ items: [ { type: 'text', - dataIndex: 'name', + dataIndex: 'businessFormCode', label: '鍗曞彿', placeholder: '璇疯緭鍏�', defaultValue: '', - }, - { - type: 'text', - dataIndex: 'name', - label: '鐗╁搧鍚嶇О', - placeholder: '璇疯緭鍏�', - defaultValue: '', - }, - { - type: 'select', - dataIndex: 'name', - label: '瑙勬牸鍨嬪彿', - placeholder: '璇烽�夋嫨', - defaultValue: '', - options: [], }, { type: 'cascader', dataIndex: 'agencyId', label: '鏈烘瀯', placeholder: '璇烽�夋嫨', + cascader: [ + {key: 'inWarehouseId', queryKey: 'tenantId'}, + {key: 'goodsTemplateId', queryKey: 'agencyId'} + ], optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null}, defaultValue: '', options: [], }, { type: 'select', - dataIndex: 'name', + dataIndex: 'inWarehouseId', label: '閮ㄩ棬', placeholder: '璇烽�夋嫨', + optionsConfig: { + url: `/pc/fin/sys/tenant/department/list/all`, + label: 'name', + value: 'id', + }, defaultValue: '', options: [], + }, + { + 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: 'text', @@ -87,13 +107,13 @@ }, { type: 'date-picker', - dataIndex: 'incomeTimeStart', + dataIndex: 'startTime', label: '鏃堕棿', defaultValue: '', }, { type: 'date-picker', - dataIndex: 'incomeTimeEnd', + dataIndex: 'endTime', label: '鑷�', defaultValue: '', }, @@ -138,7 +158,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 + '绫�'}; @@ -165,6 +185,9 @@ { title: '浣跨敤浜�', type: 'primary', + hidden: (row) => { + return row.type !== 'A' + }, events: (row) => { this.handleEdit(row); }, -- Gitblit v1.9.1