1

pages/doctor/upload.vue

@@ -87,7 +87,7 @@
 					<textarea v-model="FormData.diagnostic" style="width: 100%;height: 200rpx;margin-top: 20rpx;" :disabled="ishtmlType" placeholder="请输入诊断结果" placeholder-style="color:rgba(0, 0, 0, 0.35)"></textarea>
 				</view>
 				<view class="input inputBorNode">
-					<view class="icon">治疗方案</view>
+					<view class="icon">治疗方案<text style="color: red;">*</text></view>
 					<textarea v-model="FormData.treatment" style="width: 100%;height: 200rpx;margin-top: 20rpx;" :disabled="ishtmlType" placeholder="请输入治疗方案" placeholder-style="color:rgba(0, 0, 0, 0.35)"></textarea>
 				</view>
 			</view>

pages/index/calendar.vue

@@ -12,9 +12,9 @@
 				<!-- <image class="image1" src="../../static/img/right.png" mode=""></image> -->
 				<image class="image2" src="../../static/img/bingli.png" mode=""></image>
 			</view>
-		</view>
-		<view class="" style="padding: 10rpx 0;text-align: center;" v-if="wisWjdc	== '允许' && wisWjdcUser == '1'">
-			您本月提交调研问卷{{count || 0}}次
+		</view>
+		<view class="" style="padding: 10rpx 0;text-align: center;" v-if="wisWjdc	== '允许' && wisWjdcUser == '1'">
+			您本月提交调研问卷{{count || 0}}次
 		</view>
 		<view class="con" v-if="dataList.length == 0 && wisMhu == '允许'">
 			<image class="no" src="../../static/img/no.png" mode=""></image>
@@ -27,11 +27,22 @@
 					<view class="flex one">
 						<view class="type">{{item.title}}</view>
 						<view class="name">{{item.name}}</view>
-						<view class="status status1">初审已通过</view>
+						<!-- <view class="status status1">初审已通过</view> -->
+						<view class="u-flex-col">
+							<view class="status" v-if="item.firstTrial==0">未审核</view>
+							<view class="status status1" v-if="item.firstTrial==2">初审已通过</view>
+							<view class="status status2" v-if="item.firstTrial==1">未通过</view>
+							
+						</view>
 					</view>
 					<view class="flex address">
 						<view>{{item.city}}</view>
-						<view>{{item.hospital}}</view>
+						<view class="u-flex-1">{{item.hospital}}</view>
+						<view class="one" style="margin: 0;">
+							<!-- <view style="margin: 0;" class="status" v-if="item.type==0">专家未审核</view> -->
+							<view style="margin: 0;" class="status status1" v-if="item.type==2">专家审核已通过</view>
+							<view style="margin: 0;" class="status status2" v-if="item.type==1">专家审核未通过</view>
+						</view>
 					</view>
 					<view class="flex" style="justify-content: space-between;">
 						<view class="class">
@@ -44,13 +55,20 @@
 					<view class="flex one">
 						<view class="type">{{item.title}}</view>
 						<view class="name">{{item.name}}</view>
-						<view class="status" v-if="item.firstTrial==0">未审核</view>
-						<view class="status status1" v-else-if="item.firstTrial==2">初审已通过</view>
-						<view class="status status2" v-else>未通过</view>
+						<view class="u-flex-col">
+							<view class="status" v-if="item.firstTrial==0">未审核</view>
+							<view class="status status1" v-if="item.firstTrial==2">初审已通过</view>
+							<view class="status status2" v-if="item.firstTrial==1">未通过</view>
+						</view>
 					</view>
 					<view class="flex address">
 						<view>{{item.city}}</view>
-						<view>{{item.hospital}}</view>
+						<view class="u-flex-1">{{item.hospital}}</view>
+						<view class="one" style="margin: 0;">
+							<!-- <view style="margin:0;" class="status" v-if="item.type==0">专家未审核</view> -->
+							<view style="margin:0;" class="status status1" v-if="item.type==2">专家审核已通过</view>
+							<view style="margin:0;" class="status status2" v-if="item.type==1">专家审核未通过</view>
+						</view>
 					</view>
 					<view class="flex" style="justify-content: space-between;">
 						<view class="class">
@@ -73,28 +91,28 @@
 			return {
 				dataList: [],
 				wisMhu: '',
-				wisWjdc: '',
-				wisWjdcUser:'',
-				count:0
+				wisWjdc: '',
+				wisWjdcUser: '',
+				count: 0
 			}
 		},
 		onLoad(option) {
 			this.getsetting()
-		},
-		onShow() {
-			this.getuser()
-			this.$http.getTopicNum().then(res => {
-				this.count = res.data.result
-			})
 		},
-		methods: {
-			getsetting(){
-				this.$http.configInfo().then(res => {
-					if (res.data.code == 200) {
-						this.wisWjdcUser = res.data.result.wisWjdcUser
-					}
-					
-				})
+		onShow() {
+			this.getuser()
+			this.$http.getTopicNum().then(res => {
+				this.count = res.data.result
+			})
+		},
+		methods: {
+			getsetting() {
+				this.$http.configInfo().then(res => {
+					if (res.data.code == 200) {
+						this.wisWjdcUser = res.data.result.wisWjdcUser
+					}
+
+				})
 			},
 			getuser() {
 				this.$http.getUserInfo().then(res => {
@@ -368,4 +386,4 @@
 			}
 		}
 	}
-</style>
+</style>