ltao 3 anni fa
parent
commit
1fa9f12ec7

+ 1 - 0
src/views/bdglregular/regularinfo/index.vue

@@ -369,6 +369,7 @@
             >修改</el-button
           >
           <el-button size="btd" type="text" @click="handleDelete(scope.row)"
+           v-if="scope.row.isShenPi==0"
             >删除</el-button
           >
         </template>

+ 2 - 0
src/views/bdglregular/specialinfo/index.vue

@@ -340,9 +340,11 @@
             >审批</el-button
           >
           <el-button size="btu" type="text" @click="handleAdds(scope.row)"
+          v-if="scope.row.currentState=='待处理'&&scope.row.isShenPi==0"
             >修改</el-button
           >
           <el-button size="btd" @click="handleDelete(scope.row)"
+          v-if="scope.row.isShenPi==0"
             >删除</el-button
           >
         </template>

+ 16 - 8
src/views/pt.vue

@@ -379,7 +379,8 @@
               <img src="../assets/images/通知公告.png" alt />
               <span>通知公告</span>
             </div>
-            <span class="addspan" @click="tiaddfun">查看更多</span>
+            <div class="addspan" @click="tiaddfun"
+              >查看更多</div>
             <div class="num1-box">
               <div
                 class="num1-box-div"
@@ -387,7 +388,10 @@
                 :key="item.noticeId"
                 @click="tzggfun(item)"
               >
-                <div class="num1-box-l">{{ item.noticeTitle }}</div>
+                <div class="num1-box-l">
+                  <span style="color: #BCBCBC;font-size:14px;font-weight: 400;margin-right:10px">{{item.createTime}}</span>
+                  {{ item.noticeTitle }}
+                </div>
                 <div class="num1-box-r">
                   <img
                     src="../assets/images/通知.png"
@@ -737,6 +741,7 @@ export default {
     getlist() {
       listNotice().then((res) => {
         this.noticeList = res.data;
+        console.log(this.noticeList)
       });
     },
     getworklist() {
@@ -1257,14 +1262,16 @@ hr {
   background: rgba(0, 246, 255, 0.3);
 }
 .num1-box-l {
-  flex: 7;
+  flex: 8;
   height: 100%;
   text-align: left;
   margin-left: 10px;
   text-overflow: ellipsis;
+  white-space: nowrap; 
+  overflow: hidden;
 }
 .num1-box-r {
-  flex: 3;
+  flex: 1;
   height: 100%;
   text-align: right;
   margin-right: 10px;
@@ -1380,8 +1387,9 @@ hr {
   position: relative;
 }
 .num1 .addspan {
-  width: 59px;
-  height: 14px;
+  width: 80px;
+  /* background-color: pink; */
+  height: 20px;
   display: inline-block;
   /* background-color: #1c86e1; */
   line-height: 25px;
@@ -1392,9 +1400,9 @@ hr {
   background-image: url("../images/查看更多箭头.png");
   background-repeat: no-repeat;
   /* margin-left: 3.5px; */
-  /* background-position: 50px 10px; */
+  background-position: 70px 5px;
   position: absolute;
-  right: 6%;
+  right: 3.7%;
   top: 4%;
 }
 ::v-deep .el-dialog {