Merge branch 'master' into develop

pages/patientInspectLog/patientInspectLogDetail.vue

@@ -120,7 +120,7 @@
       </template>
     </scroll-view>
     <view class="foot_common_btns">
-      <button @click="toList()" type="default" class="primaryButton btn">返回</button>
+      <button @click="toList()" type="default" class="primaryButton btn gray">返回</button>
       <button v-if="dataInfo.patientInspectLogData.state && dataInfo.patientInspectLogData.state.value === '4'" @click="tagClick(dataInfo.patientInspectLogData)" type="default" class="primaryButton btn">标记回科</button>
     </view>
     <!-- 弹窗 -->
@@ -304,12 +304,14 @@
 .popup-content{
 	padding: 40rpx;
 }
+.gray{
+  background-color: #8F939C!important;
+}
 .incidentDetail{
   height: 100vh;
   display: flex;
   flex-direction: column;
   justify-content: space-between;
-  background-color: #EBEBEB;
   .head{
     height: 88rpx;
     display: flex;

pages/patientInspectLog/patientInspectLogList.vue

@@ -102,7 +102,7 @@
         };
         post("/common/common/getDictionary", postData).then(res => {
           let stateList = res || [];
-          
+
           if(isStorage){
             this.dataInfo.evtFilter = uni.getStorageSync('patientInspectLogEvtFilter');
             this.dataInfo.tabActiveId = +uni.getStorageSync('patientInspectLogTabActiveId');
@@ -110,7 +110,7 @@
             // 默认出科陪检中
             this.dataInfo.evtFilter.stateList = stateList.map(v => ({...v, checked: v.value == 4}));
           }
-          
+
           this.getList(0);
         })
       },
@@ -138,6 +138,7 @@
           patientInspectLog: {
             hosId: this.hosId,
             scanCode: ress1,
+            simpleQuery: 1,
           }
         }
         post("/simple/data/fetchDataList/patientInspectLog", postData).then((ress) => {
@@ -183,18 +184,19 @@
         if(this.dataInfo.idx === 0){
           this.dataInfo.list = [];
         }
-        
+
         let postData = {
             "idx": this.dataInfo.idx,
             "sum": 20,
             "patientInspectLog": {
               "hosId": this.hosId,
+              simpleQuery: 1,
             }
         }
-        
+
         let tabActiveObj = this.dataInfo.tabs.find(v => v.id == this.dataInfo.tabActiveId);
         console.log(tabActiveObj)
-        
+
         if(tabActiveObj && tabActiveObj.id){
           if(tabActiveObj.id === 1){
             if(this.dataInfo.evtFilter && this.dataInfo.evtFilter.signUser && this.dataInfo.evtFilter.signUser.id){
@@ -215,18 +217,18 @@
             }
           }
         }
-      
+
         if(this.dataInfo.evtFilter && this.dataInfo.evtFilter.department && this.dataInfo.evtFilter.department.id){
           postData.patientInspectLog.deptId = this.dataInfo.evtFilter.department.id;
         }
-        
+
         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 => {
           uni.hideLoading();
           uni.stopPullDownRefresh();