Merge branch 'dev_天津_阳光印刷' of http://114.132.189.42:9002/r/product-inventor...

张诺

18 小时以前 e5a70efeaa9fd96ce1242e5d582c8237319fade4

 src/views/collaborativeApproval/knowledgeBase/index.vue

@@ -133,7 +133,7 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-form-item label="附件材料" prop="tempFileIds">
        <el-form-item label="附件材料" prop="files">
          <el-upload
            v-model:file-list="fileList"
            :action="upload.url"
@@ -145,8 +145,22 @@
            :on-error="handleUploadError"
            :on-success="handleUploadSuccess"
            :on-remove="handleRemove"
            :on-preview="handlePreview"
            :show-file-list="true"
          >
            <el-button type="primary">上传</el-button>
            <template #file="{ file }">
              <div style="display:flex; align-items:center; gap: 10px; width: 100%;">
                <span style="flex: 1; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">
                  {{ file.name }}
                </span>
                <div style="display:flex; align-items:center; gap: 6px;">
                  <el-button link type="success" :icon="Download" @click="handleDownload(file)" />
                  <el-button link type="primary" :icon="View" @click="handlePreview(file)" />
                  <el-button link type="danger" :icon="Delete" @click="triggerRemoveFile(file)" />
                </div>
              </div>
            </template>
            <template #tip>
              <div class="el-upload__tip">
                支持文档（doc, docx, xls, xlsx, pdf, txt）和图片（jpg, jpeg, png, gif）格式
@@ -222,9 +236,10 @@
        <div class="detail-section" v-if="currentKnowledge.commonFileList && currentKnowledge.commonFileList.length > 0">
          <h4>附件材料</h4>
          <div class="file-list">
            <div v-for="file in currentKnowledge.commonFileList" :key="file.id" class="file-item" style="margin-bottom: 8px;">
              <el-icon><Document /></el-icon>
              <el-link type="primary" :href="file.url" target="_blank" style="margin-left: 8px;">{{ file.name }}</el-link>
            <div v-for="file in currentKnowledge.commonFileList" :key="file.id" class="file-item">
              <div class="file-info">
                <el-link :href="file.url" target="_blank" :download="file.name">{{ file.name }}</el-link>
              </div>
            </div>
          </div>
        </div>
@@ -256,17 +271,18 @@
        </div>
      </div>
    </FormDialog>
    <filePreview ref="filePreviewRef" />
  </div>
</template>

<script setup>
import { Search, Document } from "@element-plus/icons-vue";
import { Search, Download, View, Delete } from "@element-plus/icons-vue";
import { onMounted, ref, reactive, toRefs, getCurrentInstance, computed, watch } from "vue";
import { ElMessage, ElMessageBox } from "element-plus";
import PIMTable from "@/components/PIMTable/PIMTable.vue";
import FormDialog from '@/components/Dialog/FormDialog.vue';
import { listKnowledgeBase, delKnowledgeBase,addKnowledgeBase,updateKnowledgeBase } from "@/api/collaborativeApproval/knowledgeBase.js";
import { delLedgerFile } from "@/api/salesManagement/salesLedger.js";
import filePreview from '@/components/filePreview/index.vue'
import { listKnowledgeBase, delKnowledgeBase,addKnowledgeBase,updateKnowledgeBase, delKnowledgeBaseFile } from "@/api/collaborativeApproval/knowledgeBase.js";
import useUserStore from '@/store/modules/user';
import { userListNoPageByTenantId } from '@/api/system/user.js';
import { getToken } from "@/utils/auth";
@@ -318,7 +334,7 @@
    keyPoints: "",
    creator: "",
    usageCount: 0,
    tempFileIds: []
    files: []
  },
  dialogVisible: false,
  dialogTitle: "",
@@ -345,9 +361,30 @@

// 表单引用
const formRef = ref();
const fileUpload = ref()
const filePreviewRef = ref()
// 用户相关
const userStore = useUserStore();
const userList = ref([]);

const normalizeKnowledgeFiles = (files = []) => {
  const list = Array.isArray(files) ? files : []
  return list.map((f, index) => {
    const name = f?.name || f?.originalName || f?.fileName || ''
    const url = f?.url || f?.path || ''
    return {
      ...f,
      name,
      url,
      uid: f?.uid || f?.id || `${Date.now()}_${index}`,
      status: f?.status || 'success',
    }
  })
}

const getUploadFileUrl = (file) => {
  return file?.url || file?.response?.data?.tempPath || file?.response?.data?.url
}

// 表格列配置
const tableColumn = ref([
@@ -516,11 +553,13 @@
      keyPoints: "",
      creator: userStore.nickName || "",
      usageCount: 0,
      tempFileIds: []
      files: []
    });
  } else if (type === "edit" && row) {
    dialogTitle.value = "编辑知识";
    fileList.value = row.commonFileList || [];
    const existingFiles = row.files || row.commonFileList || [];
    const normalizedFiles = normalizeKnowledgeFiles(existingFiles);
    fileList.value = normalizedFiles;
    Object.assign(form.value, {
      id: row.id,
      title: row.title,
@@ -532,7 +571,14 @@
      keyPoints: row.keyPoints,
      creator: row.creator,
      usageCount: row.usageCount,
      tempFileIds: (row.commonFileList || []).map(file => file.id)
      files: normalizedFiles.map(f => ({
        id: f.id,
        tempId: f.tempId,
        name: f.name,
        url: f.url,
        uid: f.uid
      })),
      
    });
  }
  dialogVisible.value = true;
@@ -636,7 +682,7 @@
    keyPoints: "",
    creator: userStore.nickName || "",
    usageCount: 0,
    tempFileIds: []
    files: []
  });
  // 清除表单验证状态
  if (formRef.value) {
@@ -670,25 +716,72 @@
function handleUploadSuccess(res, file, uploadFiles) {
  proxy.$modal.closeLoading();
  if (res.code === 200) {
    if (!form.value.tempFileIds) {
      form.value.tempFileIds = [];
    if (!form.value.files) {
      form.value.files = [];
    }
    form.value.tempFileIds.push(res.data.tempId);
    file.tempId = res?.data?.tempId
    file.url = res?.data?.tempPath || res?.data?.url
    file.name = res?.data?.originalName || file?.name
    form.value.files.push({
      tempId: file.tempId,
      url: file.url,
      name: file.name,
      uid: file.uid,
    });
    proxy.$modal.msgSuccess("上传成功");
  } else {
    proxy.$modal.msgError(res.msg);
    proxy.$refs.fileUpload.handleRemove(file);
    fileUpload.value?.handleRemove?.(file) || proxy.$refs.fileUpload?.handleRemove?.(file);
  }
}
// 移除文件
function handleRemove(file) {
  if (dialogType.value === "edit") {
    let ids = [];
    ids.push(file.id);
    delLedgerFile(ids).then((res) => {
      proxy.$modal.msgSuccess("删除成功");
function handleRemove(file, fileList) {
  // 如果是编辑模式且文件有id，调用API删除
  if (dialogType.value === "edit" && file.id) {
    delKnowledgeBaseFile([file.id]).then((res) => {
      if (res.code === 200) {
        proxy.$modal.msgSuccess("删除成功");
        // 从form.value.files中移除
        const index = form.value.files.findIndex(f => f.id === file.id);
        if (index > -1) {
          form.value.files.splice(index, 1);
        }
      } else {
        proxy.$modal.msgError(res.msg || "删除失败");
        // 如果删除失败，重新添加回文件列表
        fileList.push(file);
      }
    }).catch((error) => {
      proxy.$modal.msgError("删除失败");
      // 如果删除失败，重新添加回文件列表
      fileList.push(file);
    });
  } else {
    // 新上传的文件，直接从form.value.files中移除
    const index = form.value.files.findIndex(f => f.name === file.name && f.url === file.url);
    if (index > -1) {
      form.value.files.splice(index, 1);
    }
  }
}

// 文件预览/下载
const handleDownload = (file) => {
  const url = getUploadFileUrl(file)
  if (!url) return
  proxy?.$modal?.loading?.("正在下载文件，请稍候...")
  proxy.$download.name(url);
  proxy?.$modal?.closeLoading?.()
}

function handlePreview(file) {
  const url = getUploadFileUrl(file)
  if (!url) return
  filePreviewRef.value?.open?.(url)
}

function triggerRemoveFile(file) {
  fileUpload.value?.handleRemove?.(file) || proxy.$refs.fileUpload?.handleRemove?.(file);
}

// 提交知识表单
@@ -803,12 +896,12 @@
}

.detail-content {
  background: #f8f9fa;
  padding: 16px;
  border-radius: 6px;
  line-height: 1.6;
  color: #606266;
  white-space: pre-wrap;
}

.detail-section {
  margin-top: 24px;
}

.key-points {