上下班优化

pages/mypage/mypage.vue

@@ -1,21 +1,31 @@
 <template>
   <view class="mypage">
     <view class="myTop">
-      <view class="goWork" @click="GoWork()">
+			<view class="topText">
+			  <view class="topTextHeader">
+			    <view class="text">您好,{{ userData.name }}</view>
+			  <!--  <button v-show="!userData.online" class="changeHospital" size="mini" type="default" @click="changeHospital">
+			      切换院区
+			    </button> -->
+					<view class="goWork_btn_E">
+					  <view class="goWork_btn_W" v-show="userData.online"> 
+							<text class="left-icon newicon newicon-xiuxizhong"></text>
+							<text class="state">工作中</text> 
+						</view>
+					  <view class="goWork_btn_X" v-show="!userData.online"> 
+							<text class="left-icon newicon newicon-gongzuozhong"></text>
+							<text class="state">休息中</text> 
+						</view>
+					</view>
+			  </view>
+			  <!-- <view>当前积分 : {{ tabNum.score }}</view> -->
+			</view>
+  <!--    <view class="goWork" @click="GoWork()">
         <view class="goWork_btn_E">
           <view class="goWork_btn_W" v-show="userData.online"> 下班 </view>
           <view class="goWork_btn_X" v-show="!userData.online"> 上班 </view>
         </view>
-      </view>
-      <view class="topText">
-        <view class="topTextHeader">
-          <text>您好,{{ userData.name }}</text>
-          <button v-show="!userData.online" class="changeHospital" size="mini" type="default" @click="changeHospital">
-            切换院区
-          </button>
-        </view>
-        <view>当前积分 : {{ tabNum.score }}</view>
-      </view>
+      </view> -->
     </view>
     <view class="myCont">
       <view class="myCont_cont">
@@ -73,6 +83,7 @@
         </view>
       </view>
     </view>
+		<view class="page_item_btn" hover-class="seimin-btn-hover" @click="GoWork()">{{userData.online ? '我要下班':'我要上班'}}</view>
     <!-- 弹窗 -->
     <showModel :title="models.title" :icon="models.icon" :disjunctor="models.disjunctor" :content="models.content"
       @ok="ok" @cancel="cancel" :operate="models.operate"></showModel>
@@ -514,6 +525,8 @@
 </script>
 <style lang="less">
   .mypage {
+		padding: 20rpx;
+		background: #F0F6ED;
     .charts {
       width: 625upx;
       height: 500upx;
@@ -530,67 +543,40 @@
     }
 
     .myTop {
-      height: 390rpx;
-      background-image: url(../../static/img/BG_xiaban.png);
-      background-repeat: no-repeat;
-      background-size: 100% 100%;
-
-      .goWork {
-        margin: 0 auto 20rpx auto;
-        padding-top: 30rpx;
-        width: 240rpx;
-        height: 240rpx;
-
-        .goWork_btn_E {
-          width: 100%;
-          height: 100%;
-          background: #bee1a7;
-          border-radius: 30%;
-          text-align: center;
-
-          .goWork_btn_W {
-            width: 75%;
-            height: 75%;
-            background-image: linear-gradient(to right, #72c172, #3bb197);
-            border-radius: 30%;
-            margin: 0 auto;
-            /*水平居中*/
-            position: relative;
-            /*脱离文档流*/
-            top: 12.5%;
-            /*偏移*/
-            line-height: 180rpx;
-            color: #fff;
-            font-size: 36rpx;
-          }
-
-          .goWork_btn_X {
-            width: 75%;
-            height: 75%;
-            background-image: linear-gradient(to left, #72c172, #3bb197);
-            border-radius: 30%;
-            margin: 0 auto;
-            /*水平居中*/
-            position: relative;
-            /*脱离文档流*/
-            top: 12.5%;
-            /*偏移*/
-            line-height: 180rpx;
-            color: #fff;
-            font-size: 36rpx;
-          }
+      height: 160rpx;
+			background: #fff;
+			border-radius: 8rpx;
+			padding: 40rpx;
+      .goWork_btn_E {
+        text-align: center;
+				margin-top: 70rpx;
+				font-weight: bold;
+				
+				.state{
+					margin-left: 8rpx;
+				}
+				
+				.newicon{
+					font-size: 42rpx !important;
+				}
+				
+        .goWork_btn_W {
+          color: #FFBA30;
+          font-size: 40rpx;
+        }
+      
+        .goWork_btn_X {
+          color: #64BD7B;
+          font-size: 40rpx;
         }
       }
 
       .topText {
-        font-size: 36rpx;
-        text-align: center;
-
         .topTextHeader {
-          display: flex;
-          justify-content: center;
-          align-items: center;
-
+					.text{
+						font-size: 30rpx;
+						font-weight: bold;
+					}
           .changeHospital {
             margin-left: 16rpx;
             margin-right: 0;
@@ -600,6 +586,9 @@
     }
 
     .myCont {
+			background: #fff;
+			margin-top: 20rpx;
+			border-radius: 8rpx;
       .myCont_top {
         text-align: left;
         line-height: 90rpx;
@@ -669,7 +658,7 @@
         }
 
         .TB1 {
-          height: 200rpx;
+          height: 180rpx;
 
           .title {
             text-align: left;
@@ -695,7 +684,9 @@
         .TB_list {
           width: 100%;
           text-align: left;
-
+					height: calc(100vh - 700rpx);
+					overflow-y: auto;
+					margin-bottom: 20rpx;
           view {
             height: 84rpx;
             line-height: 84rpx;
@@ -718,5 +709,15 @@
         }
       }
     }
+		.page_item_btn {
+		  height: 88rpx;
+		  background-image: linear-gradient(to right, #72c172, #3bb197);
+		  border-radius: 8rpx;
+		  line-height: 88rpx;
+		  color: #fff;
+		  font-size: 36rpx;
+		  font-weight: 700;
+		  text-align: center;
+		}
   }
 </style>

pages/newDrug/detail.vue

@@ -10,11 +10,18 @@
 
     <view class="Scanning_cont">
       <view class="column head">
+				<view class="value2" v-if="queryObj.showPatientInfo==1">患者信息</view>
         <view class="value1">药品名称+规格<text class="red">（{{drugsList.length}}）</text></view>
         <view class="value2">数量</view>
       </view>
       <scroll-view scroll-y class="scrollContent">
         <view class="column" v-for="item in drugsList" :key="item.id">
+					<view class="value2" v-if="queryObj.showPatientInfo==1">
+					  <view>
+							{{item.patientName }}<text v-if="item.bedNum">({{item.bedNum}})</text>
+							<view>{{item.residenceNo ? item.residenceNo : ''}}</view>
+						</view>
+					</view>
           <view class="value1">{{item.drugsInfo}} {{item.model}}</view>
           <view class="value2">{{item.drugsNum}}</view>
         </view>
@@ -177,6 +184,7 @@
           text-align: left;
           word-break: break-all;
           flex-shrink: 0;
+					text-align: center;
         }
         .value2,.value3{
           flex: 1;

pages/newDrug/list.vue

@@ -8,10 +8,14 @@
             <view class="value">{{item.drugsState ? item.drugsState.name : ''}}</view>
           </view>
           <view class="body">
-            <view class="bodyColumn">
-              <view class="name">种类数：{{item.drugsTypeCount}}</view>
-              <view class="value">总数：{{item.drugsCount}}</view>
+            <view class="bodyColumn" v-if="queryObj.showPatientInfo==1">
+              <view class="name">姓名(床号)：{{item.patientName ? item.patientName : ''}} <text v-if="item.bedNum">({{item.bedNum}})</text></view>
+              <view class="value">住院号：{{item.residenceNo ? item.residenceNo : ''}}</view>
             </view>
+						<view class="bodyColumn">
+						  <view class="name">种类数：{{item.drugsTypeCount}}</view>
+						  <view class="value">总数：{{item.drugsCount}}</view>
+						</view>
             <view class="bodyColumn">
               <view class="name">收取人：<template v-if="item.startLog">{{item.startLog.username}}</template></view>
               <view class="value">收取时间：<template v-if="item.startLog">{{item.startLog.operationTime | formatDate('yyyy-MM-dd hh:mm')}}</template></view>

pages/receipt_infopage/receipt_infopage.vue

@@ -1140,11 +1140,11 @@
               let config = list[0];
               if(config.drugsModel === 1){
                 uni.navigateTo({
-                  url: `/pages/newDrug/detail?drugsBagType=${type}&orderId=${workOrder.id}`,
+                  url: `/pages/newDrug/detail?drugsBagType=${type}&orderId=${workOrder.id}&showPatientInfo=${config.showPatientInfo}`,
                 });
               } else if(config.drugsModel === 2){
                 uni.navigateTo({
-                  url: `/pages/newDrug/list?drugsBagType=${type}&orderId=${workOrder.id}`,
+                  url: `/pages/newDrug/list?drugsBagType=${type}&orderId=${workOrder.id}&showPatientInfo=${config.showPatientInfo}`,
                 });
               }
             }else{

pages/receiptpage/receiptpage.vue

@@ -38,19 +38,19 @@
                 <view class="page_item_cont_start emergency1" v-if="item.emergencyType.value == 1">
                   <image mode="widthFix" class="page_item_cont_start-img" src="../../static/img/icon_shandian.png">
                   </image>
-                  {{ item.emergencyType.name }}
+									{{ item.emergencyType.name }}</text>
                 </view>
                 <view class="page_item_cont_start emergency" v-if="item.emergencyType.value == 2">
                   <image mode="widthFix" class="page_item_cont_start-img" src="../../static/img/icon_shandian.png">
                   </image>
-                  {{ item.emergencyType.name }}
+                  {{ item.emergencyType.name }}</text>
                 </view>
                 <view class="page_item_cont_start emergencys" v-if="item.emergencyType.value == 3">
                   <image mode="widthFix" class="page_item_cont_start-img" src="../../static/img/icon_shandian.png">
                   </image>
-                  {{ item.emergencyType.name }}
+                  {{ item.emergencyType.name }}</text>
                 </view>
-                <view class="page_item_top_R type" style="margin-left: 16rpx;">
+                <view class="page_item_top_R type" :style="{color: item.taskTypeConfig.renderColors?item.taskTypeConfig.renderColors:'#333'}" style="margin-left: 16rpx;">
                   {{ item.taskType.taskName }}<template v-if="item.goodsRemark">-{{item.goodsRemark}}</template>
                 </view>
                 <!-- <text class="L_time" v-if="item.overdueTime">{{ item.overdueTime }}前送达</text> -->
@@ -82,17 +82,17 @@
                 <!-- <view class="page_item_cont_start emergency1" v-if="item.emergencyType.value == 1">
                   <image mode="widthFix" class="page_item_cont_start-img" src="../../static/img/icon_shandian.png">
                   </image>
-                  {{ item.emergencyType.name }}
+                  {{ item.emergencyType.name }}</text>
                 </view>
                 <view class="page_item_cont_start emergency" v-if="item.emergencyType.value == 2">
                   <image mode="widthFix" class="page_item_cont_start-img" src="../../static/img/icon_shandian.png">
                   </image>
-                  {{ item.emergencyType.name }}
+                  {{ item.emergencyType.name }}</text>
                 </view>
                 <view class="page_item_cont_start emergencys" v-if="item.emergencyType.value == 3">
                   <image mode="widthFix" class="page_item_cont_start-img" src="../../static/img/icon_shandian.png">
                   </image>
-                  {{ item.emergencyType.name }}
+                  {{ item.emergencyType.name }}</text>
                 </view> -->
               </view>
               <view class="page_item_conts" v-if="item.taskType.associationType.value == 'specimen'">
@@ -615,6 +615,7 @@
 				keyArr: [],
 				isApp:false,
 				isUpdate:false,
+				taskTypeList:[]
       };
     },
 		components: {
@@ -648,7 +649,7 @@
         } else {
           return "-";
         }
-      },
+      }
     },
     components: {
       uniFab,
@@ -660,6 +661,24 @@
 			appUpdata
     },
     methods: {
+			// 获取任务类型
+			getTaskType(){
+				let postData = {
+				  idx: 0,
+				  sum: 9999,
+					taskType:{
+						hosIds:this.hosId
+					}
+				};
+				
+				post("/configuration/fetchDataList/taskType",postData).then((res) => {
+				    if (res.status == 200) {
+							this.taskTypeList = res.list
+							console.log(444,this.taskTypeList)
+				    }
+						this.initList();
+				  });
+			},
 			confirmKey(data){
 				this.padChange(data)
 				this.showKey = false
@@ -2683,13 +2702,20 @@
             this.totalNum = res.data.resultCount;
             res.data.data = res.data.data || [];
             res.data.data.forEach(v => {
-              v.clinicalTaskIdsFlag = this.clinicalTaskIds.includes(v.taskType.id.toString());
+							// for(let i of this.taskTypeList){
+							// 	if(i.associationType.id == v.taskType.associationType.id){
+							// 		v.colorStyle = i.renderColors
+							// 	}
+							// }
+							v.taskTypeConfig = this.taskTypeList.find(i=>i.associationType.id == v.taskType.associationType.id)
+							v.clinicalTaskIdsFlag = this.clinicalTaskIds.includes(v.taskType.id.toString());
             })
             if (idx === 0) {
               this.zxzData = res.data.data;
             } else {
               this.zxzData.push(...res.data.data);
             }
+						console.log(4444,res.data.data)
             this.tabs[1].num = res.data.resultCount;
           } else {
             uni.showToast({
@@ -2931,7 +2957,7 @@
       // });
       // #endif
       this.selectedLabelSlots = "执行中";
-      this.initList();
+			this.getTaskType();
       this.getConfig();
       // 科室二维码切换科室回显
       if (options.showDepartmentQrcodeId && options.showDepartmentQrcodeDept) {

static/font/demo_index.html

@@ -55,6 +55,18 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon newicon">&#xea89;</span>
+                <div class="name">休息中</div>
+                <div class="code-name">&amp;#xea89;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon newicon">&#xe68d;</span>
+                <div class="name">工作中</div>
+                <div class="code-name">&amp;#xe68d;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon newicon">&#xe653;</span>
                 <div class="name">密钥</div>
                 <div class="code-name">&amp;#xe653;</div>
@@ -720,9 +732,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'newicon';
-  src: url('iconfont.woff2?t=1731394849627') format('woff2'),
-       url('iconfont.woff?t=1731394849627') format('woff'),
-       url('iconfont.ttf?t=1731394849627') format('truetype');
+  src: url('iconfont.woff2?t=1744858396442') format('woff2'),
+       url('iconfont.woff?t=1744858396442') format('woff'),
+       url('iconfont.ttf?t=1744858396442') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -749,6 +761,24 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon newicon newicon-xiuxizhong"></span>
+            <div class="name">
+              休息中
+            </div>
+            <div class="code-name">.newicon-xiuxizhong
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon newicon newicon-gongzuozhong"></span>
+            <div class="name">
+              工作中
+            </div>
+            <div class="code-name">.newicon-gongzuozhong
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon newicon newicon-miyue"></span>
             <div class="name">
               密钥
@@ -1749,6 +1779,22 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-xiuxizhong"></use>
+                </svg>
+                <div class="name">休息中</div>
+                <div class="code-name">#newicon-xiuxizhong</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#newicon-gongzuozhong"></use>
+                </svg>
+                <div class="name">工作中</div>
+                <div class="code-name">#newicon-gongzuozhong</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#newicon-miyue"></use>
                 </svg>
                 <div class="name">密钥</div>

static/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "newicon"; /* Project id 4304849 */
-  src: url('~@/static/font/iconfont.woff2?t=1728893186075') format('woff2'),
-       url('~@/static/font/iconfont.woff?t=1728893186075') format('woff'),
-       url('~@/static/font/iconfont.ttf?t=1728893186075') format('truetype');
+  src: url('~@/static/font/iconfont.woff2?t=1744858396442') format('woff2'),
+       url('~@/static/font/iconfont.woff?t=1744858396442') format('woff'),
+       url('~@/static/font/iconfont.ttf?t=1744858396442') format('truetype');
 }
 
 .newicon {
@@ -13,6 +13,14 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.newicon-xiuxizhong:before {
+  content: "\ea89";
+}
+
+.newicon-gongzuozhong:before {
+  content: "\e68d";
+}
+
 .newicon-miyue:before {
   content: "\e653";
 }

static/font/iconfont.json

@@ -6,6 +6,20 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "8189388",
+      "name": "休息中",
+      "font_class": "xiuxizhong",
+      "unicode": "ea89",
+      "unicode_decimal": 60041
+    },
+    {
+      "icon_id": "10690611",
+      "name": "工作中",
+      "font_class": "gongzuozhong",
+      "unicode": "e68d",
+      "unicode_decimal": 59021
+    },
+    {
       "icon_id": "8655877",
       "name": "密钥",
       "font_class": "miyue",