更改全局样式的弹出层位置向上移动，完成了疗养管理的审批

src/api/medicalhealth/recuperate.js

@@ -50,4 +50,13 @@ export function exportRecuperate(query) {
     method: 'get',
     params: query
   })
+}
+
+// 获取审批人用户
+export function getreciuperUser(id) {
+  return request({
+    url: 'system/user/list',
+    method: 'get',
+    params: { deptId: id }
+  })
 }

src/assets/styles/global.css

@@ -1158,5 +1158,5 @@ input:-moz-placeholder {
 
 /* 弹出层向下移动 */
 .el-dialog:not(.is-fullscreen) {
-  margin-top: 12vh !important;
+  margin-top: 10vh !important;
 }

src/views/medicalhealth/antiepidemicarchives/index.vue

@@ -392,7 +392,7 @@ export default {
   },
   created() {
     this.getList();
-    getDicts("warehouse_type").then((response) => {
+    getDicts("storage_room").then((response) => {
       this.warehouse = response.data;
     });
   },

src/views/medicalhealth/antiepidemicputin/index.vue

@@ -199,7 +199,7 @@
         label="入库时间"
         align="center"
         prop="putTime"
-        width="180"
+        width="140"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.putTime, "{y}-{m}-{d}") }}</span>
@@ -567,12 +567,13 @@ export default {
 ::v-deep .el-form-item__content {
   width: 200px;
 }
-::v-deep .el-dialog .el-input__inner{
+::v-deep .el-dialog .el-input__inner {
   width: 260px;
   height: 36px;
 }
 ::v-deep .el-dialog .el-input--small .el-input__inner {
-    width: 260px;}
+  width: 260px;
+}
 /* 底部确定取消按钮 */
 ::v-deep .el-dialog__footer {
   padding: 30px 50px;

src/views/medicalhealth/bdgldurgarchives/index.vue

@@ -192,6 +192,7 @@
         label="功能主治"
         align="center"
         prop="productIntroduction"
+        show-overflow-tooltip
       />
       <el-table-column
         label="库房"
@@ -204,8 +205,7 @@
       <el-table-column label="入库数量" align="center" prop="putIn" />
       <el-table-column label="出库数量" align="center" prop="putOut" />
       <el-table-column label="过期数量" align="center" prop="overdue" />
-      <!-- <el-table-column label="备注" align="center" prop="remarks" /> -->
-      <el-table-column label="录入人" align="center" prop="userName" />
+      <!-- <el-table-column label="录入人" align="center" prop="userName" /> -->
       <el-table-column
         label="操作"
         align="center"
@@ -408,7 +408,7 @@ export default {
   },
   created() {
     this.getList();
-    getDicts("warehouse_type").then((response) => {
+    getDicts("storage_room").then((response) => {
       this.warehouse = response.data;
     });
   },

src/views/medicalhealth/bdgldurgguoqi/index.vue

@@ -42,7 +42,7 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="入库编号" align="center" prop="number" />
+      <!-- <el-table-column label="入库编号" align="center" prop="number" /> -->
       <el-table-column label="药品名称" align="center" prop="durgName" />
       <el-table-column label="品牌" align="center" prop="durgBrand" />
       <el-table-column label="生产厂商" align="center" prop="manufacturer" />

src/views/medicalhealth/bdgldurglingyong/index.vue

@@ -162,7 +162,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <!-- <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -209,12 +209,12 @@
           v-hasPermi="['medicalhealth:bdgldurgputout:export']"
           >导出</el-button
         >
-      </el-col>
-      <!-- <right-toolbar
+      </el-col> -->
+    <!-- <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
       ></right-toolbar> -->
-    </el-row>
+    <!-- </el-row> -->
 
     <el-table
       v-loading="loading"

src/views/medicalhealth/bdgldurgputin/index.vue

@@ -7,112 +7,6 @@
       v-show="showSearch"
       label-width="68px"
     >
-      <!-- <el-form-item label="药品ID" prop="durgArchivesId">
-        <el-select
-          v-model="queryParams.durgArchivesId"
-          placeholder="请选择药品ID"
-          clearable
-          size="small"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="入库数量" prop="putIn">
-        <el-input
-          v-model="queryParams.putIn"
-          placeholder="请输入入库数量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入库位置" prop="place">
-        <el-input
-          v-model="queryParams.place"
-          placeholder="请输入入库位置"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="药品来源" prop="source">
-        <el-input
-          v-model="queryParams.source"
-          placeholder="请输入药品来源"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="入库说明" prop="remarks">
-        <el-input
-          v-model="queryParams.remarks"
-          placeholder="请输入入库说明"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="过期日期" prop="overduedate">
-        <el-date-picker
-          clearable
-          size="small"
-          v-model="queryParams.overduedate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择过期日期"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="入库时间" prop="putTime">
-        <el-date-picker
-          clearable
-          size="small"
-          v-model="queryParams.putTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择入库时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="录入人(创建人)" prop="adminId">
-        <el-select
-          v-model="queryParams.adminId"
-          placeholder="请选择录入人(创建人)"
-          clearable
-          size="small"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="编号" prop="number">
-        <el-input
-          v-model="queryParams.number"
-          placeholder="请输入编号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="剩余库存" prop="surplus">
-        <el-input
-          v-model="queryParams.surplus"
-          placeholder="请输入剩余库存"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="是否销毁" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择是否销毁"
-          clearable
-          size="small"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item> -->
       <el-form-item prop="durgBrand">
         <el-input
           v-model="queryParams.durgBrand"
@@ -122,57 +16,6 @@
           @input="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="生产厂商" prop="manufacturer">
-        <el-input
-          v-model="queryParams.manufacturer"
-          placeholder="请输入生产厂商"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="规格" prop="specifications">
-        <el-input
-          v-model="queryParams.specifications"
-          placeholder="请输入规格"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="功能主治" prop="productIntroduction">
-        <el-input
-          v-model="queryParams.productIntroduction"
-          placeholder="请输入功能主治"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="库房" prop="storeHouse">
-        <el-select
-          v-model="queryParams.storeHouse"
-          placeholder="请选择库房"
-          clearable
-          size="small"
-        >
-          <el-option
-            v-for="dict in dict.type.storage_room"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="库房" prop="unitId">
-        <el-input
-          v-model="queryParams.unitId"
-          placeholder="请输入库房"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <el-form-item>
         <!-- <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
@@ -258,7 +101,7 @@
         label="过期日期"
         align="center"
         prop="overduedate"
-        width="180"
+        width="120"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.overduedate, "{y}-{m}-{d}") }}</span>
@@ -268,24 +111,18 @@
         label="入库时间"
         align="center"
         prop="putTime"
-        width="180"
+        width="120"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.putTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <!-- <el-table-column label="录入人(创建人)" align="center" prop="adminId" /> -->
       <el-table-column label="编号" align="center" prop="number" />
       <el-table-column label="剩余库存" align="center" prop="surplus" />
       <el-table-column label="是否销毁" align="center" prop="status" />
       <el-table-column label="品牌" align="center" prop="durgBrand" />
       <el-table-column label="生产厂商" align="center" prop="manufacturer" />
       <el-table-column label="规格" align="center" prop="specifications" />
-      <!-- <el-table-column
-        label="功能主治"
-        align="center"
-        prop="productIntroduction"
-      /> -->
       <el-table-column label="库房" align="center" prop="storeHouse">
         <template slot-scope="scope">
           <dict-tag
@@ -345,7 +182,7 @@
         inline
       >
         <el-form-item label="入库编号" prop="number">
-          <el-input v-model="form.number" placeholder="请输入药品来源" />
+          <el-input v-model="form.number" placeholder="请输入入库编号" />
         </el-form-item>
         <el-form-item label="药品名称" prop="durgName">
           <el-select v-model="form.durgName" placeholder="请选择药品名称">

src/views/medicalhealth/bdgldurgputout/index.vue

@@ -312,7 +312,7 @@
         inline
       >
         <el-form-item label="出库编号" prop="number">
-          <el-input v-model="form.number" placeholder="请输入编号" />
+          <el-input v-model="form.number" placeholder="请输入出库编号" />
         </el-form-item>
         <el-form-item label="药品名称" prop="putOut">
           <el-select v-model="form.durgName" placeholder="请选择药品名称">
@@ -332,7 +332,7 @@
           <treeselect
             v-model="form.unitId1"
             :options="deptOptions"
-            placeholder="选择单位"
+            placeholder="选择使用单位"
             @select="selectPeo"
           />
         </el-form-item>
@@ -376,7 +376,7 @@
           <el-input
             v-model="form.purpose"
             type="textarea"
-            placeholder="请输入用途内容"
+            placeholder="请输入内容"
           />
         </el-form-item>
         <div class="jiben">出库说明</div>
@@ -384,7 +384,7 @@
           <el-input
             v-model="form.remarks"
             type="textarea"
-            placeholder="请输入出库说明"
+            placeholder="请输入内容"
           />
         </el-form-item>
 

src/views/medicalhealth/recuperate/index.vue

@@ -25,219 +25,6 @@
           @input="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="疗养类型" prop="type">
-        <el-select
-          v-model="queryParams.type"
-          placeholder="请选择疗养类型"
-          clearable
-          size="small"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="疗养天数" prop="number">
-        <el-input
-          v-model="queryParams.number"
-          placeholder="请输入疗养天数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="开始时间" prop="startTime">
-        <el-date-picker
-          clearable
-          size="small"
-          v-model="queryParams.startTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择开始时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="结束时间" prop="endTime">
-        <el-date-picker
-          clearable
-          size="small"
-          v-model="queryParams.endTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择结束时间"
-        >
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createtime">
-        <el-input
-          v-model="queryParams.createtime"
-          placeholder="请输入创建时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="updatetime">
-        <el-input
-          v-model="queryParams.updatetime"
-          placeholder="请输入更新时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="unitId1">
-        <el-input
-          v-model="queryParams.unitId1"
-          placeholder="请输入更新时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="unitId2">
-        <el-input
-          v-model="queryParams.unitId2"
-          placeholder="请输入更新时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="unitId3">
-        <el-input
-          v-model="queryParams.unitId3"
-          placeholder="请输入更新时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="peopleId1">
-        <el-input
-          v-model="queryParams.peopleId1"
-          placeholder="请输入更新时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="peopleId2">
-        <el-input
-          v-model="queryParams.peopleId2"
-          placeholder="请输入更新时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="更新时间" prop="peopleId3">
-        <el-input
-          v-model="queryParams.peopleId3"
-          placeholder="请输入更新时间"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="1通过，0不通过,2未审核" prop="peopleState1">
-        <el-input
-          v-model="queryParams.peopleState1"
-          placeholder="请输入1通过，0不通过,2未审核"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="1通过，0不通过,2未审核" prop="peopleState2">
-        <el-input
-          v-model="queryParams.peopleState2"
-          placeholder="请输入1通过，0不通过,2未审核"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="1通过，0不通过,2未审核" prop="peopleState3">
-        <el-input
-          v-model="queryParams.peopleState3"
-          placeholder="请输入1通过，0不通过,2未审核"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="1通过，0不通过,2未审核" prop="people1Remark">
-        <el-input
-          v-model="queryParams.people1Remark"
-          placeholder="请输入1通过，0不通过,2未审核"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="1通过，0不通过,2未审核" prop="people2Remark">
-        <el-input
-          v-model="queryParams.people2Remark"
-          placeholder="请输入1通过，0不通过,2未审核"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="1通过，0不通过,2未审核" prop="people3Remark">
-        <el-input
-          v-model="queryParams.people3Remark"
-          placeholder="请输入1通过，0不通过,2未审核"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="1通过，0不通过,2未审核" prop="people1Authtime">
-        <el-input
-          v-model="queryParams.people1Authtime"
-          placeholder="请输入1通过，0不通过,2未审核"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="1通过，0不通过,2未审核" prop="people2Authtime">
-        <el-input
-          v-model="queryParams.people2Authtime"
-          placeholder="请输入1通过，0不通过,2未审核"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="1通过，0不通过,2未审核" prop="people3Authtime">
-        <el-input
-          v-model="queryParams.people3Authtime"
-          placeholder="请输入1通过，0不通过,2未审核"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="整体审批状态" prop="status">
-        <el-select
-          v-model="queryParams.status"
-          placeholder="请选择整体审批状态"
-          clearable
-          size="small"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="岗位" prop="job">
-        <el-input
-          v-model="queryParams.job"
-          placeholder="请输入岗位"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
       <el-form-item>
         <!-- <el-button type="primary" size="btn" @click="handleQuery"
           >搜索</el-button
@@ -326,11 +113,12 @@
         </template>
       </el-table-column>
       <el-table-column label="疗养天数" align="center" prop="number" />
+      <el-table-column label="疗养地点" align="center" prop="address" />
       <el-table-column
         label="开始时间"
         align="center"
         prop="startTime"
-        width="180"
+        width="120"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.startTime, "{y}-{m}-{d}") }}</span>
@@ -340,7 +128,7 @@
         label="结束时间"
         align="center"
         prop="endTime"
-        width="180"
+        width="120"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
@@ -363,10 +151,13 @@
           <span v-if="scope.row.status1 == '1'" style="color: #13ce66"
             >通过</span
           >
-          <span v-if="scope.row.status1 == '0'" style="color: #00eaff"
+          <span
+            v-if="scope.row.status1 == '2'"
+            style="color: #00eaff"
+            :title="scope.row.reasons"
             >驳回</span
           >
-          <span v-if="scope.row.status1 == '2'" style="color: #ffba00"
+          <span v-if="scope.row.status1 == '0'" style="color: #ffba00"
             >未审批</span
           >
         </template>
@@ -387,10 +178,13 @@
           <span v-if="scope.row.status2 == '1'" style="color: #13ce66"
             >通过</span
           >
-          <span v-if="scope.row.status2 == '0'" style="color: #00eaff"
+          <span
+            v-if="scope.row.status2 == '2'"
+            style="color: #00eaff"
+            :title="scope.row.reasons"
             >驳回</span
           >
-          <span v-if="scope.row.status2 == '2'" style="color: #ffba00"
+          <span v-if="scope.row.status2 == '0'" style="color: #ffba00"
             >未审批</span
           >
         </template>
@@ -411,10 +205,13 @@
           <span v-if="scope.row.status3 == '1'" style="color: #13ce66"
             >通过</span
           >
-          <span v-if="scope.row.status3 == '0'" style="color: #00eaff"
+          <span
+            v-if="scope.row.status3 == '2'"
+            style="color: #00eaff"
+            :title="scope.row.reasons"
             >驳回</span
           >
-          <span v-if="scope.row.status3 == '2'" style="color: #ffba00"
+          <span v-if="scope.row.status3 == '0'" style="color: #ffba00"
             >未审批</span
           >
         </template>
@@ -508,6 +305,9 @@
         <el-form-item label="疗养天数" prop="number">
           <el-input v-model="form.number" placeholder="请输入疗养天数" />
         </el-form-item>
+        <el-form-item label="疗养地点" prop="address">
+          <el-input v-model="form.address" placeholder="请输入疗养地点" />
+        </el-form-item>
         <el-form-item label="开始时间" prop="startTime">
           <el-date-picker
             clearable
@@ -544,9 +344,9 @@
             <el-option
               v-for="(item, i) in renYuan1"
               :key="i"
-              :label="item.name"
-              :value="item.id"
-              @click.native="qingRen1(item.name)"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="qingRen1(item.nickName)"
             >
             </el-option>
           </el-select>
@@ -565,9 +365,9 @@
             <el-option
               v-for="(item, i) in renYuan2"
               :key="i"
-              :label="item.name"
-              :value="item.id"
-              @click.native="qingRen2(item.name)"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="qingRen2(item.nickName)"
             >
             </el-option>
           </el-select>
@@ -587,9 +387,9 @@
             <el-option
               v-for="(item, i) in renYuan3"
               :key="i"
-              :label="item.name"
-              :value="item.id"
-              @click.native="qingRen3(item.name)"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="qingRen3(item.nickName)"
             >
             </el-option>
           </el-select>
@@ -608,6 +408,167 @@
         <el-button @click="cancel" size="btn">取 消</el-button>
       </div>
     </el-dialog>
+    <!-- 审批对话框 -->
+    <el-dialog
+      title="疗养管理审批"
+      :visible.sync="opene"
+      width="500px"
+      append-to-body
+    >
+      <el-form
+        ref="forme"
+        :model="form"
+        :rules="ruless"
+        label-width="80px"
+        inline
+      >
+        <el-form-item label="单位" prop="unitId">
+          <!-- <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-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-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">
+          <el-input v-model="form.number" placeholder="请输入疗养天数" />
+        </el-form-item>
+        <el-form-item label="疗养地点" prop="address">
+          <el-input v-model="form.address" placeholder="请输入疗养地点" />
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.startTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择开始时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="结束时间" prop="endTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.endTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择结束时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="一级审批单位" prop="unitId1">
+          <treeselect
+            v-model="form.unitId1"
+            :options="deptOptions"
+            placeholder="请选择一级审批单位"
+            @select="selectPeo1"
+          />
+        </el-form-item>
+        <el-form-item label="一级审批人" prop="peopleId1">
+          <!-- <el-input v-model="form.peopleId1" placeholder="请输入备注" /> -->
+          <el-select v-model="form.peopleId1" placeholder="请选择一级审批人">
+            <el-option
+              v-for="(item, i) in renYuan1"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="qingRen1(item.nickName)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="二级审批单位" prop="unitId2">
+          <treeselect
+            v-model="form.unitId2"
+            :options="deptOptions"
+            placeholder="请选择二级审批单位"
+            @select="selectPeo2"
+          />
+        </el-form-item>
+        <el-form-item label="二级审批人" prop="peopleId2">
+          <!-- <el-input v-model="form.peopleId2" placeholder="请输入备注" /> -->
+          <el-select v-model="form.peopleId2" placeholder="请选择二级审批人">
+            <el-option
+              v-for="(item, i) in renYuan2"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="qingRen2(item.nickName)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="三级审批单位" prop="unitId3">
+          <!-- <el-input v-model="form.peopleId2" placeholder="请输入备注" /> -->
+          <treeselect
+            v-model="form.unitId3"
+            :options="deptOptions"
+            placeholder="请选择三级审批单位"
+            @select="selectPeo3"
+          />
+        </el-form-item>
+        <el-form-item label="三级审批人" prop="peopleId3">
+          <!-- <el-input v-model="form.peopleId3" placeholder="请输入备注" /> -->
+          <el-select v-model="form.peopleId3" placeholder="请选择三级审批人">
+            <el-option
+              v-for="(item, i) in renYuan3"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="qingRen3(item.nickName)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <div class="jiben">备注</div>
+        <el-form-item prop="remark">
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+        <div class="jiben">驳回原因</div>
+        <el-form-item prop="reasons">
+          <el-input
+            v-model="form.reasons"
+            type="textarea"
+            placeholder="请输入驳回原因"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForms">审 批</el-button>
+        <el-button @click="boHui" size="btn">驳 回</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -619,6 +580,7 @@ import {
   addRecuperate,
   updateRecuperate,
   exportRecuperate,
+  getreciuperUser,
 } from "@/api/medicalhealth/recuperate";
 // 查询字典
 import { getDicts } from "@/api/system/dict/data";
@@ -626,11 +588,7 @@ 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";
+import { getDept, getQuanBu } from "@/api/grassrootsregistration/bdglmeeting";
 
 export default {
   name: "Recuperate",
@@ -692,6 +650,7 @@ export default {
         people3Authtime: null,
         status: null,
         job: null,
+        address: null,
       },
       // 表单参数
       form: {},
@@ -709,6 +668,14 @@ export default {
       renYuan2: [],
       // 人员列表3
       renYuan3: [],
+      //  审批弹出层
+      opene: false,
+      // 审批表单验证
+      ruless: {
+        reasons: [
+          { required: true, message: "请输入驳回原因", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
@@ -742,20 +709,20 @@ export default {
     },
     // 获取人员1
     getRen1(id) {
-      getQuanBu(id).then((response) => {
-        this.renYuan1 = response.data;
+      getreciuperUser(id).then((response) => {
+        this.renYuan1 = response.rows;
       });
     },
     // 获取人员2
     getRen2(id) {
-      getQuanBu(id).then((response) => {
-        this.renYuan2 = response.data;
+      getreciuperUser(id).then((response) => {
+        this.renYuan2 = response.rows;
       });
     },
     // 获取人员3
     getRen3(id) {
-      getQuanBu(id).then((response) => {
-        this.renYuan3 = response.data;
+      getreciuperUser(id).then((response) => {
+        this.renYuan3 = response.rows;
       });
     },
     // 选择部门单位触发
@@ -835,6 +802,7 @@ export default {
         people3Authtime: null,
         status: 0,
         job: null,
+        address: null,
       };
       this.resetForm("form");
     },
@@ -863,7 +831,6 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      console.log(row);
       this.getBuMeng();
       this.reset();
       const id = row.id || this.ids;
@@ -932,10 +899,62 @@ export default {
         })
         .catch(() => {});
     },
+    // 审批弹出层内容
     handleshenpi1(row) {
-      console.log();
-      listRecuperate({ common: row.common }).then((res) => {
-        console.log(res);
+      this.getBuMeng();
+      this.reset();
+      const id = row.id || this.ids;
+      getRecuperate(id).then((response) => {
+        this.form = response.data;
+        this.getRen(this.form.unitId);
+        this.getRen1(this.form.unitId1);
+        this.getRen2(this.form.unitId2);
+        this.getRen3(this.form.unitId3);
+        this.opene = true;
+      });
+    },
+    //审批通过按钮
+    submitForms() {
+      this.recuperateList.forEach((item) => {
+        if (item.spJiBie == "一级") {
+          this.form.status1 = 1;
+          this.form.status = "一级审批通过";
+        } else if (item.spJiBie == "二级") {
+          this.form.status2 = 1;
+          this.form.status = "二级审批通过";
+        } else if (item.spJiBie == "三级") {
+          this.form.status3 = 1;
+          this.form.status = "三级级审批通过";
+        }
+      });
+      updateRecuperate(this.form).then((response) => {
+        this.$modal.msgSuccess("审批成功");
+        this.opene = false;
+        this.getList();
+      });
+    },
+    // 审批驳回按钮
+    boHui() {
+      this.$refs["forme"].validate((valid) => {
+        if (valid) {
+          this.recuperateList.forEach((item) => {
+            if (item.spJiBie == "一级") {
+              this.form.status1 = 2;
+              this.form.status = "一级级审批驳回";
+            } else if (item.spJiBie == "二级") {
+              this.form.status2 = 2;
+              this.form.status = "二级级审批驳回";
+            } else if (item.spJiBie == "三级") {
+              this.form.status3 = 2;
+              this.form.status = "三级级审批驳回";
+            }
+          });
+          updateRecuperate(this.form).then((response) => {
+            this.$modal.msgSuccess("审批成功");
+            this.opene = false;
+            this.getList();
+          });
+        }
       });
     },
   },

src/views/militaryvehicleManagement/thebusConfig/index.vue

@@ -31,9 +31,7 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button  size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -75,7 +73,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-        class="box"
+          class="box"
           type="warning"
           plain
           icon="el-icon-download"
@@ -151,7 +149,13 @@
     />
 
     <!-- 添加军车管理设置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="500px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
       <el-form
         ref="form"
         :model="form"
@@ -393,7 +397,6 @@ export default {
     getUserRen() {
       getThebusUser().then((response) => {
         this.userRen = response.rows;
-        console.log(this.userRen);
       });
     },
     // 删除对话框查铺
@@ -424,7 +427,6 @@ export default {
       this.open = false;
       this.opens = false;
       this.reset();
-      
     },
     // 表单重置
     reset() {
@@ -569,7 +571,6 @@ export default {
   background: transparent;
   color: #fff;
   border: 1px solid white !important;
-
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
@@ -722,19 +723,19 @@ export default {
 ::v-deep input:-moz-placeholder {
   color: #bdbdbd4f !important;
 }
-.box{
+.box {
   background-color: #ffba00 !important;
 }
-.el-button--btc{
+.el-button--btc {
   width: 34px !important;
 }
 ::v-deep .el-icon-plus:before {
-    margin-left: 6px !important;
+  margin-left: 6px !important;
 }
-.el-button--btd{
+.el-button--btd {
   width: 34px !important;
 }
-::v-deep  .el-icon-delete:before {
+::v-deep .el-icon-delete:before {
   margin-left: 5px !important;
 }
 </style>

src/views/peopleChuRu/bdglLeave/index.vue

@@ -38,7 +38,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-        class="box"
+          class="box"
           type="warning"
           plain
           icon="el-icon-download"
@@ -151,7 +151,11 @@
           >
           <el-col
             v-if="scope.row.status1 == 3"
-            :title="scope.row.bdglLeaveFus.length>0?scope.row.bdglLeaveFus[0].specialApproval:''"
+            :title="
+              scope.row.bdglLeaveFus.length > 0
+                ? scope.row.bdglLeaveFus[0].specialApproval
+                : ''
+            "
             style="color: #1f73d7"
             >特殊审批</el-col
           >
@@ -184,7 +188,9 @@
           >
           <el-col
             v-if="scope.row.status2 == 3"
-            :title="scope.row.bdglLeaveFus.length>0?[1].specialApproval:''"
+            :title="
+              scope.row.bdglLeaveFus.length > 0 ? [1].specialApproval : ''
+            "
             style="color: #1f73d7"
             >特殊审批</el-col
           >
@@ -1038,7 +1044,6 @@ export default {
               return (this.form.contents = "四级审批驳回");
             }
           });
-          console.log(this.form);
           updateBdglLeave(this.form).then((response) => {
             this.$modal.msgSuccess("审批成功");
             this.open = false;
@@ -1397,7 +1402,7 @@ export default {
 ::v-deep .el-table__fixed-right {
   height: 100% !important;
 }
-::v-deep .box{
+::v-deep .box {
   background-color: #ffba00 !important;
 }
 </style>

src/views/pt.vue

@@ -537,7 +537,23 @@
           </el-col>
           <el-col :span="12" v-if="!ggflg">
             <el-form-item label="附件" label-width="0px" prop="filename">
-                <a :href="url+form.filename" target="_blank" download style="display:inline-block;width:90px;height:30px;background-color:#409EFF;border:none;border-radus:3px;color:#fff;line-height:30px;text-align: center;">下载附件</a>
+              <a
+                :href="url + form.filename"
+                target="_blank"
+                download
+                style="
+                  display: inline-block;
+                  width: 90px;
+                  height: 30px;
+                  background-color: #409eff;
+                  border: none;
+                  border-radus: 3px;
+                  color: #fff;
+                  line-height: 30px;
+                  text-align: center;
+                "
+                >下载附件</a
+              >
               <!-- <fileUpload v-model="form.filename" class="m-l-20" /> -->
             </el-form-item>
           </el-col>
@@ -560,7 +576,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <button class="button1" v-if="ggflg" @click="submitForm">确 定</button>
-        <button @click="cancel" >取 消</button>
+        <button @click="cancel">取 消</button>
       </div>
     </el-dialog>
   </div>
@@ -601,7 +617,7 @@ export default {
       title2: "",
       title3: "",
       title4: "",
-      url:process.env.VUE_APP_BASE_API,
+      url: process.env.VUE_APP_BASE_API,
       rules: {
         noticeTitle: [
           { required: true, message: "公告标题不能为空", trigger: "blur" },