From 9da637c36ad3ad92d483acd32aca93145f8b1181 Mon Sep 17 00:00:00 2001
From: zhangli <2235006734@qq.com>
Date: Thu, 12 Oct 2023 13:10:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Descriptions/src/Descriptions.vue         |  5 ++-
 src/components/Detail/src/Detail.vue          | 40 +++++++++++--------
 src/components/Form/src/helper.ts             |  2 -
 src/views/wms/itembasic/ItembasicForm.vue     |  1 -
 src/views/wms/itembasic/index.vue             |  4 --
 5 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue
index d6eff75df..c27c26b1c 100644
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -22,6 +22,8 @@ const props = defineProps({
   collapse: propTypes.bool.def(true),
   columns: propTypes.number.def(1),
   width: propTypes.string.def('50px'),
+  labelAlign: propTypes.string.def('right'),
+  labelClassName: propTypes.string.def(''),
   schema: {
     type: Array as PropType<DescriptionsSchema[]>,
     default: () => []
@@ -109,7 +111,8 @@ const toggleClick = () => {
             v-for="item in schema"
             :key="item.field"
             v-bind="getBindItemValue(item)"
-            label-align="right"
+            :label-align="labelAlign"
+            :label-class-name="labelClassName"
             :width="width"
           >
             <template #label>
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 1f29a55ed..f49d993a9 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -1,10 +1,12 @@
 <template>
-  <el-drawer v-model="isShowDrawer" title="详情" direction="rtl" size="80%" v-loading="detailLoading">
-    <div class="custom-class">
+  <el-drawer v-model="isShowDrawer" title="详情" direction="rtl" size="80%" v-loading="detailLoading" >
+    <template #header>
+         <div class="font-size-18px">
+          {{ detailData.code }} <span class="ml-20px font-size-16px">{{ detailData.name }}</span>
+        </div>
+      </template>
     <ContentWrap>
-      <div class="font-size-18px">
-        {{ detailData.code }} <span class="ml-20px font-size-16px">{{ detailData.name }}</span>
-      </div>
+      <Descriptions :data="detailData" labelClassName="label-class-name" label-align="left" direction="vertical" :column="8" :schema="ItemBasic.allSchemas.detailSchema" :columns="2" width="200px"/>
     </ContentWrap>
     <Tabs :tabsList="tabsList" :current="current" @change="change" />
     <div class="flex" v-if="current == 0">
@@ -24,12 +26,15 @@
       <ImportForm ref="importFormRef" :importTemplateData="importTemplateData" @success="importSuccess" />
     </div>
     <ContentWrap v-else>
-      <Table :columns="ItemBasic.allSchemas.tableColumns" :data="tableObject.tableList" :loading="tableObject.loading"
-        :pagination="{
-          total: tableObject.total
-        }" v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage" />
+      <Table 
+        :columns="ItemBasic.allSchemas.tableColumns"
+        :data="tableObject.tableList"
+        :loading="tableObject.loading"
+        :pagination="{total: tableObject.total}"
+        v-model:pageSize="tableObject.pageSize"
+        v-model:currentPage="tableObject.currentPage"
+      /> 
     </ContentWrap>
-    </div>
   </el-drawer>
 </template>
 
@@ -42,11 +47,8 @@ import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
 import Tabs from '@/components/Tabs/src/Tabs.vue'
 import { ItemBasic } from '@/utils/disposition/tableColumns.ts'
 import { ItemBasicTabsList } from '@/utils/disposition/tabsList.ts'
-import { getItembasic } from '@/api/wms/itembasic'
 import * as ItembasicApi from '@/api/wms/itembasic'
 
-import * as UserApi from '@/api/system/user'
-
 const isShowDrawer = ref(false)
 
 const tabsList = ref(JSON.parse(JSON.stringify(ItemBasicTabsList)))
@@ -177,10 +179,14 @@ const openDetail = async (id?: number) => {
 }
 defineExpose({ openDetail }) // 提供 open 方法，用于打开弹窗
 </script>
-<style scoped lang="scss">
-    .custom-class{
+<style lang="scss">
+    .el-drawer__body{
       background: #f5f5f5!important;
-      margin: -20px;
-      padding: 20px;
     }
+    ::v-deep(.label-class-name){
+    color: #dedede;
+  }
+</style>
+<style scoped lang="scss">
+
 </style>
diff --git a/src/components/Form/src/helper.ts b/src/components/Form/src/helper.ts
index 95d3ab965..cdfc8caac 100644
--- a/src/components/Form/src/helper.ts
+++ b/src/components/Form/src/helper.ts
@@ -21,8 +21,6 @@ export const setTextPlaceholder = (schema: FormSchema): PlaceholderModel => {
   }
   if (selectMap.includes(schema?.component as string)) {
     // 一些范围选择器
-    console.log('type=' +schema?.componentProps?.type);
-    
     const twoTextMap = ['datetimerange', 'daterange', 'monthrange', 'datetimerange', 'daterange']
     if (
       twoTextMap.includes(
diff --git a/src/views/wms/itembasic/ItembasicForm.vue b/src/views/wms/itembasic/ItembasicForm.vue
index ef09172b1..96c118f0a 100644
--- a/src/views/wms/itembasic/ItembasicForm.vue
+++ b/src/views/wms/itembasic/ItembasicForm.vue
@@ -117,7 +117,6 @@ const Butttondata = [
 const buttonBaseClick = (val, item) => {
   // 保存
   if (val == 'save') {
-    console.log(417, item)
   }
   // 关闭
   else if (val == 'close') {
diff --git a/src/views/wms/itembasic/index.vue b/src/views/wms/itembasic/index.vue
index 0781f1803..612e74c92 100644
--- a/src/views/wms/itembasic/index.vue
+++ b/src/views/wms/itembasic/index.vue
@@ -44,10 +44,6 @@ import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import { ItemBasic } from '@/utils/disposition/tableColumns'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 const router = useRouter() // 路由
-
-console.log(ItembasicApi.importUrl);
-
-
 // tableObject：表格的属性对象，可获得分页大小、条数等属性
 // tableMethods：表格的操作对象，可进行获得分页、删除记录等操作
 // 详细可见：https://doc.iocoder.cn/vue3/crud-schema/