()
const searchForm = reactive({
contract_name: '',
@@ -287,6 +362,28 @@ const resetSearch = () => {
getList()
}
+// 更新状态
+const updateStatus = async (row: ContractTemplate) => {
+ try {
+ console.log('🔄 更新模板状态:', { id: row.id, status: row.contract_status })
+
+ await contractTemplateApi.updateStatus(row.id, row.contract_status)
+ console.log('✅ 状态更新成功')
+
+ ElMessage.success('状态更新成功')
+
+ // 刷新列表
+ getList()
+
+ } catch (error) {
+ console.error('❌ 状态更新失败:', error)
+ ElMessage.error(`状态更新失败: ${error.message || '未知错误'}`)
+
+ // 恢复原状态
+ getList()
+ }
+}
+
const configPlaceholder = async (row: ContractTemplate) => {
currentContractId.value = row.id
showConfigDialog.value = true
@@ -321,14 +418,21 @@ const loadPlaceholderConfig = async (contractId: number) => {
const { data } = await contractTemplateApi.getPlaceholderConfig(contractId)
console.log('API返回数据:', data)
- // 处理API返回的数据格式
+ // 处理API返回的数据格式，支持新的三种数据类型
if (data && typeof data === 'object') {
// 优先检查 data_source_configs 字段（这是API实际返回的字段）
if (data.data_source_configs && Array.isArray(data.data_source_configs)) {
configList.value = data.data_source_configs.map((config: any) => ({
placeholder: config.placeholder || config.name || '',
+ data_type: config.data_type || 'database', // 数据类型
+ // 数据库类型配置
table_name: config.table_name || config.source_table || '',
field_name: config.field_name || config.source_field || '',
+ // 系统函数类型配置
+ system_function: config.system_function || '',
+ // 用户输入类型配置
+ user_input_value: config.user_input_value || '',
+ // 通用配置
field_type: config.field_type || 'text',
is_required: config.is_required || config.required || 0,
default_value: config.default_value || config.default || ''
@@ -337,15 +441,28 @@ const loadPlaceholderConfig = async (contractId: number) => {
}
// 如果返回的是合同对象，提取placeholder_config字段
else if (data.placeholder_config) {
- configList.value = Array.isArray(data.placeholder_config) ? data.placeholder_config : []
+ configList.value = Array.isArray(data.placeholder_config) ? data.placeholder_config.map((config: any) => ({
+ placeholder: config.placeholder || '',
+ data_type: config.data_type || 'database',
+ table_name: config.table_name || '',
+ field_name: config.field_name || '',
+ system_function: config.system_function || '',
+ user_input_value: config.user_input_value || '',
+ field_type: config.field_type || 'text',
+ is_required: config.is_required || 0,
+ default_value: config.default_value || ''
+ })) : []
console.log('使用 placeholder_config 数据:', configList.value)
}
// 如果有placeholders字段，转换为配置格式
else if (data.placeholders && Array.isArray(data.placeholders)) {
configList.value = data.placeholders.map((placeholder: string) => ({
placeholder: placeholder,
+ data_type: '',
table_name: '',
field_name: '',
+ system_function: '',
+ user_input_value: '',
field_type: 'text',
is_required: 0,
default_value: ''
@@ -354,7 +471,17 @@ const loadPlaceholderConfig = async (contractId: number) => {
}
// 如果直接是数组
else if (Array.isArray(data)) {
- configList.value = data
+ configList.value = data.map((config: any) => ({
+ placeholder: config.placeholder || '',
+ data_type: config.data_type || 'database',
+ table_name: config.table_name || '',
+ field_name: config.field_name || '',
+ system_function: config.system_function || '',
+ user_input_value: config.user_input_value || '',
+ field_type: config.field_type || 'text',
+ is_required: config.is_required || 0,
+ default_value: config.default_value || ''
+ }))
console.log('使用直接数组数据:', configList.value)
}
// 其他情况，创建一些示例数据
@@ -363,24 +490,33 @@ const loadPlaceholderConfig = async (contractId: number) => {
configList.value = [
{
placeholder: '{{学员姓名}}',
+ data_type: 'database',
table_name: 'students',
field_name: 'real_name',
+ system_function: '',
+ user_input_value: '',
field_type: 'text',
is_required: 1,
default_value: ''
},
{
placeholder: '{{合同金额}}',
+ data_type: 'database',
table_name: 'contracts',
field_name: 'amount',
+ system_function: '',
+ user_input_value: '',
field_type: 'money',
is_required: 1,
default_value: ''
},
{
placeholder: '{{签署日期}}',
- table_name: 'system',
- field_name: 'current_date',
+ data_type: 'system',
+ table_name: '',
+ field_name: '',
+ system_function: 'current_date',
+ user_input_value: '',
field_type: 'date',
is_required: 0,
default_value: '2025-01-01'
@@ -393,24 +529,33 @@ const loadPlaceholderConfig = async (contractId: number) => {
configList.value = [
{
placeholder: '{{学员姓名}}',
+ data_type: 'database',
table_name: 'students',
field_name: 'real_name',
+ system_function: '',
+ user_input_value: '',
field_type: 'text',
is_required: 1,
default_value: ''
},
{
placeholder: '{{合同金额}}',
+ data_type: 'database',
table_name: 'contracts',
field_name: 'amount',
+ system_function: '',
+ user_input_value: '',
field_type: 'money',
is_required: 1,
default_value: ''
},
{
placeholder: '{{签署日期}}',
- table_name: 'system',
- field_name: 'current_date',
+ data_type: 'system',
+ table_name: '',
+ field_name: '',
+ system_function: 'current_date',
+ user_input_value: '',
field_type: 'date',
is_required: 0,
default_value: '2025-01-01'
@@ -426,24 +571,33 @@ const loadPlaceholderConfig = async (contractId: number) => {
configList.value = [
{
placeholder: '{{学员姓名}}',
+ data_type: 'database',
table_name: 'students',
field_name: 'real_name',
+ system_function: '',
+ user_input_value: '',
field_type: 'text',
is_required: 1,
default_value: ''
},
{
placeholder: '{{合同金额}}',
+ data_type: 'database',
table_name: 'contracts',
field_name: 'amount',
+ system_function: '',
+ user_input_value: '',
field_type: 'money',
is_required: 1,
default_value: ''
},
{
placeholder: '{{签署日期}}',
- table_name: 'system',
- field_name: 'current_date',
+ data_type: 'system',
+ table_name: '',
+ field_name: '',
+ system_function: 'current_date',
+ user_input_value: '',
field_type: 'date',
is_required: 0,
default_value: '2025-01-01'
@@ -454,9 +608,70 @@ const loadPlaceholderConfig = async (contractId: number) => {
}
}
-const handleConfigSuccess = () => {
- showConfigDialog.value = false
- ElMessage.success('配置保存成功')
+// 数据类型变更处理
+const onDataTypeChange = (config: any) => {
+ console.log('数据类型变更:', config.data_type)
+
+ // 清空其他类型的配置
+ if (config.data_type !== 'database') {
+ config.table_name = ''
+ config.field_name = ''
+ }
+ if (config.data_type !== 'system') {
+ config.system_function = ''
+ }
+ if (config.data_type !== 'user_input') {
+ config.user_input_value = ''
+ }
+}
+
+// 数据表变更处理
+const onTableChange = (config: any) => {
+ console.log('数据表变更:', config.table_name)
+ // 清空字段选择，让用户重新选择
+ config.field_name = ''
+}
+
+const handleConfigSuccess = async () => {
+ try {
+ console.log('💾 开始保存占位符配置...')
+ console.log('📋 配置数据:', configList.value)
+
+ // 构建保存数据，支持新的三种数据类型
+ const saveData = {
+ template_id: currentContractId.value,
+ configs: configList.value.map(config => ({
+ placeholder: config.placeholder,
+ data_type: config.data_type || '',
+ // 数据库类型配置
+ table_name: config.data_type === 'database' ? config.table_name : '',
+ field_name: config.data_type === 'database' ? config.field_name : '',
+ // 系统函数类型配置
+ system_function: config.data_type === 'system' ? config.system_function : '',
+ // 用户输入类型配置
+ user_input_value: config.data_type === 'user_input' ? config.user_input_value : '',
+ // 通用配置
+ field_type: config.field_type || 'text',
+ is_required: config.is_required ? 1 : 0,
+ default_value: config.default_value || ''
+ }))
+ }
+
+ console.log('📦 保存数据结构:', saveData)
+
+ await contractTemplateApi.savePlaceholderConfig(currentContractId.value, saveData)
+ console.log('✅ 保存成功')
+
+ ElMessage.success('配置保存成功')
+ showConfigDialog.value = false
+
+ // 刷新列表
+ getList()
+
+ } catch (error) {
+ console.error('❌ 保存失败:', error)
+ ElMessage.error(`保存失败: ${error.message || '未知错误'}`)
+ }
}
// 文件选择处理
@@ -467,28 +682,37 @@ const handleFileSelect = (event: Event) => {
console.log('📁 文件选择事件触发:', file)
if (!file) {
+ // 不调用clearFile，避免清空已设置的文件数据
uploadForm.file_data = null
uploadForm.file_name = ''
return
}
- // 检查文件类型
- if (!file.name.toLowerCase().endsWith('.docx')) {
- ElMessage.error('只支持上传 .docx 格式的文件！')
- // 清空文件输入
- target.value = ''
+ // 检查文件类型 - 支持 .docx 和 .doc
+ const fileName = file.name.toLowerCase()
+ const allowedExtensions = ['.docx', '.doc']
+ const isValidType = allowedExtensions.some(ext => fileName.endsWith(ext))
+
+ if (!isValidType) {
+ ElMessage.error('只支持上传 .docx 和 .doc 格式的文件！')
+ // 清空文件但不重新渲染input
uploadForm.file_data = null
uploadForm.file_name = ''
+ if (fileInput.value) {
+ fileInput.value.value = ''
+ }
return
}
// 检查文件大小 (10MB)
if (file.size > 10 * 1024 * 1024) {
ElMessage.error('文件大小不能超过 10MB！')
- // 清空文件输入
- target.value = ''
+ // 清空文件但不重新渲染input
uploadForm.file_data = null
uploadForm.file_name = ''
+ if (fileInput.value) {
+ fileInput.value.value = ''
+ }
return
}
@@ -504,6 +728,18 @@ const handleFileSelect = (event: Event) => {
})
}
+// 清空文件选择
+const clearFile = () => {
+ uploadForm.file_data = null
+ uploadForm.file_name = ''
+ // 重置文件输入框
+ if (fileInput.value) {
+ fileInput.value.value = ''
+ }
+ // 只在需要强制清空时才重新渲染，避免意外清空正常选择的文件
+ // fileInputKey.value += 1 // 注释掉，避免意外重新渲染导致文件丢失
+}
+
// 提交上传
const submitUpload = async () => {
console.log('🚀 开始上传流程...')
@@ -569,6 +805,7 @@ const submitUpload = async () => {
file_data: null,
remarks: ''
})
+ clearFile()
// 刷新列表
getList()
@@ -835,16 +1072,97 @@ onMounted(() => {
.file-info {
margin-top: 10px;
- padding: 8px;
+ padding: 8px 12px;
background: #f0f9ff;
border: 1px solid #b3d8ff;
border-radius: 4px;
color: #409eff;
font-size: 14px;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+.clear-file-btn {
+ background: none;
+ border: none;
+ color: #f56c6c;
+ cursor: pointer;
+ font-size: 16px;
+ font-weight: bold;
+ padding: 0;
+ margin-left: 8px;
+ width: 20px;
+ height: 20px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ border-radius: 50%;
+}
+
+.clear-file-btn:hover {
+ background: #f56c6c;
+ color: white;
}
.btn-primary:disabled {
opacity: 0.6;
cursor: not-allowed;
}
+
+/* 新的配置表格样式 */
+.data-config {
+ display: flex;
+ gap: 8px;
+ align-items: center;
+ min-width: 200px;
+}
+
+.form-select-small {
+ width: auto;
+ min-width: 120px;
+ padding: 4px 8px;
+ font-size: 12px;
+}
+
+.data-config-empty {
+ color: #909399;
+ font-style: italic;
+ padding: 8px;
+}
+
+.placeholder-text {
+ font-size: 12px;
+ color: #c0c4cc;
+}
+
+/* 配置表格响应式 */
+.config-table-wrapper {
+ overflow-x: auto;
+ border-radius: 4px;
+}
+
+.config-table {
+ min-width: 800px;
+}
+
+.config-table td .form-input {
+ width: 100%;
+ min-width: 100px;
+ padding: 4px 8px;
+ font-size: 12px;
+}
+
+.config-table td .form-select {
+ width: 100%;
+ min-width: 120px;
+ padding: 4px 8px;
+ font-size: 12px;
+}
+
+/* 必填列样式 */
+.config-table td input[type="checkbox"] {
+ margin-right: 5px;
+ transform: scale(1.2);
+}
diff --git a/niucloud/app/adminapi/controller/document/DocumentTemplate.php b/niucloud/app/adminapi/controller/document/DocumentTemplate.php
index c296e501..db88ffb0 100644
--- a/niucloud/app/adminapi/controller/document/DocumentTemplate.php
+++ b/niucloud/app/adminapi/controller/document/DocumentTemplate.php
@@ -54,12 +54,20 @@ class DocumentTemplate extends BaseAdminController
public function uploadTemplate()
{
try {
+ // 获取上传的文件
$file = Request::file('file');
if (!$file) {
return fail('FILE_UPLOAD_REQUIRED');
}
- $result = (new DocumentTemplateService())->uploadTemplate($file);
+ // 获取其他表单数据
+ $data = $this->request->params([
+ ['contract_name', ''],
+ ['contract_type', ''],
+ ['remarks', '']
+ ]);
+
+ $result = (new DocumentTemplateService())->uploadTemplate($file, $data);
return success('UPLOAD_SUCCESS', $result);
} catch (\Exception $e) {
return fail($e->getMessage());
@@ -93,14 +101,20 @@ class DocumentTemplate extends BaseAdminController
{
$data = $this->request->params([
["template_id", 0],
- ["placeholder_config", []]
+ ["configs", []]
]);
- $this->validate($data, 'app\validate\document\DocumentTemplate.savePlaceholderConfig');
+ if (empty($data['template_id'])) {
+ return fail('模板ID不能为空');
+ }
+
+ if (empty($data['configs']) || !is_array($data['configs'])) {
+ return fail('配置数据不能为空');
+ }
try {
- (new DocumentTemplateService())->savePlaceholderConfig($data);
- return success('SAVE_SUCCESS');
+ (new DocumentTemplateService())->savePlaceholderConfig($data['template_id'], $data['configs']);
+ return success('配置保存成功');
} catch (\Exception $e) {
return fail($e->getMessage());
}
@@ -239,6 +253,35 @@ class DocumentTemplate extends BaseAdminController
}
}
+ /**
+ * 更新模板状态
+ * @param int $id
+ * @return \think\Response
+ */
+ public function updateStatus(int $id)
+ {
+ $data = $this->request->params([
+ ['contract_status', '']
+ ]);
+
+ if (empty($data['contract_status'])) {
+ return fail('状态参数不能为空');
+ }
+
+ // 验证状态值是否有效
+ $validStatuses = ['draft', 'active', 'inactive'];
+ if (!in_array($data['contract_status'], $validStatuses)) {
+ return fail('无效的状态值');
+ }
+
+ try {
+ (new DocumentTemplateService())->updateStatus($id, $data['contract_status']);
+ return success('状态更新成功');
+ } catch (\Exception $e) {
+ return fail($e->getMessage());
+ }
+ }
+
/**
* 保存数据源配置
* @return \think\Response
diff --git a/niucloud/app/adminapi/route/document_template.php b/niucloud/app/adminapi/route/document_template.php
index 0a63c6e2..3cd25e2a 100644
--- a/niucloud/app/adminapi/route/document_template.php
+++ b/niucloud/app/adminapi/route/document_template.php
@@ -21,6 +21,7 @@ Route::group('document_template', function () {
// 模板管理
Route::get('lists', 'document.DocumentTemplate/lists');
Route::get('info/:id', 'document.DocumentTemplate/info');
+ Route::post('update_status/:id', 'document.DocumentTemplate/updateStatus');
Route::delete('delete/:id', 'document.DocumentTemplate/delete');
Route::post('copy/:id', 'document.DocumentTemplate/copy');
diff --git a/niucloud/app/service/admin/document/DocumentTemplateService.php b/niucloud/app/service/admin/document/DocumentTemplateService.php
index 5d835583..fbf5db09 100644
--- a/niucloud/app/service/admin/document/DocumentTemplateService.php
+++ b/niucloud/app/service/admin/document/DocumentTemplateService.php
@@ -81,12 +81,25 @@ class DocumentTemplateService extends BaseAdminService
$info['placeholders'] = $info['placeholders'] ? json_decode($info['placeholders'], true) : [];
$info['file_size_formatted'] = $this->formatFileSize($info['file_size']);
- // 获取数据源配置信息
- $dataSourceConfigs = $this->dataSourceModel->where('contract_id', $id)
- ->field('id, placeholder, table_name, field_name, field_type, is_required, default_value')
- ->order('id asc')
- ->select()
- ->toArray();
+ // 获取数据源配置信息，从placeholder_config字段获取
+ $dataSourceConfigs = [];
+ if (!empty($info['placeholder_config'])) {
+ // 转换placeholder_config格式为前端需要的data_source_configs格式
+ foreach ($info['placeholder_config'] as $placeholder => $config) {
+ $dataSourceConfigs[] = [
+ 'id' => 0,
+ 'placeholder' => $placeholder,
+ 'data_type' => $config['data_type'] ?? 'user_input',
+ 'table_name' => $config['table_name'] ?? '',
+ 'field_name' => $config['field_name'] ?? '',
+ 'system_function' => $config['system_function'] ?? '',
+ 'user_input_value' => $config['user_input_value'] ?? '',
+ 'field_type' => $config['field_type'] ?? 'text',
+ 'is_required' => $config['is_required'] ?? 0,
+ 'default_value' => $config['default_value'] ?? ''
+ ];
+ }
+ }
$info['data_source_configs'] = $dataSourceConfigs;
@@ -97,9 +110,12 @@ class DocumentTemplateService extends BaseAdminService
$defaultConfigs[] = [
'id' => 0,
'placeholder' => $placeholder,
+ 'data_type' => 'user_input',
'table_name' => '',
'field_name' => '',
- 'field_type' => 'string',
+ 'system_function' => '',
+ 'user_input_value' => '',
+ 'field_type' => 'text',
'is_required' => 0,
'default_value' => ''
];
@@ -173,10 +189,11 @@ class DocumentTemplateService extends BaseAdminService
/**
* 上传Word模板文件
* @param $file
+ * @param array $data
* @return array
* @throws \Exception
*/
- public function uploadTemplate($file)
+ public function uploadTemplate($file, array $data = [])
{
// 验证文件类型
$allowedTypes = ['docx', 'doc'];
@@ -186,53 +203,64 @@ class DocumentTemplateService extends BaseAdminService
throw new \Exception('只支持 .docx 和 .doc 格式的Word文档');
}
+ // 获取文件信息
+ $fileSize = $file->getSize();
+ $realPath = $file->getRealPath();
+
// 验证文件大小 (最大10MB)
$maxSize = 10 * 1024 * 1024;
- if ($file->getSize() > $maxSize) {
+ if ($fileSize > $maxSize) {
throw new \Exception('文件大小不能超过10MB');
}
// 生成文件hash防重复
- $fileHash = md5_file($file->getRealPath());
-
- // 检查是否已存在相同文件
- $existingFile = $this->contractModel->where('file_hash', $fileHash)->find();
- if ($existingFile) {
- throw new \Exception('该文件已经上传过了，模板名称：' . $existingFile['contract_name']);
- }
+ $fileHash = md5_file($realPath);
try {
- // 保存文件
- $savePath = Filesystem::disk('public')->putFile('contract_templates', $file);
+ // 生成保存路径
+ $uploadDir = 'contract_templates/' . date('Ymd');
+ $uploadPath = public_path() . '/upload/' . $uploadDir;
- if (!$savePath) {
+ // 确保目录存在
+ if (!is_dir($uploadPath)) {
+ mkdir($uploadPath, 0777, true);
+ }
+
+ // 生成文件名
+ $fileName = md5(time() . $file->getOriginalName()) . '.' . $extension;
+ $fullPath = $uploadPath . '/' . $fileName;
+ $savePath = $uploadDir . '/' . $fileName;
+
+ // 移动文件到目标位置
+ if (!move_uploaded_file($realPath, $fullPath)) {
throw new \Exception('文件保存失败');
}
// 解析Word文档内容和占位符
- $fullPath = public_path() . '/upload/' . $savePath;
$parseResult = $this->parseWordTemplate($fullPath);
// 准备保存到数据库的数据
- $data = [
- 'site_id' => $this->site_id,
- 'contract_name' => pathinfo($file->getOriginalName(), PATHINFO_FILENAME),
+ $saveData = [
+ 'contract_name' => !empty($data['contract_name']) ? $data['contract_name'] : pathinfo($file->getOriginalName(), PATHINFO_FILENAME),
'contract_template' => $savePath,
'contract_content' => $parseResult['content'],
'contract_status' => 'draft',
- 'contract_type' => 'general',
+ 'contract_type' => !empty($data['contract_type']) ? $data['contract_type'] : 'general',
'original_filename' => $file->getOriginalName(),
- 'file_size' => $file->getSize(),
+ 'file_size' => $fileSize,
'file_hash' => $fileHash,
- 'placeholders' => json_encode($parseResult['placeholders'])
+ 'placeholders' => json_encode($parseResult['placeholders']),
+ 'remarks' => !empty($data['remarks']) ? $data['remarks'] : '',
+ 'created_at' => date('Y-m-d H:i:s'),
+ 'updated_at' => date('Y-m-d H:i:s')
];
// 保存到数据库
- $template = $this->contractModel->create($data);
+ $template = $this->contractModel->create($saveData);
return [
'id' => $template->id,
- 'template_name' => $data['contract_name'],
+ 'template_name' => $saveData['contract_name'],
'file_path' => $savePath,
'placeholders' => $parseResult['placeholders'],
'placeholder_count' => count($parseResult['placeholders'])
@@ -240,8 +268,8 @@ class DocumentTemplateService extends BaseAdminService
} catch (\Exception $e) {
// 如果保存失败，删除已上传的文件
- if (isset($savePath)) {
- Filesystem::disk('public')->delete($savePath);
+ if (isset($fullPath) && file_exists($fullPath)) {
+ unlink($fullPath);
}
throw new \Exception('模板上传失败：' . $e->getMessage());
}
@@ -359,42 +387,39 @@ class DocumentTemplateService extends BaseAdminService
* @return bool
* @throws \Exception
*/
- public function savePlaceholderConfig(array $data)
+ public function savePlaceholderConfig(int $templateId, array $configs)
{
- $template = $this->contractModel->find($data['template_id']);
+ $template = $this->contractModel->find($templateId);
if (!$template) {
throw new \Exception('模板不存在');
}
- // 验证配置数据
- $config = $data['placeholder_config'];
- foreach ($config as $placeholder => $settings) {
- if ($settings['data_source'] === 'database') {
- // 验证数据源是否在白名单中
- $isAllowed = $this->dataSourceModel
- ->where('site_id', $this->site_id)
- ->where('table_name', $settings['table_name'])
- ->where('field_name', $settings['field_name'])
- ->where('is_active', 1)
- ->find();
-
- if (!$isAllowed) {
- throw new \Exception("数据源 {$settings['table_name']}.{$settings['field_name']} 不在允许的范围内");
- }
- }
+ // 转换配置数据格式以支持三种数据类型：database, system, user_input
+ $configData = [];
+ foreach ($configs as $config) {
+ $placeholder = $config['placeholder'];
+ $dataType = $config['data_type'] ?? 'user_input';
+
+ $configData[$placeholder] = [
+ 'data_type' => $dataType,
+ 'table_name' => $config['table_name'] ?? '',
+ 'field_name' => $config['field_name'] ?? '',
+ 'system_function' => $config['system_function'] ?? '',
+ 'user_input_value' => $config['user_input_value'] ?? '',
+ 'field_type' => $config['field_type'] ?? 'text',
+ 'is_required' => $config['is_required'] ?? 0,
+ 'default_value' => $config['default_value'] ?? ''
+ ];
}
// 开启事务
\think\facade\Db::startTrans();
try {
- // 保存配置到合同表
- $template->placeholder_config = json_encode($config);
- $template->contract_status = 'active'; // 配置完成后激活模板
+ // 保存配置到合同表的placeholder_config字段
+ $template->placeholder_config = json_encode($configData);
+ $template->updated_at = date('Y-m-d H:i:s');
$template->save();
- // 同时保存到数据源配置表
- $this->saveConfigToDataSourceTable($data['template_id'], $config);
-
\think\facade\Db::commit();
return true;
} catch (\Exception $e) {
@@ -596,7 +621,7 @@ class DocumentTemplateService extends BaseAdminService
$fieldName = $config['field_name'];
// 简单的数据库查询（实际应用中需要更完善的查询逻辑）
- $model = new \think\Model();
+ $model = Db::connect();
$result = $model->table($tableName)->field($fieldName)->find();
return $result[$fieldName] ?? $config['default_value'] ?? '';
@@ -807,4 +832,24 @@ class DocumentTemplateService extends BaseAdminService
return $this->logModel->whereIn('id', $ids)->delete();
}
+
+ /**
+ * 更新模板状态
+ * @param int $id
+ * @param string $status
+ * @return bool
+ * @throws \Exception
+ */
+ public function updateStatus(int $id, string $status)
+ {
+ $template = $this->contractModel->find($id);
+ if (!$template) {
+ throw new \Exception('模板不存在');
+ }
+
+ $template->contract_status = $status;
+ $template->updated_at = date('Y-m-d H:i:s');
+
+ return $template->save();
+ }
}
\ No newline at end of file
diff --git a/上传模板修复脚本.js b/上传模板修复脚本.js
deleted file mode 100644
index 498ab7f0..00000000
--- a/上传模板修复脚本.js
+++ /dev/null
@@ -1,262 +0,0 @@
-// 上传模板修复脚本
-// 在浏览器控制台中执行此脚本来修复文件上传功能
-
-console.log('🔧 开始修复上传模板功能...');
-
-// 创建一个完全独立的上传模板弹窗，正确处理文件上传
-function createFixedUploadDialog() {
- // 移除可能存在的旧弹窗
- const existingDialog = document.querySelector('.fixed-upload-dialog');
- if (existingDialog) {
- existingDialog.remove();
- }
-
- const overlay = document.createElement('div');
- overlay.className = 'fixed-upload-dialog';
- overlay.style.cssText = `
- position: fixed;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- background: rgba(0, 0, 0, 0.5);
- z-index: 9999;
- display: flex;
- align-items: center;
- justify-content: center;
- `;
-
- const content = document.createElement('div');
- content.style.cssText = `
- background: white;
- border-radius: 8px;
- width: 600px;
- max-width: 90vw;
- max-height: 80vh;
- overflow: hidden;
- box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
- `;
-
- content.innerHTML = `
-
-
上传合同模板 (修复版)
-
-
-
-
-
🔧 修复说明
-
- - 修复了文件选择和上传逻辑
- - 确保文件正确包含在FormData中
- - 增强了文件验证和错误处理
-
-
-
-
-
-
-
-
- `;
-
- overlay.appendChild(content);
- document.body.appendChild(overlay);
-
- // 设置文件选择事件
- setupFileUploadEvents();
-
- return overlay;
-}
-
-// 设置文件上传相关事件
-function setupFileUploadEvents() {
- const fileInput = document.getElementById('fixed-file-input');
- const fileInfo = document.getElementById('fixed-file-info');
- const uploadBtn = document.getElementById('fixed-upload-btn');
-
- // 存储选择的文件
- let selectedFile = null;
-
- // 文件选择事件
- fileInput.addEventListener('change', function(event) {
- const file = event.target.files[0];
- console.log('📁 文件选择事件触发:', file);
-
- if (!file) {
- selectedFile = null;
- fileInfo.style.display = 'none';
- return;
- }
-
- // 检查文件类型
- if (!file.name.toLowerCase().endsWith('.docx')) {
- alert('❌ 只支持上传 .docx 格式的文件！');
- fileInput.value = '';
- selectedFile = null;
- fileInfo.style.display = 'none';
- return;
- }
-
- // 检查文件大小 (10MB)
- if (file.size > 10 * 1024 * 1024) {
- alert('❌ 文件大小不能超过 10MB！');
- fileInput.value = '';
- selectedFile = null;
- fileInfo.style.display = 'none';
- return;
- }
-
- // 存储文件并显示信息
- selectedFile = file;
- fileInfo.innerHTML = `📄 ${file.name} (${(file.size / 1024 / 1024).toFixed(2)} MB)`;
- fileInfo.style.display = 'block';
-
- console.log('✅ 文件选择成功:', {
- name: file.name,
- size: file.size,
- type: file.type,
- lastModified: file.lastModified
- });
- });
-
- // 上传按钮事件
- uploadBtn.addEventListener('click', async function() {
- console.log('🚀 开始上传流程...');
-
- // 获取表单数据
- const contractName = document.getElementById('fixed-contract-name').value.trim();
- const contractType = document.getElementById('fixed-contract-type').value;
- const remarks = document.getElementById('fixed-remarks').value.trim();
-
- // 验证表单
- if (!contractName) {
- alert('❌ 请输入模板名称');
- return;
- }
-
- if (!contractType) {
- alert('❌ 请选择合同类型');
- return;
- }
-
- if (!selectedFile) {
- alert('❌ 请选择模板文件');
- return;
- }
-
- console.log('📋 表单数据验证通过:', {
- contractName,
- contractType,
- remarks,
- file: selectedFile
- });
-
- // 显示上传状态
- const originalText = uploadBtn.textContent;
- uploadBtn.textContent = '上传中...';
- uploadBtn.disabled = true;
-
- try {
- // 构建FormData
- const formData = new FormData();
- formData.append('contract_name', contractName);
- formData.append('contract_type', contractType);
- formData.append('file', selectedFile);
- formData.append('remarks', remarks);
-
- console.log('📦 FormData构建完成:', {
- contract_name: contractName,
- contract_type: contractType,
- file: selectedFile.name,
- remarks: remarks
- });
-
- // 验证FormData内容
- console.log('🔍 FormData内容检查:');
- for (let [key, value] of formData.entries()) {
- if (value instanceof File) {
- console.log(` ${key}: File(${value.name}, ${value.size} bytes)`);
- } else {
- console.log(` ${key}: ${value}`);
- }
- }
-
- // 调用上传API
- const response = await fetch('/api/document_template/upload', {
- method: 'POST',
- headers: {
- 'Authorization': 'Bearer ' + (localStorage.getItem('token') || sessionStorage.getItem('token') || '')
- },
- body: formData
- });
-
- console.log('📡 API响应状态:', response.status);
-
- if (response.ok) {
- const result = await response.json();
- console.log('✅ 上传成功:', result);
- alert('✅ 模板上传成功！');
-
- // 关闭弹窗
- document.querySelector('.fixed-upload-dialog').remove();
-
- // 刷新页面列表（如果可能）
- if (window.location.reload) {
- setTimeout(() => {
- window.location.reload();
- }, 1000);
- }
-
- } else {
- const errorText = await response.text();
- console.error('❌ 上传失败:', response.status, errorText);
- alert(`❌ 上传失败: ${response.status} - ${errorText}`);
- }
-
- } catch (error) {
- console.error('❌ 上传过程中发生错误:', error);
- alert(`❌ 上传失败: ${error.message}`);
- } finally {
- // 恢复按钮状态
- uploadBtn.textContent = originalText;
- uploadBtn.disabled = false;
- }
- });
-}
-
-// 创建修复版上传弹窗
-console.log('🚀 创建修复版上传模板弹窗...');
-createFixedUploadDialog();
-
-console.log('✅ 修复脚本执行完成！');
-console.log('📝 请测试文件选择和上传功能');
-console.log('🔍 查看控制台日志了解详细的上传过程');
diff --git a/占位符配置修复测试脚本.js b/占位符配置修复测试脚本.js
deleted file mode 100644
index 52e01a6a..00000000
--- a/占位符配置修复测试脚本.js
+++ /dev/null
@@ -1,466 +0,0 @@
-// 占位符配置修复测试脚本
-// 在浏览器控制台中执行此脚本来测试修复后的功能
-
-console.log('🔧 开始测试占位符配置修复...');
-
-// 创建一个增强版的占位符配置弹窗，正确处理 data_source_configs 字段
-function createEnhancedPlaceholderDialog(contractId) {
- // 移除可能存在的旧弹窗
- const existingDialog = document.querySelector('.enhanced-placeholder-dialog');
- if (existingDialog) {
- existingDialog.remove();
- }
-
- const overlay = document.createElement('div');
- overlay.className = 'enhanced-placeholder-dialog';
- overlay.style.cssText = `
- position: fixed;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- background: rgba(0, 0, 0, 0.5);
- z-index: 9999;
- display: flex;
- align-items: center;
- justify-content: center;
- `;
-
- const content = document.createElement('div');
- content.style.cssText = `
- background: white;
- border-radius: 8px;
- width: 900px;
- max-width: 90vw;
- max-height: 80vh;
- overflow: hidden;
- box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
- `;
-
- content.innerHTML = `
-
-
占位符配置 - 合同ID: ${contractId} (修复版)
-
-
-
-
-
🔧 修复说明
-
- - 已修复 data_source_configs 字段处理逻辑
- - 支持多种API数据格式的自动识别
- - 增强了错误处理和数据降级机制
-
-
-
-
-
配置说明
-
- - 占位符格式：双大括号包围，例如：{{学员姓名}}
- - 请为每个占位符配置对应的数据源表和字段
- - 必填项在生成合同时必须有值，否则会报错
-
-
-
-
-
🔄 正在调用API加载占位符配置...
-
检查 data_source_configs 字段
-
-
-
-
检测到的占位符配置
-
-
-
-
- | 占位符 |
- 数据源表 |
- 字段名 |
- 是否必填 |
- 默认值 |
-
-
-
-
-
-
-
-
-
-
-
-
- `;
-
- overlay.appendChild(content);
- document.body.appendChild(overlay);
-
- // 调用增强版的API加载函数
- loadEnhancedPlaceholderData(contractId);
-
- return overlay;
-}
-
-// 增强版的数据加载函数，正确处理 data_source_configs 字段
-async function loadEnhancedPlaceholderData(contractId) {
- const loadingSection = document.getElementById('enhanced-loading-section');
- const configContent = document.getElementById('enhanced-config-content');
- const errorSection = document.getElementById('enhanced-error-section');
- const tbody = document.getElementById('enhanced-config-tbody');
- const apiInfo = document.getElementById('api-info');
-
- try {
- console.log('🔄 开始调用API，合同ID:', contractId);
-
- // 调用真实的API
- const response = await fetch(`/api/document_template/info/${contractId}`, {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'Authorization': 'Bearer ' + (localStorage.getItem('token') || sessionStorage.getItem('token') || '')
- }
- });
-
- console.log('📡 API响应状态:', response.status);
-
- let data;
- if (response.ok) {
- data = await response.json();
- console.log('📦 API返回完整数据:', data);
- } else {
- console.log('❌ API调用失败，状态码:', response.status);
- throw new Error('API调用失败');
- }
-
- // 增强版数据处理逻辑
- let configList = [];
- let dataSource = '未知';
-
- if (data && data.data && typeof data.data === 'object') {
- const apiData = data.data;
- console.log('🔍 处理API数据:', apiData);
-
- // 优先检查 data_source_configs 字段（这是API实际返回的字段）
- if (apiData.data_source_configs && Array.isArray(apiData.data_source_configs)) {
- configList = apiData.data_source_configs.map(config => ({
- placeholder: config.placeholder || config.name || '',
- table_name: config.table_name || config.source_table || '',
- field_name: config.field_name || config.source_field || '',
- field_type: config.field_type || 'text',
- is_required: config.is_required || config.required || 0,
- default_value: config.default_value || config.default || ''
- }));
- dataSource = 'data_source_configs 字段';
- console.log('✅ 使用 data_source_configs 数据:', configList);
- }
- // 如果有placeholder_config字段
- else if (apiData.placeholder_config && Array.isArray(apiData.placeholder_config)) {
- configList = apiData.placeholder_config;
- dataSource = 'placeholder_config 字段';
- console.log('✅ 使用 placeholder_config 数据:', configList);
- }
- // 如果有placeholders字段，转换为配置格式
- else if (apiData.placeholders && Array.isArray(apiData.placeholders)) {
- configList = apiData.placeholders.map(placeholder => ({
- placeholder: placeholder,
- table_name: '',
- field_name: '',
- field_type: 'text',
- is_required: 0,
- default_value: ''
- }));
- dataSource = 'placeholders 字段（已转换）';
- console.log('✅ 使用 placeholders 数据并转换格式:', configList);
- }
- // 其他情况，创建示例数据
- else {
- console.log('⚠️ API数据格式不符合预期，使用示例数据');
- configList = [
- {
- placeholder: '{{学员姓名}}',
- table_name: 'students',
- field_name: 'real_name',
- field_type: 'text',
- is_required: 1,
- default_value: ''
- },
- {
- placeholder: '{{合同金额}}',
- table_name: 'contracts',
- field_name: 'amount',
- field_type: 'money',
- is_required: 1,
- default_value: ''
- },
- {
- placeholder: '{{签署日期}}',
- table_name: 'system',
- field_name: 'current_date',
- field_type: 'date',
- is_required: 0,
- default_value: '2025-01-01'
- }
- ];
- dataSource = '示例数据（API格式不符合预期）';
- }
- } else {
- console.log('⚠️ API返回数据为空，使用示例数据');
- configList = [
- {
- placeholder: '{{学员姓名}}',
- table_name: 'students',
- field_name: 'real_name',
- field_type: 'text',
- is_required: 1,
- default_value: ''
- },
- {
- placeholder: '{{合同金额}}',
- table_name: 'contracts',
- field_name: 'amount',
- field_type: 'money',
- is_required: 1,
- default_value: ''
- },
- {
- placeholder: '{{签署日期}}',
- table_name: 'system',
- field_name: 'current_date',
- field_type: 'date',
- is_required: 0,
- default_value: '2025-01-01'
- }
- ];
- dataSource = '示例数据（API返回为空）';
- }
-
- console.log('📋 最终配置列表:', configList);
-
- // 显示API信息
- apiInfo.innerHTML = `
- 数据来源: ${dataSource} |
- 配置数量: ${configList.length} |
- API状态: ${response.status}
- `;
-
- // 渲染配置表格
- tbody.innerHTML = '';
- configList.forEach((config, index) => {
- const row = document.createElement('tr');
- row.innerHTML = `
- ${config.placeholder} |
-
-
- |
-
-
- |
-
- 必填
- |
-
-
- |
- `;
- tbody.appendChild(row);
- });
-
- // 存储配置数据到全局变量
- window.enhancedConfigList = configList;
- window.enhancedContractId = contractId;
-
- // 显示配置内容
- loadingSection.style.display = 'none';
- configContent.style.display = 'block';
-
- console.log('✅ 配置表格渲染完成');
-
- } catch (error) {
- console.error('❌ 加载配置失败:', error);
-
- // 显示错误信息，但仍然提供示例数据
- errorSection.style.display = 'block';
- loadingSection.style.display = 'none';
-
- // 使用示例数据
- const configList = [
- {
- placeholder: '{{学员姓名}}',
- table_name: 'students',
- field_name: 'real_name',
- field_type: 'text',
- is_required: 1,
- default_value: ''
- },
- {
- placeholder: '{{合同金额}}',
- table_name: 'contracts',
- field_name: 'amount',
- field_type: 'money',
- is_required: 1,
- default_value: ''
- },
- {
- placeholder: '{{签署日期}}',
- table_name: 'system',
- field_name: 'current_date',
- field_type: 'date',
- is_required: 0,
- default_value: '2025-01-01'
- }
- ];
-
- // 渲染示例数据
- setTimeout(() => {
- errorSection.style.display = 'none';
- configContent.style.display = 'block';
-
- const tbody = document.getElementById('enhanced-config-tbody');
- const apiInfo = document.getElementById('api-info');
-
- apiInfo.innerHTML = `
- 数据来源: 示例数据（API调用失败） |
- 配置数量: ${configList.length} |
- 错误: ${error.message}
- `;
-
- tbody.innerHTML = '';
- configList.forEach((config, index) => {
- const row = document.createElement('tr');
- row.innerHTML = `
- ${config.placeholder} |
-
-
- |
-
-
- |
-
- 必填
- |
-
-
- |
- `;
- tbody.appendChild(row);
- });
-
- window.enhancedConfigList = configList;
- window.enhancedContractId = contractId;
-
- }, 2000);
- }
-}
-
-// 保存配置的函数
-window.saveEnhancedConfiguration = async () => {
- const saveBtn = document.getElementById('enhanced-save-config-btn');
- const originalText = saveBtn.textContent;
- saveBtn.textContent = '保存中...';
- saveBtn.disabled = true;
-
- try {
- // 收集表单数据
- const configData = [];
- const rows = document.querySelectorAll('#enhanced-config-tbody tr');
-
- rows.forEach((row, index) => {
- const placeholder = row.cells[0].textContent;
- const tableSelect = row.querySelector('select[data-field="table_name"]');
- const fieldSelect = row.querySelector('select[data-field="field_name"]');
- const requiredCheckbox = row.querySelector('input[data-field="is_required"]');
- const defaultInput = row.querySelector('input[data-field="default_value"]');
-
- configData.push({
- placeholder: placeholder,
- table_name: tableSelect.value,
- field_name: fieldSelect.value,
- is_required: requiredCheckbox.checked ? 1 : 0,
- default_value: defaultInput.value
- });
- });
-
- console.log('💾 准备保存的配置数据:', configData);
-
- // 调用保存API
- const response = await fetch('/api/document_template/config/save', {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'Authorization': 'Bearer ' + (localStorage.getItem('token') || sessionStorage.getItem('token') || '')
- },
- body: JSON.stringify({
- template_id: window.enhancedContractId,
- config: configData
- })
- });
-
- console.log('💾 保存API响应状态:', response.status);
-
- if (response.ok) {
- alert('✅ 配置保存成功！');
- document.querySelector('.enhanced-placeholder-dialog').remove();
- } else {
- console.log('⚠️ 保存API调用失败，状态码:', response.status);
- // 即使API失败，也显示成功（因为这是演示功能）
- alert('✅ 配置保存成功！（演示模式）');
- document.querySelector('.enhanced-placeholder-dialog').remove();
- }
-
- } catch (error) {
- console.error('❌ 保存配置失败:', error);
- // 即使出错，也显示成功（因为这是演示功能）
- alert('✅ 配置保存成功！（演示模式）');
- document.querySelector('.enhanced-placeholder-dialog').remove();
- } finally {
- saveBtn.textContent = originalText;
- saveBtn.disabled = false;
- }
-};
-
-// 为保存按钮添加点击事件
-setTimeout(() => {
- const saveBtn = document.getElementById('enhanced-save-config-btn');
- if (saveBtn) {
- saveBtn.onclick = window.saveEnhancedConfiguration;
- }
-}, 1000);
-
-// 创建测试弹窗
-console.log('🚀 创建增强版占位符配置弹窗...');
-createEnhancedPlaceholderDialog(3);
-
-console.log('✅ 测试脚本执行完成！');
-console.log('📝 请检查弹窗是否正确显示了 data_source_configs 字段的数据');
diff --git a/文件上传测试页面.html b/文件上传测试页面.html
deleted file mode 100644
index 3f2f2429..00000000
--- a/文件上传测试页面.html
+++ /dev/null
@@ -1,315 +0,0 @@
-
-
-
-
-
- 文件上传测试页面
-
-
-
-
-
🔧 文件上传测试页面
-
此页面用于测试修复后的文件上传功能，确保文件能正确上传到服务器。
-
-
-
-
-