五院2.7.3BUG修复

CallCenterWeb.UI/RMYY/src/views/layout/components/Navbar/NavUserInfo.vue

@@ -1,10 +1,14 @@
 <template>
-  <div class="navar_item personalInfoWrapper" style="right: 280px;">
-    <div class="personalInfoLine">
-      <span class="personalInfoText">当前排队人数:{{ waitcountNumber }}</span>
+  <div class="navar_item personalInfoWrapper" style="right: 280px">
+    <div class="personalInfoLine" style="text-align: right">
+      <span class="personalInfoText" v-if="seatflag"
+        >当前排队人数:{{ waitcountNumber }}</span
+      >
       <span class="personalInfoText">登陆账号:{{ usercode }}</span>
       <!-- <span class="personalInfoText">姓名:{{ username }}</span> -->
-      <span class="personalInfoText">分机号:{{ extension }}</span>
+      <span class="personalInfoText" v-if="seatflag"
+        >分机号:{{ extension }}</span
+      >
     </div>
     <div class="personalInfoLine"></div>
   </div>
@@ -18,8 +22,9 @@ export default {
     ...mapGetters([
       "usercode", // 工号
       "extension", // 分机号
+      "seatflag",
       "username", // 姓名
-      "waitcountNumber",//排队数量
+      "waitcountNumber", //排队数量
     ]),
   },
 };

CallCenterWeb.UI/RMYYAPP/pages/myTask/workOrderDetail/button/button.vue

@@ -23,6 +23,7 @@
 				<uni-popup-dialog ref="inputClose" mode="input" title="原因" @confirm="dialogSelectConfirm">
 					<view style="width:100%;">
 						<dictionaries-select :flag="flag" @post-select-dic="postSelectDic" style="margin-bottom: 20px;" ></dictionaries-select>
+						<uni-datetime-picker v-if="this.flag === 'GQYY'" v-model="dateTimeValue"></uni-datetime-picker>
 						<uni-easyinput type="textarea" autoHeight maxlength="100" v-model="cbreason" placeholder="请输入原因" v-show="value == '其他'"/>
 					</view>
 				</uni-popup-dialog>
@@ -98,6 +99,7 @@
 				Maintenancer: '', //维修人
 				maintenancerDate: [], // 人员信息
 				workOrderButton: [], // 工单按钮权限
+				dateTimeValue:this.$mHelper.getNowDate()+' 23:59:59',
 				cbreason: '', //审核原因
 				auditPlaceholder: '请输入不通过审核原因'
 			}
@@ -452,7 +454,7 @@
 					const addParams = {key: this.key,WorkOrderCode: this.wid, value: this.value,ReturnReason: this.cbreason}
 					this.workOrderContent("FaultRepair/ReturnWorkOrder",addParams)
 				}else if (this.flag === 'GQYY') {
-					const addParams = {key: this.key,workordercode: this.wid, value: this.value, reason: this.cbreason}
+					const addParams = {key: this.key,workordercode: this.wid, value: this.value,expectfinishtime:this.dateTimeValue, reason: this.cbreason}
 					this.workOrderContent("FaultRepair/HangUp",addParams)
 				}else if (this.flag === 'TDYY') {
 					if(this.orderT == 'zx') {

CallCenterWeb.UI/RMYYAPP/pages/myTask/workOrderDetail/workOrderDetail.vue

@@ -73,6 +73,10 @@
 				<text class="contentText">{{ detailContentData.F_AcceptTime }}</text>
 			</view>
 			<view class="contentTable">
+				<text class="contentTitle">挂起时间：</text>
+				<text class="contentText">{{ detailContentData.F_ExceptFinishTime }}</text>
+			</view>
+			<view class="contentTable">
 				<text class="contentTitle">完成时间：</text>
 				<text class="contentText">{{ detailContentData.F_Endtime }}</text>
 			</view>

CallCenterWeb.UI/RMYYAPP/utils/helper.js

@@ -250,6 +250,30 @@ export default {
 		const ss = now.getSeconds().toString().padStart(2, 0); //秒
 		return year + "-" + month.toString().padStart(2, 0) + "-" + day + " " + hh + ":" + mm + ":" + ss;
 	},
+	/**
+	 *获取当前日期:  YYYY-MM-DD
+	 */
+	getNowDate() {
+	  var myDate = new Date();
+	  myDate.getYear(); // 获取当前年份(2位)
+	  var YY = myDate.getFullYear(); // 获取完整的年份(4位,1970-????)
+	  var MM = myDate.getMonth() + 1; // 获取当前月份(0-11,0代表1月)
+	  MM = MM > 9 ? MM : "0" + MM;
+	  var DD = myDate.getDate(); // 获取当前日(1-31)
+	  DD = DD > 9 ? DD : "0" + DD;
+	  return YY + "-" + MM + "-" + DD;
+	},
+	getPreDate(pdate = 3600 * 1000 * 24 * 30) {
+	  const start = new Date();
+	  start.setTime(start.getTime() - pdate);
+	  start.getYear(); // 获取当前年份(2位)
+	  const YY = start.getFullYear(); // 获取完整的年份(4位,1970-????)
+	  let MM = start.getMonth() + 1; // 获取当前月份(0-11,0代表1月)
+	  MM = MM > 9 ? MM : "0" + MM;
+	  let DD = start.getDate(); // 获取当前日(1-31)
+	  DD = DD > 9 ? DD : "0" + DD;
+	  return YY + "-" + MM + "-" + DD;
+	},
 	//获取当前时间年月份
 	CurentTimeType() {
 		const now = new Date();