From 20913c80c3f5fc8e533cb92b90e6f20bcd68e032 Mon Sep 17 00:00:00 2001 From: 石广澎 <shiguangpeng@163.com> Date: 星期三, 29 十一月 2023 17:49:32 +0800 Subject: [PATCH] feat: 1、优化导入 2、部门物品台账查询对接 --- admin-web/src/views/departmentitem/itemdis/disDetails/index.vue | 58 +++++++++++++++++++++++++++++----------------------------- 1 files changed, 29 insertions(+), 29 deletions(-) diff --git a/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue b/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue index ce87e36..e65a243 100644 --- a/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue +++ b/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue @@ -28,10 +28,7 @@ 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', @@ -46,6 +43,32 @@ label: '鍗曞彿', placeholder: '璇疯緭鍏�', defaultValue: '', + }, + { + 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: 'inWarehouseId', + label: '閮ㄩ棬', + placeholder: '璇烽�夋嫨', + optionsConfig: { + url: `/pc/fin/sys/tenant/department/list/all`, + label: 'name', + value: 'id', + }, + defaultValue: '', + options: [], }, { type: 'select', @@ -73,29 +96,6 @@ value: 'id', url: SettingIplatform.apiBaseURL + '/pc/base/goods/models/query/goodsModel', }, - }, - { - type: 'cascader', - dataIndex: 'agencyId', - label: '鏈烘瀯', - placeholder: '璇烽�夋嫨', - cascader: [{key: 'inWarehouseId', queryKey: 'tenantId'}], - optionsConfig: {url: '/pc/fin/sys/tenant/select/tree_fin_tenant', props: null}, - defaultValue: '', - options: [], - }, - { - type: 'select', - dataIndex: 'inWarehouseId', - label: '閮ㄩ棬', - placeholder: '璇烽�夋嫨', - optionsConfig: { - url: `/pc/fin/sys/tenant/department/list/all`, - label: 'name', - value: 'id', - }, - defaultValue: '', - options: [], }, { type: 'text', @@ -157,7 +157,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 + '绫�'}; @@ -184,8 +184,8 @@ { title: '浣跨敤浜�', type: 'primary', - hidden: (row) => { - return row.type!=='A' + hidden: (row) => { + return row.type !== 'A' }, events: (row) => { this.handleEdit(row); -- Gitblit v1.9.1