Merge remote-tracking branch 'origin/master' into master

pages.json

@@ -238,6 +238,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/ypczk/zkTask/prescriptionInfo/prescriptionInfo",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "处方信息",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",

pages/ypczk/zkTask/djTask.vue

@@ -20,6 +20,10 @@
 		<view class="operator" v-if="pageData.operatorName!=null && pageData.operatorName!=''">
 			<text class="operator_title">操作人<text class="operator_text">{{pageData.operatorName}}</text></text>
 		</view>
+		<!-- 查看处方内容按钮 -->
+		<view class="detail">
+			<view @click="showDetail" class="showDetail_button">查看处方内容<uni-icons type="calendar" color="#FFFFFF"></uni-icons></view>
+		</view>
 		<!-- 检查结果 -->
 		<uni-card padding="0" spacing="0" v-for="(item,index) in pageData.resData.results" class="djList">
 			<view class="djList_title">
@@ -153,7 +157,11 @@
 		// 任务状态(编辑为2，保存为1)
 		taskStatus: '',
 		taskStatusData: '',
-		buttonDisabled: true
+		buttonDisabled: true,
+		// 处方信息
+		detail:{},
+		// 药品
+		medicines:[]
 	})
 
 	const formData = reactive({
@@ -172,6 +180,15 @@
 		detail: '',
 		unHgStateName: ''
 	})
+	
+	// 查看处方内容
+	const showDetail=()=>{
+		console.log(pageData.detail);
+		console.log(pageData.medicines);
+		uni.navigateTo({
+			url:'/pages/ypczk/zkTask/prescriptionInfo/prescriptionInfo?detail='+encodeURIComponent(JSON.stringify(pageData.detail))+'&medicines='+encodeURIComponent(JSON.stringify(pageData.medicines)) 
+		})
+	}
 
 	// 不合格数
 	const bhgNumber = () => {
@@ -422,6 +439,10 @@
 		http.get("app-api/taskDetail/get", formData).then(res => {
 			pageData.djList = res.results
 			pageData.cfbh = res.detail.ptwybm
+			
+			pageData.detail=res.detail
+			pageData.medicines=res.medicines
+			
 			saveTaskData.detail = res.results
 			pageData.resData = res
 			pageData.djList.forEach(item => {
@@ -459,6 +480,8 @@
 			pageData.totalProgress = res.results.length
 			pageData.taskStatus = 2
 			pageData.operatorName = res.detail.creatorName
+			pageData.detail=res.detail
+			pageData.medicines=res.medicines
 			res.results.forEach(item => {
 				// 检查内容（分数与总分相同为合格，反之不合格）
 				if (item.score == item.totalScore && !item.isDj) {

pages/ypczk/zkTask/index.scss

@@ -1,6 +1,19 @@
 ::v-deep .uni-page-body,page {
 	height:100%
 }
+.detail{
+	display: flex;
+	justify-content: flex-end;
+	margin-right: 30rpx;
+	.showDetail_button{
+		text-align: center;
+		padding: 10px 15rpx;
+		border-radius:10rpx;
+		background: linear-gradient(90deg, rgba(190, 163, 117, 1) 0%, rgba(190, 163, 117, 0.86) 100%);
+		color: rgba(255, 255, 255, 1);
+	}
+}
+
 
 // 质控作业
 .qualitycontrolTask{

pages/ypczk/zkTask/prescriptionInfo/index.scss

@@ -0,0 +1,32 @@
+.info{
+	background-color: #F8F9FA;
+	padding: 15rpx;
+	height: 100%;
+	.info_card{
+		background-color: #ffffff;
+	}
+}
+
+.title{
+	display: flex;
+	justify-content: center;
+	font-size: 20px;
+	font-weight: 600;
+	padding: 40rpx 0;
+}
+
+.info_item{
+	padding: 15rpx 40rpx;
+	font-weight: 400;
+	font-size: 16px;
+}
+
+.medicines_table{
+	border-top: 1px rgba(221, 221, 221, 1) dashed;
+	border-bottom: 1px rgba(221, 221, 221, 1) dashed;
+	padding: 50rpx 0rpx;
+	margin: 50rpx 0rpx;
+	.table_th{
+		background-color: #F5F7FA;
+	}
+}

pages/ypczk/zkTask/prescriptionInfo/prescriptionInfo.vue

@@ -0,0 +1,64 @@
+<template>
+	<view class="info">
+		<view class="info_card">
+			<view class="title">处方信息</view>
+			<view class="info_item">
+				处方编号：{{pageData.detail.ptwybm}}
+			</view>
+			<view class="info_item">
+				性别：{{pageData.detail.gender}}
+			</view>
+			<view class="info_item">
+				年龄：{{pageData.detail.age}}
+			</view>
+			<view class="info_item">
+				开方时间：{{pageData.detail.kfriq}}
+			</view>
+			<view class="info_item">
+				诊断：{{pageData.detail.zdnr}}
+			</view>
+			<uni-table class="medicines_table" border stripe >
+				<!-- 表头行 -->
+				<uni-tr>
+					<uni-th align="center" width="145rpx" class="table_th">药品名称</uni-th>
+					<uni-th align="center" width="145rpx" class="table_th">单帖计量(克)</uni-th>
+					<uni-th align="center" width="120rpx" class="table_th">炮制方法</uni-th>
+					<uni-th align="center" width="100rpx" class="table_th">脚注</uni-th>
+				</uni-tr>
+				<!-- 表格数据行 -->
+				<uni-tr v-for="(item,index) in pageData.medicines" :key="index">
+					<uni-td align="center">{{item.ypmc}}</uni-td>
+					<uni-td align="center">{{item.dtsl}}</uni-td>
+					<uni-td align="center">{{item.pzfs}}</uni-td>
+					<uni-td align="center">{{item.tsjfLabel}}</uni-td>
+				</uni-tr>
+			</uni-table>
+			<view class="info_item">
+				服药方式：{{pageData.detail.fyfsyf=="1"?"内服":"外用"}}
+			</view>
+			<view class="info_item">
+				贴数：{{pageData.detail.cfts}}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import {ref,reactive,computed} from "vue";
+import {onLoad,onShow,onUnload,onPullDownRefresh} from "@dcloudio/uni-app";
+import http from '@/utils/request';
+
+const pageData=reactive({
+	detail:{},
+	medicines:[]
+})
+
+onLoad((data)=>{
+	pageData.detail = JSON.parse(decodeURIComponent(data.detail))
+	pageData.medicines = JSON.parse(decodeURIComponent(data.medicines))
+})
+</script>
+
+<style lang="scss" scoped>
+@import './index.scss'
+</style>