提交代码

components/inspectRemoveModel/inspectRemoveModel.vue

@@ -93,7 +93,7 @@
 					this.startTimestamp = Date.now();
 					this.current = -1;
 					this.yyTime = this.yy ? new Date(this.yy) : dayjs().format('YYYY-MM-DD HH:mm:ss');
-					this.setDate(this.yyTime)
+					this.setDate(this.yyTime, 'load')
 				}
 				if (newValue && this.operate.know == "返回") {
 					this.time = 5;
@@ -166,18 +166,31 @@
 		methods: {
 			dateChange(e){
 				if(e){
-					this.setDate(e)
+					this.setDate(e, 'change')
 				}else{
 					this.yyEndTime = null
 				}
 			},
 			// 设置预约结束时间
-			setDate(yyTime){
-				let date = dayjs(new Date(yyTime));
-				let num = this.currentInspect.inspectCheckType.extra1?this.currentInspect.inspectCheckType.extra1:undefined
-				let newDate = date.add(num ? num : this.yytimeGapMinute, 'minute'); 
-				let endTime = new Date(newDate);
-				this.yyEndTime = endTime.Format('yyyy-MM-dd hh:mm:ss')
+			setDate(yyTime, type){
+				let date = null
+				let num = null
+				let newDate = null
+				let endTime = null
+				if(type=='change'){
+					date = dayjs(new Date(yyTime));
+					num = this.currentInspect.inspectCheckType && this.currentInspect.inspectCheckType.extra1?this.currentInspect.inspectCheckType.extra1:undefined
+					newDate = date.add(num ? num : this.yytimeGapMinute, 'minute'); 
+					endTime = new Date(newDate);
+					this.yyEndTime = endTime.Format('yyyy-MM-dd hh:mm:ss')
+				}else{
+					if(this.currentInspect.endCheckTime){
+						date = dayjs(new Date(this.currentInspect.endCheckTime))
+						this.yyEndTime = date.format('YYYY-MM-DD HH:mm:ss')
+					}else{
+						this.yyEndTime = null
+					}
+				}
 			},
 			radioChange: function(evt) {
 				this.yyTime = '';
@@ -191,12 +204,12 @@
 			},
 			// 确定
 			ok() {
-				let date = dayjs(new Date(this.yyTime));
-				let num = this.currentInspect.inspectCheckType.extra1?this.currentInspect.inspectCheckType.extra1:undefined
-				let newDate = date.add(num ? num : this.yytimeGapMinute, 'minute'); 
-				let endTime = new Date(newDate);
+				// let date = dayjs(new Date(this.yyTime));
+				// let num = this.currentInspect.inspectCheckType.extra1?this.currentInspect.inspectCheckType.extra1:undefined
+				// let newDate = date.add(num ? num : this.yytimeGapMinute, 'minute'); 
+				// let endTime = new Date(newDate);
 				let e = {
-					yyEndTime: endTime.getTime()
+					yyEndTime: this.yyEndTime
 				};
 				if (this.current > -1) {
 					e.value = this.removeReasons[this.current].value;

manifest.json

@@ -123,8 +123,9 @@
             "disableHostCheck" : true,
             "proxy" : {
                 "/service" : {
-                    // "target" : "http://192.168.3.108", //请求的目标域名
-										"target" : "http://192.168.4.129", //陈肖本地
+                    "target" : "http://192.168.3.108", //请求的目标域名
+
+                    // "target" : "http://192.168.4.129", //陈肖本地
                     // "target" : "http://192.168.4.163", //宋程玉本地
                     "changeOrigin" : true, //是否跨域
                     "secure" : false

pages/inspectList/inspectList.vue

@@ -249,7 +249,7 @@
 			  let postData = {
 			    inspectCode: this.currentInspect.inspectCode,
 					yyTime,
-					yyEndTime
+					endCheckTime: yyEndTime
 			  };
 			  uni.showLoading({
 			    title: '加载中',
@@ -600,14 +600,12 @@
 								v.newTime = dayjs(new Date(v.yyTime)).format('MM-DD HH:mm')
 								if(v.endCheckTime){
 									v.newTime2 = dayjs(new Date(v.endCheckTime)).format('HH:mm')
+									v.yyEndTime = v.newTime +'--'+ v.newTime2
 								}else{
-									let date = dayjs(new Date(v.yyTime));
-									let newDate = date.add(this.configObj.yytimeGapMinute, 'minute'); 
-									v.newTime2 = newDate.format('HH:mm');
+									// let [date, time] = v.yyTime.split(" ");
+									// v.yyTime = new Date(date).Format('yyyy-MM-dd') + " " + time.slice(0, -3);
+									v.yyEndTime = v.newTime
 								}
-								v.yyEndTime = v.newTime +'--'+ v.newTime2
-								// let [date, time] = v.yyTime.split(" ");
-								// v.yyTime = new Date(date).Format('yyyy-MM-dd') + " " + time.slice(0, -3);
 							}
 							// return v;
 						})

pages/patientInformationInfo/patientInformationInfo.vue

@@ -369,7 +369,7 @@
 			  let postData = {
 			    inspectCode: this.currentInspect.inspectCode,
 			  	yyTime,
-					yyEndTime
+					endCheckTime: yyEndTime
 			  };
 			  uni.showLoading({
 			    title: '加载中',
@@ -502,12 +502,11 @@
 								e.newTime = dayjs(new Date(e.yyTime)).format('MM-DD HH:mm')
 								if(e.endCheckTime){
 									e.newTime2 = dayjs(new Date(e.endCheckTime)).format('HH:mm')
+									e.yyEndTime = e.newTime +'--'+ e.newTime2
 								}else{
 									let date = dayjs(new Date(e.yyTime));
-									let newDate = date.add(this.configObj.yytimeGapMinute, 'minute'); 
-									e.newTime2 = newDate.format('HH:mm');
+									e.yyEndTime = e.newTime
 								}
-								e.yyEndTime = e.newTime +'--'+ e.newTime2
 							}
 						}
 						// console.log(222, res.data.inspectListMap)

pages/patientInformationList/patientInformationList.vue

@@ -549,12 +549,10 @@
 							e.newTime = dayjs(new Date(e.sortYytime)).format('MM-DD HH:mm')
 							if(e.inspects && e.inspects.length && e.inspects[0].endCheckTime){
 								e.newTime2 = dayjs(new Date(e.inspects[0].endCheckTime)).format('HH:mm')
+								e.yyEndTime = e.newTime +'--'+ e.newTime2
 							}else{
-								let date = dayjs(new Date(e.sortYytime));
-								let newDate = date.add(this.configObj.yytimeGapMinute, 'minute'); 
-								e.newTime2 = newDate.format('HH:mm');
+								e.yyEndTime = e.newTime
 							}
-							e.yyEndTime = e.newTime +'--'+ e.newTime2
 						})
             if (idx === 0) {
               this.zxzData = res.list;

pages/receipt_infopage/receipt_infopage.vue

@@ -129,7 +129,7 @@
         </view>
         <view class="page_item_foot_text" v-if="!(infoDATA.taskType.associationType.value == 'ordinary' && (infoDATA.taskType.ordinaryField.value == 'drugsJpbag' || infoDATA.taskType.ordinaryField.value == 'drugsWestern' || infoDATA.taskType.ordinaryField.value == 'drugsReturn' || infoDATA.taskType.ordinaryField.value == 'drugsPoison' || infoDATA.taskType.ordinaryField.value == 'drugsHerbal'))">
           <text class="text1">预约时间</text>
-          <text class="text2" v-if="infoDATA.taskType.associationType.value == 'inspect'">{{ infoDATA.yyEndTime }}</text>
+          <text class="text2" v-if="infoDATA.taskType.associationType.value == 'inspect'">{{ infoDATA.yyTime }}</text>
           <text class="text2"
             v-if="infoDATA.taskType.associationType.value == 'patientTransport' || infoDATA.taskType.associationType.value == 'other'">{{ infoDATA.yyjdTime|yyTimeFilter }}</text>
 				</view>
@@ -1684,24 +1684,16 @@
 								e.newTime = dayjs(new Date(e.yyTime)).format('MM-DD HH:mm')
 								if(e.endCheckTime){
 									e.newTime2 = dayjs(new Date(e.endCheckTime)).format('HH:mm')
+									e.yyEndTime = e.newTime +'--'+ e.newTime2
 								}else{
-									let date = dayjs(new Date(e.yyTime));
-									let newDate = date.add(this.configObj.yytimeGapMinute, 'minute'); 
-									e.newTime2 = newDate.format('HH:mm');
+									// let date = dayjs(new Date(e.yyTime));
+									// let newDate = date.add(this.configObj.yytimeGapMinute, 'minute'); 
+									// e.newTime2 = newDate.format('HH:mm');
+									e.yyEndTime = e.newTime
 								}
-								e.yyEndTime = e.newTime +'--'+ e.newTime2
 							})
 						}
-						let newTime = dayjs(new Date(res.data.yyTime)).format('MM-DD HH:mm')
-						let newTime2 = null
-						if(res.data.endCheckTime){
-							newTime2 = dayjs(new Date(res.data.endCheckTime)).format('HH:mm')
-						}else{
-							let date = dayjs(new Date(res.data.yyTime));
-							let newDate = date.add(this.configObj.yytimeGapMinute, 'minute'); 
-							newTime2 = newDate.format('HH:mm');
-						}
-						res.data.yyEndTime = newTime +'--'+ newTime2
+
             this.infoDATA = res.data;
             // 计算高度
             setTimeout(() => {

pages/receiptpage/receiptpage.vue

@@ -228,7 +228,7 @@
 										  <text class="text_big" :class="dept.signIn ? 'green': ''">{{ dept.dept }}</text>
 										</view>
                     <view style="text-align: right;">
-                      {{ dept.yyEndTime | yyTimeFilter}}
+                      {{ dept.yyEndTime }}
                     </view>
 									</view>
 								</view>
@@ -2735,12 +2735,13 @@
 										e.newTime = dayjs(new Date(e.yyTime)).format('MM-DD HH:mm')
 										if(e.endCheckTime){
 											e.newTime2 = dayjs(new Date(e.endCheckTime)).format('HH:mm')
+											e.yyEndTime = e.newTime +'--'+ e.newTime2
 										}else{
-											let date = dayjs(new Date(e.yyTime));
-											let newDate = date.add(this.taskTypeConfigObj.yytimeGapMinute, 'minute'); 
-											e.newTime2 = newDate.format('HH:mm');
+											// let date = dayjs(new Date(e.yyTime));
+											// let newDate = date.add(this.taskTypeConfigObj.yytimeGapMinute, 'minute'); 
+											// e.newTime2 = date.format('YYYY-MM-DD HH:mm');
+											e.yyEndTime = e.newTime
 										}
-										e.yyEndTime = e.newTime +'--'+ e.newTime2
 									}
 								}
 								v.taskTypeConfig = this.taskTypeList.find(i=>i.id == v.taskType.id)