Merge branch 'hjw-xindaiban' into 'hjw-newuidaiban'

新待办接入

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

src/pages/main/leader/leaderhomeTask.vue

@@ -13,7 +13,10 @@
         <div class="tabbox">
           <!-- 我的待办列表 -->
           <el-table
-            :header-cell-style="{ background: '#F2F2F2' ,'text-align':'center'}" 
+            :header-cell-style="{
+              background: '#F2F2F2',
+              'text-align': 'center',
+            }"
             :cell-style="{ background: '#FaFaFa' }"
             v-if="tabbox1"
             class="com-table"
@@ -24,7 +27,12 @@
             style="width: 100%; font-size: 16px; background: '#FaFaFa'"
             height="442px"
           >
-            <el-table-column prop="woTitle" label="工单标题" align="left" :show-overflow-tooltip="true">
+            <el-table-column
+              prop="woTitle"
+              label="工单标题"
+              align="left"
+              :show-overflow-tooltip="true"
+            >
               <template slot-scope="scope">
                 <span
                   :title="scope.row.woTitle"
@@ -34,10 +42,10 @@
                       ? 'cursor: pointer;color:red;'
                       : 'cursor: pointer;color:blue;'
                   "
-                  >
+                >
                   <!-- <span style="float: left; color: #afb2d8;margin-right:5px"
                   >•</span> -->
-                {{ scope.row.woTitle }}</span
+                  {{ scope.row.woTitle }}</span
                 >
               </template>
             </el-table-column>
@@ -49,7 +57,9 @@
               :show-overflow-tooltip="true"
             >
               <template slot-scope="scope">
-                <span :title="scope.row.procName">{{ scope.row.procName }}</span>
+                <span :title="scope.row.procName">{{
+                  scope.row.procName
+                }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -60,7 +70,9 @@
               :show-overflow-tooltip="true"
             >
               <template slot-scope="scope">
-                <span :title="scope.row.assigneName">{{ scope.row.assigneName}}</span>
+                <span :title="scope.row.assigneName">{{
+                  scope.row.assigneName
+                }}</span>
               </template>
             </el-table-column>
             <el-table-column
@@ -99,7 +111,7 @@
             @current-change="currchangeDdaiban"
             layout="total,prev, pager, next"
             background
-            page-size="10"
+            :page-size="pagesize"
             :total="totalDaiban"
             v-if="tabbox1"
           >
@@ -108,7 +120,10 @@
         <div class="tabbox">
           <!-- 我的已办列表 -->
           <el-table
-            :header-cell-style="{ background: '#F2F2F2' ,'text-align':'center'}" 
+            :header-cell-style="{
+              background: '#F2F2F2',
+              'text-align': 'center',
+            }"
             :cell-style="{ background: '#FaFaFa' }"
             class="com-table"
             ref="tableDatayj"
@@ -119,22 +134,35 @@
             style="width: 100%; font-size: 16px; background: '#FaFaFa'"
             height="442px"
           >
-            <el-table-column prop="woTitle" label="工单标题" align="left" :show-overflow-tooltip="true">
+            <el-table-column
+              prop="woTitle"
+              label="工单标题"
+              align="left"
+              :show-overflow-tooltip="true"
+            >
               <template slot-scope="scope">
                 <!-- <span style="float: left; color: #afb2d8;margin-right:5px"
                   >•</span
                 > -->
                 <span
                   @click="RowDoneTitle(scope.row)"
-                  :title="scope.row.woTitle" 
-                  style="cursor: pointer; color: blue;"
+                  :title="scope.row.woTitle"
+                  style="cursor: pointer; color: blue"
                   >{{ scope.row.woTitle }}</span
                 >
               </template>
             </el-table-column>
-            <el-table-column prop="procName" label="流程名称" align="center" width="180" :show-overflow-tooltip="true">
+            <el-table-column
+              prop="procName"
+              label="流程名称"
+              align="center"
+              width="180"
+              :show-overflow-tooltip="true"
+            >
               <template slot-scope="scope">
-                <span :title="scope.row.procName">{{ scope.row.procName }}</span>
+                <span :title="scope.row.procName">{{
+                  scope.row.procName
+                }}</span>
               </template>
             </el-table-column>
 
@@ -166,14 +194,17 @@
             layout="total,prev, pager, next"
             background
             :total="totalDone"
-            page-size="10"
+            :page-size="pagesize"
           >
           </el-pagination>
         </div>
         <div class="tabbox">
           <!-- 我的发起列表 -->
           <el-table
-            :header-cell-style="{ background: '#F2F2F2' ,'text-align':'center'}" 
+            :header-cell-style="{
+              background: '#F2F2F2',
+              'text-align': 'center',
+            }"
             :cell-style="{ background: '#FaFaFa' }"
             class="com-table"
             ref="OpList"
@@ -184,7 +215,12 @@
             style="width: 100%; font-size: 16px; background: '#FaFaFa'"
             height="442px"
           >
-            <el-table-column prop="woTitle" label="工单标题" align="left"  :show-overflow-tooltip="true">
+            <el-table-column
+              prop="woTitle"
+              label="工单标题"
+              align="left"
+              :show-overflow-tooltip="true"
+            >
               <template slot-scope="scope">
                 <!-- <span style="float: left; color: #afb2d8;margin-right:5px"
                   >•</span
@@ -192,14 +228,21 @@
                 <span
                   :title="scope.row.woTitle"
                   @click="RowlaunchTitle(scope.row)"
-                  style="cursor: pointer; color: blue;"
+                  style="cursor: pointer; color: blue"
                   >{{ scope.row.woTitle }}</span
                 >
               </template>
             </el-table-column>
-            <el-table-column prop="procName" label="流程名称" align="center"  :show-overflow-tooltip="true">
+            <el-table-column
+              prop="procName"
+              label="流程名称"
+              align="center"
+              :show-overflow-tooltip="true"
+            >
               <template slot-scope="scope">
-                <span :title="scope.row.procName">{{ scope.row.procName }}</span>
+                <span :title="scope.row.procName">{{
+                  scope.row.procName
+                }}</span>
               </template>
             </el-table-column>
 
@@ -221,7 +264,7 @@
             background
             :total="totalOp"
             v-if="tabbox3"
-            page-size="10"
+            :page-size="pagesize"
           >
           </el-pagination>
         </div>
@@ -237,7 +280,7 @@
         :modal-append-to-body="false"
         :close-on-click-modal="false"
       >
-        <div >
+        <div>
           <el-form :inline="true" :model="StatusList" class="demo-form-inline">
             <el-form-item label="工单标题">
               <el-input
@@ -255,18 +298,21 @@
             </el-form-item>
           </el-form>
           <h3>流程轨迹</h3>
-          <el-table :data="WorkOrderList" style="width: 100%" max-height="350" height="300">
+          <el-table
+            :data="WorkOrderList"
+            style="width: 100%"
+            max-height="350"
+            height="300"
+          >
             <el-table-column prop="createTime" label="节点开始时间" />
             <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>
         <div class="diobtn">
-           <el-button  @click="dlogStatus()">处理</el-button>
+          <el-button @click="dlogStatus()">处理</el-button>
         </div>
-         
       </el-dialog>
       <!-- 查看已办弹窗 -->
       <el-dialog
@@ -279,8 +325,8 @@
         :modal-append-to-body="false"
         :close-on-click-modal="false"
       >
-        <div >
-          <el-form :inline="true" :model="StatusList" class="demo-form-inline" >
+        <div>
+          <el-form :inline="true" :model="StatusList" class="demo-form-inline">
             <el-form-item label="工单标题">
               <el-input
                 v-model="StatusList.woTitle"
@@ -297,18 +343,21 @@
             </el-form-item>
           </el-form>
           <h3>流程轨迹</h3>
-          <el-table :data="DoneList" style="width: 100%" max-height="350" height="300">
+          <el-table
+            :data="DoneList"
+            style="width: 100%"
+            max-height="350"
+            height="300"
+          >
             <el-table-column prop="createTime" label="节点开始时间" />
             <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>
         <div class="diobtn">
           <el-button @click="dlogStatus()">查看详情</el-button>
         </div>
-          
       </el-dialog>
       <!-- 查看发起弹窗 -->
       <el-dialog
@@ -321,7 +370,7 @@
         :modal-append-to-body="false"
         :close-on-click-modal="false"
       >
-        <div >
+        <div>
           <el-form :inline="true" :model="StatusList" class="demo-form-inline">
             <el-form-item label="工单标题">
               <el-input
@@ -339,7 +388,12 @@
             </el-form-item>
           </el-form>
           <h3>流程轨迹</h3>
-          <el-table :data="launchList" style="width: 100%" max-height="350" height="300">
+          <el-table
+            :data="launchList"
+            style="width: 100%"
+            max-height="350"
+            height="300"
+          >
             <el-table-column prop="createTime" label="节点开始时间" />
             <el-table-column prop="stepName" label="节点名称" width="180" />
             <el-table-column prop="assigneeName" label="处理角色" width="180" />
@@ -397,6 +451,7 @@ export default {
       totalOp: 0, //已办分页
       params: {},
       pageSize: 1,
+      pagesize: 10,
       pageSizeDone: 1,
       pageSizeDdaiban: 1,
       pageSizeOp: 1,
@@ -413,43 +468,41 @@ export default {
     //查看标题按钮按钮
     RowTitle(v) {
       this.StatusList = v;
-      // let url= v.actionUrl;
-      // console.log(url+111);
-      // // this.dialogdiv="/static/views/insideFilecollect/launch.html"
-      // this.dialogdiv=url.replace("/views","/static/views")
-      // this.dialogdiv=url.replace("/static/views","/static/views")
-      // this.dialogdiv=url.replace("/dist/views/","/static/views/")
-      // console.log( this.dialogdiv+"new");
-      this.WorkOrderStatus = true;
-      this.$http({
-        url: "/market/cwo/queryProcStepByWono",
-        method: "post",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        data: {
-          woNo: v.woNo,
-        },
-      }).then((res) => {
-        this.WorkOrderList = 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);
-      });
+      console.log(v.actionUrl);
+      if (v.procName) {
+        this.WorkOrderStatus = true;
+        this.$http({
+          url: "/market/cwo/queryProcStepByWono",
+          method: "post",
+          headers: {
+            "Content-Type": "application/json",
+          },
+          data: {
+            woNo: v.woNo,
+          },
+        }).then((res) => {
+          this.WorkOrderList = 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);
+        });
+      }else{
+        this.$router.push(v.actionUrl);
+      }
     },
     //我的已办查看按钮
     RowDoneTitle(v) {
@@ -467,7 +520,7 @@ export default {
       }).then((res) => {
         this.DoneList = res.data;
       });
-       this.$http({
+      this.$http({
         url: "/market/cwo/redirectDealPage",
         method: "post",
         headers: {
@@ -519,7 +572,7 @@ export default {
           "Content-Type": "application/json",
           page: '{"pageNo":"' + n + '","pageSize":"10"}',
         },
-        data:'{"pageNo":"' + n + '","pageSize":"10"}',
+        data: '{"pageNo":"' + n + '","pageSize":"10"}',
       }).then((res) => {
         this.niticList = res.data.data;
         this.totalDaiban = res.data.totalRecord;
@@ -537,7 +590,7 @@ export default {
           "Content-Type": "application/json",
           page: '{"pageNo":"' + n + '","pageSize":"10"}',
         },
-        data:'{"pageNo":"' + n + '","pageSize":"10"}',
+        data: '{"pageNo":"' + n + '","pageSize":"10"}',
       }).then((res) => {
         this.tableDatayj = res.data.data;
         this.totalDone = res.data.totalRecord;
@@ -553,7 +606,7 @@ export default {
       this.pageSizeDone = v;
       this.getListyj(this.params, this.pageSizeDone);
     },
-    //已办分页
+    //发起分页
     currchangeOp(v) {
       this.pageSizeOp = v;
       this.getOPlist(this.params, this.pageSizeOp);
@@ -568,7 +621,7 @@ export default {
           "Content-Type": "application/json",
           page: '{"pageNo":"' + n + '","pageSize":"10"}',
         },
-        data:'{"pageNo":"' + n + '","pageSize":"10"}',
+        data: '{"pageNo":"' + n + '","pageSize":"10"}',
       }).then((res) => {
         this.OpList = res.data.data;
         this.totalOp = res.data.totalRecord;
@@ -625,8 +678,8 @@ export default {
 .diobtn {
   position: relative;
   text-align: right;
-//  display: flex;
-//     justify-content: end;
+  //  display: flex;
+  //     justify-content: end;
   margin-top: 10px;
 }
 .taskbox {