1

Signed-off-by: liubaiyan <632697560@qq.com>

src/assets/css/public.scss

@@ -252,3 +252,9 @@
   border-radius: 4px;
   background-color: #f6f6f6;
 }
+.table-head{
+  background-color: #f8f8f9!important;
+  th{
+    background: transparent!important;
+  }
+}

src/utils/viewCurrency.js

@@ -10,6 +10,7 @@ const viewCurrency = {
     return {
       //  公用
       buttonLoading: false,
+      shrinkState: false,
       //  表格
       tableLoading: false,
       tableTotal: 0,

src/views/dangerManage/dangerManage.vue

@@ -30,7 +30,7 @@
               <el-form-item prop="troubleCode">
                 <el-input
                   v-model="filterForm.troubleCode"
-                  placeholder="请输入隐患单号"
+                  placeholder="隐患单号"
                   clearable
                 />
               </el-form-item>
@@ -39,7 +39,7 @@
               <el-form-item prop="userName">
                 <el-input
                   v-model="filterForm.userName"
-                  placeholder="请输入上报人"
+                  placeholder="上报人"
                   clearable
                 />
               </el-form-item>
@@ -48,27 +48,33 @@
               <el-form-item prop="phone">
                 <el-input
                   v-model="filterForm.phone"
-                  placeholder="请输入上报人电话"
+                  placeholder="上报人电话"
                   clearable
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="9">
+            <el-col
+              v-show="!shrinkState"
+              :span="9"
+            >
               <el-form-item prop="date">
                 <el-date-picker
                   v-model="filterForm.date"
-                  type="datetimerange"
+                  type="daterange"
                   range-separator="至"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期"
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="sourceType">
                 <el-select
                   v-model="filterForm.sourceType"
-                  placeholder="请选择隐患来源"
+                  placeholder="隐患来源"
                   clearable
                   filterable
                 >
@@ -81,11 +87,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="troubleType">
                 <el-select
                   v-model="filterForm.troubleType"
-                  placeholder="请选择上报方式"
+                  placeholder="上报方式"
                   clearable
                   filterable
                 >
@@ -98,29 +107,38 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="description">
                 <el-input
                   v-model="filterForm.description"
-                  placeholder="请输入隐患内容"
+                  placeholder="隐患内容"
                   clearable
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="location">
                 <el-input
                   v-model="filterForm.location"
-                  placeholder="请输入隐患位置"
+                  placeholder="隐患位置"
                   clearable
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col
+              v-show="!shrinkState"
+              :span="4"
+            >
               <el-form-item prop="troubleState">
                 <el-select
                   v-model="filterForm.troubleState"
-                  placeholder="请选择隐患状态"
+                  placeholder="隐患状态"
                   clearable
                   filterable
                 >
@@ -133,11 +151,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="handleType">
                 <el-select
                   v-model="filterForm.handleType"
-                  placeholder="请选择处理方式"
+                  placeholder="处理方式"
                   clearable
                   filterable
                 >
@@ -150,11 +171,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="orderState">
                 <el-select
                   v-model="filterForm.orderState"
-                  placeholder="请选择工单状态"
+                  placeholder="工单状态"
                   clearable
                   filterable
                 >
@@ -167,11 +191,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="closeType">
                 <el-select
                   v-model="filterForm.closeType"
-                  placeholder="请选择汇报状态"
+                  placeholder="汇报状态"
                   clearable
                   filterable
                 >
@@ -197,6 +224,9 @@
                 <el-button @click="resetFilterForm">
                   重置
                 </el-button>
+                <el-button @click="shrinkState = !shrinkState">
+                  {{ shrinkState ? '展开' : '收缩' }}
+                </el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -204,7 +234,8 @@
         <el-table
           v-loading="tableLoading"
           :data="tableData"
-          :height="resizeHeight - 397"
+          header-row-class-name="table-head"
+          :height="resizeHeight - 397 + (shrinkState ? 100 : 0)"
           stripe
           border
           fit
@@ -698,8 +729,8 @@ export default {
       this.tableLoading = true
       getTableListOfDanger({
         ...this.filterForm,
-        startTime: this.filterForm.date[0] ? formatFullDateTime(this.filterForm.date[0]) : '',
-        endTime: this.filterForm.date[1] ? formatFullDateTime(this.filterForm.date[1]) : '',
+        startTime: this.filterForm.date[0] ? formatFullDateTime(this.filterForm.date[0] + '00:00:00') : '',
+        endTime: this.filterForm.date[1] ? formatFullDateTime(this.filterForm.date[1] + '23:59:59') : '',
         pageIndex: this.pageIndex,
         pageSize: this.pageSize
       }).then(res => {

src/views/dangerManage/reportDanger.vue

@@ -30,7 +30,7 @@
               <el-form-item prop="troubleCode">
                 <el-input
                   v-model="filterForm.troubleCode"
-                  placeholder="请输入隐患单号"
+                  placeholder="隐患单号"
                   clearable
                 />
               </el-form-item>
@@ -39,7 +39,7 @@
               <el-form-item prop="userName">
                 <el-input
                   v-model="filterForm.userName"
-                  placeholder="请输入上报人"
+                  placeholder="上报人"
                   clearable
                 />
               </el-form-item>
@@ -48,12 +48,12 @@
               <el-form-item prop="phone">
                 <el-input
                   v-model="filterForm.phone"
-                  placeholder="请输入上报人电话"
+                  placeholder="上报人电话"
                   clearable
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" v-show="!shrinkState">
               <el-form-item prop="date">
                 <el-date-picker
                   v-model="filterForm.date"
@@ -68,7 +68,7 @@
               <el-form-item prop="sourceType">
                 <el-select
                   v-model="filterForm.sourceType"
-                  placeholder="请选择隐患来源"
+                  placeholder="隐患来源"
                   clearable
                   filterable
                 >
@@ -81,29 +81,29 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="4" v-show="!shrinkState">
               <el-form-item prop="description">
                 <el-input
                   v-model="filterForm.description"
-                  placeholder="请输入隐患内容"
+                  placeholder="隐患内容"
                   clearable
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="4" v-show="!shrinkState">
               <el-form-item prop="location">
                 <el-input
                   v-model="filterForm.location"
-                  placeholder="请输入隐患位置"
+                  placeholder="隐患位置"
                   clearable
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="4" v-show="!shrinkState">
               <el-form-item prop="troubleState">
                 <el-select
                   v-model="filterForm.troubleState"
-                  placeholder="请选择隐患状态"
+                  placeholder="隐患状态"
                   clearable
                   filterable
                 >
@@ -116,11 +116,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="4" v-show="!shrinkState">
               <el-form-item prop="closeType">
                 <el-select
                   v-model="filterForm.closeType"
-                  placeholder="请选择汇报状态"
+                  placeholder="汇报状态"
                   clearable
                   filterable
                 >
@@ -146,6 +146,9 @@
                 <el-button @click="resetFilterForm">
                   重置
                 </el-button>
+                <el-button @click="shrinkState = !shrinkState">
+                  {{ shrinkState ? '展开' : '收缩' }}
+                </el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -153,7 +156,8 @@
         <el-table
           v-loading="tableLoading"
           :data="tableData"
-          :height="resizeHeight - 346"
+          header-row-class-name="table-head"
+          :height="resizeHeight - 346 + (shrinkState ? 50 : 0)"
           stripe
           border
           fit

src/views/dangerManage/transferDanger.vue

@@ -26,7 +26,7 @@
               <el-form-item prop="troubleCode">
                 <el-input
                   v-model="filterForm.troubleCode"
-                  placeholder="请输入隐患单号"
+                  placeholder="隐患单号"
                   clearable
                 />
               </el-form-item>
@@ -35,7 +35,7 @@
               <el-form-item prop="userName">
                 <el-input
                   v-model="filterForm.userName"
-                  placeholder="请输入上报人"
+                  placeholder="上报人"
                   clearable
                 />
               </el-form-item>
@@ -44,7 +44,7 @@
               <el-form-item prop="phone">
                 <el-input
                   v-model="filterForm.phone"
-                  placeholder="请输入上报人电话"
+                  placeholder="上报人电话"
                   clearable
                 />
               </el-form-item>
@@ -60,11 +60,14 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col
+              v-show="!shrinkState"
+              :span="4"
+            >
               <el-form-item prop="sourceType">
                 <el-select
                   v-model="filterForm.sourceType"
-                  placeholder="请选择隐患来源"
+                  placeholder="隐患来源"
                   clearable
                   filterable
                 >
@@ -77,29 +80,38 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col
+              v-show="!shrinkState"
+              :span="4"
+            >
               <el-form-item prop="description">
                 <el-input
                   v-model="filterForm.description"
-                  placeholder="请输入隐患内容"
+                  placeholder="隐患内容"
                   clearable
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col
+              v-show="!shrinkState"
+              :span="4"
+            >
               <el-form-item prop="location">
                 <el-input
                   v-model="filterForm.location"
-                  placeholder="请输入隐患位置"
+                  placeholder="隐患位置"
                   clearable
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col
+              v-show="!shrinkState"
+              :span="4"
+            >
               <el-form-item prop="troubleState">
                 <el-select
                   v-model="filterForm.troubleState"
-                  placeholder="请选择隐患状态"
+                  placeholder="隐患状态"
                   clearable
                   filterable
                 >
@@ -112,11 +124,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col
+              v-show="!shrinkState"
+              :span="4"
+            >
               <el-form-item prop="orderState">
                 <el-select
                   v-model="filterForm.orderState"
-                  placeholder="请选择工单状态"
+                  placeholder="工单状态"
                   clearable
                   filterable
                 >
@@ -140,6 +155,9 @@
                 <el-button @click="resetFilterForm">
                   重置
                 </el-button>
+                <el-button @click="shrinkState = !shrinkState">
+                  {{ shrinkState ? '展开' : '收缩' }}
+                </el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -147,7 +165,8 @@
         <el-table
           v-loading="tableLoading"
           :data="tableData"
-          :height="resizeHeight - 346"
+          header-row-class-name="table-head"
+          :height="resizeHeight - 346 + (shrinkState ? 50 : 0)"
           stripe
           border
           fit

src/views/dangerManage/voiceManage.vue

@@ -22,34 +22,37 @@
           class="filter-form"
         >
           <el-row :gutter="16">
-            <el-col :span="5">
+            <el-col :span="4">
               <el-form-item prop="troubleCode">
                 <el-input
                   v-model="filterForm.troubleCode"
-                  placeholder="请输入隐患单号"
+                  placeholder="隐患单号"
                   clearable
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="4">
               <el-form-item prop="userName">
                 <el-input
                   v-model="filterForm.userName"
-                  placeholder="请输入上报人"
+                  placeholder="上报人"
                   clearable
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="4">
               <el-form-item prop="phone">
                 <el-input
                   v-model="filterForm.phone"
-                  placeholder="请输入上报人电话"
+                  placeholder="上报人电话"
                   clearable
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="9">
+            <el-col
+              v-show="!shrinkState"
+              :span="12"
+            >
               <el-form-item prop="date">
                 <el-date-picker
                   v-model="filterForm.date"
@@ -60,11 +63,11 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col :span="4">
               <el-form-item prop="sourceType">
                 <el-select
                   v-model="filterForm.sourceType"
-                  placeholder="请选择隐患来源"
+                  placeholder="隐患来源"
                   clearable
                   filterable
                 >
@@ -77,20 +80,26 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="4"
+            >
               <el-form-item prop="location">
                 <el-input
                   v-model="filterForm.location"
-                  placeholder="请输入隐患位置"
+                  placeholder="隐患位置"
                   clearable
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="4"
+            >
               <el-form-item prop="troubleState">
                 <el-select
                   v-model="filterForm.troubleState"
-                  placeholder="请选择隐患状态"
+                  placeholder="隐患状态"
                   clearable
                   filterable
                 >
@@ -103,11 +112,14 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="4"
+            >
               <el-form-item prop="voiceState">
                 <el-select
                   v-model="filterForm.voiceState"
-                  placeholder="请选择语音识别状态"
+                  placeholder="语音识别状态"
                   clearable
                   filterable
                 >
@@ -120,9 +132,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col
-              :span="4"
-            >
+            <el-col :span="8">
               <el-form-item>
                 <el-button
                   type="primary"
@@ -133,6 +143,9 @@
                 <el-button @click="resetFilterForm">
                   重置
                 </el-button>
+                <el-button @click="shrinkState = !shrinkState">
+                  {{ shrinkState ? '展开' : '收缩' }}
+                </el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -140,7 +153,8 @@
         <el-table
           v-loading="tableLoading"
           :data="tableData"
-          :height="resizeHeight - 346"
+          header-row-class-name="table-head"
+          :height="resizeHeight - 346 + (shrinkState ? 50 : 0)"
           stripe
           border
           fit

src/views/medicalWasteConfig/personManage.vue

@@ -39,7 +39,7 @@
                   <el-form-item prop="userId">
                     <el-select
                       v-model="filterForm.userId"
-                      placeholder="请选择人员"
+                      placeholder="人员"
                       clearable
                       filterable
                     >
@@ -56,7 +56,7 @@
                   <el-form-item prop="categoryType">
                     <el-select
                       v-model="filterForm.categoryType"
-                      placeholder="请选择岗位"
+                      placeholder="岗位"
                       clearable
                       filterable
                     >
@@ -73,7 +73,7 @@
                   <el-form-item prop="account">
                     <el-input
                       v-model="filterForm.account"
-                      placeholder="请输入账号"
+                      placeholder="账号"
                       clearable
                     />
                   </el-form-item>
@@ -82,12 +82,12 @@
                   <el-form-item prop="positionId">
                     <el-select
                       v-model="filterForm.positionId"
-                      placeholder="请选择负责区域"
+                      placeholder="负责区域"
                       clearable
                       filterable
                     >
                       <el-option
-                        v-for="item in pointList"
+                        v-for="item in filterPointList"
                         :key="item.id"
                         :label="item.positionName"
                         :value="item.id"
@@ -116,6 +116,7 @@
             <el-table
               v-loading="tableLoading"
               :data="tableData"
+              header-row-class-name="table-head"
               :height="resizeHeight - 295"
               stripe
               border
@@ -163,7 +164,7 @@
               />
               <el-table-column
                 label="操作"
-                width="160"
+                width="100"
                 align="center"
                 fixed="right"
                 class-name="table-flex-column-right"
@@ -171,14 +172,15 @@
                 <template #default="scope">
                   <el-button
                     size="mini"
-                    type="primary"
+                    type="text"
                     @click="handleEdit(scope.row, 'edit')"
                   >
                     编辑
                   </el-button>
                   <el-button
                     size="mini"
-                    type="danger"
+                    type="text"
+                    style="color: #F56C6C"
                     @click="handleDelete(scope.row)"
                   >
                     删除
@@ -222,6 +224,7 @@
                 placeholder="请选择人员"
                 clearable
                 filterable
+                @change="getBuildingList"
               >
                 <el-option
                   v-for="item in userList"
@@ -242,6 +245,7 @@
                 placeholder="请选择岗位"
                 clearable
                 filterable
+                @change="getPointList"
               >
                 <el-option
                   v-for="item in $store.state.categoryTypeList"
@@ -309,6 +313,7 @@
                 placeholder="请选择楼层"
                 clearable
                 filterable
+                @change="getPointList"
               >
                 <el-option
                   v-for="item in floorList"
@@ -321,7 +326,10 @@
           </el-col>
         </el-row>
         <el-row v-if="detailForm.postCategory != 2">
-          <el-col :span="12">
+          <el-col
+            v-if="detailForm.postCategory != 3"
+            :span="12"
+          >
             <el-form-item
               label="负责点位"
               prop="positionId"
@@ -341,6 +349,30 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col
+            v-else
+            :span="12"
+          >
+            <el-form-item
+              label="负责点位"
+              prop="positionList"
+            >
+              <el-select
+                v-model="detailForm.positionList"
+                placeholder="请输入负责点位"
+                clearable
+                filterable
+                multiple
+              >
+                <el-option
+                  v-for="item in pointList"
+                  :key="item.id"
+                  :label="item.positionName"
+                  :value="item.id"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12" />
         </el-row>
       </el-form>
@@ -412,6 +444,7 @@ export default {
       userList: [],
       buildingList: [],
       floorList: [],
+      filterPointList: [],
       pointList: [],
       //  详情
       detailFormShow: false,
@@ -423,7 +456,8 @@ export default {
         buildingId: '',
         buildingList: [],
         floorId: '',
-        positionId: ''
+        positionId: '',
+        positionList: []
       },
       detailFormRules: {
         userId: [
@@ -443,6 +477,9 @@ export default {
         ],
         positionId: [
           { required: true, message: '请选择负责点位', trigger: 'change' }
+        ],
+        positionList: [
+          { required: true, type: 'array', message: '请选择负责点位', trigger: 'change' }
         ]
       }
     }
@@ -470,9 +507,10 @@ export default {
         })
       }
     })
-    getPointDictionary({}).then(res => {
+    getPointDictionary({
+    }).then(res => {
       if (res.code == 200) {
-        this.pointList = res.data
+        this.filterPointList = res.data
       } else {
         ElNotification({
           title: '获取点位字典失败',
@@ -491,13 +529,61 @@ export default {
         this.handlePageChange(1)
       }
     },
+    //  获取楼栋
+    getBuildingList () {
+      getBuildingDictionary({
+        projectId: this.$store.state.projectId,
+        noBinded: 1,
+        userId: this.detailForm.userId
+      }).then(res => {
+        if (res.code == 200) {
+          this.buildingList = res.data
+          this.setFloorList(this.detailForm.buildingId, 'keep')
+        } else {
+          ElNotification({
+            title: '获取楼栋字典失败',
+            message: res.msg,
+            type: 'error'
+          })
+        }
+      })
+    },
     //  获取楼层列表
     setFloorList (val, type) {
       if (type != 'keep') {
         this.detailForm.floorId = ''
+        this.detailForm.positionId = ''
+        this.detailForm.positionList = []
+        this.pointList = []
+      } else {
+        this.getPointList(this.detailForm.floorId, 'keep')
       }
       this.floorList = val ? this.buildingList.find(item => item.id == val).floorList : []
     },
+    //  获取点位数据
+    getPointList (val, type) {
+      if (type != 'keep') {
+        this.detailForm.positionId = ''
+        this.detailForm.positionList = []
+        this.pointList = []
+      }
+      if (this.detailForm.floorId && this.detailForm.postCategory) {
+        getPointDictionary({
+          floorId: this.detailForm.floorId,
+          positionType: this.detailForm.postCategory
+        }).then(res => {
+          if (res.code == 200) {
+            this.pointList = res.data
+          } else {
+            ElNotification({
+              title: '获取点位字典失败',
+              message: res.msg,
+              type: 'error'
+            })
+          }
+        })
+      }
+    },
     //  获取表格数据
     getTableList () {
       this.tableLoading = true
@@ -528,7 +614,8 @@ export default {
         buildingId: '',
         buildingList: [],
         floorId: '',
-        positionId: ''
+        positionId: '',
+        positionList: []
       }
       this.detailFormShow = true
       this.detailFormType = type
@@ -546,12 +633,11 @@ export default {
               postCategory: JSON.stringify(res.data.postCategory),
               buildingId: res.data.postCategory == 2 ? '' : res.data.buildingId,
               buildingList: res.data.postCategory == 2 ? res.data.buildingId.split(',') : [],
-              floorId: res.data.floorId,
-              positionId: res.data.positionId
-            }
-            if (this.buildingList.length) {
-              this.setFloorList(this.detailForm.buildingId, 'keep')
+              floorId: res.data.postCategory == 2 ? '' : res.data.floorId,
+              positionId: res.data.postCategory == 1 ? res.data.positionId : '',
+              positionList: res.data.postCategory == 3 ? res.data.positionId.split(',') : []
             }
+            this.getBuildingList()
           } else {
             ElNotification({
               title: '获取详情失败',
@@ -563,24 +649,6 @@ export default {
       } else {
         this.detailForm.id = null
       }
-      getBuildingDictionary({
-        projectId: this.$store.state.projectId,
-        noBinded: 1,
-        userId: type == 'edit' ? row.userId : ''
-      }).then(res => {
-        if (res.code == 200) {
-          this.buildingList = res.data
-          if (this.detailForm.buildingId) {
-            this.setFloorList(this.detailForm.buildingId, 'keep')
-          }
-        } else {
-          ElNotification({
-            title: '获取楼栋字典失败',
-            message: res.msg,
-            type: 'error'
-          })
-        }
-      })
     },
     //  提交表单
     submitForm () {
@@ -589,9 +657,11 @@ export default {
           this.buttonLoading = true
           submitFormOfPerson({
             ...this.detailForm,
-            buildingId: this.detailForm.postCategory != 2 ? this.detailForm.buildingId : this.detailForm.buildingList.join(',')
+            buildingId: this.detailForm.postCategory != 2 ? this.detailForm.buildingId : this.detailForm.buildingList.join(','),
+            positionId: this.detailForm.postCategory != 3 ? this.detailForm.positionId : this.detailForm.positionList.join(',')
           }).then(res => {
             this.buttonLoading = false
+            debugger
             if (res.code == 200) {
               this.detailFormShow = false
               ElNotification({

src/views/medicalWasteConfig/pointManage.vue

@@ -63,7 +63,7 @@
                   <el-form-item prop="name">
                     <el-input
                       v-model="filterForm.name"
-                      placeholder="请输入点位名称"
+                      placeholder="点位名称"
                       clearable
                     />
                   </el-form-item>
@@ -72,7 +72,7 @@
                   <el-form-item prop="type">
                     <el-select
                       v-model="filterForm.type"
-                      placeholder="请选择点位类型"
+                      placeholder="点位类型"
                       clearable
                       filterable
                     >
@@ -89,7 +89,7 @@
                   <el-form-item prop="positionName">
                     <el-input
                       v-model="filterForm.positionName"
-                      placeholder="请输入点位位置"
+                      placeholder="点位位置"
                       clearable
                     />
                   </el-form-item>
@@ -114,6 +114,7 @@
             <el-table
               v-loading="tableLoading"
               :data="tableData"
+              header-row-class-name="table-head"
               :height="resizeHeight - 295"
               stripe
               border
@@ -167,7 +168,7 @@
               />
               <el-table-column
                 label="操作"
-                width="220"
+                width="200"
                 align="center"
                 fixed="right"
                 class-name="table-flex-column-right"
@@ -175,25 +176,33 @@
                 <template #default="scope">
                   <el-button
                     size="mini"
-                    type="primary"
+                    type="text"
                     @click="handleEdit(scope.row, 'check')"
                   >
                     查看
                   </el-button>
                   <el-button
                     size="mini"
-                    type="primary"
+                    type="text"
                     @click="handleEdit(scope.row, 'edit')"
                   >
                     编辑
                   </el-button>
                   <el-button
                     size="mini"
-                    type="danger"
+                    type="text"
                     @click="handleDelete(scope.row)"
+                    style="color: #F56C6C"
                   >
                     删除
                   </el-button>
+                  <el-button
+                    size="mini"
+                    type="text"
+                    @click="handleDownload(scope.row)"
+                  >
+                    下载二维码
+                  </el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -608,6 +617,12 @@ export default {
           }
         })
       })
+    },
+    //  下载单个二维码
+    handleDownload (row) {
+      downloadCodeDataOfPoint({
+        positionId: row.id
+      })
     }
   }
 }

src/views/medicalWasteConfig/routerManage.vue

@@ -39,7 +39,7 @@
                   <el-form-item prop="keyWord">
                     <el-input
                       v-model="filterForm.keyWord"
-                      placeholder="请输入关键字查询"
+                      placeholder="关键字查询"
                       clearable
                     />
                   </el-form-item>
@@ -62,6 +62,7 @@
             <el-table
               v-loading="tableLoading"
               :data="tableData"
+              header-row-class-name="table-head"
               :height="resizeHeight - 295"
               stripe
               border
@@ -99,7 +100,7 @@
               />
               <el-table-column
                 label="操作"
-                width="220"
+                width="130"
                 align="center"
                 fixed="right"
                 class-name="table-flex-column-right"
@@ -107,22 +108,23 @@
                 <template #default="scope">
                   <el-button
                     size="mini"
-                    type="primary"
+                    type="text"
                     @click="handleEdit(scope.row, 'check')"
                   >
                     详情
                   </el-button>
                   <el-button
                     size="mini"
-                    type="primary"
+                    type="text"
                     @click="handleEdit(scope.row, 'edit')"
                   >
                     编辑
                   </el-button>
                   <el-button
                     size="mini"
-                    type="danger"
+                    type="text"
                     @click="handleDelete(scope.row)"
+                    style="color: #F56C6C"
                   >
                     删除
                   </el-button>

src/views/medicalWasteManage/medicalWasteManage.vue

@@ -65,7 +65,10 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="packCode">
                 <el-input
                   v-model="filterForm.packCode"
@@ -74,7 +77,10 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col
+              v-show="!shrinkState"
+              :span="4"
+            >
               <el-form-item prop="buildingId">
                 <el-select
                   v-model="filterForm.buildingId"
@@ -91,7 +97,10 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="createTime">
                 <el-date-picker
                   v-model="filterForm.createTime"
@@ -100,7 +109,10 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="packUserName">
                 <el-input
                   v-model="filterForm.packUserName"
@@ -109,7 +121,10 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="collectUserName">
                 <el-input
                   v-model="filterForm.collectUserName"
@@ -118,7 +133,10 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="checkUserName">
                 <el-input
                   v-model="filterForm.checkUserName"
@@ -127,7 +145,10 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col
+              v-show="!shrinkState"
+              :span="4"
+            >
               <el-form-item prop="packState">
                 <el-select
                   v-model="filterForm.packState"
@@ -144,7 +165,10 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="abnormalType">
                 <el-select
                   v-model="filterForm.abnormalType"
@@ -161,7 +185,10 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="abnormalCategory">
                 <el-select
                   v-model="filterForm.abnormalCategory"
@@ -178,7 +205,10 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="finishState">
                 <el-select
                   v-model="filterForm.finishState"
@@ -206,6 +236,9 @@
                 <el-button @click="resetFilterForm">
                   重置
                 </el-button>
+                <el-button @click="shrinkState = !shrinkState">
+                  {{ shrinkState ? '展开' : '收缩' }}
+                </el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -213,7 +246,8 @@
         <el-table
           v-loading="tableLoading"
           :data="tableData"
-          :height="resizeHeight - 397"
+          header-row-class-name="table-head"
+          :height="resizeHeight - 397 + (shrinkState ? 100 : 0)"
           stripe
           border
           fit

src/views/medicalWasteManage/wasteAbnormalManage.vue

@@ -65,7 +65,10 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="packCode">
                 <el-input
                   v-model="filterForm.packCode"
@@ -74,7 +77,10 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col
+              v-show="!shrinkState"
+              :span="4"
+            >
               <el-form-item prop="buildingId">
                 <el-select
                   v-model="filterForm.buildingId"
@@ -92,7 +98,10 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="positionId">
                 <el-select
                   v-model="filterForm.positionId"
@@ -109,7 +118,10 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="createTime">
                 <el-date-picker
                   v-model="filterForm.createTime"
@@ -118,7 +130,10 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="packUserName">
                 <el-input
                   v-model="filterForm.packUserName"
@@ -127,7 +142,10 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="collectUserName">
                 <el-input
                   v-model="filterForm.collectUserName"
@@ -136,7 +154,10 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col
+              v-show="!shrinkState"
+              :span="4"
+            >
               <el-form-item prop="checkUserName">
                 <el-input
                   v-model="filterForm.checkUserName"
@@ -145,7 +166,10 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="packState">
                 <el-select
                   v-model="filterForm.packState"
@@ -162,7 +186,10 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="abnormalCategory">
                 <el-select
                   v-model="filterForm.abnormalCategory"
@@ -179,7 +206,10 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="5">
+            <el-col
+              v-show="!shrinkState"
+              :span="5"
+            >
               <el-form-item prop="finishState">
                 <el-select
                   v-model="filterForm.finishState"
@@ -209,6 +239,9 @@
                 <el-button @click="resetFilterForm">
                   重置
                 </el-button>
+                <el-button @click="shrinkState = !shrinkState">
+                  {{ shrinkState ? '展开' : '收缩' }}
+                </el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -216,7 +249,8 @@
         <el-table
           v-loading="tableLoading"
           :data="tableData"
-          :height="resizeHeight - 397"
+          header-row-class-name="table-head"
+          :height="resizeHeight - 397 + (shrinkState ? 100 : 0)"
           stripe
           border
           fit

src/views/medicalWasteManage/wasteBatchManage.vue

@@ -26,7 +26,7 @@
               <el-form-item prop="projectId">
                 <el-select
                   v-model="filterForm.projectId"
-                  placeholder="请选择项目"
+                  placeholder="项目"
                   clearable
                   filterable
                 >
@@ -43,7 +43,7 @@
               <el-form-item prop="batchCode">
                 <el-input
                   v-model="filterForm.batchCode"
-                  placeholder="请输入批次编码"
+                  placeholder="批次编码"
                   clearable
                 />
               </el-form-item>
@@ -52,7 +52,7 @@
               <el-form-item prop="batchName">
                 <el-select
                   v-model="filterForm.batchName"
-                  placeholder="请选择批次"
+                  placeholder="批次"
                   clearable
                   filterable
                 >
@@ -69,34 +69,34 @@
               <el-form-item prop="collectUserName">
                 <el-input
                   v-model="filterForm.collectUserName"
-                  placeholder="请输入收集人"
+                  placeholder="收集人"
                   clearable
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="4" v-show="!shrinkState">
               <el-form-item prop="createTime">
                 <el-date-picker
                   v-model="filterForm.createTime"
                   type="datetime"
-                  placeholder="请选择日期"
+                  placeholder="日期"
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="4" v-show="!shrinkState">
               <el-form-item prop="checkUserName">
                 <el-input
                   v-model="filterForm.checkUserName"
-                  placeholder="请输入验收人"
+                  placeholder="验收人"
                   clearable
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="4" v-show="!shrinkState">
               <el-form-item prop="batchState">
                 <el-select
                   v-model="filterForm.batchState"
-                  placeholder="请选择状态"
+                  placeholder="状态"
                   clearable
                   filterable
                 >
@@ -109,11 +109,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="4" v-show="!shrinkState">
               <el-form-item prop="pathState">
                 <el-select
                   v-model="filterForm.pathState"
-                  placeholder="请选择运送线路"
+                  placeholder="运送线路"
                   clearable
                   filterable
                 >
@@ -126,11 +126,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="4" v-show="!shrinkState">
               <el-form-item prop="abnormalType">
                 <el-select
                   v-model="filterForm.abnormalType"
-                  placeholder="请选择验收异常"
+                  placeholder="验收异常"
                   clearable
                   filterable
                 >
@@ -143,11 +143,11 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4">
+            <el-col :span="4" v-show="!shrinkState">
               <el-form-item prop="finishState">
                 <el-select
                   v-model="filterForm.finishState"
-                  placeholder="请选择异常状态"
+                  placeholder="异常状态"
                   clearable
                   filterable
                 >
@@ -173,6 +173,9 @@
                 <el-button @click="resetFilterForm">
                   重置
                 </el-button>
+                <el-button @click="shrinkState = !shrinkState">
+                  {{ shrinkState ? '展开' : '收缩' }}
+                </el-button>
               </el-form-item>
             </el-col>
           </el-row>
@@ -180,7 +183,8 @@
         <el-table
           v-loading="tableLoading"
           :data="tableData"
-          :height="resizeHeight - 346"
+          header-row-class-name="table-head"
+          :height="resizeHeight - 346 + (shrinkState ? 50 : 0)"
           stripe
           border
           fit

vite.config.js

@@ -25,27 +25,22 @@ export default ({ command, mode }) => {
         port: 3001,
         proxy:{
           '/landcrm': {
-            target: 'http://172.18.0.23/',
             // target: 'https://ebeitest.wuyeface.com:1188/',
-            // target: 'http://101.200.225.123/',
+            target: 'http://101.200.225.123/',
             changeOrigin: true,
             ws: true,
             rewrite: (path) => path.replace(/^\/landcrm/, '/landcrm')
           },
           '/device': {
-            target: 'http://172.18.0.23/',
             // target: 'https://ebeitest.wuyeface.com:1188/',
-            // target: 'http://101.200.225.123/',
+            target: 'http://101.200.225.123/',
             changeOrigin: true,
             ws: true,
             rewrite: (path) => path.replace(/^\/device/, '/device')
           },
           '/hospital': {
-            // target: 'http://172.18.0.23/',
-            // target: 'http://172.18.0.78:9090/',
-            target: 'http://172.18.1.79:9091/',
             // target: 'https://ebeitests.wuyeface.com:1188/',
-            // target: 'http://101.200.225.123/',
+            target: 'http://101.200.225.123/',
             changeOrigin: true,
             ws: true,
             rewrite: (path) => path.replace(/^\/hospital/, '/hospital')