优化

main.js

@@ -54,6 +54,14 @@ Vue.filter('filterSecondDate', function(dateStr){
     return dateStr;
   }
 })
+// 多个名称显示
+Vue.filter('filterNames', function(arr, fieldName){
+  if(Array.isArray((arr))){
+    return arr.map(v => v[fieldName]).toString();
+  }else{
+    return '';
+  }
+})
 App.mpType = 'app'
 
 const app = new Vue({

pages/patientInspectLog/components/patientInspectLogListFilter.vue

@@ -4,10 +4,10 @@
       <view class="container_form">
         <view class="head">
           <text class="name">状态</text>
-          <text class="status">{{searchData.state ? searchData.state.name : ''}}</text>
+          <text class="status">{{getStateNames()}}</text>
         </view>
         <view class="statusList">
-          <view class="statusItem" :class="{ active: searchData.state.id == item.id }" v-for="item in pageData.stateList" :key="item.id" @click="searchData.state = item;">{{item.name}}<text class="newicon newicon-xuanzejiaobiao" v-if="searchData.state.id == item.id"></text></view>
+          <view class="statusItem" :class="{ active: item.checked }" v-for="item in searchData.stateList" :key="item.id" @click="item.checked = !item.checked;">{{item.name}}<text class="newicon newicon-xuanzejiaobiao" v-if="item.checked"></text></view>
         </view>
         <view class="category" @click="clickPageRouter('department')">
           <text class="name">科室</text>
@@ -131,22 +131,16 @@
       }
     },
     methods: {
+      getStateNames(){
+        if(Array.isArray(this.searchData.stateList)){
+          return this.searchData.stateList.filter(v => v.checked).map(v => v.name).toString();
+        }else{
+          return '';
+        }
+      },
       // 获取状态列表
       getStateList(){
-        let postData = {
-          "type": "list",
-          "key": "patient_inspect_state",
-        };
-        post("/common/common/getDictionary", postData).then(res => {
-          this.pageData.stateList = res || [];
-          if(this.evt.state.id){
-            this.searchData.state = this.evt.state;
-          }else{
-            // 默认出科陪检中
-            let state4 = this.pageData.stateList.find(v => v.value == 4);
-            this.searchData.state = state4 || {};
-          }
-        })
+        this.searchData.stateList = this.evt.stateList || [];
       },
       departmentInput(event) {
           this.departmentKeyWord = event.detail.value;
@@ -182,8 +176,9 @@
           this.searchData.inspectUser = {id: 0, name: '全部'};
         }
         this.searchData.department = {id: 0, dept: '全部'};
-        let state4 = this.pageData.stateList.find(v => v.value == 4);
-        this.searchData.state = state4 || {};
+        this.searchData.stateList.forEach(v => {
+          v.checked = v.value == 4;
+        });
       },
       // 确认
       confirm(){
@@ -206,16 +201,19 @@
       },
       // 点击科室
       clickDepartment(department){
+        this.departmentKeyWord = '';
         this.pageData.pageRouter = 'default';
         this.searchData.department = department;
       },
       // 点击签到人
       clickSignUser(signUser){
+        this.signUserKeyWord = '';
         this.pageData.pageRouter = 'default';
         this.searchData.signUser = signUser;
       },
       // 点击出科陪检人
       clickInspectUser(inspectUser){
+        this.inspectUserKeyWord = '';
         this.pageData.pageRouter = 'default';
         this.searchData.inspectUser = inspectUser;
       },

pages/patientInspectLog/patientInspectLogDetail.vue

@@ -46,7 +46,7 @@
           </view>
           <view class="deital_item">
             <text class="name">携带设备：</text>
-            <text class="value">{{dataInfo.patientInspectLogData.goodsNames}}</text>
+            <text class="value">{{dataInfo.patientInspectLogData.goodsList | filterNames('name')}}</text>
           </view>
           <view class="deital_item">
             <text class="name">出科时间：</text>
@@ -54,7 +54,7 @@
           </view>
           <view class="deital_item">
             <text class="name">出科人：</text>
-            <text class="value">{{dataInfo.patientInspectLogData.backDeptUserDTO ? dataInfo.patientInspectLogData.backDeptUserDTO.name : ''}}</text>
+            <text class="value">{{dataInfo.patientInspectLogData.outDeptUserDTO ? dataInfo.patientInspectLogData.outDeptUserDTO.name : ''}}</text>
           </view>
         </view>
         
@@ -121,7 +121,7 @@
     </scroll-view>
     <view class="foot_common_btns">
       <button @click="toList()" type="default" class="primaryButton btn">返回</button>
-      <button v-if="dataInfo.patientInspectLogData.state.value === '4'" @click="tagClick(dataInfo.patientInspectLogData)" type="default" class="primaryButton btn">标记回科</button>
+      <button v-if="dataInfo.patientInspectLogData.state && dataInfo.patientInspectLogData.state.value === '4'" @click="tagClick(dataInfo.patientInspectLogData)" type="default" class="primaryButton btn">标记回科</button>
     </view>
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content" @ok="ok" @cancel="cancel" @know="know" :operate="models.operate"></showModel>
@@ -276,9 +276,7 @@
          if(res.status == 200){
            this.dataInfo.patientInspectLogData = res.data || {};
            this.dataInfo.logList = this.dataInfo.patientInspectLogData.logList || [];
-           
            this.dataInfo.tabActiveValue = this.dataInfo.tabs[0].value;
-           console.log(this.dataInfo.tabActiveValue)
            this.initData()
          }else{
            uni.showToast({
@@ -300,196 +298,6 @@
       this.getDetail();
     }
   }
- //  import chunk from 'lodash-es/chunk'
- //  import { ref, reactive } from 'vue'
- //  import { onLoad } from '@dcloudio/uni-app'
- //  import { api_listAttachment, api_inspectionTaskDetail, api_inspectionFormValues } from "@/http/api.js"
- //  import { defaultColor } from '@/static/js/theme.js'
- //  import { useSetTitle } from '@/share/useSetTitle.js'
- //  import { filterFormatDate } from '@/filters/filterFormatDate.js'
-
- //  useSetTitle();
- //  const { formatDate }  = filterFormatDate();
-
- //  // 主题颜色
- //  const primaryColor = ref(defaultColor)
-	
- //  // 数据
- //  const dataInfo = reactive({
- //    tabs: [
- //      {id: 1, name: '基础信息', value: '1', num: ''},
- //      // {id: 2, name: '巡检信息', value: '2', num: ''},
- //      {id: 3, name: '流程图', value: '3', num: ''},
- //    ],
- //    tabActiveValue: 0,//当前选择的tab
- //    patientInspectLogId: undefined,//巡检执行ID
- //    patientInspectLogData: {},//巡检执行对象
- //    inspectionTaskImgs: [],//巡检图片
- //    valueList: [],//巡检信息
- //    logList: [],//流程图
- //  })
-  
- //  function getValuex(value){
- //    return value.formItemConfigList ? value.formItemConfigList.map(v => v.valuex).toString() : value.valuex;
- //  }
-
- //  // 获取巡检信息
- //  function getValue(){
- //    uni.showLoading({
- //      title: "加载中",
- //      mask: true,
- //    });
- //    let postData = {
- //        "idx": 0,
- //        "sum": 9999,
- //        "inspectionFormValues": {
- //          taskId: dataInfo.patientInspectLogId,
- //        }
- //    };
- //    api_inspectionFormValues(postData).then(res => {
- //      uni.hideLoading();
- //      if(res.status == 200){
- //        let valueList = res.list || [];
- //        let imgFlag = valueList.some(v => v.inspectionFormItemDTO.type.value == 7);
-
- //        if(imgFlag){
- //          valueList.forEach(v => {
- //            if(v.inspectionFormItemDTO.type.value == 7){
- //              v.valuex = [];
- //            }
- //          })
- //        }
-
- //        dataInfo.valueList = chunk(valueList, 3);
-
- //        if(imgFlag){
- //          getInspectionImgs();
- //        }
- //      }else{
- //        uni.showToast({
- //          icon: 'none',
- //          title: res.msg || '请求数据失败！'
- //        });
- //      }
- //    })
- //  }
-
- //  // 预览图片
- //  function previewImg(index, type, imgList){
- //    uni.previewImage({
- //      current: index,
- //      urls: imgList.map(v => v.previewUrl),
- //      longPressActions: {
- //        itemList: ['发送给朋友', '保存图片', '收藏'],
- //        success: function(data) {
- //          console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
- //        },
- //        fail: function(err) {
- //          console.log(err.errMsg);
- //        }
- //      }
- //    });
- //  }
-
- //  // 初始化表单
- //  function initData(){
- //    if(dataInfo.tabActiveValue === '1'){
-      
- //    }else if(dataInfo.tabActiveValue === '2'){
- //      getValue();
- //    }else if(dataInfo.tabActiveValue === '3'){
-      
- //    }
- //  }
-
- //  // 点击tab
- //  function clickTab(tabValue){
- //    if(dataInfo.tabActiveValue == tabValue){
- //      return;
- //    }
- //    dataInfo.tabActiveValue = tabValue;
- //    initData()
- //  }
-
- //  // 获取巡检执行详情
- //  function getDetail(){
- //    uni.showLoading({
- //      title: "加载中",
- //      mask: true,
- //    });
-
- //    api_inspectionTaskDetail(dataInfo.patientInspectLogId).then(res => {
- //      uni.hideLoading();
- //      if(res.status == 200){
- //        dataInfo.patientInspectLogData = res.data || {};
- //        dataInfo.logList = dataInfo.patientInspectLogData.logList || [];
-        
- //        // 巡检信息
- //        if(dataInfo.patientInspectLogData.status.value === '2'){
- //          let flag = dataInfo.tabs.some(v => v.value === '2');
- //          !flag && dataInfo.tabs.splice(1, 0, {id: 2, name: '巡检信息', value: '2', num: ''});
- //        }
-        
- //        dataInfo.tabActiveValue = dataInfo.tabs[0].value;
- //        initData()
- //      }else{
- //        uni.showToast({
- //          icon: 'none',
- //          title: res.msg || '请求数据失败！'
- //        });
- //      }
- //    })
- //  }
-	
- //  // 获取巡检图片
- //  function getInspectionImgs(){
- //    uni.showLoading({
- //      title: "加载中",
- //      mask: true,
- //    });
- //    api_listAttachment('inspection', dataInfo.patientInspectLogId).then(res => {
- //      uni.hideLoading();
- //      res.data = res.data || [];
- //      res.data.forEach(v => {
- //        v.previewUrl = location.origin + "/file" + v.relativeFilePath;
- //        v.thumbFilePath = location.origin + "/file" + v.thumbFilePath;
- //      })
-      
- //      let imgList = res.data || [];
- //      dataInfo.valueList.forEach(v => {
- //        v.forEach(vv => {
- //          imgList.forEach(item => {
- //            if(vv.itemId == item.recordId){
- //              if(vv.valuex && vv.valuex.length){
- //                vv.valuex.push(item)
- //              }else{
- //                vv.valuex = [item];
- //              }
- //            }
- //          })
- //        })
- //      })
- //    })
- //  }
-
- //  // 返回巡检列表
- //  function toList(){
- //    uni.reLaunch({
- //      url: `/pages/inspection/inspectionExecute/inspectionExecute`
- //    })
- //  }
-  
- //  // 查看故障单
- //  function viewIncidentDetail(incidentId){
- //    uni.navigateTo({
- //      url: `/pages/incidentDetail/incidentDetail?incidentId=${incidentId}`
- //    })
- //  }
-
- //  onLoad((option) => {
- //    dataInfo.patientInspectLogId = option.patientInspectLogId;
-	// 	getDetail();
- //  })
 </script>
 
 <style lang="scss" scoped>

pages/patientInspectLog/patientInspectLogList.vue

@@ -20,7 +20,7 @@
         <view class="body_item_content">
           <view class="body_item_content_p">
             <text class="name ellipsis">住院号：{{data.patientCode}}</text>
-            <text>{{(data.patientDTO && data.patientDTO.gender) ? data.patientDTO.gender.name : ''}}<text v-if="data.age !== undefined" class="ml24">{{data.age}}</text></text>
+            <text>{{(data.patientDTO && data.patientDTO.gender) ? data.patientDTO.gender.name : ''}}<text v-if="data.age !== undefined" class="ml24">{{data.age}}<text v-if="data.age !== undefined">岁</text></text></text>
           </view>
           <view class="body_item_content_p">
             <text class="name ellipsis">患者科室：{{ data.deptDTO ? data.deptDTO.dept : '' }}</text>
@@ -88,12 +88,32 @@
             signUser: {id: 0, name: '全部'},
             inspectUser: {id: 0, name: '全部'},
             department: {id: 0, dept: '全部'},
-            state: {},
+            stateList: [],
           },//筛选框数据
         }
       }
     },
     methods: {
+      // 获取状态列表
+      getStateList(isStorage = false){
+        let postData = {
+          "type": "list",
+          "key": "patient_inspect_state",
+        };
+        post("/common/common/getDictionary", postData).then(res => {
+          let stateList = res || [];
+          
+          if(isStorage){
+            this.dataInfo.evtFilter = uni.getStorageSync('patientInspectLogEvtFilter');
+            this.dataInfo.tabActiveId = +uni.getStorageSync('patientInspectLogTabActiveId');
+          }else{
+            // 默认出科陪检中
+            this.dataInfo.evtFilter.stateList = stateList.map(v => ({...v, checked: v.value == 4}));
+          }
+          
+          this.getList(0);
+        })
+      },
       // 扫一扫
       scan(isFlag = false) {
         if (!this.SMFlag) {
@@ -146,12 +166,12 @@
         });
       },
       // 初始化
-      onLoadFn(){
-        this.getTabs();
+      onLoadFn(isStorage = false){
+        this.getTabs(isStorage);
       },
       // 获取tab选项
-      getTabs(){
-        this.getList(0);
+      getTabs(isStorage = false){
+        this.getStateList(isStorage);
       },
       // 获取列表信息
       getList(idx){
@@ -200,8 +220,11 @@
           postData.patientInspectLog.deptId = this.dataInfo.evtFilter.department.id;
         }
         
-        if(this.dataInfo.evtFilter && this.dataInfo.evtFilter.state && this.dataInfo.evtFilter.state.id){
-          postData.patientInspectLog.state = this.dataInfo.evtFilter.state;
+        if(this.dataInfo.evtFilter && this.dataInfo.evtFilter.stateList && this.dataInfo.evtFilter.stateList.length){
+          let values = this.dataInfo.evtFilter.stateList.filter(v => v.checked).map(v => v.value).toString();
+          postData.patientInspectLog.state = values ? {
+            value: values
+          } : undefined;
         }
       
         post("/simple/data/fetchDataList/patientInspectLog", postData).then(res => {
@@ -297,6 +320,8 @@
       },
       // 确认筛选
       conformFilter(evtFilter){
+        uni.setStorageSync('patientInspectLogEvtFilter', evtFilter);//缓存
+        uni.setStorageSync('patientInspectLogTabActiveId', this.dataInfo.tabActiveId);//缓存
         this.dataInfo.evtFilter = evtFilter;
         this.dataInfo.isFilter = false;
         this.getList(0);
@@ -307,7 +332,7 @@
       },
     },
     onLoad(options){
-      this.onLoadFn();
+      this.onLoadFn(uni.getStorageSync('patientInspectLogEvtFilter') && uni.getStorageSync('patientInspectLogTabActiveId'));
     },
     onTabItemTap(){
       this.onLoadFn();

pages/receiptpage/receiptpage.vue

@@ -2231,6 +2231,8 @@
             url: "/pages/transferWorkOrder/transferWorkOrderUser",
           });
         } else if (e.item.text === "陪检闭环") {
+          uni.removeStorageSync('patientInspectLogEvtFilter');//清除缓存
+          uni.removeStorageSync('patientInspectLogTabActiveId');//清除缓存
           uni.navigateTo({
             url: "/pages/patientInspectLog/patientInspectLogList",
           });