Merge remote-tracking branch 'origin/dev_JLMY' into dev_JLMY

maven

8 天以前 239f117fab7b05566914fb3f4f445203f08ded3d

 src/views/personnelManagement/contractManagement/filesDia.vue

@@ -6,7 +6,7 @@
        width="50%"
        @close="closeDia"
    >
      <div style="margin-bottom: 10px;text-align: right">
      <!-- <div style="margin-bottom: 10px;text-align: right">
        <el-upload
            v-model:file-list="fileList"
            class="upload-demo"
@@ -20,6 +20,7 @@
        >
          <el-button type="primary">上传附件</el-button>
        </el-upload>

        <el-button type="danger" plain @click="handleDelete">删除</el-button>
      </div>
      <PIMTable
@@ -39,12 +40,20 @@
            :total="total"
            :page="page.current"
            :limit="page.size"
         />
         /> -->
      <template #footer>
        <div class="dialog-footer">
          <el-button @click="closeDia">取消</el-button>
        </div>
      </template>
      <fileUpload
        ref="fileUploadRef"
        :fileSize="1024"
        :fileType="['pdf', 'docx', 'txt', 'xlsx', 'pptx....']"
        :limit="10"
        :drag="false"
        v-model:modelValue="modelValue"
    />
    </el-dialog>
    <filePreview ref="filePreviewRef" />
  </div>
@@ -62,6 +71,7 @@
  fileListPage
} from "@/api/financialManagement/revenueManagement.js";
import Pagination from "@/components/PIMTable/Pagination.vue";
import fileUpload from "@/components/FileUpload/index.vue";
const { proxy } = getCurrentInstance()
const emit = defineEmits(['close'])

@@ -108,7 +118,7 @@
const headers = ref({
  Authorization: "Bearer " + getToken(),
});
const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/file/upload"); // 上传的图片服务器地址
// const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/file/upload"); // 上传的图片服务器地址

// 打开弹框
const openDialog = (row,type) => {