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 |   45 ++++++++++++++++-----------------------------
 1 files changed, 16 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 757bc2c..1a49feb 100644
--- a/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
@@ -46,36 +46,10 @@
           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',
           dataIndex: 'goodsTemplateId',
           label: '鐗╁搧鍚嶇О',
-          placeholder: '璇疯緭鍏�',
+          placeholder: '璇烽�夋嫨',
           defaultValue: '',
           options: [],
           cascader: [{key: 'goodsModelId', queryKey: 'goodsTemplatesId'}],
@@ -99,8 +73,21 @@
           },
         },
         {
+          type: 'select',
+          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: '',
@@ -166,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'},
           {

--
Gitblit v1.9.1