2023-4-19

src/HDrpManagement/toolBorrowingMag/detail/index.vue

@@ -40,7 +40,7 @@
             <el-button class="inline-16" v-if="tool.checkAuth($route.name,'examine')"  :disabled="mainData.status !== '提交' && mainData.status !== '交期确认'" type="primary" size="mini" slot="reference">审 核</el-button>
           </el-popover> -->
           <el-button v-if="tool.checkAuth($route.name,'examine')" :disabled="mainData.status !== '审核'" type="primary" size="mini" @click="onReturnCheck">反审核</el-button>
-          <el-button v-if="tool.checkAuth($route.name,'reback')"  type="primary" size="mini" @click="dialogVisible = true">退 回</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'reback') && mainData.status == '提交'"  type="primary" size="mini" @click="dialogVisible = true">退 回</el-button>
           <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
           <!-- <el-button v-if="tool.checkAuth($route.name,'close')" :disabled="mainData.status !== '审核'" type="primary" size="mini" @click="closeOrder">关 闭</el-button> -->
           <!-- <el-button v-if="tool.checkAuth($route.name,'insert')"  type="primary" size="mini" @click="onCopy">复 制</el-button> -->

src/components/socketMessage/index.vue

@@ -4,12 +4,11 @@
       <p>消息提示</p>
       <p @click="panelIsShow = false">忽略</p>
     </div>
-    <p class="message-item" v-for="item in list" :key="item.index">
-      <el-tooltip class="item" effect="dark" :content="item.type+'消息 ' + item.title" placement="top">
-        <p>[{{item.type}}消息]&nbsp;{{item.title}}</p>
-      </el-tooltip>
+    <div class="message-item" v-for="item in list" :key="item.index">
+      <p class="text" style="margin-bottom:10px;font-weight: 400;">[{{item.type}}消息]&nbsp;{{item.title}}</p>
+      <div style="height:170px;overflow-y: scroll;">{{ item.text }}</div>
       
-    </p>
+    </div>
     <p class="unread-panel">共有{{total}}条未读消息</p>
   </div>
 </template>
@@ -20,6 +19,7 @@
     data () {
       return {
         id:'',
+        // path:"ws://61.164.207.46:8000//yos/webSocket/",
         path:"wss://oms.idcgroup.com.cn:8079/yos/webSocket/",
         panelIsShow:false,
         list:[],
@@ -123,6 +123,12 @@
 <style>
 </style>
 <style scoped>
+*{
+  box-sizing: border-box;
+}
+::-webkit-scrollbar{
+  display: none;
+}
 .messageBox{
   position: fixed;
   right:10px;
@@ -150,9 +156,14 @@
   padding: 10px;
   font-size: 14px;
   width: 100%;
+  /* overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis; */
+}
+.text {
   overflow: hidden;
   white-space: nowrap;
-  text-overflow: ellipsis
+  text-overflow: ellipsis;
 }
 .unread-panel{
   position: absolute;