Merge branch 'hjw-spfmui' into 'master'

Hjw spfmui

See merge request spfm/spfm-market-front!216

public/index.html

@@ -25,8 +25,8 @@
   <div id="app"></div>
   <!-- built files will be auto injected -->
   <script type="text/javascript">
-    // window.staticHost = 'http://10.230.26.15:8000/mkt'; // 正式
-    window.staticHost = 'http://10.149.85.91:8000/spfm'; // 测试
+    window.staticHost = 'http://10.230.26.15:8000/mkt'; // 正式
+    // window.staticHost = 'http://10.149.85.91:8000/spfm'; // 测试
     // window.staticHost = 'http://192.168.0.103:9600/';
     // window.staticHost = 'http://192.168.2.142:9600/';
 

src/App.vue

@@ -22,8 +22,9 @@ export default {
   padding: 0;
   margin: 0;
   box-sizing: border-box;
-  font-family: Helvetica Neue, Helvetica, Arial, PingFang SC, Hiragino Sans GB,
-    WenQuanYi Micro Hei, Microsoft Yahei, sans-serif !important;
+  // font-family: Helvetica Neue, Helvetica, Arial, PingFang SC, Hiragino Sans GB,
+  //   WenQuanYi Micro Hei, Microsoft Yahei, sans-serif !important;
+  font-family: "Microsoft YaHei",微软雅黑,Consolas,"LiberationMono",Courier,monospace,simsun !important;
 }
 
 html,

src/components/p-menu-item.vue

@@ -1,121 +1,147 @@
 <template>
-	<div>
-		<template v-for="(menu, index) in menuData">
-			<el-submenu :key="menu.index" :index="
+  <div>
+    <template v-for="(menu, index) in menuData">
+      <el-submenu
+        :key="menu.index"
+        :index="
           menu.rountPath == '' || menu.rountPath == '#'
             ? menu.name + index
             : menu.rountPath
-        " v-if="menu.children" @click="handelRouterTo(menu)">
-				<template slot="title">
-					<i style="color: #409eff !important" class="el-icon-location"></i>
-					<el-tooltip class="item" effect="dark" :content="menu.name" placement="right"
-						v-if="menu.name.length > 9"><span>{{ menu.name }}</span>
-					</el-tooltip>
-					<span v-else>{{ menu.name }}</span>
-				</template>
-				<MenuTree :menuData="menu.children"></MenuTree>
-			</el-submenu>
-			<el-menu-item v-show="menu.systemflag != 1" @click="handelRouterTo(menu)"
-				:index="menu.rountPath == '' ? menu.name : menu.rountPath" :key="menu.index" v-else>
-				<el-tooltip class="item" effect="dark" :content="menu.name" placement="right"
-					v-if="menu.name.length > 9"><span>{{ menu.name }}</span>
-				</el-tooltip>
-				<span v-else>{{ menu.name }}</span>
-			</el-menu-item>
-		</template>
-	</div>
+        "
+        v-if="menu.children"
+        @click="handelRouterTo(menu)"
+      >
+        <template slot="title">
+          <i style="color: #409eff !important" class="el-icon-location"></i>
+          <el-tooltip
+            class="item"
+            effect="dark"
+            :content="menu.name"
+            placement="right"
+            v-if="menu.name.length > 9"
+            ><span>{{ menu.name }}</span>
+          </el-tooltip>
+          <span v-else>{{ menu.name }}</span>
+        </template>
+        <MenuTree :menuData="menu.children"></MenuTree>
+      </el-submenu>
+      <el-menu-item
+        v-show="menu.systemflag != 1"
+        @click="handelRouterTo(menu)"
+        :index="menu.rountPath == '' ? menu.name : menu.rountPath"
+        :key="menu.index"
+        v-else
+      >
+        <el-tooltip
+          class="item"
+          effect="dark"
+          :content="menu.name"
+          placement="right"
+          v-if="menu.name.length > 9"
+          ><span>{{ menu.name }}</span>
+        </el-tooltip>
+        <span v-else>{{ menu.name }}</span>
+      </el-menu-item>
+    </template>
+  </div>
 </template>
 
 <script>
-	export default {
-		name: "MenuTree",
-		props: ["menuData"],
-		methods: {
-			handleOpen(e) {
-				if (e.indexOf("/") != -1) {
-					if (this.$route.path != e) {
-						this.$router.push(e);
-					}
-				}
-			},
-			handleClose() {},
-			handelRouterTo(item) {
-				if (item.systemflag == "1") {
-					return;
-				}
-				for (let i = 0; i < this.$store.state.tabList.length; i++) {
-					if (this.$store.state.tabList[i].rountPath === item.rountPath) {
-						this.$store.state.tabList[i] = item;
-					}
-				}
-				let set = new Set([...this.$store.state.tabList, item]);
-				set.add(item);
-				this.$store.commit("setDefaultActive", item.rountPath);
-				this.$store.commit("setTabList", Array.from(set));
-			},
-		},
-	};
+export default {
+  name: "MenuTree",
+  props: ["menuData"],
+  methods: {
+    handleOpen(e) {
+      if (e.indexOf("/") != -1) {
+        if (this.$route.path != e) {
+          this.$router.push(e);
+        }
+      }
+    },
+    handleClose() {},
+    handelRouterTo(item) {
+      if (item.systemflag == "1") {
+        return;
+      }
+      for (let i = 0; i < this.$store.state.tabList.length; i++) {
+        if (this.$store.state.tabList[i].rountPath === item.rountPath) {
+          this.$store.state.tabList[i] = item;
+        }
+      }
+      let set = new Set([...this.$store.state.tabList, item]);
+      set.add(item);
+      this.$store.commit("setDefaultActive", item.rountPath);
+      this.$store.commit("setTabList", Array.from(set));
+    },
+  },
+};
 </script>
-<style>
-	.el-submenu {
-		border-bottom: 1px solid #ececec;
-	}
-	
-	.is-opened .el-submenu__title {
-		/* background-color: #ecf5ff !important; */
-		background-color: #dddddd !important;
-		border-left:3px solid #34A0CE;
-	}
-	.el-submenu__title:hover{
-		background-color: #bbbbbb !important;
-		border-left:3px solid #34A0CE;
-	}
-	.is-opened .el-submenu__title:hover{
-		background-color: #bbbbbb !important;
-		border-left:3px solid #34A0CE;
-	}
-	.el-submenu__title {
-		/* background-color: #ecf5ff;
+<style lang="scss" scoped>
+.el-submenu {
+  border-bottom: 1px solid #ececec;
+}
+
+.is-opened .el-submenu__title {
+  /* background-color: #ecf5ff !important; */
+  background-color: #dddddd !important;
+  border-left: 3px solid #34a0ce;
+}
+.el-submenu__title:hover {
+  background-color: #bbbbbb !important;
+  border-left: 3px solid #34a0ce;
+}
+.is-opened .el-submenu__title:hover {
+  background-color: #bbbbbb !important;
+  border-left: 3px solid #34a0ce;
+}
+::v-deep .el-submenu__title {
+  padding-left: 30px !important;
+
+  .el-submenu__icon-arrow {
+    position: absolute;
+    right: 8px;
+  }
+  /* background-color: #ecf5ff;
   border-radius: 30px;
   margin-bottom: 10px; */
-	}
+}
 
-	.el-submenu.is-active .el-submenu__title {
-		/* background-color: #ecf5ff; */
-	}
+.el-submenu.is-active .el-submenu__title {
+  /* background-color: #ecf5ff; */
+}
 </style>
 <style lang="scss" scoped>
-	.el-menu-item {
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-		width: 50px;
-		background: #2e7dcf;
-		span {
-			padding-right: 10px;
-			color: #bdddff;
-		}
-		
-	}
+.el-menu-item {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  width: 50px;
+  padding-left: 60px !important;
+  background: #2e7dcf;
+  span {
+    padding-right: 10px;
+    color: #bdddff;
+  }
+}
 
-	.el-menu-item:hover{
-		background: #577494;
-	}
+.el-menu-item:hover {
+  background: #577494;
+}
 
-	.el-menu--vertical {
-		.el-menu-item {
-			width: auto !important;
-			span {
-				padding-right: 0;
-			}
-		}
-	}
+.el-menu--vertical {
+  .el-menu-item {
+    width: auto !important;
+    span {
+      padding-right: 0;
+    }
+  }
+}
 
-	.bgc {
-		background-color: #f56c6c;
-	}
+.bgc {
+  background-color: #f56c6c;
+}
 
-	.bgcChild {
-		background-color: #f56c6c;
-	}
+.bgcChild {
+  background-color: #f56c6c;
+}
 </style>

src/components/p-tabs.vue

@@ -397,7 +397,7 @@ export default {
 
     .tab-item-shap {
       position: absolute;
-      width: 100%;
+      width: 160px;
       height: 38px;
       transition: 0.3s;
       background: rgba(255, 255, 255, 0.4);
@@ -408,14 +408,14 @@ export default {
 
     .text {
       text-align: center;
-      // overflow-x: hidden;
+      overflow: hidden;
       white-space: nowrap;
       text-overflow: ellipsis;
       // padding: 0px 16px;
       font-size: 14px;
       letter-spacing: 0;
       position: absolute;
-      width: 100%;
+      width: 160px;
       height: 38px;
       text-align: center;
       // background-color: white;

src/pages/main/leader/index.vue

@@ -25,7 +25,10 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col
+              :span="24"
+              style="background: #fff; margin-top: 10px; border-radius: 5px"
+            >
               <leaderTag :dynamicTags="dynamicTags"></leaderTag>
             </el-col>
           </el-row>
@@ -35,7 +38,10 @@
                 <hometask></hometask>
               </el-col>
               <el-col :span="6">
-                <numberhits :numHits="numHits"  :numHits1="numHits1"  ></numberhits>
+                <numberhits
+                  :numHits="numHits"
+                  :numHits1="numHits1"
+                ></numberhits>
               </el-col>
             </div>
             <div v-else>
@@ -100,15 +106,14 @@ export default {
       status: true,
       dynamicTags: [], //已添加的常用功能
       numHits: [], //点击率排行
-      numHits1:[],
+      numHits1: [],
       menuqList: [], //有权限的菜单
       dialogStatus: false,
-      datalist:[],
+      datalist: [],
       infolist: {},
     };
   },
   methods: {
-    
     //获取员工信息
     getpeo() {
       this.$http({
@@ -237,7 +242,7 @@ export default {
           }
         }
         this.numHits = newmen;
-        this.numHits1= newmen.slice(0, 10);
+        this.numHits1 = newmen.slice(0, 10);
       });
     },
   },

src/pages/main/leader/leaderHprocess.vue

@@ -54,6 +54,7 @@
                       class="span"
                       style="float: right"
                       @click="jumpTo(items)"
+                      :title="items.moduleName"
                     >
                       {{ items.moduleName }}
                     </div>
@@ -245,8 +246,8 @@ export default {
 }
 
 .bg-style {
-  height: 60px;
-  overflow-y: auto;
+  // height: 60px;
+  // overflow-y: auto;
   margin: 5px;
   .custom-tree-node {
     width: 100%;
@@ -285,9 +286,7 @@ export default {
     .f-box-info {
       display: inline-block;
       height: 60px;
-  
-      text-align: center;
-
+      width: 16%;
       i {
         width: 40px;
         height: 40px;
@@ -300,17 +299,20 @@ export default {
       }
 
       .span {
-        font-size: 13px;
+        // font-size: 13px;
         text-align: left;
-        width: 200px;
+        width: 110px;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
         // height: 40px;
         line-height: 20px;
         cursor: pointer;
       }
-      .f-box-tit{
-        font-size: 13px;
+      .f-box-tit {
+        // font-size: 13px;
         text-align: left;
-        width: 200px;
+        // width: 200px;
         // height: 20px;
         line-height: 20px;
         cursor: pointer;
@@ -348,13 +350,13 @@ export default {
 }
 
 ::v-deep .el-badge__content {
-  margin-top: 8px;
-  margin-right: 35px;
+  // margin-top: 8px;
+  margin-right: -20px;
 }
-.elbadgefather{
+.elbadgefather {
   display: flex;
 }
-.elbadgeson2{
+.elbadgeson2 {
   display: flex;
   flex-direction: column;
 }

src/pages/main/leader/leaderTag.vue

@@ -238,6 +238,7 @@ export default {
             type: "success",
           });
           this.setStatus = false;
+          location.reload();
         }
       });
     },
@@ -260,6 +261,7 @@ export default {
             type: "success",
           });
           this.setStatus = false;
+          location.reload();
         }
       });
     },
@@ -273,7 +275,6 @@ export default {
       //   checknode.push(item.functionName);
       // });
       // console.log(checknode)
-
       this.$http({
         url: "/market/usuaFun/save",
         method: "post",
@@ -304,7 +305,7 @@ export default {
   width: 100%;
   background: #fff;
   margin-top: 10px;
-  padding-top: 10px;
+  // padding-top: 10px;
   padding-left: 10px;
   border-radius: 5px;
 
@@ -317,8 +318,7 @@ export default {
     font-weight: 600;
   }
   .foxbox {
-    overflow-y: auto;
-    height: 61px;
+    background: #fff;
     margin-left: 5px;
   }
   .tags {
@@ -336,7 +336,7 @@ export default {
       overflow: hidden;
       text-overflow: ellipsis; /*超出部分省略号表示*/
       width: 110px;
-      text-align: center;
+      text-align: left;
     }
     .icon {
       float: left;

src/pages/main/leader/leaderhomeTask.vue

@@ -9,15 +9,7 @@
         <span class="span3" @click="tabboxclick3">我的发起</span>
         <!-- <span class="span" @click="more">更多>></span> -->
       </div>
-      <div
-        style="
-          background: #fafafa;
-          padding: 10px;
-          min-height: 250px;
-          border-bottom-left-radius: 5px;
-          border-bottom-right-radius: 5px;
-        "
-      >
+      <div class="fatherbox">
         <div class="tabbox">
           <!-- 我的待办列表 -->
           <el-table
@@ -30,25 +22,31 @@
             tooltip-effect="dark"
             size="small"
             style="width: 100%; font-size: 16px; background: '#FaFaFa'"
-            height="250px"
+            height="442px"
           >
             <el-table-column prop="woTitle" label="工单标题" align="center">
               <template slot-scope="scope">
-                <span style="float: left; color: #afb2d8; margin-right: 5px"
-                  >•</span
-                >
+                
                 <span
+                  :title="scope.row.woTitle"
                   @click="RowTitle(scope.row)"
                   :style="
                     scope.row.woTypeDesc == '预警工单'
-                      ? 'cursor: pointer;color:red;float:left;'
-                      : 'cursor: pointer;color:blue;float:left;'
+                      ? 'cursor: pointer;color:red;float:left;display:inline-block;width:150px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;text-align:left;'
+                      : 'cursor: pointer;color:blue;float:left;display:inline-block;width:150px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;text-align:left;'
                   "
-                  >{{ scope.row.woTitle }}</span
+                  ><span style="float: left; color: #afb2d8; margin-right: 5px"
+                  >•</span
+                >{{ scope.row.woTitle }}</span
                 >
               </template>
             </el-table-column>
-            <el-table-column prop="procName" label="流程名称" align="center">
+            <el-table-column
+              prop="procName"
+              label="流程名称"
+              align="center"
+              width="180"
+            >
               <template slot-scope="scope">
                 <span>{{ scope.row.procName }}</span>
               </template>
@@ -57,7 +55,7 @@
               prop="assigneName"
               label="上一步处理人"
               align="center"
-              width="120"
+              width="110"
             >
               <template slot-scope="scope">
                 <span>{{ $desensitization(scope.row.assigneName, 1) }}</span>
@@ -67,17 +65,17 @@
               prop="clsj"
               label="上一步处理时间"
               align="center"
-              width="140"
+              width="120"
             >
               <template slot-scope="scope">
-                <span>{{ $formatDate(scope.row.clsj, "YYYY-MM-DD") }}</span>
+                <span>{{ scope.row.clsj }}</span>
               </template>
             </el-table-column>
             <el-table-column
               prop="opName"
               label="发起姓名"
               align="center"
-              width="100"
+              width="80"
             >
               <template slot-scope="scope">
                 <span>{{ scope.row.opName }}</span>
@@ -90,126 +88,138 @@
               width="120"
             >
               <template slot-scope="scope">
-                <span>{{
-                  $formatDate(scope.row.createTime, "YYYY-MM-DD")
-                }}</span>
+                <span>{{ scope.row.createTime }}</span>
               </template>
             </el-table-column>
           </el-table>
-          <div>
-            <div class="tabbox">
-              <!-- 我的已办列表 -->
-              <el-table
-                :header-cell-style="{ background: '#F2F2F2' }"
-                :cell-style="{ background: '#FaFaFa' }"
-                v-if="tabbox2"
-                class="com-table"
-                ref="tableDatayj"
-                :data="tableDatayj"
-                tooltip-effect="dark"
-                size="small"
-                style="width: 100%; font-size: 16px"
-                height="250px"
-              >
-                <el-table-column prop="woTitle" label="工单标题" align="center">
-                  <template slot-scope="scope">
-                    <span style="float: left; color: #afb2d8; margin-right: 5px"
-                      >•</span
-                    >
-                    <span
-                      @click="RowDoneTitle(scope.row)"
-                      style="cursor: pointer; color: blue; float: left"
-                      >{{ scope.row.woTitle }}</span
-                    >
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="procName"
-                  label="流程名称"
-                  align="center"
+          <el-pagination
+            class="pageBox"
+            @current-change="currchangeDdaiban"
+            layout="total,prev, pager, next"
+            background
+            page-size="10"
+            :total="totalDaiban"
+            v-if="tabbox1"
+          >
+          </el-pagination>
+        </div>
+        <div class="tabbox">
+          <!-- 我的已办列表 -->
+          <el-table
+            :header-cell-style="{ background: '#F2F2F2' }"
+            :cell-style="{ background: '#FaFaFa' }"
+            class="com-table"
+            ref="tableDatayj"
+            v-if="tabbox2"
+            :data="tableDatayj"
+            tooltip-effect="dark"
+            size="small"
+            style="width: 100%; font-size: 16px; background: '#FaFaFa'"
+            height="442px"
+          >
+            <el-table-column prop="woTitle" label="工单标题" align="center">
+              <template slot-scope="scope">
+                <span style="float: left; color: #afb2d8; margin-right: 5px"
+                  >•</span
                 >
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.procName }}</span>
-                  </template>
-                </el-table-column>
-
-                <el-table-column
-                  prop="opName"
-                  label="发起姓名"
-                  align="center"
-                  width="120"
+                <span
+                  @click="RowDoneTitle(scope.row)"
+                  style="cursor: pointer; color: blue; float: left"
+                  >{{ scope.row.woTitle }}</span
                 >
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.opName }}</span>
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="createTime"
-                  label="发起时间"
-                  align="center"
-                  width="120"
+              </template>
+            </el-table-column>
+            <el-table-column prop="procName" label="流程名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.procName }}</span>
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              prop="opName"
+              label="发起姓名"
+              align="center"
+              width="120"
+            >
+              <template slot-scope="scope">
+                <span>{{ scope.row.opName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="createTime"
+              label="发起时间"
+              align="center"
+              width="180"
+            >
+              <template slot-scope="scope">
+                <span>{{ scope.row.createTime }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination
+            class="pageBox"
+            v-if="tabbox2"
+            @current-change="currchangeDone"
+            layout="total,prev, pager, next"
+            background
+            :total="totalDone"
+            page-size="10"
+          >
+          </el-pagination>
+        </div>
+        <div class="tabbox">
+          <!-- 我的发起列表 -->
+          <el-table
+            :header-cell-style="{ background: '#F2F2F2' }"
+            :cell-style="{ background: '#FaFaFa' }"
+            class="com-table"
+            ref="OpList"
+            :data="OpList"
+            v-if="tabbox3"
+            tooltip-effect="dark"
+            size="small"
+            style="width: 100%; font-size: 16px; background: '#FaFaFa'"
+            height="442px"
+          >
+            <el-table-column prop="woTitle" label="工单标题" align="center">
+              <template slot-scope="scope">
+                <span style="float: left; color: #afb2d8; margin-right: 5px"
+                  >•</span
                 >
-                  <template slot-scope="scope">
-                    <span>{{
-                      $formatDate(scope.row.createTime, "YYYY-MM-DD")
-                    }}</span>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-          </div>
-          <div>
-            <div class="tabbox">
-              <!-- 我的发起列表 -->
-              <el-table
-                :header-cell-style="{ background: '#F2F2F2' }"
-                :cell-style="{ background: '#FaFaFa' }"
-                v-if="tabbox3"
-                class="com-table"
-                ref="OpList"
-                :data="OpList"
-                tooltip-effect="dark"
-                size="small"
-                style="width: 100%; font-size: 16px"
-                height="250px"
-              >
-                <el-table-column prop="woTitle" label="工单标题" align="center">
-                  <template slot-scope="scope">
-                    <span style="float: left; color: #afb2d8; margin-right: 5px"
-                      >•</span
-                    >
-                    <span
-                      @click="RowlaunchTitle(scope.row)"
-                      style="cursor: pointer; color: blue; float: left"
-                      >{{ scope.row.woTitle }}</span
-                    >
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  prop="procName"
-                  label="流程名称"
-                  align="center"
+                <span
+                  @click="RowlaunchTitle(scope.row)"
+                  style="cursor: pointer; color: blue; float: left"
+                  >{{ scope.row.woTitle }}</span
                 >
-                  <template slot-scope="scope">
-                    <span>{{ scope.row.procName }}</span>
-                  </template>
-                </el-table-column>
+              </template>
+            </el-table-column>
+            <el-table-column prop="procName" label="流程名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.procName }}</span>
+              </template>
+            </el-table-column>
 
-                <el-table-column
-                  prop="createTime"
-                  label="发起时间"
-                  align="center"
-                  width="120"
-                >
-                  <template slot-scope="scope">
-                    <span>{{
-                      $formatDate(scope.row.createTime, "YYYY-MM-DD")
-                    }}</span>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-          </div>
+            <el-table-column
+              prop="createTime"
+              label="发起时间"
+              align="center"
+              width="180"
+            >
+              <template slot-scope="scope">
+                <span>{{ scope.row.createTime }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination
+            class="pageBox"
+            @current-change="currchangeOp"
+            layout="total,prev, pager, next"
+            background
+            :total="totalOp"
+            v-if="tabbox3"
+            page-size="10"
+          >
+          </el-pagination>
         </div>
       </div>
       <!-- 查看待办弹窗 -->
@@ -285,6 +295,7 @@
             <el-table-column prop="assigneeName" label="处理角色" width="180" />
             <el-table-column prop="opTime" label="处理时间" />
           </el-table>
+          <el-button class="diobtn" @click="dlogStatus()">查看详情</el-button>
         </div>
       </el-dialog>
       <!-- 查看发起弹窗 -->
@@ -321,7 +332,6 @@
             <el-table-column prop="stepName" label="节点名称" width="180" />
             <el-table-column prop="assigneeName" label="处理角色" width="180" />
             <el-table-column prop="opTime" label="处理时间" />
-            
           </el-table>
         </div>
       </el-dialog>
@@ -358,7 +368,7 @@ export default {
       tabbox2: false, //已办
       tabbox3: false, //发起
       niticList: [], //待办列表
-      tableDatayj:[],//已办列表
+      tableDatayj: [], //已办列表
       OpList: [], //我的发起列表
       WorkOrderStatus: false, //查看待办弹窗
       launchStatus: false, //查看我的发起弹窗
@@ -368,20 +378,27 @@ export default {
       StatusList: [], //form表单里列表
       WorkOrderList: [], //我的待办流程节点
       DoneList: [], //我的已办流程节点
-      launchList:[],//我的发起流程节点
-      urlllll:"",//跳转路由
+      launchList: [], //我的发起流程节点
+      urlllll: "", //跳转路由
+      totalDone: 0, //已办分页
+      totalDaiban: 0, //已办分页
+      totalOp: 0, //已办分页
+      params: {},
+      pageSize: 1,
+      pageSizeDone: 1,
+      pageSizeDdaiban: 1,
+      pageSizeOp: 1,
     };
   },
   methods: {
-    
     //处理按钮
     dlogStatus() {
       // this.WorkOrderStatus = false;
       // this.WorkOrderStatus1 = true;
       this.$router.push(this.urlllll);
-      console.log(this.urlllll)
+      console.log(this.urlllll);
     },
-    //查看标题按钮
+    //查看标题按钮按钮
     RowTitle(v) {
       this.StatusList = v;
       // let url= v.actionUrl;
@@ -414,16 +431,15 @@ export default {
           procId: v.procId,
         },
       }).then((res) => {
-        this.urlllll=res.data[0].jspUrl
+        this.urlllll = res.data[0].jspUrl;
         // console.log(this.urlllll)
         // if(this.urlllll=="#"){
         //   this.urlllll=res.data[1].jspUrl
         // }
-        console.log(this.urlllll)
+        console.log(this.urlllll);
       });
-      
     },
-    //我的已办查看
+    //我的已办查看按钮
     RowDoneTitle(v) {
       this.StatusList = v;
       this.DoneStatus = true;
@@ -438,10 +454,27 @@ export default {
         },
       }).then((res) => {
         this.DoneList = res.data;
-        
+      });
+       this.$http({
+        url: "/market/cwo/redirectDealPage",
+        method: "post",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        data: {
+          procId: v.procId,
+        },
+      }).then((res) => {
+        this.urlllll = res.data[0].jspUrl;
+        // console.log(this.urlllll)
+        // if(this.urlllll=="#"){
+        //   this.urlllll=res.data[1].jspUrl
+        // }
+        console.log(this.urlllll);
       });
     },
-    //我的发起查看
+
+    //我的发起查看按钮
     RowlaunchTitle(v) {
       this.StatusList = v;
       this.launchStatus = true;
@@ -464,48 +497,69 @@ export default {
       console.log(11);
     },
 
-    //待办列表
-    daiban() {
+    //待办列表初始化
+    daiban(v, n) {
+      this.pageSizeDdaiban = n;
       this.$http({
         url: "/market/cwo/queryQaToDoList",
         method: "post",
         headers: {
           "Content-Type": "application/json",
-          page: '{"pageNo":"' + 1 + '","pageSize":"100"}',
+          page: '{"pageNo":"' + n + '","pageSize":"10"}',
         },
-        data: {},
+        data:'{"pageNo":"' + n + '","pageSize":"10"}',
       }).then((res) => {
         this.niticList = res.data.data;
+        this.totalDaiban = res.data.totalRecord;
       });
     },
 
-    //已办列表
-    getListyj() {
+    //已办列表初始化
+    getListyj(v, n) {
+      this.pageSizeDone = n;
       let _this = this;
       this.$http({
         url: "/market/cwo/queryQaFinishList",
         method: "post",
         headers: {
           "Content-Type": "application/json",
-          page: '{"pageNo":"' + 1 + '","pageSize":"100"}',
+          page: '{"pageNo":"' + n + '","pageSize":"10"}',
         },
-        data: {},
+        data:'{"pageNo":"' + n + '","pageSize":"10"}',
       }).then((res) => {
         this.tableDatayj = res.data.data;
+        this.totalDone = res.data.totalRecord;
       });
     },
-    //我的发起列表
-    getOPlist() {
+    //待办分页
+    currchangeDdaiban(v) {
+      this.pageSizeDdaiban = v;
+      this.daiban(this.params, this.pageSizeDdaiban);
+    },
+    //已办分页
+    currchangeDone(v) {
+      this.pageSizeDone = v;
+      this.getListyj(this.params, this.pageSizeDone);
+    },
+    //已办分页
+    currchangeOp(v) {
+      this.pageSizeOp = v;
+      this.getOPlist(this.params, this.pageSizeOp);
+    },
+    //我的发起列表初始化
+    getOPlist(v, n) {
+      this.pageSizeOp = n;
       this.$http({
         url: "/market/cwo/queryOpList",
         method: "post",
         headers: {
           "Content-Type": "application/json",
-          page: '{"pageNo":"' + 1 + '","pageSize":"100"}',
+          page: '{"pageNo":"' + n + '","pageSize":"10"}',
         },
-        data: {},
+        data:'{"pageNo":"' + n + '","pageSize":"10"}',
       }).then((res) => {
         this.OpList = res.data.data;
+        this.totalOp = res.data.totalRecord;
       });
     },
     tabboxclick1() {
@@ -518,11 +572,13 @@ export default {
       document.querySelector(".span1").style.borderBottom = "2px solid blue";
       document.querySelector(".span3").style.color = "black";
       document.querySelector(".span3").style.border = 0;
+      document.querySelector(".com-table").style.backgroundColor = "#FaFaFa";
     },
     tabboxclick2() {
       this.tabbox1 = false;
       this.tabbox2 = true;
       this.tabbox3 = false;
+      document.querySelector(".com-table").style.backgroundColor = "#FaFaFa";
       document.querySelector(".span1").style.border = 0;
       document.querySelector(".span2").style.borderBottom = "2px solid blue";
       document.querySelector(".span2").style.color = "blue";
@@ -534,6 +590,7 @@ export default {
       this.tabbox1 = false;
       this.tabbox2 = false;
       this.tabbox3 = true;
+      document.querySelector(".com-table").style.backgroundColor = "#FaFaFa";
       document.querySelector(".span1").style.color = "black";
       document.querySelector(".span2").style.color = "black";
       document.querySelector(".span1").style.border = 0;
@@ -543,9 +600,9 @@ export default {
     },
   },
   mounted() {
-    this.daiban();
-    this.getListyj();
-    this.getOPlist();
+    this.daiban({}, 1);
+    this.getListyj({}, 1);
+    this.getOPlist({}, 1);
     this.userInfo = JSON.parse(window.sessionStorage.userInfo);
   },
   created() {},
@@ -639,10 +696,30 @@ export default {
     margin-left: 20px;
   }
 }
+.fatherbox {
+  background: #fafafa;
+  padding: 10px;
+  height: 484px;
+  border-bottom-left-radius: 5px;
+  border-bottom-right-radius: 5px;
+  width: 100%;
+}
+.pageBox {
+}
 ::v-deep .gutter {
   background: #fafafa;
 }
 ::v-deep .is-scrolling-none {
   background: #fafafa;
 }
+
+::v-deep .el-table--scrollable-y .el-table__body-wrapper {
+  overflow: hidden;
+}
+::v-deep .el-table th>.cell{
+  padding:0px;
+}
+::v-deep .el-table__body-wrapper .is-scrolling-left{
+  overflow-x: hidden;
+}
 </style>

src/pages/main/noticec/index.vue

@@ -529,6 +529,7 @@
 
     .tabbox {
         margin-top: 16px;
+        font-size: 14px !important;
     }
 
     .pageBox {
@@ -582,4 +583,7 @@
             width: calc(100% - 100px);
         }
     }
+    ::v-deep .el-table--mini, .el-table--small, .el-table__expand-icon{
+        font-size: 14px;
+    }
 </style>