Merge branch 'new' of http://116.204.114.73:3000/ccsens_zhengzhichuan/acupuncture into new

acupuncture-前台/src/views/patientFile/index.vue

@@ -90,7 +90,7 @@
           >删除</el-button
         >
       </el-col>
-      <!-- <el-col :span="1.5">
+      <el-col :span="1.5">
         <el-button
           type="info"
           plain
@@ -109,7 +109,7 @@
           @click="handleImport"
           >导入</el-button
         >
-      </el-col> -->
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -120,6 +120,26 @@
           >导出</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-bottom"
+          size="mini"
+          @click="handleScreenDownload"
+          >下载筛查患者模版</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleScreenImport"
+          >导入筛查患者</el-button
+        >
+      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -467,6 +487,7 @@
       :visible.sync="importOpen"
       width="640px"
       append-to-body
+      class="div-dialog"
     >
       <el-form ref="importform" :model="importform">
         <el-form-item prop="accessUrl">
@@ -490,6 +511,36 @@
         </el-form-item>
       </el-form>
     </el-dialog>
+    <!-- 导入筛查患者 -->
+    <el-dialog
+      title="导入筛查患者"
+      :visible.sync="importScreenOpen"
+      width="640px"
+      append-to-body
+      class="div-dialog"
+    >
+      <el-form ref="importform">
+        <el-form-item prop="accessUrl">
+          <el-upload
+            :limit="1"
+            class="avatar-uploader wj-uploader"
+            :headers="headers"
+            :action="uploadScreenFileUrl"
+            accept=".xlsx, .xls"
+            :before-upload="handleBeforePdfUpload1"
+            :on-success="handleUploadPdfAdd1"
+            :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>
+    </el-dialog>
   </div>
 </template>
 
@@ -507,6 +558,8 @@ export default {
   dicts: ["sys_notice_status", "sys_notice_type"],
   data() {
     return {
+      importScreenOpen: false,
+      uploadScreenFileUrl: process.env.VUE_APP_API_QZURL + "/patient/import1", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
         deptId: localStorage.getItem("hospitalId"),
@@ -774,6 +827,7 @@ export default {
     handleUploadPdfAdd1(res) {
       if (res.code == 200) {
         this.importOpen = false;
+        this.importScreenOpen = false;
         this.getList();
         this.$modal.msgSuccess("导入成功");
       } else {
@@ -956,11 +1010,23 @@ export default {
       this.fileList = [];
       this.importOpen = true;
     },
+    // 筛查导入
+    handleScreenImport() {
+      this.fileList = [];
+      this.importScreenOpen = true;
+    },
+    /** 下载按钮操作 */
+    handleScreenDownload() {
+      window.open(`${process.env.VUE_APP_API_QZURL}/profile/sctemplate.xlsx`);
+    },
   },
 };
 </script>
 <style scoped src="@/assets/styles/common.css"></style>
 <style scoped>
+.div-dialog >>> .el-dialog__body {
+  padding-bottom: 30px;
+}
 .popup-title {
   font-size: 18px;
   line-height: 20px;

acupuncture-后台/src/views/system/dict/index.vue

@@ -1,6 +1,13 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
       <el-form-item label="字典名称" prop="dictName">
         <el-input
           v-model="queryParams.dictName"
@@ -46,8 +53,16 @@
         ></el-date-picker>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</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>
 
@@ -60,7 +75,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:dict:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -71,7 +87,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['system:dict:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -82,7 +99,18 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['system:dict:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          >导入</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -92,8 +120,10 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['system:dict:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
+
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -102,34 +132,71 @@
           size="mini"
           @click="handleRefreshCache"
           v-hasPermi="['system:dict:remove']"
-        >刷新缓存</el-button>
+          >刷新缓存</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="typeList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典编号" align="center" prop="dictId" />
-      <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
+      <el-table-column
-      <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
+        label="字典名称"
+        align="center"
+        prop="dictName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="字典类型"
+        align="center"
+        :show-overflow-tooltip="true"
+      >
         <template slot-scope="scope">
-          <router-link :to="'/system/dict-data/index/' + scope.row.dictId" class="link-type">
+          <router-link
+            :to="'/system/dict-data/index/' + scope.row.dictId"
+            class="link-type"
+          >
             <span>{{ scope.row.dictType }}</span>
           </router-link>
         </template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
+          <dict-tag
+            :options="dict.type.sys_normal_disable"
+            :value="scope.row.status"
+          />
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
+      <el-table-column
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        label="备注"
+        align="center"
+        prop="remark"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -137,20 +204,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dict:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:dict:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -172,11 +241,16 @@
               v-for="dict in dict.type.sys_normal_disable"
               :key="dict.value"
               :label="dict.value"
-            >{{dict.label}}</el-radio>
+              >{{ dict.label }}</el-radio
+            >
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          ></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -184,15 +258,52 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 导入患者信息 -->
+    <el-dialog
+      title="导入字典表"
+      :visible.sync="importOpen"
+      width="640px"
+      append-to-body
+    >
+      <el-form ref="importform" :model="importform">
+        <el-form-item prop="accessUrl">
+          <el-upload
+            :limit="1"
+            class="avatar-uploader wj-uploader"
+            :headers="headers"
+            :action="uploadFileUrl1"
+            accept=".xlsx, .xls"
+            :before-upload="handleBeforePdfUpload1"
+            :on-success="handleUploadPdfAdd1"
+            :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>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
+import { getToken } from "@/utils/auth";
+import {
+  listType,
+  getType,
+  delType,
+  addType,
+  updateType,
+  refreshCache,
+} from "@/api/system/dict/type";
 
 export default {
   name: "Dict",
-  dicts: ['sys_normal_disable'],
+  dicts: ["sys_normal_disable"],
   data() {
     return {
       // 遮罩层
@@ -221,29 +332,72 @@ export default {
         pageSize: 10,
         dictName: undefined,
         dictType: undefined,
-        status: undefined
+        status: undefined,
       },
       // 表单参数
       form: {},
+      importform: {},
+      importOpen: false, // 导入弹窗
       // 表单校验
       rules: {
         dictName: [
-          { required: true, message: "字典名称不能为空", trigger: "blur" }
+          { required: true, message: "字典名称不能为空", trigger: "blur" },
         ],
         dictType: [
-          { required: true, message: "字典类型不能为空", trigger: "blur" }
+          { required: true, message: "字典类型不能为空", trigger: "blur" },
-        ]
+        ],
-      }
+      },
+      headers: {
+        Authorization: "Bearer " + getToken(),
+        deptId: localStorage.getItem("hospitalId"),
+      },
+      uploadFileUrl1:
+        process.env.VUE_APP_API_QZURL + "/system/dict/type/importData", // 上传的图片服务器地址
+      fileList: [],
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    // 上传成功回 - pdg
+    handleUploadPdfAdd1(res) {
+      if (res.code == 200) {
+        this.importOpen = false;
+        this.getList();
+        this.$modal.msgSuccess("导入成功");
+      } else {
+        this.$message.error(res.msg || "导入失败");
+        this.fileList = [];
+      }
+    },
+    // 上传前校检格式和大小 - 图片
+    handleBeforeUpload1(file) {
+      const isLt2M = file.size / 1024 / 1024 < 100;
+      // 校检文件大小
+      if (!isLt2M) {
+        this.$message.error("上传文件大小不能超过 100MB!");
+      }
+      return isLt2M;
+    },
+    // 上传前校检格式和大小 - 文件
+    handleBeforePdfUpload1(file) {
+      const fileSuffix = file.name.substring(file.name.lastIndexOf(".") + 1);
+      const whiteList = ["xlsx", "xls"];
+      if (whiteList.indexOf(fileSuffix) === -1) {
+        this.$message.error("上传文件只能是.xlsx, .xls");
+        return false;
+      }
+    },
+    /** 导入按钮操作 */ handleImport() {
+      this.fileList = [];
+      this.importOpen = true;
+    },
     /** 查询字典类型列表 */
     getList() {
       this.loading = true;
-      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
+      listType(this.addDateRange(this.queryParams, this.dateRange)).then(
+        (response) => {
           this.typeList = response.rows;
           this.total = response.total;
           this.loading = false;
@@ -262,7 +416,7 @@ export default {
         dictName: undefined,
         dictType: undefined,
         status: "0",
-        remark: undefined
+        remark: undefined,
       };
       this.resetForm("form");
     },
@@ -285,32 +439,32 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictId)
+      this.ids = selection.map((item) => item.dictId);
-      this.single = selection.length!=1
+      this.single = selection.length != 1;
-      this.multiple = !selection.length
+      this.multiple = !selection.length;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const dictId = row.dictId || this.ids
+      const dictId = row.dictId || this.ids;
-      getType(dictId).then(response => {
+      getType(dictId).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改字典类型";
       });
     },
     /** 提交按钮 */
-    submitForm: function() {
+    submitForm: function () {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
+            updateType(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addType(this.form).then(response => {
+            addType(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -322,26 +476,34 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
+      this.$modal
-        return delType(dictIds);
+        .confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？')
-      }).then(() => {
+        .then(function () {
-        this.getList();
+          return delType(dictIds);
-        this.$modal.msgSuccess("删除成功");
+        })
-      }).catch(() => {});
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
-      this.download('system/dict/type/export', {
+      this.download(
-        ...this.queryParams
+        "system/dict/type/export",
-      }, `type_${new Date().getTime()}.xlsx`)
+        {
+          ...this.queryParams,
+        },
+        `type_${new Date().getTime()}.xlsx`
+      );
     },
     /** 刷新缓存按钮操作 */
     handleRefreshCache() {
       refreshCache().then(() => {
         this.$modal.msgSuccess("刷新成功");
-        this.$store.dispatch('dict/cleanDict');
+        this.$store.dispatch("dict/cleanDict");
       });
-    }
+    },
-  }
+  },
 };
 </script>