From 05cd45a18d7dcf0bf7245456f8c441e6e8652d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9C=B1=E8=BF=9B?= <barry-zhu@szlecheng.cn>
Date: Thu, 21 May 2026 16:23:35 +0800
Subject: [PATCH] =?UTF-8?q?refactor(contracttemp):=20=E7=94=A8=E6=8A=BD?=
 =?UTF-8?q?=E5=B1=89=E6=9B=BF=E6=8D=A2=E6=A8=A1=E6=80=81=E6=A1=86=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=AF=A6=E6=83=85=E5=92=8C=E8=A1=A8=E5=8D=95=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 Detail.vue 与 Form.vue 中的 BasicModal 替换为 BasicDrawer
- 调整详情页和表单页布局样式，包含内边距和宽度设置
- 更新状态管理和方法，匹配抽屉打开、关闭与加载流程
- 统一合同打印模板字段列展示格式，修正字段名错误
- 增加合同模版编码与名称为必填且唯一属性
- 修正合同参数和打印模板的提示文案细节
- 优化代码格式及空格缩进统一规范
---
 src/views/cm/contracttemp/Detail.vue          | 775 +++++++++---------
 src/views/cm/contracttemp/Form.vue            |  57 +-
 .../cm/contracttemp/helper/columnList.ts      |   5 +-
 .../cm/contracttemp/helper/superQueryJson.ts  |  19 +-
 4 files changed, 436 insertions(+), 420 deletions(-)

diff --git a/src/views/cm/contracttemp/Detail.vue b/src/views/cm/contracttemp/Detail.vue
index b4599b4..47cc38f 100644
--- a/src/views/cm/contracttemp/Detail.vue
+++ b/src/views/cm/contracttemp/Detail.vue
@@ -1,423 +1,418 @@
 <template>
-    <BasicModal v-bind="$attrs" @register="registerModal" :title="title" width="1000px" :minHeight="100"
-        :showOkBtn="false">
+    <BasicDrawer v-bind="$attrs" @register="registerDrawer" :title="title" width="80%" showFooter
+                 :showOkBtn="false">
         <template #insertFooter>
         </template>
-        <!-- 表单 -->
-        <a-row class="dynamic-form ">
-            <a-form :colon="false" size="middle" layout="horizontal" labelAlign="right"
-                :labelCol="{ style: { width: '100px' } }" :model="dataForm" ref="formRef">
-                <a-row :gutter="15">
-                    <!-- 具体表单 -->
-                    <a-col :span="12" class="ant-col-item">
-                        <a-form-item name="contract_temp_code">
-                            <template #label>合同模版编码
-                            </template>
-                            <YunzhupaasInput v-model:value="dataForm.contract_temp_code" placeholder="请输入" disabled
-                                detailed allowClear :style='{ "width": "100%" }'
-                                :maskConfig="maskConfig.contract_temp_code">
-                            </YunzhupaasInput>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="12" class="ant-col-item">
-                        <a-form-item name="contract_temp_name">
-                            <template #label>合同模版名称
-                            </template>
-                            <YunzhupaasInput v-model:value="dataForm.contract_temp_name" placeholder="请输入" disabled
-                                detailed allowClear :style='{ "width": "100%" }'
-                                :maskConfig="maskConfig.contract_temp_name">
-                            </YunzhupaasInput>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="24" class="ant-col-item">
-                        <a-form-item name="remark">
-                            <template #label>备注
-                            </template>
-                            <p>{{ dataForm.remark }}</p>
-                        </a-form-item>
-                    </a-col>
-                    <a-col :span="24" class="ant-col-item">
-                        <a-tabs v-model:activeKey="state.activetabformItem45e7a2" tabPosition="left" class="mb-20">
-                            <a-tab-pane tab="合同框架" key="1" forceRender>
-                                <a-row :gutter="15">
-                                    <table class="table-grid-box"
-                                        :style='{ "--borderType": "solid", "--borderColor": "#E2E0E0", "--borderWidth": "1px" }'>
-                                        <tbody>
-                                            <tr>
-                                                <td colspan="1" rowspan="1">
-                                                    <a-col :span="24" class="ant-col-item">
-                                                        <a-form-item name="is_framework">
-                                                            <template #label>框架合同
-                                                                <BasicHelp text="是：只有合同基本信息和合同主体，无合同清单、金额、付款计划。否：反之" />
-                                                            </template>
-                                                            <p>{{ dataForm.is_framework }}</p>
-                                                        </a-form-item>
-                                                    </a-col>
-                                                </td>
-                                                <td colspan="1" rowspan="1">
-                                                    <a-col :span="24" class="ant-col-item">
-                                                        <a-form-item name="is_detail_list">
-                                                            <template #label>清单合同
-                                                                <BasicHelp
-                                                                    text="是：显示合同清单，合同金额根据清单金额汇总生成；否：不显示清单，只显示合同金额与付款计划，合同金额手工录入" />
-                                                            </template>
-                                                            <p>{{ dataForm.is_detail_list }}</p>
-                                                        </a-form-item>
-                                                    </a-col>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td colspan="1" rowspan="1">
-                                                    <a-col :span="24" class="ant-col-item">
-                                                        <a-form-item name="enable_tableProductList">
-                                                            <template #label>启用产品清单
-                                                            </template>
-                                                            <p>{{ dataForm.enable_tableProductList }}</p>
-                                                        </a-form-item>
-                                                    </a-col>
-                                                </td>
-                                                <td colspan="1" rowspan="1">
-                                                    <a-col :span="24" class="ant-col-item">
-                                                        <a-form-item name="enable_tableMaterialList">
-                                                            <template #label>启用材料清单
-                                                            </template>
-                                                            <p>{{ dataForm.enable_tableMaterialList }}</p>
-                                                        </a-form-item>
-                                                    </a-col>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td colspan="1" rowspan="1">
-                                                    <a-col :span="24" class="ant-col-item">
-                                                        <a-form-item name="enable_tableWorktypeList">
-                                                            <template #label>启用人力清单
-                                                            </template>
-                                                            <p>{{ dataForm.enable_tableWorktypeList }}</p>
-                                                        </a-form-item>
-                                                    </a-col>
-                                                </td>
-                                                <td colspan="1" rowspan="1">
-                                                    <a-col :span="24" class="ant-col-item">
-                                                        <a-form-item name="enable_tableAssetList">
-                                                            <template #label>启用资产清单
-                                                            </template>
-                                                            <p>{{ dataForm.enable_tableAssetList }}</p>
-                                                        </a-form-item>
-                                                    </a-col>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td colspan="1" rowspan="1">
-                                                    <a-col :span="24" class="ant-col-item">
-                                                        <a-form-item name="enable_tableTaskList">
-                                                            <template #label>启用任务清单
-                                                            </template>
-                                                            <p>{{ dataForm.enable_tableTaskList }}</p>
-                                                        </a-form-item>
-                                                    </a-col>
-                                                </td>
-                                                <td colspan="1" rowspan="1">
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td colspan="1" rowspan="1">
-                                                </td>
-                                                <td colspan="1" rowspan="1">
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </a-row>
-                            </a-tab-pane>
-                            <a-tab-pane tab="合同参数" key="2" forceRender>
-                                <a-row :gutter="15">
-                                    <table class="table-grid-box"
-                                        :style='{ "--borderType": "solid", "--borderColor": "#E2E0E0", "--borderWidth": "1px" }'>
-                                        <tbody>
-                                            <tr>
-                                                <td colspan="1" rowspan="1">
-                                                    <a-col :span="24" class="ant-col-item">
-                                                        <a-form-item name="contract_type">
-                                                            <template #label>合同类型
-                                                            </template>
-                                                            <p>{{ dataForm.contract_type }}</p>
-                                                        </a-form-item>
-                                                    </a-col>
-                                                </td>
-                                                <td colspan="1" rowspan="1">
-                                                    <a-col :span="24" class="ant-col-item">
-                                                        <a-form-item name="enable_printing">
-                                                            <template #label>启用在线打印
-                                                            </template>
-                                                            <p>{{ dataForm.enable_printing }}</p>
-                                                        </a-form-item>
-                                                    </a-col>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td colspan="1" rowspan="1">
-                                                    <a-col :span="24" class="ant-col-item">
-                                                        <a-form-item name="our_company_type">
-                                                            <template #label>我方签约类型
-                                                            </template>
-                                                            <p>{{ dataForm.our_company_type }}</p>
-                                                        </a-form-item>
-                                                    </a-col>
-                                                </td>
-                                                <td colspan="1" rowspan="1">
-                                                    <a-col :span="24" class="ant-col-item">
-                                                        <a-form-item name="second_party_type">
-                                                            <template #label>乙方签约类型
-                                                            </template>
-                                                            <p>{{ dataForm.second_party_type }}</p>
-                                                        </a-form-item>
-                                                    </a-col>
-                                                </td>
-                                            </tr>
-                                            <tr>
-                                                <td colspan="1" rowspan="1">
-                                                    <a-col :span="24" class="ant-col-item">
-                                                        <a-form-item name="third_party_type">
-                                                            <template #label>丙方签约类型
-                                                            </template>
-                                                            <p>{{ dataForm.third_party_type }}</p>
-                                                        </a-form-item>
-                                                    </a-col>
-                                                </td>
-                                                <td colspan="1" rowspan="1">
-                                                </td>
-                                            </tr>
-                                        </tbody>
-                                    </table>
-                                </a-row>
-                            </a-tab-pane>
-                            <a-tab-pane tab="打印模版" key="fbb4be" forceRender>
-                                <a-row :gutter="15">
-                                    <a-col :span="24" class="ant-col-item  mb-20px">
-                                        <a-form-item>
-                                            <a-table :data-source="dataForm.tablePrintingTemp"
-                                                :columns="contractPrintingTempColumns" size="small" :pagination="false"
-                                                :scroll="{ x: 'max-content' }">
-                                                <template #headerCell="{ column }">
-                                                    <span class="required-sign" v-if="column.required">*</span>
-                                                    {{ column.title }}
-                                                    <BasicHelp :text="column.tipLabel"
-                                                        v-if="column.tipLabel && column.title" />
-                                                </template>
-                                                <template #bodyCell="{ column, index, record }">
-                                                    <template v-if="column.key === 'index'">{{ index + 1 }}</template>
-                                                    <template v-if="column.key === 'printing_temp_id'">
-                                                        <p>{{ record.printing_temp_id }}</p>
-                                                    </template>
-                                                    <template v-if="column.key === 'is_enabled'">
-                                                        <p>{{ record.is_enabled }}</p>
-                                                    </template>
-                                                </template>
-                                            </a-table>
-                                        </a-form-item>
-                                    </a-col>
-                                </a-row>
-                            </a-tab-pane>
-                        </a-tabs>
-                    </a-col>
-                    <!-- 表单结束 -->
+        <a-row class="p-10px dynamic-form ">
+            <!-- 表单 -->
+                <a-form :colon="false" size="middle" layout= "horizontal" 
+            labelAlign= "right" 
+ :labelCol="{ style: { width: '100px' } }"             :model="dataForm"  ref="formRef" >
+            <a-row :gutter="15">
+                <!-- 具体表单 -->
+        <a-col :span="12" class="ant-col-item"  >
+        <a-form-item    
+  name="contract_temp_code" >
+<template #label>合同模版编码 
+</template>     <YunzhupaasInput    v-model:value="dataForm.contract_temp_code"
+ placeholder="请输入"   disabled
+ detailed  allowClear  :style='{"width":"100%"}' :maskConfig = "maskConfig.contract_temp_code"    >
+    </YunzhupaasInput>
+        </a-form-item>
+    </a-col>
+        <a-col :span="12" class="ant-col-item"  >
+        <a-form-item    
+  name="contract_temp_name" >
+<template #label>合同模版名称 
+</template>     <YunzhupaasInput    v-model:value="dataForm.contract_temp_name"
+ placeholder="请输入"   disabled
+ detailed  allowClear  :style='{"width":"100%"}' :maskConfig = "maskConfig.contract_temp_name"    >
+    </YunzhupaasInput>
+        </a-form-item>
+    </a-col>
+        <a-col :span="24" class="ant-col-item"  >
+        <a-form-item    
+  name="remark" >
+<template #label>备注 
+</template>             <p>{{dataForm.remark}}</p>
+        </a-form-item>
+    </a-col>
+                <a-col :span="24" class="ant-col-item">
+                    <a-tabs  v-model:activeKey="state.activetabformItem45e7a2"  tabPosition="left" class="mb-20" >
+                    <a-tab-pane   tab="合同框架" key="1" forceRender>
+                    <a-row :gutter="15">
+                    <table class="table-grid-box" :style='{"--borderType":"solid","--borderColor":"#E2E0E0","--borderWidth":"1px"}'>
+                    <tbody>
+                    <tr>
+                    <td colspan="1" rowspan="1">
+        <a-col :span="24" class="ant-col-item"  >
+        <a-form-item    
+  name="is_framework" >
+<template #label>框架合同 
+                        <BasicHelp  text="是：只有合同基本信息和合同主体，无合同清单、金额、付款计划。否：反之"  /></template>             <p>{{dataForm.is_framework}}</p>
+        </a-form-item>
+    </a-col>
+                    </td>
+                    <td colspan="1" rowspan="1">
+        <a-col :span="24" class="ant-col-item"  >
+        <a-form-item    
+  name="is_detail_list" >
+<template #label>清单合同 
+                        <BasicHelp  text="是：显示合同清单，合同金额根据清单金额汇总生成；否：不显示清单，只显示合同金额与付款计划，合同金额手工录入"  /></template>             <p>{{dataForm.is_detail_list}}</p>
+        </a-form-item>
+    </a-col>
+                    </td>
+                    </tr>
+                    <tr>
+                    <td colspan="1" rowspan="1">
+        <a-col :span="24" class="ant-col-item"  >
+        <a-form-item    
+  name="enable_tableProductList" >
+<template #label>启用产品清单 
+</template>             <p>{{dataForm.enable_tableProductList}}</p>
+        </a-form-item>
+    </a-col>
+                    </td>
+                    <td colspan="1" rowspan="1">
+        <a-col :span="24" class="ant-col-item"  >
+        <a-form-item    
+  name="enable_tableMaterialList" >
+<template #label>启用材料清单 
+</template>             <p>{{dataForm.enable_tableMaterialList}}</p>
+        </a-form-item>
+    </a-col>
+                    </td>
+                    </tr>
+                    <tr>
+                    <td colspan="1" rowspan="1">
+        <a-col :span="24" class="ant-col-item"  >
+        <a-form-item    
+  name="enable_tableWorktypeList" >
+<template #label>启用人力清单 
+</template>             <p>{{dataForm.enable_tableWorktypeList}}</p>
+        </a-form-item>
+    </a-col>
+                    </td>
+                    <td colspan="1" rowspan="1">
+        <a-col :span="24" class="ant-col-item"  >
+        <a-form-item    
+  name="enable_tableAssetList" >
+<template #label>启用资产清单 
+</template>             <p>{{dataForm.enable_tableAssetList}}</p>
+        </a-form-item>
+    </a-col>
+                    </td>
+                    </tr>
+                    <tr>
+                    <td colspan="1" rowspan="1">
+        <a-col :span="24" class="ant-col-item"  >
+        <a-form-item    
+  name="enable_tableTaskList" >
+<template #label>启用任务清单 
+</template>             <p>{{dataForm.enable_tableTaskList}}</p>
+        </a-form-item>
+    </a-col>
+                    </td>
+                    <td colspan="1" rowspan="1">
+                    </td>
+                    </tr>
+                    <tr>
+                    <td colspan="1" rowspan="1">
+                    </td>
+                    <td colspan="1" rowspan="1">
+                    </td>
+                    </tr>
+                    </tbody>
+                    </table>
                 </a-row>
+                </a-tab-pane >
+                    <a-tab-pane   tab="合同参数" key="2" forceRender>
+                    <a-row :gutter="15">
+                    <table class="table-grid-box" :style='{"--borderType":"solid","--borderColor":"#E2E0E0","--borderWidth":"1px"}'>
+                    <tbody>
+                    <tr>
+                    <td colspan="1" rowspan="1">
+        <a-col :span="24" class="ant-col-item"  >
+        <a-form-item    
+  name="contract_type" >
+<template #label>合同类型 
+</template>             <p>{{dataForm.contract_type}}</p>
+        </a-form-item>
+    </a-col>
+                    </td>
+                    <td colspan="1" rowspan="1">
+        <a-col :span="24" class="ant-col-item"  >
+        <a-form-item    
+  name="enable_printing" >
+<template #label>启用在线打印 
+</template>             <p>{{dataForm.enable_printing}}</p>
+        </a-form-item>
+    </a-col>
+                    </td>
+                    </tr>
+                    <tr>
+                    <td colspan="1" rowspan="1">
+        <a-col :span="24" class="ant-col-item"  >
+        <a-form-item    
+  name="our_company_type" >
+<template #label>我方签约类型 
+</template>             <p>{{dataForm.our_company_type}}</p>
+        </a-form-item>
+    </a-col>
+                    </td>
+                    <td colspan="1" rowspan="1">
+        <a-col :span="24" class="ant-col-item"  >
+        <a-form-item    
+  name="second_party_type" >
+<template #label>乙方签约类型 
+</template>             <p>{{dataForm.second_party_type}}</p>
+        </a-form-item>
+    </a-col>
+                    </td>
+                    </tr>
+                    <tr>
+                    <td colspan="1" rowspan="1">
+        <a-col :span="24" class="ant-col-item"  >
+        <a-form-item    
+  name="third_party_type" >
+<template #label>丙方签约类型 
+</template>             <p>{{dataForm.third_party_type}}</p>
+        </a-form-item>
+    </a-col>
+                    </td>
+                    <td colspan="1" rowspan="1">
+                    </td>
+                    </tr>
+                    </tbody>
+                    </table>
+                </a-row>
+                </a-tab-pane >
+                    <a-tab-pane   tab="打印模版" key="fbb4be" forceRender>
+                    <a-row :gutter="15">
+<a-col :span="24" class="ant-col-item  mb-20px"  >
+<a-form-item>
+    <a-table :data-source="dataForm.tablePrintingTemp"  
+             :columns="contractPrintingTempColumns" size="small" :pagination="false" :scroll="{ x: 'max-content' }">
+        <template #headerCell="{ column }">
+            <span class="required-sign" v-if="column.required">*</span>
+            {{ column.title }}
+            <BasicHelp :text="column.tipLabel" v-if="column.tipLabel && column.title" />
+        </template>
+        <template #bodyCell="{ column, index, record }">
+            <template v-if="column.key === 'index'">{{ index + 1 }}</template>
+                <template v-if="column.key ===  'printing_temp_id' ">
+            <p>{{record.printing_temp_id}}</p>
+                </template>
+                <template v-if="column.key ===  'is_enabled' ">
+            <p>{{record.is_enabled}}</p>
+                </template>
+        </template>
+    </a-table>
+</a-form-item>
+</a-col>
+                </a-row>
+                </a-tab-pane >
+                </a-tabs>
+                </a-col>
+                <!-- 表单结束 -->
+            </a-row>
             </a-form>
         </a-row>
-    </BasicModal>
+    </BasicDrawer>
     <!-- 有关联表单详情：开始 -->
     <RelationDetail ref="relationDetailRef" />
     <!-- 有关联表单详情：结束 -->
 </template>
 <script lang="ts" setup>
-import { getDetailInfo } from './helper/api';
-import { getConfigData } from '@/api/onlineDev/visualDev';
-import { reactive, toRefs, nextTick, ref, computed, unref, toRaw } from 'vue';
-import { BasicModal, useModal } from '@/components/Modal';
-// 有关联表单详情
-import RelationDetail from '@/views/common/dynamicModel/list/detail/index.vue';
-// 表单权限
-import { usePermission } from '@/hooks/web/usePermission';
-import { useMessage } from '@/hooks/web/useMessage';
-import { CaretRightOutlined } from '@ant-design/icons-vue';
-import { buildUUID } from '@/utils/uuid';
-import { useI18n } from '@/hooks/web/useI18n';
-import { getDataChange } from '@/api/onlineDev/visualDev';
-import { getDataInterfaceDataInfoByIds } from '@/api/systemData/dataInterface';
-import ExtraRelationInfo from '@/components/yunzhupaas/RelationForm/src/ExtraRelationInfo.vue';
+    import { getDetailInfo } from './helper/api';
+    import { getConfigData } from '@/api/onlineDev/visualDev';
+    import { reactive, toRefs, nextTick, ref, computed, unref ,toRaw} from 'vue';
+    import { BasicModal, useModal } from '@/components/Modal';
+    import { BasicDrawer, useDrawer } from '@/components/Drawer';
+    // 有关联表单详情
+    import RelationDetail from '@/views/common/dynamicModel/list/detail/index.vue';
+    // 表单权限
+    import { usePermission } from '@/hooks/web/usePermission';
+    import { useMessage } from '@/hooks/web/useMessage';
+    import { CaretRightOutlined } from '@ant-design/icons-vue';
+    import { buildUUID } from '@/utils/uuid';
+    import { useI18n } from '@/hooks/web/useI18n';
+    import { getDataChange } from '@/api/onlineDev/visualDev';
+    import { getDataInterfaceDataInfoByIds } from '@/api/systemData/dataInterface';
+    import ExtraRelationInfo from '@/components/yunzhupaas/RelationForm/src/ExtraRelationInfo.vue';
 
-interface State {
-    dataForm: any;
-    title: string;
-    maskConfig: any;
-    interfaceRes: any;
-    locationScope: any;
-    extraOptions: any;
-    extraData: any;
+    interface State {
+        dataForm: any;
+        title: string;
+        maskConfig: any;
+        interfaceRes: any;
+        locationScope: any;
+        extraOptions: any;
+        extraData: any;
 
-    activetabformItem45e7a2: any;
-}
+            activetabformItem45e7a2:any;
+    }
 
-defineOptions({ name: 'Detail' });
-const { createMessage, createConfirm } = useMessage();
-const [registerModal, { openModal, setModalProps, closeModal }] = useModal();
-const contractPrintingTempColumns: any[] = computed(() => {
-    let list = [
+    defineOptions({ name: 'Detail' });
+    const { createMessage, createConfirm } = useMessage();
+    const [registerDrawer, { openDrawer, setDrawerProps, closeDrawer }] = useDrawer();
+        const contractPrintingTempColumns: any[] = computed(() => {
+        let list = [
         {
-            title: '打印模版ID',
-            dataIndex: 'printing_temp_id',
-            key: 'printing_temp_id',
+            title:  '打印模版ID' ,
+            dataIndex:  'printing_temp_id' ,
+            key:  'printing_temp_id' ,
             width: 350,
-            labelWidth: '',
-            span: '24',
-            tipLabel: '',
+            labelWidth: '' ,
+            span:'24',
+            tipLabel:  '' ,
             required: false,
-            style: { "width": "100%" },
-            align: 'left',
-            fixed: false,
-            formP: 'printing_temp_id',
+            style: {"width":"100%"} ,
+            align:  'left',
+            fixed:  false ,
+            formP:  'printing_temp_id' ,
         },
         {
-            title: '是否启用',
-            dataIndex: 'is_enabled',
-            key: 'is_enabled',
-            labelWidth: '',
-            span: '24',
-            tipLabel: '',
+            title:  '是否启用' ,
+            dataIndex:  'is_enabled' ,
+            key:  'is_enabled' ,
+            labelWidth: '' ,
+            span:'24',
+            tipLabel:  '' ,
             required: false,
-            style: '',
-            align: 'left',
-            fixed: false,
-            formP: 'is_enabled',
+            style:  '',
+            align:  'left',
+            fixed:  false ,
+            formP:  'is_enabled' ,
         },
-    ];
-    const indexColumn = { title: '序号', showLabel: true, dataIndex: 'index', key: 'index', align: 'center', fixed: 'left', width: 50 };
-    //子表复杂表头-处理
-    let columnList = list;
-    let complexHeaderList: any[] = [];
-    if (complexHeaderList.length) {
-        let childColumns: any[] = [];
-        let firstChildColumns: string[] = [];
-        for (let i = 0; i < complexHeaderList.length; i++) {
-            const e = complexHeaderList[i];
-            e.title = e.fullNameI18nCode ? t(e.fullNameI18nCode, e.fullName) : e.fullName;
-            e.align = e.align;
-            e.children = [];
-            e.yunzhupaasKey = 'complexHeader';
-            if (e.childColumns?.length) {
-                childColumns.push(...e.childColumns);
-                for (let k = 0; k < e.childColumns.length; k++) {
-                    const item = e.childColumns[k];
-                    for (let j = 0; j < list.length; j++) {
-                        const o = list[j];
-                        if (o.key == item && o.fixed !== 'left' && o.fixed !== 'right') e.children.push({ ...o });
+        ];
+                const indexColumn = { title: '序号', showLabel: true, dataIndex: 'index', key: 'index', align: 'center', fixed: 'left', width: 50 };
+        //子表复杂表头-处理
+        let columnList = list;
+        let complexHeaderList: any[] =  []; 
+        if (complexHeaderList.length) {
+            let childColumns: any[] = [];
+            let firstChildColumns: string[] = [];
+            for (let i = 0; i < complexHeaderList.length; i++) {
+                const e = complexHeaderList[i];
+                e.title = e.fullNameI18nCode ? t(e.fullNameI18nCode,e.fullName) : e.fullName;
+                e.align = e.align;
+                e.children = [];
+                e.yunzhupaasKey = 'complexHeader';
+                if (e.childColumns?.length) {
+                    childColumns.push(...e.childColumns);
+                    for (let k = 0; k < e.childColumns.length; k++) {
+                        const item = e.childColumns[k];
+                        for (let j = 0; j < list.length; j++) {
+                            const o = list[j];
+                            if (o.key == item && o.fixed !== 'left' && o.fixed !== 'right') e.children.push({ ...o });
+                        }
+                    }
+                }
+                if (e.children.length) firstChildColumns.push(e.children[0].key);
+            }
+            complexHeaderList = complexHeaderList.filter(o => o.children.length);
+            let newList: any[] = [];
+            for (let i = 0; i < list.length; i++) {
+                const e = list[i];
+                if (!childColumns.includes(e.key) || e.fixed === 'left' || e.fixed === 'right') {
+                    newList.push(e);
+                } else {
+                    if (firstChildColumns.includes(e.key)) {
+                        const item = complexHeaderList.find(o => o.childColumns.includes(e.key));
+                        newList.push(item);
                     }
                 }
             }
-            if (e.children.length) firstChildColumns.push(e.children[0].key);
+            columnList = newList;
         }
-        complexHeaderList = complexHeaderList.filter(o => o.children.length);
-        let newList: any[] = [];
-        for (let i = 0; i < list.length; i++) {
-            const e = list[i];
-            if (!childColumns.includes(e.key) || e.fixed === 'left' || e.fixed === 'right') {
-                newList.push(e);
-            } else {
-                if (firstChildColumns.includes(e.key)) {
-                    const item = complexHeaderList.find(o => o.childColumns.includes(e.key));
-                    newList.push(item);
-                }
-            }
-        }
-        columnList = newList;
-    }
-    let columns = [indexColumn, ...columnList]
-    const leftFixedList = columns.filter(o => o.fixed === 'left');
-    const rightFixedList = columns.filter(o => o.fixed === 'right');
-    const noFixedList = columns.filter(o => o.fixed !== 'left' && o.fixed !== 'right');
-    return [...leftFixedList, ...noFixedList, ...rightFixedList];
-});
-
-const { t } = useI18n();
-const relationDetailRef = ref<any>(null);
-const state = reactive<State>({
-    dataForm: {},
-    title: t('common.detailText', '详情'),
-    maskConfig: {
-        contract_temp_code: { "prefixType": 1, "useUnrealMask": false, "maskType": 1, "unrealMaskLength": 1, "prefixLimit": 0, "suffixLimit": 0, "filler": "*", "prefixSpecifyChar": "", "suffixType": 1, "ignoreChar": "", "suffixSpecifyChar": "" },
-        contract_temp_name: { "prefixType": 1, "useUnrealMask": false, "maskType": 1, "unrealMaskLength": 1, "prefixLimit": 0, "suffixLimit": 0, "filler": "*", "prefixSpecifyChar": "", "suffixType": 1, "ignoreChar": "", "suffixSpecifyChar": "" },
-    }
-    ,
-    interfaceRes: { "enable_tableAssetList": [], "is_framework": [], "enable_tableMaterialList": [], "enable_printing": [], "our_company_type": [], "third_party_type": [], "remark": [], "contractPrintingTempprinting_temp_id": [], "enable_tableWorktypeList": [], "contract_type": [], "enable_tableTaskList": [], "contractPrintingTempis_enabled": [], "contract_temp_code": [], "enable_tableProductList": [], "is_detail_list": [], "second_party_type": [], "contract_temp_name": [] },
-    locationScope: {
-    }
-    ,
-    extraOptions: {
-    }
-    ,
-    extraData: {
-    }
-    ,
-    activetabformItem45e7a2: 'fbb4be',
-});
-const { title, dataForm, maskConfig } = toRefs(state);
-// 表单权限
-const { hasFormP } = usePermission();
-
-defineExpose({ init });
-
-function init(data) {
-    state.dataForm.id = data.id;
-    openModal();
-    nextTick(() => {
-        setTimeout(initData, 0);
+        let columns =  [indexColumn, ...columnList]
+        const leftFixedList = columns.filter(o => o.fixed === 'left');
+        const rightFixedList = columns.filter(o => o.fixed === 'right');
+        const noFixedList = columns.filter(o => o.fixed !== 'left' && o.fixed !== 'right');
+        return [...leftFixedList, ...noFixedList, ...rightFixedList];
     });
+
+    const { t } = useI18n();
+    const relationDetailRef = ref<any>(null);
+    const state = reactive<State>({
+        dataForm:{},
+        title: t('common.detailText','详情'),
+        maskConfig:{
+        contract_temp_code: {"prefixType":1,"useUnrealMask":false,"maskType":1,"unrealMaskLength":1,"prefixLimit":0,"suffixLimit":0,"filler":"*","prefixSpecifyChar":"","suffixType":1,"ignoreChar":"","suffixSpecifyChar":""} ,
+        contract_temp_name: {"prefixType":1,"useUnrealMask":false,"maskType":1,"unrealMaskLength":1,"prefixLimit":0,"suffixLimit":0,"filler":"*","prefixSpecifyChar":"","suffixType":1,"ignoreChar":"","suffixSpecifyChar":""} ,
 }
-function initData() {
-    changeLoading(true);
-    state.activetabformItem45e7a2 = 'fbb4be';
-    if (state.dataForm.id) {
-        getData(state.dataForm.id);
-    } else {
-        closeModal();
-    }
+,
+        interfaceRes: {"enable_tableAssetList":[],"is_framework":[],"enable_tableMaterialList":[],"enable_printing":[],"our_company_type":[],"third_party_type":[],"remark":[],"contractPrintingTempprinting_temp_id":[],"enable_tableWorktypeList":[],"contract_type":[],"enable_tableTaskList":[],"contractPrintingTempis_enabled":[],"contract_temp_code":[],"enable_tableProductList":[],"is_detail_list":[],"second_party_type":[],"contract_temp_name":[]},
+        locationScope:{
 }
-function getData(id) {
-    getDetailInfo(id).then((res) => {
-        state.dataForm = res.data || {};
+,
+        extraOptions: {
+}
+,
+        extraData: {
+}
+,
+        activetabformItem45e7a2:'1',
+    });
+    const { title, dataForm, maskConfig } = toRefs(state);
+    // 表单权限
+    const { hasFormP } = usePermission();
+
+    defineExpose({ init });
+
+    function init(data) {
+        state.dataForm.id = data.id;
+            openDrawer();
         nextTick(() => {
-            changeLoading(false);
+            setTimeout(initData, 0);
         });
-    });
-}
-
-function toDetail(modelId, id, propsValue) {
-    if (!id) return;
-    getConfigData(modelId).then((res) => {
-        if (!res.data || !res.data.formData) return;
-        const formConf = JSON.parse(res.data.formData);
-        formConf.popupType = 'general';
-        formConf.hasPrintBtn = false;
-        formConf.customBtns = [];
-        const data = { id, formConf, modelId, propsValue };
-        relationDetailRef.value?.init(data);
-    });
-}
-function setFormProps(data) {
-    setModalProps(data);
-}
-function changeLoading(loading) {
-    setFormProps({ loading });
-}
-
-function getParamList(key) {
-    let templateJson: any[] = state.interfaceRes[key];
-    if (!templateJson || !templateJson.length || !state.dataForm) return templateJson;
-    for (let i = 0; i < templateJson.length; i++) {
-        if (templateJson[i].relationField && templateJson[i].sourceType == 1) {
-            templateJson[i].defaultValue = state.dataForm[templateJson[i].relationField + '_id'] || '';
+    }
+    function initData() {
+        changeLoading(true);
+            state.activetabformItem45e7a2='1';
+        if (state.dataForm.id) {
+            getData(state.dataForm.id);
+        } else {
+            closeDrawer();
         }
     }
-    return templateJson;
-}
+    function getData(id) {
+        getDetailInfo(id).then((res) => {
+            state.dataForm = res.data || {};
+            nextTick(() => {
+                changeLoading(false);
+            });
+        });
+    }
+
+    function toDetail(modelId, id, propsValue) {
+        if (!id) return;
+        getConfigData(modelId).then((res) => {
+            if (!res.data || !res.data.formData) return;
+            const formConf = JSON.parse(res.data.formData);
+            formConf.popupType = 'general';
+            formConf.hasPrintBtn = false;
+            formConf.customBtns = [];
+            const data = { id, formConf, modelId, propsValue};
+            relationDetailRef.value?.init(data);
+        });
+    }
+    function setFormProps(data) {
+        setDrawerProps(data);
+    }
+    function changeLoading(loading) {
+        setFormProps({ loading });
+    }
+    
+    function getParamList(key) {
+      let templateJson: any[] = state.interfaceRes[key];
+      if (!templateJson || !templateJson.length || !state.dataForm) return templateJson;
+      for (let i = 0; i < templateJson.length; i++) {
+        if (templateJson[i].relationField && templateJson[i].sourceType == 1) {
+          templateJson[i].defaultValue = state.dataForm[templateJson[i].relationField + '_id'] || '';
+        }
+      }
+      return templateJson;
+    }
 </script>
diff --git a/src/views/cm/contracttemp/Form.vue b/src/views/cm/contracttemp/Form.vue
index 84693ac..887a122 100644
--- a/src/views/cm/contracttemp/Form.vue
+++ b/src/views/cm/contracttemp/Form.vue
@@ -1,6 +1,5 @@
 <template>
-    <BasicModal v-bind="$attrs" @register="registerModal"  width="1000px"
-                    :minHeight="100"
+    <BasicDrawer v-bind="$attrs" @register="registerDrawer" width="80%" showFooter
 :cancelText="t('common.cancelText','取消')"
 :okText="t('common.okText','确定')"
                     @ok="handleSubmit" :closeFunc="onClose">
@@ -26,12 +25,13 @@
             <yunzhupaasCheckboxSingle v-model:value="submitType" :label="continueText" />
           </div>
         </template>
-        <a-row class="dynamic-form ">
+        <a-row class="p-10px dynamic-form ">
+            <!-- 表单 -->
             <a-form :colon="false" size="middle" layout= "horizontal" 
-            labelAlign= "right" 
- :labelCol="{ style: { width: '100px' } }"             :model="dataForm" :rules="dataRule" ref="formRef">
-            <a-row :gutter="15">
-                <!-- 具体表单 -->
+                labelAlign= "right" 
+ :labelCol="{ style: { width: '100px' } }"                 :model="dataForm" :rules="dataRule" ref="formRef" >
+                <a-row :gutter="15">
+                    <!-- 具体表单 -->
     <a-col :span="12" class="ant-col-item"  >
         <a-form-item   
   name="contract_temp_code" >
@@ -300,8 +300,6 @@
 
 <a-col :span="24" class="ant-col-item  mb-20px"    >
 <a-form-item>
-        <yunzhupaasGroupTitle  content="设计子表"  :bordered="false"
- helpMessage=""  />
 <a-table :data-source="dataForm.contractPrintingTempList"  
          :columns="contractPrintingTempColumns" size="small" :pagination="false" :scroll="{ x: 'max-content' }"
          :rowSelection="getcontractPrintingTempRowSelection" rowKey="yunzhupaasId">
@@ -346,16 +344,16 @@
             </a-tab-pane >
             </a-tabs>
             </a-col>
-                <!-- 表单结束 -->
-            </a-row>
+                    <!-- 表单结束 -->
+                </a-row>
             </a-form>
         </a-row>
-    </BasicModal>
+    </BasicDrawer>
 </template>
 <script lang="ts" setup>
     import { create, update, getInfo } from './helper/api';
     import { reactive, toRefs, nextTick, ref, unref, computed,toRaw, inject } from 'vue';
-    import { BasicModal, useModal } from '@/components/Modal';
+    import { BasicDrawer, useDrawer } from '@/components/Drawer';
     import { yunzhupaasRelationForm } from '@/components/yunzhupaas';
     import { useMessage } from '@/hooks/web/useMessage';
     import { useI18n } from '@/hooks/web/useI18n';
@@ -403,7 +401,7 @@ continueText: string;         allList: any[];
     const userInfo = userStore.getUserInfo;
     const { createMessage, createConfirm } = useMessage();
     const { t } = useI18n();
-    const [registerModal, { openModal, setModalProps }] = useModal();
+    const [registerDrawer, { openDrawer, setDrawerProps }] = useDrawer();
     const formRef = ref<FormInstance>();
     const contractPrintingTempColumns: any[] = computed(() => {
         let list = [
@@ -527,6 +525,27 @@ tableRows:{
 },
 
 dataRule: {
+                contract_temp_code: [
+                {
+                required: true,
+                message: t('sys.validate.textRequiredSuffix','不能为空'),
+                trigger: 'blur'
+                },
+            ],
+                contract_temp_name: [
+                {
+                required: true,
+                message: t('sys.validate.textRequiredSuffix','不能为空'),
+                trigger: 'blur'
+                },
+            ],
+                contract_type: [
+                {
+                required: true,
+                message: t('sys.validate.arrayRequiredPrefix	','请至少选择一个'),
+                trigger: 'change'
+                },
+            ],
 },
 
 optionsObj:{
@@ -558,7 +577,7 @@ maskConfig:{
 locationScope:{
 },
 
-                        activetabformItem45e7a2:'fbb4be',
+                        activetabformItem45e7a2:'1',
     selectedcontractPrintingTempRowKeys : [], 
 extraOptions:{
 },
@@ -585,7 +604,7 @@ extraOptions:{
         state.title = !data.id ? t('common.add2Text','新增') : t('common.editText','编辑');
  state.continueText = !data.id ? t('common.continueAndAddText','确定并新增') : t('common.continueText','确定并继续');         setFormProps({ continueLoading: false });
         state.dataForm.id = data.id;
-        openModal();
+        openDrawer();
         state.allList = data.allList;
         state.currIndex = state.allList.length && data.id ? state.allList.findIndex((item) => item.id === data.id) : 0;
         nextTick(() => {
@@ -596,7 +615,7 @@ extraOptions:{
     }
     function initData() {
         changeLoading(true);
-            state.activetabformItem45e7a2='fbb4be';
+            state.activetabformItem45e7a2='1';
         if (state.dataForm.id) {
             getData(state.dataForm.id);
         } else {
@@ -696,10 +715,10 @@ extraOptions:{
         getData(id);
     }
     function setFormProps(data) {
-        setModalProps(data);
+        setDrawerProps(data);
     }
     function changeLoading(loading) {
-        setModalProps({ loading });
+        setDrawerProps({ loading });
     }
     async function onClose() {
         if (state.isContinue) emit('reload');
diff --git a/src/views/cm/contracttemp/helper/columnList.ts b/src/views/cm/contracttemp/helper/columnList.ts
index 55ba4f1..4f766f6 100644
--- a/src/views/cm/contracttemp/helper/columnList.ts
+++ b/src/views/cm/contracttemp/helper/columnList.ts
@@ -23,11 +23,12 @@ const columnList = [
 			"label":"合同模版编码",
 			"trigger":"blur",
 			"showLabel":true,
-			"required":false,
+			"required":true,
 			"tableName":"cm_contract_temp",
 			"renderKey":1779197093361,
 			"layout":"colFormItem",
 			"tagIcon":"icon-ym icon-ym-generator-input",
+			"unique":true,
 			"tag":"YunzhupaasInput",
 			"regList":[],
 			"tableAlign":"left",
@@ -99,7 +100,7 @@ const columnList = [
 			"label":"合同模版名称",
 			"trigger":"blur",
 			"showLabel":true,
-			"required":false,
+			"required":true,
 			"tableName":"cm_contract_temp",
 			"renderKey":1779197096173,
 			"layout":"colFormItem",
diff --git a/src/views/cm/contracttemp/helper/superQueryJson.ts b/src/views/cm/contracttemp/helper/superQueryJson.ts
index 1e4477c..c301c83 100644
--- a/src/views/cm/contracttemp/helper/superQueryJson.ts
+++ b/src/views/cm/contracttemp/helper/superQueryJson.ts
@@ -25,11 +25,12 @@ const superQueryJson = [
 			"label":"合同模版编码",
 			"trigger":"blur",
 			"showLabel":true,
-			"required":false,
+			"required":true,
 			"tableName":"cm_contract_temp",
 			"renderKey":1779197093361,
 			"layout":"colFormItem",
 			"tagIcon":"icon-ym icon-ym-generator-input",
+			"unique":true,
 			"tag":"YunzhupaasInput",
 			"regList":[],
 			"tableAlign":"left",
@@ -92,7 +93,7 @@ const superQueryJson = [
 			"label":"合同模版名称",
 			"trigger":"blur",
 			"showLabel":true,
-			"required":false,
+			"required":true,
 			"tableName":"cm_contract_temp",
 			"renderKey":1779197096173,
 			"layout":"colFormItem",
@@ -192,7 +193,7 @@ const superQueryJson = [
 			],
 			"defaultValue":0,
 			"noShow":false,
-			"tipLabel":"是：只有合同基本信息和合同主体，无合同清单和金额。否：反之",
+			"tipLabel":"是：只有合同基本信息和合同主体，无合同清单、金额、付款计划。否：反之",
 			"tableFixed":"none",
 			"dragDisabled":false,
 			"className":[],
@@ -234,7 +235,7 @@ const superQueryJson = [
 			],
 			"defaultValue":1,
 			"noShow":false,
-			"tipLabel":"是：显示合同清单，合同金额根据清单金额汇总生成；否：不显示清单，合同金额手工录入",
+			"tipLabel":"是：显示合同清单，合同金额根据清单金额汇总生成；否：不显示清单，只显示合同金额与付款计划，合同金额手工录入",
 			"tableFixed":"none",
 			"dragDisabled":false,
 			"className":[],
@@ -496,7 +497,7 @@ const superQueryJson = [
 			"propsUrl":"",
 			"templateJson":[],
 			"showLabel":true,
-			"required":false,
+			"required":true,
 			"tableName":"cm_contract_temp",
 			"renderKey":1779206776300,
 			"tagIcon":"icon-ym icon-ym-generator-select",
@@ -810,7 +811,7 @@ const superQueryJson = [
 		],
 		"templateJson":[],
 		"__config__":{
-			"relationTable":"cm_contract_pringing_temp",
+			"relationTable":"cm_contract_printing_temp",
 			"yunzhupaasKey":"popupTableSelect",
 			"defaultValue":"",
 			"parentVModel":"tablePrintingTemp",
@@ -853,7 +854,7 @@ const superQueryJson = [
 		"filterable":true,
 		"clearable":true,
 		"multiple":false,
-		"fullName":"设计子表-打印模版ID",
+		"fullName":"打印模板-打印模版ID",
 		"relationField":"f_full_name",
 		"extraOptions":[],
 		"popupTitle":"选择数据",
@@ -867,7 +868,7 @@ const superQueryJson = [
 	{
 		"__config__":{
 			"formId":"formItemd53b4e",
-			"relationTable":"cm_contract_pringing_temp",
+			"relationTable":"cm_contract_printing_temp",
 			"yunzhupaasKey":"switch",
 			"visibility":[
 				"pc",
@@ -897,7 +898,7 @@ const superQueryJson = [
 		"activeValue":1,
 		"inactiveValue":0,
 		"__vModel__":"is_enabled",
-		"fullName":"设计子表-是否启用",
+		"fullName":"打印模板-是否启用",
 		"inactiveTxt":"N",
 		"fullNameI18nCode":[
 			"",