diff --git a/acupuncture-后台/src/views/report/type.vue b/acupuncture-后台/src/views/report/type.vue
index 8a9f7876..a805fb59 100644
--- a/acupuncture-后台/src/views/report/type.vue
+++ b/acupuncture-后台/src/views/report/type.vue
@@ -1,266 +1,500 @@
 <template>
-	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-			label-width="80px">
-			<el-form-item label="类型名称" prop="typeName">
-				<el-input v-model="queryParams.param.typeName" placeholder="请输入" clearable
-					@keyup.enter.native="handleQuery" />
-			</el-form-item>
-			<el-form-item>
-				<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-				<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-			</el-form-item>
-		</el-form>
-		<el-row :gutter="10" class="mb8">
-			<el-col :span="1.5">
-				<el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
-			</el-col>
-			<el-col :span="1.5">
-				<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
-					@click="handleDelete">删除</el-button>
-			</el-col>
-			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-		</el-row>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="80px"
+    >
+      <el-form-item label="类型名称" prop="typeName">
+        <el-input
+          v-model="queryParams.param.typeName"
+          placeholder="请输入"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          >删除</el-button
+        >
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
 
-		<el-table v-loading="loading" :data="listData" @selection-change="handleSelectionChange" max-height="600">
-			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column fixed label="类型名称" align="center" prop="typeName" min-width="100" />
-      <el-table-column  label="备注" align="center" prop="remark" min-width="100" />
-			<el-table-column label="创建人/创建时间" align="center" min-width="140">
-				<template slot-scope="scope">
-					<div>{{scope.row.createBy}}</div>
-					<span>
-						{{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}") }}
-					</span>
-				</template>
-			</el-table-column>
-			<el-table-column fixed="right" label="操作" align="center" class-name="small-padding fixed-width" width="200">
-				<template slot-scope="scope">
-					<el-button size="mini" type="text" icon="el-icon-edit"
-						@click="handleUpdate(scope.row)">修改</el-button>
-					<el-button size="mini" type="text" icon="el-icon-delete"
-						@click="handleDelete(scope.row)">删除</el-button>
-				</template>
-			</el-table-column>
-		</el-table>
+    <el-table
+      v-loading="loading"
+      :data="listData"
+      @selection-change="handleSelectionChange"
+      max-height="600"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        fixed
+        label="类型名称"
+        align="center"
+        prop="typeName"
+        min-width="100"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="单位"
+        align="center"
+        prop="tenantIdList"
+        min-width="250"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <!-- 通过id列表找到tenantsData中匹配的数据并替换为中文，数据后面添加逗号 -->
+          <template v-for="(item, index) in scope.row.tenantIdList">
+            <template v-if="tenantsData.some((tenant) => tenant.id === item)">
+              {{ tenantsData.find((tenant) => tenant.id === item).name
+              }}{{ index < scope.row.tenantIdList.length - 1 ? "，" : "" }}
+            </template>
+          </template>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="附件"
+        align="center"
+        prop="typeName"
+        min-width="150"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          <el-button type="text" size="mini" @click="handleDownload(scope.row)">
+            <span v-if="scope.row.file">
+              <i class="el-icon-download"></i>
+              <span>{{
+                scope.row.file.substring(scope.row.file.lastIndexOf("/") + 1)
+              }}</span>
+            </span>
+          </el-button>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remark"
+        min-width="150"
+        show-overflow-tooltip
+      />
+      <el-table-column label="创建人/创建时间" align="center" min-width="140">
+        <template slot-scope="scope">
+          <div>{{ scope.row.createBy }}</div>
+          <span>
+            {{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}") }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="200"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            >修改</el-button
+          >
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
 
-		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
-			:limit.sync="queryParams.pageSize" @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
-		<!-- 添加或修改公告对话框 -->
-		<el-dialog class="popup" :title="title" :visible.sync="open" width="780px" append-to-body>
-			<el-form ref="form" :model="form" :rules="rules" label-width="90px" class="formStep">
-				<el-form-item label="类型名称" prop="typeName">
-					<el-input v-model="form.typeName" placeholder="请输入" />
-				</el-form-item>
-			</el-form>
-			<div slot="footer" class="dialog-footer">
-				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
-			</div>
-		</el-dialog>
-	</div>
+    <!-- 添加或修改公告对话框 -->
+    <el-dialog
+      class="popup"
+      :title="title"
+      :visible.sync="open"
+      width="780px"
+      append-to-body
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="90px"
+        class="formStep"
+      >
+        <el-form-item label="类型名称" prop="typeName">
+          <el-input v-model="form.typeName" placeholder="请输入" />
+        </el-form-item>
+        <el-form-item label="单位" prop="tenantIdList">
+          <el-select v-model="form.tenantIdList" multiple placeholder="请选择">
+            <el-option
+              v-for="item in tenantsData"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="附件" prop="file">
+          <el-upload
+            :limit="1"
+            class="avatar-uploader wj-uploader"
+            :headers="headers"
+            :action="uploadFileUrl"
+            accept=".xlsx,.xls,.pdf,.doc,.docx"
+            :before-upload="handleBeforePdfUpload1"
+            :on-success="handleUploadPdfAdd1"
+            :on-remove="handleRemove"
+            :file-list="fileList"
+            :show-file-list="true"
+          >
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">
+              将文件拖到此处，或
+              <em>点击上传</em>
+            </div>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input
+            type="textarea"
+            v-model="form.remark"
+            placeholder="请输入"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
-	import {
-		reportList,
-		reportAdd,
-		reportUpd,
-		reportDel
-	} from "@/api/report";
-	export default {
-		name: "Notice",
-		data() {
-			return {
-				dataSourceList: [],
-				queryParams: {
-					param: {
-						name: "",
-					}
-				},
-				listData: [],
-				title: '',
-				open: false,
-				total: 0,
-				form: {},
-				loading: false,
-				showSearch: true,
-				multiple: false,
-				// 表单校验
-				rules: {
-					typeName: [{
-						required: true,
-						message: "上报类型不能为空",
-						trigger: "blur",
-					}],
-				},
-			};
-		},
-		created() {
-			this.getList();
-		},
-		methods: {
-			/** 查询公告列表 */
-			getList() {
-				this.loading = true;
-				reportList(this.queryParams).then((res) => {
-					this.listData = res.data.list;
-					this.total = res.data.total;
-					this.loading = false;
-				});
-			},
-			// 取消按钮
-			cancel() {
-				this.open = false;
-				this.reset();
-			},
-			// 表单重置
-			reset() {
-				this.form = {
-					"typeName": "",
-				};
-				this.resetForm("form");
-			},
-			/** 搜索按钮操作 */
-			handleQuery() {
-				this.queryParams.pageNum = 1;
-				this.getList();
-			},
-			/** 重置按钮操作 */
-			resetQuery() {
-				this.queryParams.param = {
-					typeName: "",
-				};
-				this.handleQuery();
-			},
-			// 多选框选中数据
-			handleSelectionChange(selection) {
-				this.ids = selection.map((item) => item.id);
-				this.single = selection.length != 1;
-				this.multiple = !selection.length;
-			},
-			/** 新增按钮操作 */
-			handleAdd() {
-				this.reset();
-				this.open = true;
-				this.title = "新增上报类型";
-			},
-			/** 修改按钮操作 */
-			handleUpdate(row) {
-				this.open = true;
-				this.title = "修改诊疗档案";
-				this.form = JSON.parse(JSON.stringify(row))
-			},
-			/** 诊疗档案 */
-			submitForm: function() {
-				this.$refs["form"].validate((valid) => {
-					if (valid) {
-						if (this.form.id != undefined) {
-							reportUpd(this.form).then((response) => {
-								this.$modal.msgSuccess("修改成功");
-								this.open = false;
-								this.getList();
-							});
-						} else {
-							reportAdd(this.form).then((response) => {
-								this.$modal.msgSuccess("新增成功");
-								this.open = false;
-								this.getList();
-							});
-						}
-					}
-				});
-			},
+import { getToken } from "@/utils/auth";
+import { tenantsList } from "@/api/member";
+import { reportList, reportAdd, reportUpd, reportDel } from "@/api/report";
+export default {
+  name: "Notice",
+  data() {
+    return {
+      uploadFileUrl: process.env.VUE_APP_API_QZURL + "/common/upload", // 上传的图片服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      dataSourceList: [],
+      queryParams: {
+        param: {
+          name: "",
+        },
+      },
+      listData: [],
+      title: "",
+      open: false,
+      total: 0,
+      form: {},
+      loading: false,
+      showSearch: true,
+      multiple: false,
+      // 表单校验
+      rules: {
+        typeName: [
+          {
+            required: true,
+            message: "上报类型不能为空",
+            trigger: "blur",
+          },
+        ],
+        tenantIdList: [
+          {
+            required: true,
+            message: "单位不能为空",
+            trigger: "change",
+          },
+        ],
+        file: [
+          {
+            required: true,
+            message: "附件不能为空",
+            trigger: "change",
+          },
+        ],
+      },
+      tenantsData: [],
+      fileList: [],
+    };
+  },
+  created() {
+    this.getList();
+    this.getTenantsList();
+  },
+  methods: {
+    handleRemove(file, fileList) {
+      this.form.file = "";
+      this.fileList = [];
+    },
+    // 上传成功回 - pdg
+    handleUploadPdfAdd1(res) {
+      if (res.code == 200) {
+        this.$message.success(res.msg || "导入成功");
+        this.form.file = res.fileName;
+        setTimeout(() => {
+          this.$refs["form"].validateField("file", (errorMessage) => {});
+        });
+      } else {
+        this.$message.error(res.msg || "导入失败");
+        this.fileList = [];
+      }
+    },
 
-			/** 删除按钮操作 */
-			handleDelete(row) {
-				const idList = row.id ? [row.id] : this.ids;
-				this.$modal
-					.confirm("是否确认删除当前选择的数据？")
-					.then(function() {
-						return reportDel({
-							idList: idList,
-						});
-					})
-					.then(() => {
-						this.getList();
-						this.$modal.msgSuccess("删除成功");
-					})
-					.catch(() => {});
-			},
-		},
-	};
+    // 上传前校检格式和大小 - 文件
+    handleBeforePdfUpload1(file) {
+      const fileSuffix = file.name.substring(file.name.lastIndexOf(".") + 1);
+      const whiteList = ["xlsx", "xls", "pdf", "doc", "docx"];
+      if (whiteList.indexOf(fileSuffix) === -1) {
+        this.$message.error("上传文件只能是xlsx/xls/pdf/doc/docx 格式！");
+        return false;
+      }
+    },
+    /** 查询公告列表 */
+    getTenantsList() {
+      tenantsList({
+        pageNum: -1,
+        param: {},
+      }).then((res) => {
+        this.tenantsData = res.data.list;
+      });
+    },
+    /** 查询公告列表 */
+    getList() {
+      this.loading = true;
+      reportList(this.queryParams).then((res) => {
+        this.listData = res.data.list;
+        this.total = res.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.fileList = [];
+      this.form = {
+        typeName: "",
+        tenantIdList: [],
+        remark: "",
+        file: "",
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.param = {
+        typeName: "",
+      };
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length != 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "新增上报类型";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.open = true;
+      this.title = "修改上报类型";
+      this.form = JSON.parse(JSON.stringify(row));
+      if (row.file) {
+        this.fileList = [
+          {
+            // 截取字符串，获取文件名
+            name: row.file.substring(row.file.lastIndexOf("/") + 1),
+            url: row.file,
+          },
+        ];
+      } else {
+        this.fileList = [];
+      }
+    },
+    /** 诊疗档案 */
+    submitForm: function () {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != undefined) {
+            reportUpd(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            reportAdd(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const idList = row.id ? [row.id] : this.ids;
+      this.$modal
+        .confirm("是否确认删除当前选择的数据？")
+        .then(function () {
+          return reportDel({
+            idList: idList,
+          });
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+  },
+};
 </script>
 <style scoped src="@/assets/styles/common.css"></style>
 
 <style scoped>
-	.div-title1 {
-		font-size: 22px;
-		font-weight: bold;
-		margin-bottom: 10px;
-	}
+>>> .el-upload-list__item:first-child {
+  margin-top: 0 !important;
+}
+.div-title1 {
+  font-size: 22px;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
 
-	.div-title2 {
-		font-size: 20px;
-		font-weight: bold;
-		margin-bottom: 10px;
-	}
+.div-title2 {
+  font-size: 20px;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
 
-	.div-title3 {
-		font-size: 18px;
-		font-weight: bold;
-		margin-bottom: 10px;
-	}
+.div-title3 {
+  font-size: 18px;
+  font-weight: bold;
+  margin-bottom: 10px;
+}
 
-	.span-but {
-		display: inline-block;
-		border-radius: 4px;
-		border: 1px solid #dcdfe6;
-		line-height: 32px;
-		padding: 0 15px;
-		margin: 5px;
-	}
+.span-but {
+  display: inline-block;
+  border-radius: 4px;
+  border: 1px solid #dcdfe6;
+  line-height: 32px;
+  padding: 0 15px;
+  margin: 5px;
+}
 
-	.span-but-active {
-		border: 1px solid #1890ff;
-	}
+.span-but-active {
+  border: 1px solid #1890ff;
+}
 
-	.human-body {
-		display: flex;
-		flex-wrap: wrap;
-	}
+.human-body {
+  display: flex;
+  flex-wrap: wrap;
+}
 
-	.human-body>>>.el-form-item {
-		width: 49%;
-		margin-right: 2%;
-	}
+.human-body >>> .el-form-item {
+  width: 49%;
+  margin-right: 2%;
+}
 
-	.human-body>>>.el-form-item:nth-of-type(2n) {
-		margin-right: 0;
-	}
+.human-body >>> .el-form-item:nth-of-type(2n) {
+  margin-right: 0;
+}
 
-	.formStep1>>>.el-form-item__label {}
+.formStep1 >>> .el-form-item__label {
+}
 
-	.form-item-zd {
-		width: 100%;
-		text-align: left;
-	}
+.form-item-zd {
+  width: 100%;
+  text-align: left;
+}
 
-	.form-item-age {
-		display: flex;
-		align-items: center;
-	}
+.form-item-age {
+  display: flex;
+  align-items: center;
+}
 
-	.form-item-age span {
-		margin: 0 10px;
-	}
+.form-item-age span {
+  margin: 0 10px;
+}
 
-	.form-item-age>>>.el-input {
-		width: 100px;
-	}
+.form-item-age >>> .el-input {
+  width: 100px;
+}
 
-	>>>.el-drawer.rtl {
-		width: 50% !important;
-	}
-</style>
\ No newline at end of file
+>>> .el-drawer.rtl {
+  width: 50% !important;
+}
+</style>