From 63446979abaafce5007896f88a2b6c7ee22d88c5 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期三, 29 十一月 2023 14:21:38 +0800
Subject: [PATCH] feat: 1、物品分发明细查询

---
 admin-web/src/views/departmentitem/itemdis/disDetails/index.vue    |   38 ++++++++++++++++++++++++++++++--------
 admin-web/src/views/departmentitem/itemdis/distribution/detail.vue |    8 ++++++++
 2 files changed, 38 insertions(+), 8 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..ce87e36 100644
--- a/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
+++ b/admin-web/src/views/departmentitem/itemdis/disDetails/index.vue
@@ -31,6 +31,7 @@
 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,40 +42,58 @@
       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',
+          },
         },
         {
           type: 'select',
-          dataIndex: 'name',
+          dataIndex: 'goodsModelId',
           label: '瑙勬牸鍨嬪彿',
-          placeholder: '璇烽�夋嫨',
+          placeholder: '璇疯緭鍏�',
           defaultValue: '',
           options: [],
+          optionsConfig: {
+            label: 'modelName',
+            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: 'name',
+          dataIndex: 'inWarehouseId',
           label: '閮ㄩ棬',
           placeholder: '璇烽�夋嫨',
+          optionsConfig: {
+            url: `/pc/fin/sys/tenant/department/list/all`,
+            label: 'name',
+            value: 'id',
+          },
           defaultValue: '',
           options: [],
         },
@@ -87,13 +106,13 @@
         },
         {
           type: 'date-picker',
-          dataIndex: 'incomeTimeStart',
+          dataIndex: 'startTime',
           label: '鏃堕棿',
           defaultValue: '',
         },
         {
           type: 'date-picker',
-          dataIndex: 'incomeTimeEnd',
+          dataIndex: 'endTime',
           label: '鑷�',
           defaultValue: '',
         },
@@ -165,6 +184,9 @@
             {
               title: '浣跨敤浜�',
               type: 'primary',
+              hidden:  (row) => {
+                return row.type!=='A'
+              },
               events: (row) => {
                 this.handleEdit(row);
               },
diff --git a/admin-web/src/views/departmentitem/itemdis/distribution/detail.vue b/admin-web/src/views/departmentitem/itemdis/distribution/detail.vue
index e0a6b7d..e27de51 100644
--- a/admin-web/src/views/departmentitem/itemdis/distribution/detail.vue
+++ b/admin-web/src/views/departmentitem/itemdis/distribution/detail.vue
@@ -232,4 +232,12 @@
   border-radius: 2px;
   background: #ffffff;
 }
+.img-box{
+  width: 100px;
+  height: 100px;
+}
+.img-box .img{
+  width: 100px;
+  height: 100px;
+}
 </style>

--
Gitblit v1.9.1