Răsfoiți Sursa

主页的样式,提示

sunyanqiang 3 ani în urmă
părinte
comite
f0c1180507

+ 10 - 1
src/api/medicalhealth/consumeputin.js

@@ -50,4 +50,13 @@ export function exportPutin(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+// // 药品过期列表
+// export function exportYaoPing(query) {
+//   return request({
+//     url: '/medicalhealth/yaopinguoqi/getGuoQ',
+//     method: 'get',
+//     params: query
+//   })
+// }

+ 98 - 45
src/views/PrintsLog/printlog/index.vue

@@ -16,7 +16,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item label="打印文件名称" prop="printName">
+      <el-form-item prop="printName">
         <el-input
           v-model="queryParams.printName"
           placeholder="请输入打印文件名称"
@@ -60,8 +60,12 @@
           placeholder="选择打印时间">
         </el-date-picker>
       </el-form-item>-->
-      <el-form-item label="归还状态" prop="statusG">
-        <el-select v-model="queryParams.statusG" clearable placeholder="请选择归还状态">
+      <el-form-item prop="statusG">
+        <el-select
+          v-model="queryParams.statusG"
+          clearable
+          placeholder="请选择归还状态"
+        >
           <el-option
             v-for="dict in statusGlist"
             :key="dict.dictValue"
@@ -98,8 +102,10 @@
         />
       </el-form-item>-->
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="btn" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery">重置</el-button>
+        <el-button type="primary" size="btn" @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -116,7 +122,12 @@
         >
       </el-col>-->
       <el-col :span="1.5">
-        <el-button type="primary" @click="handleUpdate" style="width:76px;height:36px;">归还</el-button>
+        <el-button
+          type="primary"
+          @click="handleUpdate"
+          style="width: 76px; height: 36px"
+          >归还</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -139,7 +150,10 @@
           v-hasPermi="['PrintsLog:printlog:export']"
         >导出</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
@@ -167,7 +181,12 @@
       </el-table-column>-->
       <!-- <el-table-column label="归还状态" align="center" prop="statusG" /> -->
       <el-table-column label="文件打印人" align="center" prop="printfileName" />
-      <el-table-column label="打印时间" align="center" prop="printTime" width="180">
+      <el-table-column
+        label="打印时间"
+        align="center"
+        prop="printTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.printTime, "{y}-{m}-{d}") }}</span>
         </template>
@@ -175,22 +194,25 @@
       <el-table-column label="归还状态" align="center" prop="statusG">
         <template slot-scope="scope">
           <!-- <dict-tag :options="dict.type.sys_statusG" :value="scope.row.statusG" /> -->
-          <div
-            style="color: #00FF00;"
-            v-if="scope.row.statusG=='0'"
-          >未归还</div>
-          <div
-            style="color:#90da90;"
-            v-if="scope.row.statusG=='1'"
-          >已归还</div>
+          <div style="color: #00ff00" v-if="scope.row.statusG == '0'">
+            未归还
+          </div>
+          <div style="color: #90da90" v-if="scope.row.statusG == '1'">
+            已归还
+          </div>
         </template>
       </el-table-column>
       <el-table-column label="归还份数" align="center" prop="returnNumber">
         <template slot-scope="scope">
-          <span>{{ scope.row.returnNumber?scope.row.returnNumber:0 }}</span>
+          <span>{{ scope.row.returnNumber ? scope.row.returnNumber : 0 }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="归还时间" align="center" prop="returnTime" width="180">
+      <el-table-column
+        label="归还时间"
+        align="center"
+        prop="returnTime"
+        width="180"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.returnTime, "{y}-{m}-{d}") }}</span>
         </template>
@@ -198,9 +220,15 @@
       <!-- <el-table-column label="打印编码信息" align="center" prop="printCode" />
       <el-table-column label="原文件路径" align="center" prop="primaryPath" />
       <el-table-column label="现文件路径" align="center" prop="presentPath" />-->
-      <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="btk" type="text" @click="handlesee(scope.row)">查看</el-button>
+          <el-button size="btk" type="text" @click="handlesee(scope.row)"
+            >查看</el-button
+          >
           <!-- <el-button size="mini" type="text" v-if="scope.row.statusG==1||scope.row.statusG==2">已归还</el-button> -->
           <!-- <el-button
             size="btd"
@@ -221,14 +249,30 @@
     />
 
     <!-- 添加或修改集中文印记录对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1030px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :inline="true" :rules="rules" label-width="120px">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1030px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :inline="true"
+        :rules="rules"
+        label-width="120px"
+      >
         <!-- <el-form-item label="打印id" prop="printId">
           <el-input v-model="form.printId" placeholder="请输入打印id" />
         </el-form-item>-->
         <div class="jiben">打印编码</div>
         <el-form-item label="打印编码" prop="printCode">
-          <el-input v-model="form.printCode" @blur="printCodeblur" placeholder="请输入打印编码" />
+          <el-input
+            v-model="form.printCode"
+            @blur="printCodeblur"
+            placeholder="请输入打印编码"
+          />
           <!-- <el-select v-model="form.printCode" filterable @change="printCodechange" clearable placeholder="请选择打印编码">
           <el-option
             v-for="dict in printlogList"
@@ -272,10 +316,17 @@
           <el-input v-model="form.isReturn" placeholder="请输入是否需要归还(0否1是)" />
         </el-form-item>-->
         <el-form-item label="归还份数" prop="returnNumber">
-          <el-input v-model="form.returnNumber" @blur="returnNumberblur" placeholder="请输入打印份数" />
+          <el-input
+            v-model="form.returnNumber"
+            @blur="returnNumberblur"
+            placeholder="请输入打印份数"
+          />
         </el-form-item>
         <el-form-item label="文件打印人" prop="printfileName">
-          <el-input v-model="form.printfileName" placeholder="请输入文件打印人" />
+          <el-input
+            v-model="form.printfileName"
+            placeholder="请输入文件打印人"
+          />
           <!-- <el-select v-model="form.printfileName" filterable clearable placeholder="请选择文件打印人">
             <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
           </el-select>-->
@@ -307,7 +358,9 @@
         </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm" v-if="flg!=1">确 定</el-button>
+        <el-button type="primary" @click="submitForm" v-if="flg != 1"
+          >确 定</el-button
+        >
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
@@ -322,7 +375,7 @@ import {
   addPrintlog,
   updatePrintlog,
   exportPrintlog,
-  listPeople
+  listPeople,
 } from "@/api/PrintsLog/printlog";
 
 export default {
@@ -364,33 +417,33 @@ export default {
         returnNumber: null,
         printCode: null,
         primaryPath: null,
-        presentPath: null
+        presentPath: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         returnNumber: [
-          { required: true, message: "归还份数不能为空", trigger: "blur" }
-        ]
+          { required: true, message: "归还份数不能为空", trigger: "blur" },
+        ],
       },
       statusGlist: [],
       rylist: [],
       returnNumber: null,
-      flg: null
+      flg: null,
     };
   },
   created() {
     this.getList();
     //检查类型
-    this.getDicts("sys_statusG").then(response => {
+    this.getDicts("sys_statusG").then((response) => {
       this.statusGlist = response.data;
     });
   },
   methods: {
     //获取人员
     getrylist() {
-      listPeople().then(res => {
+      listPeople().then((res) => {
         if (res.code == 200) {
           this.rylist = res.rows;
         }
@@ -399,7 +452,7 @@ export default {
     /** 查询集中文印记录列表 */
     getList() {
       this.loading = true;
-      listPrintlog(this.queryParams).then(response => {
+      listPrintlog(this.queryParams).then((response) => {
         this.printlogList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -426,7 +479,7 @@ export default {
         printCode: null,
         primaryPath: null,
         presentPath: null,
-        unitName: null
+        unitName: null,
       };
       this.resetForm("form");
     },
@@ -442,7 +495,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -455,7 +508,7 @@ export default {
     },
     /** 查看按钮操作 */
     handlesee(row) {
-      getPrintlog(row.id).then(res => {
+      getPrintlog(row.id).then((res) => {
         if (res.code == 200) {
           this.form = res.data;
           if (res.data.returnNumber) {
@@ -508,7 +561,7 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           this.form.returnNumber =
             Number(this.form.returnNumber) + Number(this.returnNumber);
@@ -516,13 +569,13 @@ export default {
             this.form.statusG = 1;
           }
           if (this.form.id != null) {
-            updatePrintlog(this.form).then(response => {
+            updatePrintlog(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addPrintlog(this.form).then(response => {
+            addPrintlog(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -536,7 +589,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否删除该记录?")
-        .then(function() {
+        .then(function () {
           return delPrintlog(ids);
         })
         .then(() => {
@@ -554,7 +607,7 @@ export default {
           this.exportLoading = true;
           return exportPrintlog(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -563,7 +616,7 @@ export default {
     //打印编号
     printCodeblur() {
       if (this.form.printCode) {
-        listPrintlog({ printCode: this.form.printCode }).then(response => {
+        listPrintlog({ printCode: this.form.printCode }).then((response) => {
           this.form = response.rows[0];
           if (this.form.returnNumber) {
             this.form.returnNumber = this.form.returnNumber;
@@ -572,8 +625,8 @@ export default {
           }
         });
       }
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>

+ 143 - 62
src/views/PrintsManage/manage/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="文件名称" prop="name">
+      <el-form-item prop="name">
         <el-input
           v-model="queryParams.name"
           placeholder="请输入文件名称"
@@ -133,8 +133,10 @@
         />
       </el-form-item>-->
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="btn" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery">重置</el-button>
+        <el-button type="primary" size="btn" @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -146,7 +148,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['PrintsManage:manage:add']"
-        >发送文件</el-button>
+          >发送文件</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -168,7 +171,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['PrintsManage:manage:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <!-- <el-col :span="1.5">
         <el-button
@@ -181,7 +185,10 @@
           v-hasPermi="['PrintsManage:manage:export']"
         >导出</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
@@ -198,18 +205,22 @@
       <el-table-column label="类型" align="center" prop="type" />
       <el-table-column label="是否彩打" align="center" prop="isPrintColor">
         <template slot-scope="scope">
-          <span>{{scope.row.isPrintColor==0?'否':'是'}}</span>
+          <span>{{ scope.row.isPrintColor == 0 ? "否" : "是" }}</span>
         </template>
       </el-table-column>
       <el-table-column label="是否双面打" align="center" prop="isPrintTwo">
         <template slot-scope="scope">
-          <span>{{scope.row.isPrintTwo==0?'否':'是'}}</span>
+          <span>{{ scope.row.isPrintTwo == 0 ? "否" : "是" }}</span>
         </template>
       </el-table-column>
       <el-table-column label="打印状态" align="center" prop="printStatus">
         <template slot-scope="scope">
-          <span style="color: #90da90;" v-if="scope.row.printStatus==1">打印中</span>
-          <span style="color:  #00FF00;" v-if="scope.row.printStatus==2">已打印</span>
+          <span style="color: #90da90" v-if="scope.row.printStatus == 1"
+            >打印中</span
+          >
+          <span style="color: #00ff00" v-if="scope.row.printStatus == 2"
+            >已打印</span
+          >
         </template>
       </el-table-column>
       <!-- <el-table-column label="大小" align="center" prop="size" /> -->
@@ -237,26 +248,33 @@
       <el-table-column label="接收人" align="center" prop="receiveName" />
       <el-table-column label="生成路径" align="center" prop="sFile" />
       <el-table-column label="打印回复信息" align="center" prop="printInfo" />-->
-      <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="btk"
             type="text"
-            v-if="scope.row.printStatus==1"
+            v-if="scope.row.printStatus == 1"
             @click="handlePrint(scope.row)"
-          >打印</el-button>
+            >打印</el-button
+          >
           <el-button
             size="btu"
             type="text"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['PrintsManage:manage:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="btd"
             type="text"
             @click="handleDelete(scope.row)"
             v-hasPermi="['PrintsManage:manage:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -270,11 +288,27 @@
     />
 
     <!-- 添加或修改集中文印主对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1030px" append-to-body :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :inline="true" :rules="rules" label-width="120px">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1030px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :inline="true"
+        :rules="rules"
+        label-width="120px"
+      >
         <div class="jiben">发送人信息</div>
         <el-form-item label="发送人" prop="sendName">
-          <el-input v-model="form.sendName" disabled placeholder="请输入发送人" />
+          <el-input
+            v-model="form.sendName"
+            disabled
+            placeholder="请输入发送人"
+          />
         </el-form-item>
         <div class="jiben">文件信息</div>
         <el-form-item label="上传文件">
@@ -291,18 +325,24 @@
             :headers="headers"
             class="upload-file-uploader"
             ref="upload"
-            style="width:200px;"
+            style="width: 200px"
             name="pfile"
           >
             <!-- 上传按钮 -->
-            <el-button size="mini" type="primary" class="select_file">选取文件</el-button>
+            <el-button size="mini" type="primary" class="select_file"
+              >选取文件</el-button
+            >
           </el-upload>
         </el-form-item>
         <el-form-item label="文件名称" prop="name">
           <el-input v-model="form.name" placeholder="请输入文件名称" />
         </el-form-item>
         <el-form-item label="打印份数" prop="printNumber">
-          <el-input v-model="form.printNumber" :min="0"  placeholder="请输入打印份数" />
+          <el-input
+            v-model="form.printNumber"
+            :min="0"
+            placeholder="请输入打印份数"
+          />
         </el-form-item>
         <el-form-item label="文件大小" prop="size">
           <el-input v-model="form.size" placeholder="请输入文件大小" />
@@ -336,13 +376,21 @@
           </el-radio-group>
         </el-form-item>-->
         <el-form-item label="是否为彩打" prop="isPrintColor">
-          <el-radio-group v-model="form.isPrintColor" style="width:200px;" size="mini">
+          <el-radio-group
+            v-model="form.isPrintColor"
+            style="width: 200px"
+            size="mini"
+          >
             <el-radio label="1">是</el-radio>
             <el-radio label="0">否</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="是否为双面打" prop="isPrintTwo">
-          <el-radio-group v-model="form.isPrintTwo" style="width:200px;" size="mini">
+          <el-radio-group
+            v-model="form.isPrintTwo"
+            style="width: 200px"
+            size="mini"
+          >
             <el-radio label="1">是</el-radio>
             <el-radio label="0">否</el-radio>
           </el-radio-group>
@@ -397,19 +445,33 @@
       :visible.sync="dyopen"
       append-to-body
       width="700px"
-      style="padding-top:100px;"
+      style="padding-top: 100px"
       :close-on-click-modal="false"
     >
-      <el-form ref="dyform" :model="dyform" :inline="true" :rules="rules" label-width="120px">
+      <el-form
+        ref="dyform"
+        :model="dyform"
+        :inline="true"
+        :rules="rules"
+        label-width="120px"
+      >
         <div class="jiben jiben2">打印信息</div>
         <el-form-item label="打印文件" prop="printName">
           <el-input v-model="dyform.printName" placeholder="请输入打印文件" />
         </el-form-item>
         <el-form-item label="打印份数" prop="printNumber">
-          <el-input v-model="dyform.printNumber" :min="0" placeholder="请输入打印份数" />
+          <el-input
+            v-model="dyform.printNumber"
+            :min="0"
+            placeholder="请输入打印份数"
+          />
         </el-form-item>
         <el-form-item label="是否需要归还" prop="isReturn">
-          <el-radio-group v-model="dyform.isReturn" style="width:200px;" size="mini">
+          <el-radio-group
+            v-model="dyform.isReturn"
+            style="width: 200px"
+            size="mini"
+          >
             <el-radio label="1">归还</el-radio>
             <el-radio label="0">无需归还</el-radio>
           </el-radio-group>
@@ -428,14 +490,35 @@
         </el-form-item>-->
         <!-- <div class="jiben">打印人信息</div> -->
         <el-form-item label="打印人" prop="printfileName">
-          <el-select v-model="dyform.printfileName" filterable clearable placeholder="请选择打印人">
-            <el-option v-for="item in rylist" :key="item.id" :label="item.name" :value="item.id"></el-option>
+          <el-select
+            v-model="dyform.printfileName"
+            filterable
+            clearable
+            placeholder="请选择打印人"
+          >
+            <el-option
+              v-for="item in rylist"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
         <div class="jiben jiben2">打印说明</div>
         <div
-          style="width:98.5%;height:45px;font-size:14px;line-height:45px;color:#fff;border-bottom:1px solid #fff;margin-bottom:20px;padding-left:15px;"
-        >其他要求:{{yaoqiu}}</div>
+          style="
+            width: 98.5%;
+            height: 45px;
+            font-size: 14px;
+            line-height: 45px;
+            color: #fff;
+            border-bottom: 1px solid #fff;
+            margin-bottom: 20px;
+            padding-left: 15px;
+          "
+        >
+          其他要求:{{ yaoqiu }}
+        </div>
         <el-form-item label prop="explainInfo">
           <el-input
             v-model="dyform.explainInfo"
@@ -472,7 +555,7 @@ import {
   exportManage,
   printFile,
   listPeople,
-  printCode
+  printCode,
 } from "@/api/PrintsManage/manage";
 import { getToken } from "@/utils/auth";
 import Cookies from "js-cookie";
@@ -490,23 +573,23 @@ export default {
     // 数量限制
     limit: {
       type: Number,
-      default: 5
+      default: 5,
     },
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 5
+      default: 5,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "xls", "ppt", "txt", "pdf"]
+      default: () => ["doc", "xls", "ppt", "txt", "pdf"],
     },
     // 是否显示提示
     isShowTip: {
       type: Boolean,
-      default: true
-    }
+      default: true,
+    },
   },
   data() {
     return {
@@ -551,7 +634,7 @@ export default {
         receiveId: null,
         receiveName: null,
         sFile: null,
-        printInfo: null
+        printInfo: null,
       },
       // 表单参数
       form: {},
@@ -564,7 +647,7 @@ export default {
       uploadFileUrl:
         process.env.VUE_APP_BASE_API + "/PrintsManage/manage/printFile", // 上传的图片服务器地址
       headers: {
-        Authorization: "Bearer " + getToken()
+        Authorization: "Bearer " + getToken(),
       },
       fileList: [],
       faith: null,
@@ -572,17 +655,17 @@ export default {
       islist: [],
       yaoqiu: "",
       dyopen2: false,
-      tableau: null
+      tableau: null,
     };
   },
   created() {
     this.getList();
     //级别
-    this.getDicts("level").then(response => {
+    this.getDicts("level").then((response) => {
       this.levelMs = response.data;
     });
     //是否
-    this.getDicts("sys_is").then(response => {
+    this.getDicts("sys_is").then((response) => {
       this.islist = response.data;
     });
   },
@@ -590,7 +673,7 @@ export default {
     /** 查询集中文印主列表 */
     getList() {
       this.loading = true;
-      listManage(this.queryParams).then(response => {
+      listManage(this.queryParams).then((response) => {
         this.manageList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -629,7 +712,7 @@ export default {
         isReturn: null,
         printNumber: null,
         isPrintTwo: null,
-        isPrintColor: null
+        isPrintColor: null,
       };
       this.resetForm("form");
     },
@@ -646,7 +729,7 @@ export default {
         printId: null,
         statusG: null,
         isPrintTwo: null,
-        isPrintColor: null
+        isPrintColor: null,
       };
       this.resetForm("dyform");
     },
@@ -662,7 +745,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id);
+      this.ids = selection.map((item) => item.id);
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
     },
@@ -678,7 +761,7 @@ export default {
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getManage(id).then(response => {
+      getManage(id).then((response) => {
         this.form = response.data;
         this.form.isPrintColor = response.data.isPrintColor + "";
         this.form.isPrintTwo = response.data.isPrintTwo + "";
@@ -688,16 +771,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateManage(this.form).then(response => {
+            updateManage(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addManage(this.form).then(response => {
+            addManage(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -711,7 +794,7 @@ export default {
       const ids = row.id || this.ids;
       this.$modal
         .confirm("是否确认删除该数据项?")
-        .then(function() {
+        .then(function () {
           return delManage(ids);
         })
         .then(() => {
@@ -729,7 +812,7 @@ export default {
           this.exportLoading = true;
           return exportManage(queryParams);
         })
-        .then(response => {
+        .then((response) => {
           this.$download.name(response.msg);
           this.exportLoading = false;
         })
@@ -755,7 +838,7 @@ export default {
           fileExtension = file.name.slice(file.name.lastIndexOf(".") + 1);
           this.form.type = fileExtension;
         }
-        const isTypeOk = this.fileType.some(type => {
+        const isTypeOk = this.fileType.some((type) => {
           if (file.type.indexOf(type) > -1) return true;
           if (fileExtension && fileExtension.indexOf(type) > -1) return true;
           return false;
@@ -821,7 +904,7 @@ export default {
     },
     //获取人员
     getrylist() {
-      listPeople().then(res => {
+      listPeople().then((res) => {
         if (res.code == 200) {
           this.rylist = res.rows;
         }
@@ -834,23 +917,21 @@ export default {
       } else {
         this.dyform.statusG = 0;
       }
-      printCode(this.dyform).then(res => {
+      printCode(this.dyform).then((res) => {
         if (res.code == 200) {
           console.log(res);
           this.dyopen = false;
           this.getList();
           // var open=window.open();
           // let url='http://192.168.5.188:8080/profile/print/';
-          let url='http://192.168.5.66:8089/profile/print/';
-          location.href =
-            url + res.printFileName;
-        
+          let url = "http://192.168.5.66:8089/profile/print/";
+          location.href = url + res.printFileName;
         }
       });
       // open.location.href="http://192.168.5.188:8080/priofile/print/202203211244.docx";
       // window.open( `https://view.officeapps.live.com/op/view.aspx?src=http://192.168.5.188:8080/profile/print/202203211428.docx`, "_blank");
-    }
-  }
+    },
+  },
 };
 </script>
 <style scoped>
@@ -1042,6 +1123,6 @@ export default {
   color: #bdbdbd4f !important;
 }
 ::v-deep .el-dialog__footer {
-    padding-right: 30px !important;
+  padding-right: 30px !important;
 }
 </style>

+ 295 - 150
src/views/medicalhealth/recuperate/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <el-form-item label="单位" prop="unitId">
+      <!-- <el-form-item label="单位" prop="unitId">
         <el-input
           v-model="queryParams.unitId"
           placeholder="请输入单位"
@@ -15,8 +15,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="疗养人" prop="peopleId">
+      </el-form-item> -->
+      <el-form-item prop="peopleId">
         <el-input
           v-model="queryParams.peopleId"
           placeholder="请输入疗养人"
@@ -25,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="疗养类型" prop="type">
+      <!-- <el-form-item label="疗养类型" prop="type">
         <el-select
           v-model="queryParams.type"
           placeholder="请选择疗养类型"
@@ -237,7 +237,7 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button
           type="primary"
@@ -300,21 +300,23 @@
           >导出</el-button
         >
       </el-col>
-      <right-toolbar
+      <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
-      ></right-toolbar>
+      ></right-toolbar> -->
     </el-row>
 
     <el-table
       v-loading="loading"
       :data="recuperateList"
       @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="岗位" align="center" prop="id" />
+      <el-table-column label="序号" align="center" prop="id" />
       <el-table-column label="单位" align="center" prop="unitId" />
-      <el-table-column label="疗养人" align="center" prop="peopleId" />
+      <el-table-column label="人员名称" align="center" prop="peopleId" />
+      <el-table-column label="岗位" align="center" prop="job" />
       <el-table-column label="疗养类型" align="center" prop="type" />
       <el-table-column label="疗养天数" align="center" prop="number" />
       <el-table-column
@@ -337,81 +339,21 @@
           <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="创建时间" align="center" prop="createtime" />
-      <el-table-column label="更新时间" align="center" prop="updatetime" />
-      <el-table-column label="更新时间" align="center" prop="unitId1" />
-      <el-table-column label="更新时间" align="center" prop="unitId2" />
-      <el-table-column label="更新时间" align="center" prop="unitId3" />
-      <el-table-column label="更新时间" align="center" prop="peopleId1" />
-      <el-table-column label="更新时间" align="center" prop="peopleId2" />
-      <el-table-column label="更新时间" align="center" prop="peopleId3" />
-      <el-table-column
-        label="1通过,0不通过,2未审核"
-        align="center"
-        prop="status1"
-      />
-      <el-table-column
-        label="1通过,0不通过,2未审核"
-        align="center"
-        prop="status2"
-      />
-      <el-table-column
-        label="1通过,0不通过,2未审核"
-        align="center"
-        prop="status3"
-      />
-      <el-table-column
-        label="1通过,0不通过,2未审核"
-        align="center"
-        prop="peopleState1"
-      />
-      <el-table-column
-        label="1通过,0不通过,2未审核"
-        align="center"
-        prop="peopleState2"
-      />
-      <el-table-column
-        label="1通过,0不通过,2未审核"
-        align="center"
-        prop="peopleState3"
-      />
-      <el-table-column
-        label="1通过,0不通过,2未审核"
-        align="center"
-        prop="people1Remark"
-      />
-      <el-table-column
-        label="1通过,0不通过,2未审核"
-        align="center"
-        prop="people2Remark"
-      />
-      <el-table-column
-        label="1通过,0不通过,2未审核"
-        align="center"
-        prop="people3Remark"
-      />
-      <el-table-column
-        label="1通过,0不通过,2未审核"
-        align="center"
-        prop="people1Authtime"
-      />
-      <el-table-column
-        label="1通过,0不通过,2未审核"
-        align="center"
-        prop="people2Authtime"
-      />
-      <el-table-column
-        label="1通过,0不通过,2未审核"
-        align="center"
-        prop="people3Authtime"
-      />
-      <el-table-column label="整体审批状态" align="center" prop="status" />
-      <el-table-column label="岗位" align="center" prop="job" />
+      <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
+      <el-table-column label="一级审批人" align="center" prop="createtime" />
+      <el-table-column label="一级审批状态" align="center" prop="updatetime" />
+      <el-table-column label="二级审批人" align="center" prop="unitId1" />
+      <el-table-column label="二级审批状态" align="center" prop="unitId2" />
+      <el-table-column label="三级审批人" align="center" prop="unitId3" />
+      <el-table-column label="三级审批状态" align="center" prop="peopleId1" />
+      <!-- <el-table-column label="申请时间" align="center" prop="peopleId2" /> -->
+      <!-- <el-table-column label="更新时间" align="center" prop="peopleId3" /> -->
+      <!-- <el-table-column label="整体审批状态" align="center" prop="status" /> -->
       <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="120"
       >
         <template slot-scope="scope">
           <el-button
@@ -444,16 +386,47 @@
 
     <!-- 添加或修改疗养管理对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        inline
+      >
         <el-form-item label="单位" prop="unitId">
-          <el-input v-model="form.unitId" placeholder="请输入单位" />
+          <!-- <el-input v-model="form.unitId" placeholder="请输入单位" /> -->
+          <treeselect
+            v-model="form.unitId"
+            :options="deptOptions"
+            placeholder="请选择单位"
+            @select="selectPeo"
+          />
         </el-form-item>
-        <el-form-item label="疗养人" prop="peopleId">
-          <el-input v-model="form.peopleId" placeholder="请输入疗养人" />
+        <el-form-item label="人员姓名" prop="peopleId">
+          <!-- <el-input v-model="form.peopleId" placeholder="请输入疗养人" /> -->
+          <el-select v-model="form.peopleId" placeholder="请选择请假人员">
+            <el-option
+              v-for="(item, i) in renYuan"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="qingRen(item.name)"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="疗养类型" prop="type">
-          <el-select v-model="form.type" placeholder="请选择疗养类型">
+          <!-- <el-select v-model="form.type" placeholder="">
             <el-option label="请选择字典生成" value="" />
+          </el-select> -->
+          <el-select v-model="form.type" placeholder="请选择疗养类型">
+            <el-option
+              v-for="(item, i) in liaoYang"
+              :key="i"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            >
+            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="疗养天数" prop="number">
@@ -481,89 +454,58 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="备注" prop="unitId1">
-          <el-input v-model="form.unitId1" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="备注" prop="unitId2">
-          <el-input v-model="form.unitId2" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="备注" prop="unitId3">
-          <el-input v-model="form.unitId3" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="备注" prop="peopleId1">
-          <el-input v-model="form.peopleId1" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="备注" prop="peopleId2">
-          <el-input v-model="form.peopleId2" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="备注" prop="peopleId3">
-          <el-input v-model="form.peopleId3" placeholder="请输入备注" />
-        </el-form-item>
-        <el-form-item label="1通过,0不通过,2未审核" prop="peopleState1">
-          <el-input
-            v-model="form.peopleState1"
-            placeholder="请输入1通过,0不通过,2未审核"
-          />
-        </el-form-item>
-        <el-form-item label="1通过,0不通过,2未审核" prop="peopleState2">
-          <el-input
-            v-model="form.peopleState2"
-            placeholder="请输入1通过,0不通过,2未审核"
+        <el-form-item label="一级审批单位" prop="remark">
+          <treeselect
+            v-model="form.unitId1"
+            :options="deptOptions"
+            placeholder="请选择单位"
+            @select="selectPeo"
           />
         </el-form-item>
-        <el-form-item label="1通过,0不通过,2未审核" prop="peopleState3">
-          <el-input
-            v-model="form.peopleState3"
-            placeholder="请输入1通过,0不通过,2未审核"
-          />
-        </el-form-item>
-        <el-form-item label="1通过,0不通过,2未审核" prop="people1Remark">
-          <el-input
-            v-model="form.people1Remark"
-            placeholder="请输入1通过,0不通过,2未审核"
-          />
+        <el-form-item label="一级审批人" prop="unitId1">
+          <el-input v-model="form.unitId1" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="1通过,0不通过,2未审核" prop="people2Remark">
-          <el-input
-            v-model="form.people2Remark"
-            placeholder="请输入1通过,0不通过,2未审核"
+        <el-form-item label="二级审批单位" prop="unitId2">
+          <!-- <el-input v-model="form.unitId2" placeholder="请输入备注" /> -->
+          <treeselect
+            v-model="form.unitId2"
+            :options="deptOptions"
+            placeholder="请选择单位"
+            @select="selectPeo"
           />
         </el-form-item>
-        <el-form-item label="1通过,0不通过,2未审核" prop="people3Remark">
-          <el-input
-            v-model="form.people3Remark"
-            placeholder="请输入1通过,0不通过,2未审核"
-          />
+        <el-form-item label="二级审批人" prop="unitId3">
+          <el-input v-model="form.unitId3" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="1通过,0不通过,2未审核" prop="people1Authtime">
-          <el-input
-            v-model="form.people1Authtime"
-            placeholder="请输入1通过,0不通过,2未审核"
+        <el-form-item label="三级审批单位" prop="peopleId2">
+          <!-- <el-input v-model="form.peopleId2" placeholder="请输入备注" /> -->
+          <treeselect
+            v-model="form.unitId3"
+            :options="deptOptions"
+            placeholder="请选择单位"
+            @select="selectPeo"
           />
         </el-form-item>
-        <el-form-item label="1通过,0不通过,2未审核" prop="people2Authtime">
-          <el-input
-            v-model="form.people2Authtime"
-            placeholder="请输入1通过,0不通过,2未审核"
-          />
+        <el-form-item label="三级审批人" prop="peopleId3">
+          <el-input v-model="form.peopleId3" placeholder="请输入备注" />
         </el-form-item>
-        <el-form-item label="1通过,0不通过,2未审核" prop="people3Authtime">
+        <div class="jiben">备注</div>
+        <el-form-item prop="remark">
           <el-input
-            v-model="form.people3Authtime"
-            placeholder="请输入1通过,0不通过,2未审核"
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
           />
         </el-form-item>
-        <el-form-item label="整体审批状态">
+
+        <!-- <el-form-item label="整体审批状态">
           <el-radio-group v-model="form.status">
             <el-radio label="1">请选择字典生成</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="岗位" prop="job">
           <el-input v-model="form.job" placeholder="请输入岗位" />
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -582,9 +524,24 @@ import {
   updateRecuperate,
   exportRecuperate,
 } from "@/api/medicalhealth/recuperate";
+// 查询字典
+import { getDicts } from "@/api/system/dict/data";
+// 导入树形结构
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+import {
+  getUser,
+  getDept,
+  getQuanBu,
+} from "@/api/grassrootsregistration/bdglmeeting";
 
 export default {
   name: "Recuperate",
+  dicts: ["convalescent_type"],
+  components: {
+    Treeselect,
+  },
   data() {
     return {
       // 遮罩层
@@ -644,12 +601,44 @@ export default {
       form: {},
       // 表单校验
       rules: {},
+      // 疗养列表
+      liaoYang: [],
+      // 树形结构列表
+      deptOptions: [],
+      // 人员列表
+      renYuan: [],
     };
   },
   created() {
     this.getList();
+    getDicts("convalescent_type").then((response) => {
+      console.log(response);
+      this.liaoYang = response.data;
+    });
   },
   methods: {
+    // 人员姓名选中
+    qingRen(name) {
+      this.form.peopleName = name;
+    },
+    // 获取人员
+    getRen(id) {
+      getQuanBu(id).then((response) => {
+        this.renYuan = response.data;
+      });
+    },
+    // 选择部门单位触发
+    selectPeo(data) {
+      this.form.unitId = data.id;
+      this.form.unitName = data.label;
+      this.getRen(this.form.unitId, 0);
+    },
+    // 获取部门列表
+    getBuMeng() {
+      getDept().then((res) => {
+        this.deptOptions = res.data;
+      });
+    },
     /** 查询疗养管理列表 */
     getList() {
       this.loading = true;
@@ -718,12 +707,14 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.getBuMeng();
       this.reset();
       this.open = true;
       this.title = "添加疗养管理";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      this.getBuMeng();
       this.reset();
       const id = row.id || this.ids;
       getRecuperate(id).then((response) => {
@@ -790,3 +781,157 @@ export default {
   },
 };
 </script>
+<style scoped>
+/* 对话框背景颜色 */
+::v-deep .el-dialog {
+  background: #004d86 !important;
+}
+::v-deep .el-textarea__inner {
+  width: 920px;
+  height: 104px;
+  margin: auto;
+}
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #718a9d;
+}
+::v-deep .el-dialog__title {
+  color: #fff;
+  font: 18px;
+}
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+  color: #fff;
+}
+::v-deep .el-form-item__label {
+  font: 16px;
+  color: #fff;
+  width: 100px !important;
+}
+::v-deep .el-input__inner {
+  /* width: 200px !important;
+  height: 36px; */
+  background: transparent;
+  color: #fff;
+  border: 1px solid white !important;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+}
+/* 基本信息背景 */
+.jiben {
+  width: 920px;
+  height: 32px;
+  background-image: url(../../../images/小标题底.png);
+  margin-bottom: 25px;
+  color: #fff;
+  padding-left: 16px;
+  line-height: 32px;
+}
+/*调整表单间距 */
+::v-deep .el-form-item__content {
+  width: 200px;
+}
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 30px 50px;
+}
+::v-deep .el-dialog__body {
+  margin: 10px 30px 20px 50px;
+  padding-top: 20px !important;
+  box-sizing: border-box;
+  /* padding: 30px 12px 30px 28px; */
+}
+.contents {
+  padding: 0px 40px !important;
+}
+/* 下拉菜单 */
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409eff;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+/* 刷新图标 */
+/* .el-icon-refresh {
+  width: 76px;
+  height: 36px;
+  color: #fff;
+  background-color: #1d96ff !important;
+  border-radius: 4px;
+  border: none;
+  margin-left: 20px;
+  font-size: 14px;
+} */
+/* 下拉菜单字体/背景颜色 */
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  background-color: #004d86;
+  color: #fff;
+}
+.el-select-dropdown__item {
+  color: #fff;
+}
+/* 时间选择 */
+::v-deep .el-input--small .el-input__inner {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+.el-date-editor.el-input {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+::v-deep .el-date-editor.el-input .el-input__inner {
+  height: 36px;
+  line-height: 36px;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+  color: #fff;
+}
+/* 单位下拉菜单选中字体颜色 */
+::v-deep .vue-treeselect__single-value {
+  color: #fff !important;
+}
+/* 分页按钮 */
+::v-deep .el-pagination.is-background .el-pager li {
+  background-color: #004d86;
+  color: #fff;
+}
+::v-deep .el-pagination.is-background .btn-next {
+  background-color: #004d86;
+  color: #fff;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 18px 42px 30px 0px;
+  margin-right: 30px;
+}
+/* 增加按钮弹框 */
+::v-deep .el-dialog {
+  width: 1060px !important;
+}
+::v-deep .el-dialog__body {
+  padding: none !important;
+}
+::v-deep .box4 .el-textarea__inner {
+  min-height: 120px !important;
+}
+
+/* 调整输入框提示文字颜色 */
+::v-deep .vue-treeselect__placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input::-webkit-input-placeholder {
+  color: #bdbdbd4f !important;
+}
+::v-deep input:-moz-placeholder {
+  color: #bdbdbd4f !important;
+}
+</style>

+ 1 - 1
src/views/peopleChuRu/bdglLeave/index.vue

@@ -555,7 +555,7 @@
         <el-form-item label="请假人员" prop="peopleId">
           <el-select
             v-model="form.peopleId"
-            placeholder="请输入请假人员"
+            placeholder="请选择请假人员"
             ref="headerSearchSelect"
           >
             <el-option

+ 26 - 26
src/views/pt.vue

@@ -4,7 +4,7 @@
     <div class="box">
       <!-- 头部区域 -->
       <div class="tou">
-        <span style="color:#00ccff;font-size:1.2vw;">{{ times }}</span>
+        <span style="color: #00ccff; font-size: 1.2vw">{{ times }}</span>
         <!-- <img class="liuxian" src="../assets/images/流线.gif" alt />
         <img class="img-left" src="../assets/images/闪烁GIF-慢.gif" alt /> -->
       </div>
@@ -495,7 +495,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="24" style="margin-top:15px;margin-bottom:10px;">
+          <el-col :span="24" style="margin-top: 15px; margin-bottom: 10px">
             <el-form-item label="状态">
               <el-radio-group v-model="form.status">
                 <el-radio
@@ -526,12 +526,12 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button
-          style="margin-top:15px;width:55px;height:25px;"
+          style="margin-top: 15px; width: 55px; height: 25px"
           @click="submitForm"
           >确 定</el-button
         >
         <el-button
-          style="width:55px;height:25px;margin-top:15px;"
+          style="width: 55px; height: 25px; margin-top: 15px"
           @click="cancel"
           >取 消</el-button
         >
@@ -545,7 +545,7 @@ import {
   printTrigger,
   printTriggerClear,
   printPeople,
-  printEachTrigger
+  printEachTrigger,
 } from "@/api/PrintsManage/manage";
 import { workEachTrigger, workTrigger, addNotice } from "@/api/pt";
 import Cookies from "js-cookie";
@@ -569,14 +569,14 @@ export default {
       title4: "",
       rules: {
         noticeTitle: [
-          { required: true, message: "公告标题不能为空", trigger: "blur" }
+          { required: true, message: "公告标题不能为空", trigger: "blur" },
         ],
         noticeType: [
-          { required: true, message: "公告类型不能为空", trigger: "change" }
-        ]
+          { required: true, message: "公告类型不能为空", trigger: "change" },
+        ],
       },
       // 表单参数
-      form: {}
+      form: {},
     };
   },
   created() {
@@ -600,7 +600,7 @@ export default {
         noticeTitle: undefined,
         noticeType: undefined,
         noticeContent: undefined,
-        status: "0"
+        status: "0",
       };
       this.resetForm("form");
     },
@@ -703,31 +703,31 @@ export default {
       // window.open(`/taishi`,'_self');
     },
     showfun() {
-      printTriggerClear().then(res => {
+      printTriggerClear().then((res) => {
         // console.log(res)
       });
       this.open = false;
     },
     showfun2() {
-      printTriggerClear().then(res => {
+      printTriggerClear().then((res) => {
         // console.log(res)
       });
       this.open2 = false;
     },
     showfun3() {
-       printTriggerClear().then(res => {
+      printTriggerClear().then((res) => {
         // console.log(res)
       });
       this.open3 = false;
     },
     showfun4() {
-       printTriggerClear().then(res => {
+      printTriggerClear().then((res) => {
         // console.log(res)
       });
       this.open4 = false;
     },
     quchulifun() {
-      printTriggerClear().then(res => {
+      printTriggerClear().then((res) => {
         if (res.code == 200) {
           this.open = true;
           window.open(`/print/manage`, "_self");
@@ -735,7 +735,7 @@ export default {
       });
     },
     quchulifun2() {
-      printTriggerClear().then(res => {
+      printTriggerClear().then((res) => {
         if (res.code == 200) {
           this.open = false;
           window.open(`/print/manage`, "_self");
@@ -743,7 +743,7 @@ export default {
       });
     },
     quchulifun3() {
-      printTriggerClear().then(res => {
+      printTriggerClear().then((res) => {
         if (res.code == 200) {
           this.open3 = false;
           window.open(`/workingArrangements/workTask`, "_self");
@@ -751,7 +751,7 @@ export default {
       });
     },
     quchulifun4() {
-      printTriggerClear().then(res => {
+      printTriggerClear().then((res) => {
         if (res.code == 200) {
           this.open4 = false;
           window.open(`/workingArrangements/workTask`, "_self");
@@ -760,7 +760,7 @@ export default {
     },
     startTime2() {
       this.timer = setInterval(() => {
-        printTrigger().then(res => {
+        printTrigger().then((res) => {
           if (res.code == 200) {
             if (res.print == "print") {
               if (res.numb != 0) {
@@ -770,7 +770,7 @@ export default {
             }
           }
         });
-        printEachTrigger().then(res => {
+        printEachTrigger().then((res) => {
           if (res.code == 200) {
             if (res.print == "printUserInfo") {
               var sendId = Cookies.get("userId");
@@ -783,7 +783,7 @@ export default {
             }
           }
         });
-        workEachTrigger().then(res => {
+        workEachTrigger().then((res) => {
           var sendId = Cookies.get("userId");
           if (res.code == 200) {
             if (res.workEach != 0) {
@@ -794,7 +794,7 @@ export default {
             }
           }
         });
-        workTrigger().then(res => {
+        workTrigger().then((res) => {
           // var sendId = Cookies.get("userId");
           if (res.code == 200) {
             if (res.workRequest != 0) {
@@ -810,7 +810,7 @@ export default {
       this.open5 = true;
     },
     submitForm() {
-      addNotice(this.form).then(response => {
+      addNotice(this.form).then((response) => {
         this.$modal.msgSuccess("新增成功");
         this.open5 = false;
         // this.getList();
@@ -821,14 +821,14 @@ export default {
     },
     tiaddfun() {
       this.$router.push({ path: "/system/notice" }).catch(() => {});
-    }
+    },
   },
   destroyed() {
     clearInterval(this.timer); // 清除定时器
     this.timer = null;
     clearInterval(this.timer2); // 清除定时器
     this.timer2 = null;
-  }
+  },
 };
 </script>
 
@@ -885,7 +885,7 @@ li {
   /* margin: 0 80px; */
 }
 .demo img {
-  margin-top: 36px;
+  margin-top: 42px;
 }
 .demo-box {
   width: 100%;