From eb17cd619314726119d4b766189316ff344f5356 Mon Sep 17 00:00:00 2001
From: zhangli <2235006734@qq.com>
Date: Fri, 13 Oct 2023 17:20:41 +0800
Subject: [PATCH 1/5] tableForm

---
 src/components/TableForm/src/TableForm.vue | 204 +++++++++++++++++++--
 src/views/wms/itembasic/ItembasicForm.vue  |   7 +-
 2 files changed, 195 insertions(+), 16 deletions(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index c3584b243..c5cf173fa 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -12,7 +12,6 @@
       @selection-change="tableSelectionChange"
       @sort-change="tableSortChange"
       @row-click="handleTableSelect"
-      style="{width:100%}"
     >
       <!-- 多选 -->
       <el-table-column
@@ -20,6 +19,7 @@
         :reserve-selection="true"
         type="selection"
         :width="50"
+        v-if="selectionTable"
       />
       <!-- 序号 -->
       <el-table-column 
@@ -28,31 +28,180 @@
         label="序号" 
         width="80" 
         :align="'center'"
+        v-if="isShowIndex"
       />
        <el-table-column
         v-slot="{ row }"
         v-for="headerItem in tableFields"
         :key="headerItem"
-        :fixed="headerItem.tableForm &&headerItem.tableForm.fixed? headerItem.tableForm.fixed:''"
+        :fixed="headerItem.tableForm?.fixed"
         :label="headerItem.label"
         :prop="headerItem.field"
-        :sortable="headerItem.tableForm && headerItem.tableForm.sortable ? headerItem.tableForm.sortable:''"
-        :width="headerItem.tableForm && headerItem.tableForm.width ? headerItem.tableForm.width : '100'"
+        :align="headerItem?.tableForm?.align || 'left'"
+        :sortable="headerItem?.tableForm?.sortable || ''"
+        :width="headerItem?.tableForm?.width || 'auto'"
       >
-    
-      <el-form 
+        <el-form 
           ref="TableBaseForm_Ref"
           :model="row"
-          :rules="tableFormRules"
-          :class="tableFormRules ? '' : 'noRulesForm'"
         >
-        <el-form-item >
+          <!-- 字符串输入框 -->
+          <el-form-item v-if="!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString'" :prop="headerItem.field">
             <el-input
               v-model="row[headerItem.field]"
+              :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
+              :disabled="itemIsDisabled(headerItem, row)"
             />
           </el-form-item>
-      </el-form>
-    </el-table-column>
+          <!-- 数字输入框 -->
+          <el-form-item v-if="headerItem?.tableForm?.type  == 'InputNumber'" :prop="headerItem.field">
+            <el-input-number
+              style="width: 100%;"
+              v-model="row[headerItem.field]"
+              :max="headerItem?.tableForm?.max"
+              :min="headerItem?.tableForm?.min"
+              :disabled="itemIsDisabled(headerItem, row)"
+            />
+          </el-form-item>
+           <!-- 下拉框 -->
+          <el-form-item v-if="headerItem?.tableForm?.type == 'Select'" :prop="headerItem.field">
+            <el-select
+              v-model="row[headerItem.field]"
+              :clearable="headerItem?.tableForm.clearable"
+              :multiple="headerItem?.tableForm.multiple"
+              :disabled="itemIsDisabled(headerItem, row)"
+              :filterable="headerItem?.tableForm.filterable"
+              :allow-create="headerItem?.tableForm.allowCreate"
+              style="width: 100%"
+              :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
+              @change="formSelectChange(row[headerItem.field], $event)"
+            >
+             <el-option
+                v-for="op in initSelectOptions(headerItem)"
+                :label="op.label"
+                :value="op.value"
+                :key="op.value"
+              />
+            </el-select>
+          </el-form-item>
+           <!-- 时间选择器 -->
+          <el-form-item v-if="headerItem?.tableForm?.type == 'FormTime'" :prop="headerItem.field">
+            <el-time-picker
+              v-model="row[headerItem.field]"
+              :placeholder="headerItem?.tableForm?.placeholder || '选择时间'"
+              style="width: 100%"
+              :disabled="itemIsDisabled(headerItem, row)"
+              :format="headerItem?.tableForm?.format || 'HH:mm:ss'"
+              :value-format="headerItem?.tableForm?.valueFormat || 'HH:mm:ss'"
+            />
+          </el-form-item>
+          <!-- 日期选择器 -->
+          <el-form-item v-if="headerItem?.tableForm?.type == 'FormDate'" :prop="headerItem.field">
+            <el-date-picker
+              v-model="row[headerItem.field]"
+              style="width: 100%"
+              :disabled="itemIsDisabled(headerItem, row)"
+              :placeholder="headerItem?.tableForm?.placeholder || '选择日期'"
+              :format="headerItem?.tableForm?.format || 'YYYY-MM-DD'"
+              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DD'"
+            />
+          </el-form-item>
+          <!-- 日期时间选择器 -->
+          <el-form-item v-if="headerItem?.tableForm?.type == 'FormDateTime'" :prop="headerItem.field">
+            <el-date-picker
+              type="datetime"
+              v-model="row[headerItem.field]"
+              :placeholder="headerItem?.tableForm?.placeholder || '选择日期时间'"
+              style="width: 100%"
+              :format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'"
+              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'"
+              :disabled="itemIsDisabled(headerItem, row)"
+            />
+          </el-form-item>
+          <!--开始时间结束时间选择器 (原类型datetimerange已弃用 使用type+timeType结合方式)-->
+          <el-form-item v-if="headerItem?.tableForm?.type == 'FormTimerange'" :prop="headerItem.field">
+            <el-date-picker
+              v-model="row[headerItem.field]"
+              :disabled="itemIsDisabled(headerItem, row)"
+              :type="headerItem?.tableForm?.timeType || 'datetimerange'"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'"
+              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'"
+            />
+            
+          </el-form-item>
+          <!-- Switch 开关 -->
+          <el-form-item v-if="headerItem?.tableForm?.type == 'Switch'" :prop="headerItem.field">
+            <el-switch
+              v-model="row[headerItem.field]"
+              :disabled="itemIsDisabled(headerItem, row)"
+              :loading="headerItem?.tableForm?.loading"
+              :size="headerItem?.tableForm?.size"
+              :width="headerItem?.tableForm?.width"
+              :active-icon="headerItem?.tableForm?.activeIcon"
+              :inactive-icon="headerItem?.tableForm?.inactiveIcon"
+              :active-text="headerItem?.tableForm?.activeText"
+              :inactive-text="headerItem?.tableForm?.inactiveText"
+              :active-value="headerItem?.tableForm?.activeValue"
+              :inactive-value="headerItem?.tableForm?.inactiveValue"
+              :active-color="headerItem?.tableForm?.inactiveColor"
+              :inactive-color="headerItem?.tableForm?.inactiveColor"
+            />
+          </el-form-item>
+          <!-- Radio  单选-->
+            <el-form-item v-if="headerItem?.tableForm?.type == 'Radio'" :prop="headerItem.field">
+              <el-radio-group
+                v-model="row[headerItem.field]"
+                :size="headerItem?.tableForm?.size"
+                :disabled="itemIsDisabled(headerItem, row)"
+                :text-color="headerItem?.tableForm?.textColor"
+                :fill="headerItem?.tableForm?.fill"
+                :name="headerItem?.tableForm?.name"
+                :id="headerItem?.tableForm?.id"
+              >
+                <el-radio
+                  v-for="(item, index) in initSelectOptions(headerItem)"
+                  :key="index"
+                  :label="item.value" 
+                  :size="headerItem?.tableForm?.size"
+                  :disabled="itemIsDisabled(headerItem, row)"
+                  :border="headerItem?.tableForm?.border"
+                >
+                  {{ item.label }}
+                </el-radio>
+              </el-radio-group>
+            </el-form-item>
+            <!-- Checkbox  单选-->
+            <el-form-item v-if="headerItem?.tableForm?.type == 'Checkbox'" :prop="headerItem.field">
+              <el-checkbox-group
+                v-model="row[headerItem.field]"
+                :disabled="itemIsDisabled(headerItem, row)"
+                :size="headerItem?.tableForm?.size"
+                :min="headerItem?.tableForm?.min"
+                :max="headerItem?.tableForm?.max"
+                :text-color="headerItem?.tableForm?.textColor"
+                :fill="headerItem?.tableForm?.fill"
+              >
+                <el-checkbox
+                  v-for="(item, index) in initSelectOptions(headerItem)"
+                  :key="index"
+                  :label="item.value" 
+                  :disabled="itemIsDisabled(headerItem, row)"
+                  :true-label="headerItem?.tableForm?.trueLabel"
+                  :false-label="headerItem?.tableForm?.falseLabel"
+                  :border="headerItem?.tableForm?.border"
+                  :size="headerItem?.tableForm?.size"
+                  :name="headerItem?.tableForm?.name"
+                  :checked="headerItem?.tableForm?.checked"
+                >
+                {{ item.label }}
+              </el-checkbox>
+            </el-checkbox-group>
+          </el-form-item>
+        </el-form>
+      </el-table-column>
       <slot></slot>
       <template #empty>
         <el-empty class="vab-data-empty" description="暂无数据" />
@@ -62,6 +211,8 @@
 </template>
 
 <script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
+import { log } from 'console'
   const props = defineProps({
   // 是否显示选择框 :custom="headerItem.sortable?headerItem.sortable:false"
   selectionTable: {
@@ -96,7 +247,7 @@
   height: {
     type: [Number, String],
     default: () => {
-      return '650'
+      return 'auto'
     }
   },
   // 是否有边框（可拖拽）
@@ -111,10 +262,37 @@
   }
 })
 console.log(props.tableFields);
+// 某个item是否禁用
+const itemIsDisabled = (colum, row) => {
+  return Boolean(colum.tableForm?.disabled) || Boolean(row.disabled) || Boolean(row['disabled_' + colum.field])
+}
+console.log(getStrDictOptions('uom'));
 
+// 获取下拉列表 | type = radio | type = select
+const initSelectOptions = (item) => {
+  return item.dictType ? getStrDictOptions(item.dictType) : item.tableForm.initOptions
+}
+
+// 传递给父类
+const emit = defineEmits([
+  'tableSelectionChange',
+  'extendedButtonsClick',
+  'formSelectChange',
+  'tableSortChange',
+  'showDrawer',
+  'selectCallback',
+  'handleTableSelect',
+])
+
+//普通下拉改变事件
+const formSelectChange = (field, val) => {
+  emit('formSelectChange', field, val)
+}
 </script>
 
 
 <style scoped lang="scss">
-
+::v-deep(.el-form-item){
+  margin-bottom: 0px;
+}
 </style>
diff --git a/src/views/wms/itembasic/ItembasicForm.vue b/src/views/wms/itembasic/ItembasicForm.vue
index 720ce4568..f1e15aff2 100644
--- a/src/views/wms/itembasic/ItembasicForm.vue
+++ b/src/views/wms/itembasic/ItembasicForm.vue
@@ -4,7 +4,7 @@
       <Form ref="formRef" v-loading="formLoading" :rules="ItemBasicRules" :schema="ItemBasic.allSchemas.formSchema"
         :model="formData" :is-col="true" />
       <div class="table">
-        <TableForm  :tableFields="ItemBasic.allSchemas.tableFormColumns" :tableData="tableData"/>
+        <TableForm  :tableFields="ItemBasic.allSchemas.tableFormColumns" :tableData="tableData" class="w-[100%]"/>
       </div>
     </div>
     <template #footer>
@@ -126,10 +126,11 @@ const buttonBaseClick = (val, item) => {
 }
 
 const tableData =  ref([{
-  code: 'GOODS-0202-12',
+  code: '',
   name:'物料',
   unit:'吨',
-  num: '20'
+  num: '20',
+  isStdPack:'FALSE'
 }, {
   code: 'GOODS-0202-12',
   name: '物料',

From 223842fef950560d0a14b258aa3495a6433d3a33 Mon Sep 17 00:00:00 2001
From: zhangli <2235006734@qq.com>
Date: Mon, 16 Oct 2023 11:57:16 +0800
Subject: [PATCH 2/5] tableForm

---
 src/components/TableForm/src/TableForm.vue | 382 +++++++++++----------
 src/utils/disposition/tableColumns.ts      |  26 +-
 src/views/wms/itembasic/ItembasicForm.vue  |  63 ++--
 3 files changed, 257 insertions(+), 214 deletions(-)

diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index c5cf173fa..170575188 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -1,219 +1,134 @@
 <!-- 附件组件 -->
 <template>
   <div class="table-form">
-     <el-table
-      class="multipleTableComponents"
-      ref="TableBaseComponents_Ref"
-      v-loading="tableLoading"
-      :data="tableData"
-      :height="height"
-      row-key="id"
-      :border="border"
-      @selection-change="tableSelectionChange"
-      @sort-change="tableSortChange"
-      @row-click="handleTableSelect"
-    >
+    <el-table class="multipleTableComponents" ref="TableBaseComponents_Ref" v-loading="tableLoading" :data="tableData"
+       max-height="maxHeight" row-key="id" :border="border" @selection-change="tableSelectionChange"
+      @sort-change="tableSortChange" @row-click="handleTableSelect">
+      <!-- 删除按钮 -->
+      <el-table-column fixed="left" :width="50" v-if="isShowButton" v-slot="{ row, $index }">
+        <Icon icon="ep:remove" color="#409eff" size="26" style="cursor: pointer;margin-top: -16px;" @click="handleDelete(row, $index)" />
+      </el-table-column>
       <!-- 多选 -->
-      <el-table-column
-        fixed="left"
-        :reserve-selection="true"
-        type="selection"
-        :width="50"
-        v-if="selectionTable"
-      />
+      <el-table-column fixed="left" :reserve-selection="true" type="selection" :width="50" v-if="selectionTable" />
       <!-- 序号 -->
-      <el-table-column 
-        type="index" 
-        fixed="left" 
-        label="序号" 
-        width="80" 
-        :align="'center'"
-        v-if="isShowIndex"
-      />
-       <el-table-column
-        v-slot="{ row }"
-        v-for="headerItem in tableFields"
-        :key="headerItem"
-        :fixed="headerItem.tableForm?.fixed"
-        :label="headerItem.label"
-        :prop="headerItem.field"
-        :align="headerItem?.tableForm?.align || 'left'"
-        :sortable="headerItem?.tableForm?.sortable || ''"
-        :width="headerItem?.tableForm?.width || 'auto'"
-      >
-        <el-form 
-          ref="TableBaseForm_Ref"
-          :model="row"
-        >
+      <el-table-column type="index" fixed="left" label="序号" width="80" :align="'center'" v-if="isShowIndex" />
+      <el-table-column v-slot="{ row }" v-for="headerItem in tableFields" :key="headerItem"
+        :fixed="headerItem.tableForm?.fixed" :label="headerItem.label" :prop="headerItem.field"
+        :align="headerItem?.tableForm?.align || 'center'" :sortable="headerItem?.tableForm?.sortable || ''"
+        :width="headerItem?.tableForm?.width || 'auto'" :min-width="headerItem?.tableForm?.minWidth || 'auto'">
+        <el-form ref="TableBaseForm_Ref" :model="row" style="width: 100%;" :rules="tableFormRules"
+          :class="tableFormRules ? '' : 'noRulesForm'">
           <!-- 字符串输入框 -->
-          <el-form-item v-if="!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString'" :prop="headerItem.field">
-            <el-input
-              v-model="row[headerItem.field]"
+          <el-form-item v-if="!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString'"
+            :prop="headerItem.field">
+            <el-input v-model="row[headerItem.field]"
               :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
-              :disabled="itemIsDisabled(headerItem, row)"
-            />
+              :disabled="itemIsDisabled(headerItem, row)" style="width: 100%;" />
           </el-form-item>
           <!-- 数字输入框 -->
-          <el-form-item v-if="headerItem?.tableForm?.type  == 'InputNumber'" :prop="headerItem.field">
-            <el-input-number
-              style="width: 100%;"
-              v-model="row[headerItem.field]"
-              :max="headerItem?.tableForm?.max"
-              :min="headerItem?.tableForm?.min"
-              :disabled="itemIsDisabled(headerItem, row)"
-            />
+          <el-form-item v-if="headerItem?.tableForm?.type == 'InputNumber'" :prop="headerItem.field">
+            <el-input-number style="width: 100%;" v-model="row[headerItem.field]" :max="headerItem?.tableForm?.max"
+              :min="headerItem?.tableForm?.min" :disabled="itemIsDisabled(headerItem, row)" />
           </el-form-item>
-           <!-- 下拉框 -->
+          <!-- 下拉框 -->
           <el-form-item v-if="headerItem?.tableForm?.type == 'Select'" :prop="headerItem.field">
-            <el-select
-              v-model="row[headerItem.field]"
-              :clearable="headerItem?.tableForm.clearable"
-              :multiple="headerItem?.tableForm.multiple"
-              :disabled="itemIsDisabled(headerItem, row)"
-              :filterable="headerItem?.tableForm.filterable"
-              :allow-create="headerItem?.tableForm.allowCreate"
-              style="width: 100%"
-              :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
-              @change="formSelectChange(row[headerItem.field], $event)"
-            >
-             <el-option
-                v-for="op in initSelectOptions(headerItem)"
-                :label="op.label"
-                :value="op.value"
-                :key="op.value"
-              />
+            <el-select v-model="row[headerItem.field]" :clearable="headerItem?.tableForm.clearable"
+              :multiple="headerItem?.tableForm.multiple" :disabled="itemIsDisabled(headerItem, row)"
+              :filterable="headerItem?.tableForm.filterable" :allow-create="headerItem?.tableForm.allowCreate"
+              style="width: 100%" :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
+              @change="formSelectChange(row[headerItem.field], $event)">
+              <el-option v-for="op in initSelectOptions(headerItem)" :label="op.label" :value="op.value"
+                :key="op.value" />
             </el-select>
           </el-form-item>
-           <!-- 时间选择器 -->
+          <!-- 时间选择器 -->
           <el-form-item v-if="headerItem?.tableForm?.type == 'FormTime'" :prop="headerItem.field">
-            <el-time-picker
-              v-model="row[headerItem.field]"
-              :placeholder="headerItem?.tableForm?.placeholder || '选择时间'"
-              style="width: 100%"
-              :disabled="itemIsDisabled(headerItem, row)"
+            <el-time-picker v-model="row[headerItem.field]" :placeholder="headerItem?.tableForm?.placeholder || '选择时间'"
+              style="width: 100%" :disabled="itemIsDisabled(headerItem, row)"
               :format="headerItem?.tableForm?.format || 'HH:mm:ss'"
-              :value-format="headerItem?.tableForm?.valueFormat || 'HH:mm:ss'"
-            />
+              :value-format="headerItem?.tableForm?.valueFormat || 'HH:mm:ss'" />
           </el-form-item>
           <!-- 日期选择器 -->
           <el-form-item v-if="headerItem?.tableForm?.type == 'FormDate'" :prop="headerItem.field">
-            <el-date-picker
-              v-model="row[headerItem.field]"
-              style="width: 100%"
-              :disabled="itemIsDisabled(headerItem, row)"
-              :placeholder="headerItem?.tableForm?.placeholder || '选择日期'"
+            <el-date-picker v-model="row[headerItem.field]" style="width: 100%"
+              :disabled="itemIsDisabled(headerItem, row)" :placeholder="headerItem?.tableForm?.placeholder || '选择日期'"
               :format="headerItem?.tableForm?.format || 'YYYY-MM-DD'"
-              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DD'"
-            />
+              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DD'" />
           </el-form-item>
           <!-- 日期时间选择器 -->
           <el-form-item v-if="headerItem?.tableForm?.type == 'FormDateTime'" :prop="headerItem.field">
-            <el-date-picker
-              type="datetime"
-              v-model="row[headerItem.field]"
-              :placeholder="headerItem?.tableForm?.placeholder || '选择日期时间'"
-              style="width: 100%"
+            <el-date-picker type="datetime" v-model="row[headerItem.field]"
+              :placeholder="headerItem?.tableForm?.placeholder || '选择日期时间'" style="width: 100%"
               :format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'"
               :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'"
-              :disabled="itemIsDisabled(headerItem, row)"
-            />
+              :disabled="itemIsDisabled(headerItem, row)" />
           </el-form-item>
           <!--开始时间结束时间选择器 (原类型datetimerange已弃用 使用type+timeType结合方式)-->
           <el-form-item v-if="headerItem?.tableForm?.type == 'FormTimerange'" :prop="headerItem.field">
-            <el-date-picker
-              v-model="row[headerItem.field]"
-              :disabled="itemIsDisabled(headerItem, row)"
-              :type="headerItem?.tableForm?.timeType || 'datetimerange'"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              :format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'"
-              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'"
-            />
-            
+            <el-date-picker v-model="row[headerItem.field]" :disabled="itemIsDisabled(headerItem, row)"
+              :type="headerItem?.tableForm?.timeType || 'datetimerange'" range-separator="至" start-placeholder="开始日期"
+              end-placeholder="结束日期" :format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'"
+              :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'" />
+
           </el-form-item>
           <!-- Switch 开关 -->
           <el-form-item v-if="headerItem?.tableForm?.type == 'Switch'" :prop="headerItem.field">
-            <el-switch
-              v-model="row[headerItem.field]"
-              :disabled="itemIsDisabled(headerItem, row)"
-              :loading="headerItem?.tableForm?.loading"
-              :size="headerItem?.tableForm?.size"
-              :width="headerItem?.tableForm?.width"
-              :active-icon="headerItem?.tableForm?.activeIcon"
-              :inactive-icon="headerItem?.tableForm?.inactiveIcon"
-              :active-text="headerItem?.tableForm?.activeText"
-              :inactive-text="headerItem?.tableForm?.inactiveText"
-              :active-value="headerItem?.tableForm?.activeValue"
-              :inactive-value="headerItem?.tableForm?.inactiveValue"
+            <el-switch v-model="row[headerItem.field]" :disabled="itemIsDisabled(headerItem, row)"
+              :loading="headerItem?.tableForm?.loading" :size="headerItem?.tableForm?.size"
+              :active-icon="headerItem?.tableForm?.activeIcon" :inactive-icon="headerItem?.tableForm?.inactiveIcon"
+              :active-text="headerItem?.tableForm?.activeText" :inactive-text="headerItem?.tableForm?.inactiveText"
+              :active-value="headerItem?.tableForm?.activeValue" :inactive-value="headerItem?.tableForm?.inactiveValue"
               :active-color="headerItem?.tableForm?.inactiveColor"
-              :inactive-color="headerItem?.tableForm?.inactiveColor"
-            />
+              :inactive-color="headerItem?.tableForm?.inactiveColor" />
           </el-form-item>
           <!-- Radio  单选-->
-            <el-form-item v-if="headerItem?.tableForm?.type == 'Radio'" :prop="headerItem.field">
-              <el-radio-group
-                v-model="row[headerItem.field]"
-                :size="headerItem?.tableForm?.size"
-                :disabled="itemIsDisabled(headerItem, row)"
-                :text-color="headerItem?.tableForm?.textColor"
-                :fill="headerItem?.tableForm?.fill"
-                :name="headerItem?.tableForm?.name"
-                :id="headerItem?.tableForm?.id"
-              >
-                <el-radio
-                  v-for="(item, index) in initSelectOptions(headerItem)"
-                  :key="index"
-                  :label="item.value" 
-                  :size="headerItem?.tableForm?.size"
-                  :disabled="itemIsDisabled(headerItem, row)"
-                  :border="headerItem?.tableForm?.border"
-                >
-                  {{ item.label }}
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-            <!-- Checkbox  单选-->
-            <el-form-item v-if="headerItem?.tableForm?.type == 'Checkbox'" :prop="headerItem.field">
-              <el-checkbox-group
-                v-model="row[headerItem.field]"
-                :disabled="itemIsDisabled(headerItem, row)"
-                :size="headerItem?.tableForm?.size"
-                :min="headerItem?.tableForm?.min"
-                :max="headerItem?.tableForm?.max"
-                :text-color="headerItem?.tableForm?.textColor"
-                :fill="headerItem?.tableForm?.fill"
-              >
-                <el-checkbox
-                  v-for="(item, index) in initSelectOptions(headerItem)"
-                  :key="index"
-                  :label="item.value" 
-                  :disabled="itemIsDisabled(headerItem, row)"
-                  :true-label="headerItem?.tableForm?.trueLabel"
-                  :false-label="headerItem?.tableForm?.falseLabel"
-                  :border="headerItem?.tableForm?.border"
-                  :size="headerItem?.tableForm?.size"
-                  :name="headerItem?.tableForm?.name"
-                  :checked="headerItem?.tableForm?.checked"
-                >
+          <el-form-item v-if="headerItem?.tableForm?.type == 'Radio'" :prop="headerItem.field">
+            <el-radio-group v-model="row[headerItem.field]" :size="headerItem?.tableForm?.size"
+              :disabled="itemIsDisabled(headerItem, row)" :text-color="headerItem?.tableForm?.textColor"
+              :fill="headerItem?.tableForm?.fill" :name="headerItem?.tableForm?.name" :id="headerItem?.tableForm?.id">
+              <el-radio v-for="(item, index) in initSelectOptions(headerItem)" :key="index" :label="item.value"
+                :size="headerItem?.tableForm?.size" :disabled="itemIsDisabled(headerItem, row)"
+                :border="headerItem?.tableForm?.border">
+                {{ item.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <!-- Checkbox  多选-->
+          <el-form-item v-if="headerItem?.tableForm?.type == 'Checkbox'" :prop="headerItem.field">
+            <el-checkbox-group v-model="row[headerItem.field]" :disabled="itemIsDisabled(headerItem, row)"
+              :size="headerItem?.tableForm?.size" :min="headerItem?.tableForm?.min" :max="headerItem?.tableForm?.max"
+              :text-color="headerItem?.tableForm?.textColor" :fill="headerItem?.tableForm?.fill">
+              <el-checkbox v-for="(item, index) in initSelectOptions(headerItem)" :key="index" :label="item.value"
+                :disabled="itemIsDisabled(headerItem, row)" :true-label="headerItem?.tableForm?.trueLabel"
+                :false-label="headerItem?.tableForm?.falseLabel" :border="headerItem?.tableForm?.border"
+                :size="headerItem?.tableForm?.size" :name="headerItem?.tableForm?.name"
+                :checked="headerItem?.tableForm?.checked">
                 {{ item.label }}
               </el-checkbox>
             </el-checkbox-group>
           </el-form-item>
         </el-form>
       </el-table-column>
-      <slot></slot>
-      <template #empty>
-        <el-empty class="vab-data-empty" description="暂无数据" />
-      </template>
+     
     </el-table>
+    <div class="button flex" v-if="isShowButton">
+      <div class="p-12px" @click="handleAdd">
+        <Icon icon="ep:circle-plus" color="#409eff" size="26" style="cursor: pointer;" />
+        <div>添加明细</div>
+      </div>
+    </div>
+
   </div>
 </template>
 
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
-import { log } from 'console'
-  const props = defineProps({
+const props = defineProps({
+  // 是否显示删除按钮
+  isShowButton: {
+    type: Boolean,
+    default: true,
+  },
   // 是否显示选择框 :custom="headerItem.sortable?headerItem.sortable:false"
   selectionTable: {
     type: Boolean,
@@ -247,13 +162,19 @@ import { log } from 'console'
   height: {
     type: [Number, String],
     default: () => {
-      return 'auto'
+      return '200'
+    }
+  }, 
+  maxHeight: {
+    type: [Number, String],
+    default: () => {
+      return '650'
     }
   },
   // 是否有边框（可拖拽）
   border: {
     type: Boolean,
-    default: true,
+    default: false,
   },
   // table输入表单的rules
   tableFormRules: {
@@ -261,18 +182,6 @@ import { log } from 'console'
     default: null
   }
 })
-console.log(props.tableFields);
-// 某个item是否禁用
-const itemIsDisabled = (colum, row) => {
-  return Boolean(colum.tableForm?.disabled) || Boolean(row.disabled) || Boolean(row['disabled_' + colum.field])
-}
-console.log(getStrDictOptions('uom'));
-
-// 获取下拉列表 | type = radio | type = select
-const initSelectOptions = (item) => {
-  return item.dictType ? getStrDictOptions(item.dictType) : item.tableForm.initOptions
-}
-
 // 传递给父类
 const emit = defineEmits([
   'tableSelectionChange',
@@ -282,17 +191,114 @@ const emit = defineEmits([
   'showDrawer',
   'selectCallback',
   'handleTableSelect',
+  'handleDelete',
+  'handleAdd'
 ])
-
+// 获取下拉列表 | type = radio | type = select
+const initSelectOptions = (item) => {
+  return item.dictType ? getStrDictOptions(item.dictType) : item.tableForm.initOptions
+}
 //普通下拉改变事件
 const formSelectChange = (field, val) => {
   emit('formSelectChange', field, val)
 }
+// 点击selection框
+const tableSelectionChange = (val) => {
+  emit('tableSelectionChange', val)
+}
+// 列表排序
+const tableSortChange = (column, prop, order) => {
+  emit('tableSortChange', column, prop, order)
+}
+//下拉框回显方法
+const showSelect = (val, statusID) => {
+  return getDictForStatusID(val, statusID)
+}
+
+// 行点击
+const handleTableSelect = (row, column, event) => {
+  emit('handleTableSelect', row, column, event)
+}
+
+// 某个item是否禁用
+const itemIsDisabled = (colum, row) => {
+  return Boolean(colum.tableForm?.disabled) || Boolean(row.disabled) || Boolean(row['disabled_' + colum.field])
+}
+
+
+const TableBaseComponents_Ref = ref()
+const TableBaseForm_Ref = ref()
+/**
+   * 验证表单是否符合rules
+   * @param {*} success 如果验证【成功】走的方法
+   * @param {*} error 如果验证【不成功】走的方法
+   */
+
+const $baseMessage = inject('$baseMessage')
+const validateForm = (success, error) => {
+  let _lists = TableBaseForm_Ref.value.map(v => v.validate())
+  Promise.all(_lists).then(res => {
+    if (success) success()
+  }).catch(err => {
+    if (error) {
+      error()
+      return
+    }
+    $baseMessage('验证未通过，请按规则填写', 'error', 'vab-hey-message-error')
+  })
+}
+// 删除数据
+const handleDelete = (row, index) => {
+  console.log(row);
+  console.log(index);
+  emit('handleDelete', row)
+}
+// 添加数据
+const handleAdd = () => {
+  emit('handleAdd')
+}
+// setup 语法糖 抛出方法
+defineExpose({
+  TableBaseComponents_Ref,
+  validateForm
+})
 </script>
 
 
 <style scoped lang="scss">
-::v-deep(.el-form-item){
-  margin-bottom: 0px;
+::v-deep(.el-table__body){
+  padding:10px 0px
+}
+::v-deep(.el-table--default .el-table__cell) {
+  padding: 2px 0px;
+  border: none;
+}
+
+::v-deep(.el-table td.el-table__cell div) {
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center !important;
+  overflow: visible;
+}
+
+::v-deep(.el-icon) {
+  display: block;
+}
+
+.button {
+  >div {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+
+    >div {
+      margin-left: 6px;
+      text-decoration: underline;
+      color: #409eff;
+    }
+  }
+
+
 }
 </style>
diff --git a/src/utils/disposition/tableColumns.ts b/src/utils/disposition/tableColumns.ts
index 7fe51ed8d..8ab5e9392 100644
--- a/src/utils/disposition/tableColumns.ts
+++ b/src/utils/disposition/tableColumns.ts
@@ -12,7 +12,7 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
       width:700
     },
     tableForm:{
-       width: 300,
+      minWidth:200,
        sortable:false
     }
   },
@@ -24,7 +24,7 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
       width: 150
     },
     tableForm:{
-       width: 300,
+      minWidth:200,
        sortable:false
     }
   },
@@ -60,6 +60,10 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
     } ,
     form: {
       component: 'Switch',
+    },
+     tableForm:{
+     width: 100,
+      type:'Switch',
     }
   },
   {
@@ -72,7 +76,11 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
     isTable: true,
     table: {
       width: 120
-    } 
+    } ,
+     tableForm:{
+     width: 200,
+      type:'Select',
+    }
   },
   {
     label: '替代计量单位',
@@ -100,6 +108,10 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
     },
     form: {
       component: 'Switch',
+    },
+    tableForm:{
+      width: 180,
+      type:'Radio',
     }
   },
   {
@@ -131,6 +143,10 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
     } ,
     form: {
       component: 'Radio',
+    },
+    tableForm:{
+      width: 180,
+      type:'Checkbox',
     }
   },
   {
@@ -326,6 +342,10 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
       componentProps: {
         type: 'datetimerange',
       }
+    },
+    tableForm:{
+      width: 200,
+      type:'FormDateTime',
     }
   },
   {
diff --git a/src/views/wms/itembasic/ItembasicForm.vue b/src/views/wms/itembasic/ItembasicForm.vue
index f1e15aff2..557c60bb8 100644
--- a/src/views/wms/itembasic/ItembasicForm.vue
+++ b/src/views/wms/itembasic/ItembasicForm.vue
@@ -4,7 +4,7 @@
       <Form ref="formRef" v-loading="formLoading" :rules="ItemBasicRules" :schema="ItemBasic.allSchemas.formSchema"
         :model="formData" :is-col="true" />
       <div class="table">
-        <TableForm  :tableFields="ItemBasic.allSchemas.tableFormColumns" :tableData="tableData" class="w-[100%]"/>
+        <TableForm ref="tableFormRef"  :tableFields="ItemBasic.allSchemas.tableFormColumns" :tableData="tableData" class="w-[100%]" @handleAdd="handleAdd" :tableFormRules="ItemBasicRules" @handleDelete="handleDelete"/>
       </div>
     </div>
     <template #footer>
@@ -29,6 +29,7 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formData = ref('')
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formRef = ref() // 表单 Ref
+const tableFormRef =  ref()
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
@@ -118,6 +119,7 @@ const Butttondata = [
 const buttonBaseClick = (val, item) => {
   // 保存
   if (val == 'save') {
+    tableFormRef.value.validateForm()
   }
   // 关闭
   else if (val == 'close') {
@@ -125,28 +127,43 @@ const buttonBaseClick = (val, item) => {
   }
 }
 
-const tableData =  ref([{
-  code: '',
-  name:'物料',
-  unit:'吨',
-  num: '20',
-  isStdPack:'FALSE'
-}, {
-  code: 'GOODS-0202-12',
-  name: '物料',
-  unit: '吨',
-  num: '20'
-}, {
-  code: 'GOODS-0202-12',
-  name: '物料',
-  unit: '吨',
-  num: '20'
-}, {
-  code: 'GOODS-0202-12',
-  name: '物料',
-  unit: '吨',
-  num: '20'
-}])
+// const tableData =  ref([{
+//   code: '',
+//   name:'物料',
+//   unit:'吨',
+//   num: '20',
+//   isStdPack:'FALSE'
+// }, {
+//   code: 'GOODS-0202-12',
+//   name: '物料',
+//   unit: '吨',
+//   num: '20'
+// }, {
+//   code: 'GOODS-0202-12',
+//   name: '物料',
+//   unit: '吨',
+//   num: '20'
+// }, {
+//   code: 'GOODS-0202-12',
+//   name: '物料',
+//   unit: '吨',
+//   num: '20'
+// }])
+const tableData = ref([])
+// 添加明细
+const handleAdd = ()=>{
+  tableData.value.push({
+    code: '',
+    name: '',
+    unit: '',
+    num: ''
+  })
+}
+// 删除明细
+
+const handleDelete =(item,index)=>{
+  tableData.value.splice(index,1)
+}
 </script>
 <style scoped>
 .table {

From 7ac0f40b38e5ca707234352c6d57171dbe90d827 Mon Sep 17 00:00:00 2001
From: zhangli <2235006734@qq.com>
Date: Mon, 16 Oct 2023 13:29:25 +0800
Subject: [PATCH 3/5] 1

---
 .env.test | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.env.test b/.env.test
index b993274a1..3cb46094c 100644
--- a/.env.test
+++ b/.env.test
@@ -29,3 +29,6 @@ VITE_BASE_PATH=/
 
 # 输出路径
 VITE_OUT_DIR=dist-test
+
+# 自定义接口路径
+VITE_INTERFACE_URL='http://dev.ccwin-in.com:25100/magic/web/index.html'

From f63aa1b931eaaaf33f0f6c870287279da3f99f95 Mon Sep 17 00:00:00 2001
From: zhangli <2235006734@qq.com>
Date: Mon, 16 Oct 2023 17:08:22 +0800
Subject: [PATCH 4/5] =?UTF-8?q?tableForm=E7=BB=84=E4=BB=B6,=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E7=BB=84=E4=BB=B6=E5=B0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Annex/src/Annex.vue            |   2 +-
 .../ChangeRecord/src/ChangeRecord.vue         |   4 +-
 src/components/Detail/src/Detail.vue          |  13 +-
 src/components/Remarks/src/Remarks.vue        |   2 +-
 src/components/TableForm/src/TableForm.vue    | 228 +++++++++++++-----
 src/components/Tabs/src/Tabs.vue              |   2 -
 src/store/modules/app.ts                      |   2 +-
 src/utils/disposition/tableColumns.ts         |   2 +-
 src/views/detail/detail/index.vue             | 179 --------------
 src/views/infra/customInterface/index.vue     |   4 +-
 src/views/wms/itembasic/ItembasicForm.vue     |   7 +-
 11 files changed, 189 insertions(+), 256 deletions(-)
 delete mode 100644 src/views/detail/detail/index.vue

diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue
index 6e5f640c8..3322fa4ba 100644
--- a/src/components/Annex/src/Annex.vue
+++ b/src/components/Annex/src/Annex.vue
@@ -32,7 +32,7 @@ defineComponent({
   name: 'Annex'
 })
 // 接受父组件参数
-const { data } = defineProps({
+const props = defineProps({
   data: {
     type: Object,
     required: true
diff --git a/src/components/ChangeRecord/src/ChangeRecord.vue b/src/components/ChangeRecord/src/ChangeRecord.vue
index 3db371576..206315421 100644
--- a/src/components/ChangeRecord/src/ChangeRecord.vue
+++ b/src/components/ChangeRecord/src/ChangeRecord.vue
@@ -52,10 +52,10 @@
 <script lang="ts" setup>
 import download from '@/utils/download'
 defineComponent({
-  name: 'Annex'
+  name: 'ChangeRecord'
 })
 // 接收父组件数据
-const { data } = defineProps({
+const props = defineProps({
   data: {
     type: Object,
     required: true
diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue
index 5c4f873a1..c3f0e8d1d 100644
--- a/src/components/Detail/src/Detail.vue
+++ b/src/components/Detail/src/Detail.vue
@@ -6,13 +6,13 @@
       </div>
     </template>
     <ContentWrap v-if="!isBasic">
-      <Descriptions :data="detailData" labelClassName="label-class-name" label-align="left" direction="vertical" :column="8" :schema="detailSchema" :columns="2" width="200px"/>
+      <Descriptions :data="detailData" labelClassName="label-class-name" label-align="left" direction="vertical" :column="8" :schema="allSchemas.detailSchema" :columns="2" width="200px"/>
     </ContentWrap>
     <Tabs :tabsList="tabsList" :current="current" @change="change" />
     <div class="flex" v-if="current == 0">
       <!-- 详情 -->
       <ContentWrap class="w-[73%]">
-        <Descriptions :data="detailData" :schema="detailSchema" :columns="2" />
+        <Descriptions :data="detailData" :schema="allSchemas.detailSchema" :columns="2" />
       </ContentWrap>
       <ContentWrap class="w-[27%] ml-16px">
         <!-- 附件组件 -->
@@ -25,7 +25,7 @@
     </div>
     <ContentWrap v-else>
       <Table 
-        :columns="tableColumns"
+        :columns="allSchemas.tableColumns"
         :data="tableObject.tableList"
         :loading="tableObject.loading"
         :pagination="{total: tableObject.total}"
@@ -83,20 +83,17 @@ const props = defineProps({
 })
 
 const isShowDrawer = ref(false)
-const isBasic = ref(props.isBasic)
-const tableColumns = ref(props.allSchemas.tableColumns)
-const detailSchema = ref(props.allSchemas.detailSchema)
 
 const tabsList = ref(JSON.parse(JSON.stringify(props.tabs?props.tabs:'')))
 
-if (tabsList.value) {
+if (tabsList.value&& tabsList.value.length>0) {
   tabsList.value.unshift({
     label: '详情',
     prop: 'Detail'
   })
 } else {
   tabsList.value = [{
-    label: '详情',
+    label: '明细',
     prop: 'Detail'
   }]
 }
diff --git a/src/components/Remarks/src/Remarks.vue b/src/components/Remarks/src/Remarks.vue
index 132ebf0da..eed1779c7 100644
--- a/src/components/Remarks/src/Remarks.vue
+++ b/src/components/Remarks/src/Remarks.vue
@@ -37,7 +37,7 @@ defineComponent({
 
 const remark = ref('')
 // 接受父级数据
-const { data } = defineProps({
+const props = defineProps({
   data: {
     type: Object,
     required: true
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 170575188..e84d1a3ba 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -1,107 +1,214 @@
 <!-- 附件组件 -->
 <template>
   <div class="table-form">
-    <el-table class="multipleTableComponents" ref="TableBaseComponents_Ref" v-loading="tableLoading" :data="tableData"
-       max-height="maxHeight" row-key="id" :border="border" @selection-change="tableSelectionChange"
-      @sort-change="tableSortChange" @row-click="handleTableSelect">
+    <el-table class="multipleTableComponents"
+      ref="TableBaseComponents_Ref" 
+      v-loading="tableLoading" 
+      :data="tableData"
+      max-height="maxHeight" 
+      row-key="id" 
+      :border="border" 
+      @selection-change="tableSelectionChange"
+      @sort-change="tableSortChange" 
+      @row-click="handleTableSelect"
+    >
       <!-- 删除按钮 -->
-      <el-table-column fixed="left" :width="50" v-if="isShowButton" v-slot="{ row, $index }">
+      <el-table-column
+        fixed="left" 
+        :width="50" 
+        v-if="isShowButton" 
+        v-slot="{ row, $index }"
+      >
         <Icon icon="ep:remove" color="#409eff" size="26" style="cursor: pointer;margin-top: -16px;" @click="handleDelete(row, $index)" />
       </el-table-column>
       <!-- 多选 -->
-      <el-table-column fixed="left" :reserve-selection="true" type="selection" :width="50" v-if="selectionTable" />
+      <el-table-column 
+        fixed="left" 
+        :reserve-selection="true" 
+        type="selection" 
+        :width="50" 
+        v-if="selectionTable" 
+      />
       <!-- 序号 -->
-      <el-table-column type="index" fixed="left" label="序号" width="80" :align="'center'" v-if="isShowIndex" />
-      <el-table-column v-slot="{ row }" v-for="headerItem in tableFields" :key="headerItem"
-        :fixed="headerItem.tableForm?.fixed" :label="headerItem.label" :prop="headerItem.field"
-        :align="headerItem?.tableForm?.align || 'center'" :sortable="headerItem?.tableForm?.sortable || ''"
-        :width="headerItem?.tableForm?.width || 'auto'" :min-width="headerItem?.tableForm?.minWidth || 'auto'">
-        <el-form ref="TableBaseForm_Ref" :model="row" style="width: 100%;" :rules="tableFormRules"
-          :class="tableFormRules ? '' : 'noRulesForm'">
+      <el-table-column 
+        type="index" 
+        fixed="left" 
+        label="序号" 
+        width="80" 
+        :align="'center'" 
+        v-if="isShowIndex" 
+      />
+      <el-table-column 
+        v-slot="{ row }" 
+        v-for="headerItem in tableFields" 
+        :key="headerItem"
+        :fixed="headerItem.tableForm?.fixed" 
+        :label="headerItem.label" :prop="headerItem.field"
+        :align="headerItem?.tableForm?.align || 'center'" 
+        :sortable="headerItem?.tableForm?.sortable || ''"
+        :width="headerItem?.tableForm?.width || 'auto'" 
+        :min-width="headerItem?.tableForm?.minWidth || 'auto'">
+        <el-form ref="TableBaseForm_Ref" 
+        :model="row" 
+        style="width: 100%;" 
+        :rules="tableFormRules"
+        :class="tableFormRules ? '' : 'noRulesForm'">
           <!-- 字符串输入框 -->
-          <el-form-item v-if="!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString'"
+          <el-form-item 
+            v-if="!headerItem?.tableForm?.type || headerItem?.tableForm?.type == 'InputString'"
             :prop="headerItem.field">
             <el-input v-model="row[headerItem.field]"
               :placeholder="headerItem?.tableForm?.placeholder || '请输入' + headerItem.label"
-              :disabled="itemIsDisabled(headerItem, row)" style="width: 100%;" />
+              :disabled="itemIsDisabled(headerItem, row)" 
+              style="width: 100%;" 
+            />
           </el-form-item>
           <!-- 数字输入框 -->
-          <el-form-item v-if="headerItem?.tableForm?.type == 'InputNumber'" :prop="headerItem.field">
-            <el-input-number style="width: 100%;" v-model="row[headerItem.field]" :max="headerItem?.tableForm?.max"
-              :min="headerItem?.tableForm?.min" :disabled="itemIsDisabled(headerItem, row)" />
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'InputNumber'" 
+            :prop="headerItem.field">
+            <el-input-number 
+              style="width: 100%;" 
+              v-model="row[headerItem.field]" 
+              :max="headerItem?.tableForm?.max"
+              :min="headerItem?.tableForm?.min" 
+              :disabled="itemIsDisabled(headerItem, row)" 
+              @focus="inpuFocus(headerItem)"/>
           </el-form-item>
           <!-- 下拉框 -->
-          <el-form-item v-if="headerItem?.tableForm?.type == 'Select'" :prop="headerItem.field">
-            <el-select v-model="row[headerItem.field]" :clearable="headerItem?.tableForm.clearable"
-              :multiple="headerItem?.tableForm.multiple" :disabled="itemIsDisabled(headerItem, row)"
-              :filterable="headerItem?.tableForm.filterable" :allow-create="headerItem?.tableForm.allowCreate"
-              style="width: 100%" :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'Select'" 
+            :prop="headerItem.field">
+            <el-select 
+              v-model="row[headerItem.field]" 
+              :clearable="headerItem?.tableForm.clearable"
+              :multiple="headerItem?.tableForm.multiple" 
+              :disabled="itemIsDisabled(headerItem, row)"
+              :filterable="headerItem?.tableForm.filterable" 
+              :allow-create="headerItem?.tableForm.allowCreate"
+              style="width: 100%" 
+              :placeholder="headerItem?.tableForm?.placeholder || '请选择' + headerItem.label"
               @change="formSelectChange(row[headerItem.field], $event)">
-              <el-option v-for="op in initSelectOptions(headerItem)" :label="op.label" :value="op.value"
+              <el-option 
+                v-for="op in initSelectOptions(headerItem)" 
+                :label="op.label" 
+                :value="op.value"
                 :key="op.value" />
             </el-select>
           </el-form-item>
           <!-- 时间选择器 -->
-          <el-form-item v-if="headerItem?.tableForm?.type == 'FormTime'" :prop="headerItem.field">
-            <el-time-picker v-model="row[headerItem.field]" :placeholder="headerItem?.tableForm?.placeholder || '选择时间'"
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'FormTime'" 
+            :prop="headerItem.field">
+            <el-time-picker 
+              v-model="row[headerItem.field]" 
+              :placeholder="headerItem?.tableForm?.placeholder || '选择时间'"
               style="width: 100%" :disabled="itemIsDisabled(headerItem, row)"
               :format="headerItem?.tableForm?.format || 'HH:mm:ss'"
               :value-format="headerItem?.tableForm?.valueFormat || 'HH:mm:ss'" />
           </el-form-item>
           <!-- 日期选择器 -->
-          <el-form-item v-if="headerItem?.tableForm?.type == 'FormDate'" :prop="headerItem.field">
-            <el-date-picker v-model="row[headerItem.field]" style="width: 100%"
-              :disabled="itemIsDisabled(headerItem, row)" :placeholder="headerItem?.tableForm?.placeholder || '选择日期'"
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'FormDate'" 
+            :prop="headerItem.field">
+            <el-date-picker 
+              v-model="row[headerItem.field]" 
+              style="width: 100%"
+              :disabled="itemIsDisabled(headerItem, row)" 
+              :placeholder="headerItem?.tableForm?.placeholder || '选择日期'"
               :format="headerItem?.tableForm?.format || 'YYYY-MM-DD'"
               :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DD'" />
           </el-form-item>
           <!-- 日期时间选择器 -->
-          <el-form-item v-if="headerItem?.tableForm?.type == 'FormDateTime'" :prop="headerItem.field">
-            <el-date-picker type="datetime" v-model="row[headerItem.field]"
-              :placeholder="headerItem?.tableForm?.placeholder || '选择日期时间'" style="width: 100%"
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'FormDateTime'" 
+            :prop="headerItem.field">
+            <el-date-picker 
+              type="datetime" 
+              v-model="row[headerItem.field]"
+              :placeholder="headerItem?.tableForm?.placeholder || '选择日期时间'" 
+              style="width: 100%"
               :format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'"
               :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'"
               :disabled="itemIsDisabled(headerItem, row)" />
           </el-form-item>
           <!--开始时间结束时间选择器 (原类型datetimerange已弃用 使用type+timeType结合方式)-->
-          <el-form-item v-if="headerItem?.tableForm?.type == 'FormTimerange'" :prop="headerItem.field">
-            <el-date-picker v-model="row[headerItem.field]" :disabled="itemIsDisabled(headerItem, row)"
-              :type="headerItem?.tableForm?.timeType || 'datetimerange'" range-separator="至" start-placeholder="开始日期"
-              end-placeholder="结束日期" :format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'"
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'FormTimerange'" 
+            :prop="headerItem.field">
+            <el-date-picker 
+              v-model="row[headerItem.field]" 
+              :disabled="itemIsDisabled(headerItem, row)"
+              :type="headerItem?.tableForm?.timeType || 'datetimerange'"
+              range-separator="至" 
+              start-placeholder="开始日期"
+              end-placeholder="结束日期" 
+              :format="headerItem?.tableForm?.format || 'YYYY-MM-DD HH:mm:ss'"
               :value-format="headerItem?.tableForm?.valueFormat || 'YYYY-MM-DDTHH:mm:ss'" />
-
           </el-form-item>
           <!-- Switch 开关 -->
-          <el-form-item v-if="headerItem?.tableForm?.type == 'Switch'" :prop="headerItem.field">
-            <el-switch v-model="row[headerItem.field]" :disabled="itemIsDisabled(headerItem, row)"
-              :loading="headerItem?.tableForm?.loading" :size="headerItem?.tableForm?.size"
-              :active-icon="headerItem?.tableForm?.activeIcon" :inactive-icon="headerItem?.tableForm?.inactiveIcon"
-              :active-text="headerItem?.tableForm?.activeText" :inactive-text="headerItem?.tableForm?.inactiveText"
-              :active-value="headerItem?.tableForm?.activeValue" :inactive-value="headerItem?.tableForm?.inactiveValue"
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'Switch'" 
+            :prop="headerItem.field">
+            <el-switch 
+              v-model="row[headerItem.field]" 
+              :disabled="itemIsDisabled(headerItem, row)"
+              :loading="headerItem?.tableForm?.loading" 
+              :size="headerItem?.tableForm?.size"
+              :active-icon="headerItem?.tableForm?.activeIcon" 
+              :inactive-icon="headerItem?.tableForm?.inactiveIcon"
+              :active-text="headerItem?.tableForm?.activeText" 
+              :inactive-text="headerItem?.tableForm?.inactiveText"
+              :active-value="headerItem?.tableForm?.activeValue" 
+              :inactive-value="headerItem?.tableForm?.inactiveValue"
               :active-color="headerItem?.tableForm?.inactiveColor"
               :inactive-color="headerItem?.tableForm?.inactiveColor" />
           </el-form-item>
           <!-- Radio  单选-->
-          <el-form-item v-if="headerItem?.tableForm?.type == 'Radio'" :prop="headerItem.field">
-            <el-radio-group v-model="row[headerItem.field]" :size="headerItem?.tableForm?.size"
-              :disabled="itemIsDisabled(headerItem, row)" :text-color="headerItem?.tableForm?.textColor"
-              :fill="headerItem?.tableForm?.fill" :name="headerItem?.tableForm?.name" :id="headerItem?.tableForm?.id">
-              <el-radio v-for="(item, index) in initSelectOptions(headerItem)" :key="index" :label="item.value"
-                :size="headerItem?.tableForm?.size" :disabled="itemIsDisabled(headerItem, row)"
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'Radio'" 
+            :prop="headerItem.field">
+            <el-radio-group 
+              v-model="row[headerItem.field]" 
+              :size="headerItem?.tableForm?.size"
+              :disabled="itemIsDisabled(headerItem, row)" 
+              :text-color="headerItem?.tableForm?.textColor"
+              :fill="headerItem?.tableForm?.fill" 
+              :name="headerItem?.tableForm?.name" 
+              :id="headerItem?.tableForm?.id">
+              <el-radio 
+                v-for="(item, index) in initSelectOptions(headerItem)" 
+                :key="index" 
+                :label="item.value"
+                :size="headerItem?.tableForm?.size" 
+                :disabled="itemIsDisabled(headerItem, row)"
                 :border="headerItem?.tableForm?.border">
                 {{ item.label }}
               </el-radio>
             </el-radio-group>
           </el-form-item>
           <!-- Checkbox  多选-->
-          <el-form-item v-if="headerItem?.tableForm?.type == 'Checkbox'" :prop="headerItem.field">
-            <el-checkbox-group v-model="row[headerItem.field]" :disabled="itemIsDisabled(headerItem, row)"
-              :size="headerItem?.tableForm?.size" :min="headerItem?.tableForm?.min" :max="headerItem?.tableForm?.max"
-              :text-color="headerItem?.tableForm?.textColor" :fill="headerItem?.tableForm?.fill">
-              <el-checkbox v-for="(item, index) in initSelectOptions(headerItem)" :key="index" :label="item.value"
-                :disabled="itemIsDisabled(headerItem, row)" :true-label="headerItem?.tableForm?.trueLabel"
-                :false-label="headerItem?.tableForm?.falseLabel" :border="headerItem?.tableForm?.border"
-                :size="headerItem?.tableForm?.size" :name="headerItem?.tableForm?.name"
+          <el-form-item 
+            v-if="headerItem?.tableForm?.type == 'Checkbox'" 
+            :prop="headerItem.field">
+            <el-checkbox-group 
+              v-model="row[headerItem.field]" 
+              :disabled="itemIsDisabled(headerItem, row)"
+              :size="headerItem?.tableForm?.size" 
+              :min="headerItem?.tableForm?.min" 
+              :max="headerItem?.tableForm?.max"
+              :text-color="headerItem?.tableForm?.textColor" 
+              :fill="headerItem?.tableForm?.fill">
+              <el-checkbox 
+                v-for="(item, index) in initSelectOptions(headerItem)" 
+                :key="index" 
+                :label="item.value"
+                :disabled="itemIsDisabled(headerItem, row)" 
+                :true-label="headerItem?.tableForm?.trueLabel"
+                :false-label="headerItem?.tableForm?.falseLabel" 
+                :border="headerItem?.tableForm?.border"
+                :size="headerItem?.tableForm?.size" 
+                :name="headerItem?.tableForm?.name"
                 :checked="headerItem?.tableForm?.checked">
                 {{ item.label }}
               </el-checkbox>
@@ -192,7 +299,8 @@ const emit = defineEmits([
   'selectCallback',
   'handleTableSelect',
   'handleDelete',
-  'handleAdd'
+  'handleAdd',
+  'inpuFocus'
 ])
 // 获取下拉列表 | type = radio | type = select
 const initSelectOptions = (item) => {
@@ -257,6 +365,12 @@ const handleDelete = (row, index) => {
 const handleAdd = () => {
   emit('handleAdd')
 }
+// 输入框聚焦
+const inpuFocus = (headerItem)=>{
+  if(headerItem.isInpuFocusShow){
+    emit('inpuFocus')
+  }
+}
 // setup 语法糖 抛出方法
 defineExpose({
   TableBaseComponents_Ref,
diff --git a/src/components/Tabs/src/Tabs.vue b/src/components/Tabs/src/Tabs.vue
index 8d23db972..aa646613e 100644
--- a/src/components/Tabs/src/Tabs.vue
+++ b/src/components/Tabs/src/Tabs.vue
@@ -26,8 +26,6 @@ const props  = defineProps({
     default: 0
   },
 })
-const tabsList  = props.tabsList
-
 const current = ref(props.current);
 const change = (item, index) => {
   current.value = index
diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index 2489f87e3..b06b6597d 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -59,7 +59,7 @@ export const useAppStore = defineStore('app', {
       tagsViewIcon: true, // 是否显示标签图标
       logo: true, // logo
       fixedHeader: true, // 固定toolheader
-      footer: true, // 显示页脚
+      footer: false, // 显示页脚
       greyMode: false, // 是否开始灰色模式，用于特殊悼念日
       fixedMenu: wsCache.get('fixedMenu') || false, // 是否固定菜单
 
diff --git a/src/utils/disposition/tableColumns.ts b/src/utils/disposition/tableColumns.ts
index 8ab5e9392..1b779fe9d 100644
--- a/src/utils/disposition/tableColumns.ts
+++ b/src/utils/disposition/tableColumns.ts
@@ -9,7 +9,7 @@ export const ItemBasic = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'code',
     sort: 'custom',
     table: {
-      width:700
+      width: 150
     },
     tableForm:{
       minWidth:200,
diff --git a/src/views/detail/detail/index.vue b/src/views/detail/detail/index.vue
deleted file mode 100644
index 30274d1b8..000000000
--- a/src/views/detail/detail/index.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<template>
-  <!-- 搜索工作栏 -->
-  <ContentWrap>
-    <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
-      <el-form-item label="部门名称" prop="title">
-        <el-input v-model="queryParams.name" placeholder="请输入部门名称" clearable class="!w-240px" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="info" plain @click="handleQuery">
-          <Icon icon="ep:search" class="mr-5px" /> 搜索
-        </el-button>
-        <el-button type="info" plain @click="resetQuery">
-          <Icon icon="ep:refresh" class="mr-5px" /> 重置
-        </el-button>
-      </el-form-item>
-    </el-form>
-  </ContentWrap>
-  <div class="flex">
-    <!-- 详情 -->
-    <ContentWrap class="w-[73%]">
-       <Form ref="formRef" v-loading="formLoading" :rules="rules" :schema="ItemBasic.allSchemas.formSchema"  :is-col="true"/>
-    </ContentWrap>
-    <ContentWrap class="w-[27%] ml-16px">
-      <!-- 附件组件 -->
-      <Annex :data="annexData" @handleImport="handleImport" @deleteAnnex="deleteAnnexSuccess" />
-      <!-- 备注组件 -->
-      <Remarks :data="remarksData" class="mt-20px" @submitSucss="remarksSubmitSucss"/>
-      <!-- 变更记录组件 -->
-      <ChangeRecord :data="changeRecordData" class="mt-20px" />
-    </ContentWrap>
-    <!-- 用户导入对话框 -->
-    <ImportForm ref="importFormRef" :importTemplateData="importTemplateData" @success="importSuccess" />
-  </div>
-</template>
-
-<script lang="ts" setup>
-defineOptions({ name: 'Detail' })
-import Annex from '@/components/Annex/src/Annex.vue'
-import Remarks from '@/components/Remarks/src/Remarks.vue'
-import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
-import ChangeRecord from '@/components/ChangeRecord/src/ChangeRecord.vue'
-import { ItemBasic } from '@/utils/disposition/tableColumns.ts'
-
-
-import * as UserApi from '@/api/system/user'
-
-// 搜索参数
-const queryParams = reactive({
-  title: '',
-  name: undefined,
-  status: undefined,
-  pageNo: 1,
-  pageSize: 100
-})
-const queryFormRef = ref() // 搜索的表单
-// const formLabel = ref(ItemBasic)//form表单label列表
-// 附件默认数据
-const annexData = reactive({
-  annexList: [{
-    title: '文件名文件名2023-12-12.docx',
-    size: '150.02KB',
-    people: '贾先生',
-    time: '2023年5月6日 17:16:00',
-  }, {
-    title: '文件名文件名2023-12-15.docx',
-    size: '242KB',
-    people: '张张',
-    time: '2022年12月12日 17:16:00',
-  }]
-})
-// 备注默认数据
-const remarksData = reactive({
-  remarksList: [{
-    name: '诸葛亮',
-    text: '转朱阁，低绮户，照无眠。不应有恨，何事长向别时圆？人有悲欢离合，月有阴晴圆缺，此事古难全。但愿人长久，千里共婵娟。',
-    time: '2023年5月6日 17:16:00',
-  }, {
-    name: '刘备',
-    text: '转朱阁，低绮户，照无眠。不应有恨，何事长向别时圆？人有悲欢离合，月有阴晴圆缺，此事古难全。但愿人长久，千里共婵娟。',
-    time: '2022年12月12日 17:16:00',
-  }]
-})
-
-// 变更记录默认数据
-const changeRecordData = reactive({
-  changeRecordList: [{
-    name: '诸葛亮',
-    type: 1,
-    time: '2023年5月6日 17:16:00',
-  }, {
-    name: '刘备',
-    type: 2,
-    time: '2023年5月6日 17:16:00',
-  }, {
-    name: '曹操',
-    type: 3,
-    time: '2023年5月6日 17:16:00',
-    file: [{
-      name: '这是个附件的名字.docx',
-      url: 'http://localhost:12080/admin-api/system/user/get-import-template'
-    }, {
-      name: '这是个附件的名字.docx',
-      url: 'http://localhost:12080/admin-api/system/user/get-import-template'
-    }]
-  }]
-})
-// 导入附件弹窗所需的参数
-const importTemplateData = reactive({
-  templateUrl: UserApi.importUserTemplate(),
-  templateTitle: '导入模版99.xls'
-})
-// 导入成功之后
-const importSuccess = () => {
-
-}
-/** 搜索按钮操作 */
-const handleQuery = () => {
-
-}
-
-/** 重置按钮操作 */
-const resetQuery = () => {
-  queryParams.pageNo = 1
-  queryFormRef.value.resetFields()
-}
-
-/** 用户导入 */
-const importFormRef = ref()
-const handleImport = () => {
-  importFormRef.value.open()
-}
-// 删除附件成功之后所走的方法
-const deleteAnnexSuccess = async () => {
-  console.log('删除成功');
-}
-// 备注提交成功之后
-const remarksSubmitSucss=()=>{
-  console.log('提交陈工');
-}
-
-
-import * as MailAccountApi from '@/api/system/mail/account'
-import { allSchemas, rules } from '@/views/system/mail/account/account.data'
-
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formRef = ref() // 表单 Ref
-
-
-/** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
-  // 校验表单
-  if (!formRef) return
-  const valid = await formRef.value.getElFormRef().validate()
-  if (!valid) return
-  // 提交请求
-  formLoading.value = true
-  try {
-    const data = formRef.value.formModel as MailAccountApi.MailAccountVO
-    if (formType.value === 'create') {
-      await MailAccountApi.createMailAccount(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await MailAccountApi.updateMailAccount(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-</script>
diff --git a/src/views/infra/customInterface/index.vue b/src/views/infra/customInterface/index.vue
index 823aa1219..935922305 100644
--- a/src/views/infra/customInterface/index.vue
+++ b/src/views/infra/customInterface/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <ContentWrap>
-    <IFrame :src="src" />
-  </ContentWrap>
+    <IFrame :src="src"/>
 </template>
 <script lang="ts" setup name="CustomInterface">
 // import { getAccessToken, getTenantId } from '@/utils/auth'
diff --git a/src/views/wms/itembasic/ItembasicForm.vue b/src/views/wms/itembasic/ItembasicForm.vue
index 557c60bb8..975eabc44 100644
--- a/src/views/wms/itembasic/ItembasicForm.vue
+++ b/src/views/wms/itembasic/ItembasicForm.vue
@@ -4,7 +4,7 @@
       <Form ref="formRef" v-loading="formLoading" :rules="ItemBasicRules" :schema="ItemBasic.allSchemas.formSchema"
         :model="formData" :is-col="true" />
       <div class="table">
-        <TableForm ref="tableFormRef"  :tableFields="ItemBasic.allSchemas.tableFormColumns" :tableData="tableData" class="w-[100%]" @handleAdd="handleAdd" :tableFormRules="ItemBasicRules" @handleDelete="handleDelete"/>
+        <TableForm ref="tableFormRef"  :tableFields="ItemBasic.allSchemas.tableFormColumns" :tableData="tableData" class="w-[100%]" @handleAdd="handleAdd" :tableFormRules="ItemBasicRules" @handleDelete="handleDelete" @inpuFocus="inpuFocus"/>
       </div>
     </div>
     <template #footer>
@@ -164,6 +164,11 @@ const handleAdd = ()=>{
 const handleDelete =(item,index)=>{
   tableData.value.splice(index,1)
 }
+// input聚焦的时候操作
+const inpuFocus = () => {
+  console.log(1);
+  
+}
 </script>
 <style scoped>
 .table {

From 2d2d90e408a3d6d97f74ea7f69aab0ec0bb7220d Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Tue, 17 Oct 2023 08:00:55 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E7=9B=B4=E8=BF=9Ejava=E7=AB=AF=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.test | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env.test b/.env.test
index 3cb46094c..3d5028e29 100644
--- a/.env.test
+++ b/.env.test
@@ -4,10 +4,10 @@ NODE_ENV=test
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://dev.ccwin-in.com:25100/api'
+VITE_BASE_URL='http://dev.ccwin-in.com:25110'
 
 # 上传路径
-VITE_UPLOAD_URL='http://dev.ccwin-in.com:25100/api/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://dev.ccwin-in.com:25110/admin-api/infra/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=
@@ -31,4 +31,4 @@ VITE_BASE_PATH=/
 VITE_OUT_DIR=dist-test
 
 # 自定义接口路径
-VITE_INTERFACE_URL='http://dev.ccwin-in.com:25100/magic/web/index.html'
+VITE_INTERFACE_URL='http://dev.ccwin-in.com:25110/magic/web/index.html'