Browse Source

修改样式问题

lsh 1 week ago
parent
commit
ad249b7bb9

+ 3 - 0
App.vue

@@ -17,4 +17,7 @@
 
 <style>
 	/*每个页面公共css */
+	* body {
+		background-color: #F8F9FA;
+	}
 </style>

+ 4 - 4
pages/ypczk/djfk/index/djfkIndex.vue

@@ -26,7 +26,7 @@
 			</view>
 		</view>
 		<!-- 任务列表 -->
-		<view v-if="pageData.taskList.length!=0">
+		<view v-if="pageData.taskList.length!=0" style="padding-bottom: 30px;">
 			<uni-card v-for="(item,index) in pageData.taskList" padding="0" spacing="0" class="djfkIndex_list">
 				<view class="list_content">
 					<view class="list_content_img">
@@ -173,9 +173,9 @@ const getNotice=()=>{
 	http.get("app-api/rectify/findNoticeList").then(res=>{
 		uni.hideLoading()
 		res.forEach(item=>{
-			let dateList=[]
-			dateList=item.createTime.split('-')
-			item.createTime=dateList[1]+'月'+dateList[2]+'日'
+			const [datePart, timePart] = item.createTime.split(' ');
+			const [year, month, day] = datePart.split('-');
+			item.createTime = `${year}年${month}月${day}日 ${timePart}`;
 		})
 		pageData.noticeList=res
 		if(res.length!=0 && res!=[]){

+ 3 - 4
pages/ypczk/djfk/uploadZg/zgMeasureList.vue

@@ -12,7 +12,7 @@
 			<view class="list_item">附件</view>
 		</view>
 		<view v-if="props.zgData.rectificationUrls!=null && props.zgData.rectificationUrls!=''">
-			<uni-file-picker :modelValue="showImageStr(props.zgData.rectificationUrls)" readonly="false"></uni-file-picker>
+			<uni-file-picker :modelValue="showImageStr(props.zgData.rectificationUrls)" :readonly="false"></uni-file-picker>
 		</view>
 		<view class="list_content">
 			<view class="list_item">整改措施</view>
@@ -67,13 +67,12 @@ const deleteImg=(val)=>{
 const showImageStr = (urlStr) => {
 	const rawPrefix = UrlPath.getBaseUrl()
 	const prefix = rawPrefix.replace(/\/+$/, '');
-	console.log("内容",prefix + urlStr)
-	return prefix + urlStr
+	const urlArray = urlStr.split(",").map(url => prefix + url);
+	return urlArray
 }
 // 显示图片
 const showImage=(urlStr)=>{
 	if (!urlStr)return
-	console.log("内容",urlStr)
 	const rawPrefix = UrlPath.getBaseUrl()
 	const prefix = rawPrefix.replace(/\/+$/, '');
 	const result = urlStr.map(url => {

+ 7 - 6
pages/ypczk/zkTask/choosePrescription.vue

@@ -61,7 +61,7 @@
 		<uni-popup ref="chooseDialog" type="dialog">
 			<uni-popup-dialog type="info" confirmText="确定" cancelText="取消" title="选择处方" :content="pageData.popupMessage.showMessage" @confirm="dialogConfirm" @close="dialogClose"></uni-popup-dialog>
 		</uni-popup>
-		<view style="border: 1px solid red;">
+		<view>
 			<uni-load-more :status="loadingData.status" :contentText="loadingData.contentText"></uni-load-more>
 		</view>
 	</view>
@@ -79,6 +79,8 @@ const pageData=reactive({
 	deptName:'',
 	//机构Code
 	deptCode:'',
+	// 院内处方编号
+	yncfbh: '',
 	// 处方编号
 	cfbh:'',
 	// 平台唯一编号
@@ -149,10 +151,11 @@ const dialogConfirm=()=>{
 	dialogClose()
 	let url=''
 	// 跳转到下一个页面
+	console.log("pageData",pageData)
 	if(pageData.fyfslx=='2' || pageData.fyfslx=='3'){
-		url='/pages/ypczk/zkTask/djTask?cfbh='+pageData.cfbh+'&fyfslx='+pageData.fyfslx+'&ptwybh='+pageData.cfbh+'&state=add'
+		url='/pages/ypczk/zkTask/djTask?yncfbh='+pageData.yncfbh+'&fyfslx='+pageData.fyfslx+'&ptwybh='+pageData.cfbh+'&state=add'
 	}else if(pageData.fyfslx=='4' || pageData.fyfslx=='5'){
-		url='/pages/ypczk/zkTask/dpTask?cfbh='+pageData.cfbh+'&fyfslx='+pageData.fyfslx+'&ptwybh='+pageData.cfbh+'&state=add'
+		url='/pages/ypczk/zkTask/dpTask?yncfbh='+pageData.yncfbh+'&fyfslx='+pageData.fyfslx+'&ptwybh='+pageData.cfbh+'&state=add'
 	}
 	uni.navigateTo({
 		url:url,
@@ -192,6 +195,7 @@ const chooseCf=(e)=>{
 	pageData.cfbh=e.cfbm
 	pageData.fyfslx=e.cflx[0]
 	pageData.ptwybh=e.ptwybh
+	pageData.yncfbh=e.yncfbh
 }
 
 // 获取处方信息
@@ -264,8 +268,5 @@ const getUserInfo=()=>{
 </script>
 
 <style lang="scss" scoped>
-	body {
-		background-color: #F8F9FA;
-	}
 	@import './index.scss'
 </style>

+ 22 - 6
pages/ypczk/zkTask/dpTask.vue

@@ -9,7 +9,7 @@
 			</view>
 			<view class="sub_title">
 				<view class="cfbh">
-					<text class="cfbh_title">处方编号<text class="cfbh_text">{{pageData.cfbh}}</text></text>
+					<text class="cfbh_title">处方编号<text class="cfbh_text">{{pageData.yncfbh}}</text></text>
 				</view>
 			</view>
 			<view class="send">
@@ -35,12 +35,13 @@
 					</uni-td>
 					<uni-td align="center" style="width: 200rpx;">
 						<view style="display: flex;align-items: center;">
-							<span v-if="index==0? true : false">
+							<uni-easyinput v-model.number="item.totalScore" :clearable="false" :disabled="pageData.disabledStatus" type="digit" @change="changeNewYz(item)"></uni-easyinput>
+							<!-- <span v-if="index==0? true : false">
 								<uni-easyinput v-model.number="item.totalScore" :clearable="false" :disabled="pageData.disabledStatus" type="digit" @change="changeYz(item)"></uni-easyinput>
 							</span>
 							<span v-else>
-								{{item.totalScore}}
-							</span>
+							 {{item.totalScore}}
+							</span> -->
 							<!-- <text>{{"(>"+(item.score!=null?item.score:0)+"g)"}}</text> -->
 						</view>
 					</uni-td>
@@ -103,6 +104,7 @@ const pageData = reactive({
 	operatorName:'',
 	operatorStatus:'',
 	cfbh:'',
+	yncfbh:'',
 	detailList: [],
 	dpList:[],
 	// 图片列表
@@ -139,6 +141,20 @@ const changeSz=(item)=>{
 	}
 }
 
+const changeNewYz = (item) => {
+	if(item.totalScore != "0" || item.totalScore != 0){
+		if(item.score!=null && item.totalScore!=null){
+			// 误差率 = (实重 - 应重) / 应重*100%
+			item.resultContent=Math.abs(((item.score-item.totalScore)/item.totalScore).toFixed(2)*100) || 0
+		}
+	}else{
+		uni.showToast({
+			title: '应重不能为0,请重新输入',
+			icon:'error'
+		});
+	}
+}
+
 const changeYz=(item)=>{
 	if(item.totalScore!="0" || item.totalScore!=0){
 		if(item.score!=null && item.totalScore!=null){
@@ -457,8 +473,8 @@ onLoad((type)=>{
 	if(type.state!=null){
 		pageData.operatorStatus=type.state
 	}
-	if(type.cfbh!=null){
-		pageData.cfbh=type.cfbh
+	if(type.yncfbh!=null){
+		pageData.yncfbh=type.yncfbh
 	}
 	if(type.ptwybh!=null){
 		createData.pId=type.ptwybh

+ 3 - 2
pages/ypczk/zkTask/index.scss

@@ -133,7 +133,8 @@
 		background: #F8F9FA;
 		.button{
 			width: 700rpx;
-			margin-top: 10rpx;
+			margin-top: 0rpx;
+			margin-bottom: 20rpx;
 			border-radius: 5px;
 			color: rgba(255, 255, 255, 1);
 			background:  linear-gradient(90deg, rgba(190, 163, 117, 1) 0%, rgba(190, 163, 117, 0.8) 100%);
@@ -243,7 +244,7 @@
 // 代煎处方质控作业
 .djTask{
 	background-color: #F8F9FA;
-	height: 100%;
+	height: calc(100vh - 140rpx);
 	overflow-y: auto;
 	padding:10rpx 5rpx;
 	.progress_title{

+ 1 - 1
pages/ypczk/zkTask/zkTask.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="qualitycontrolTask">
+	<view class="qualitycontrolTask" style="border: 1px solid #F8F9FA;">
 		<!-- 飞行质控任务 -->
 		<view class="flightTask">
 			<uni-card>

BIN
static/slogan_header_img.png