Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/views/system/business.vue

package.json

@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     
-    "serve": "vue-cli-service serve",
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
     "build": "vue-cli-service build"
   },
   "dependencies": {

src/api/index.js

@@ -174,6 +174,12 @@ export function findCooperatorFieldsByName(cooperatorName){
         method: 'get',
     })
 }
+export function getBusinessSize(businessType){
+    return request.post('/business/getBusinessSize',
+        {
+            businessType:businessType
+        });
+    }
 export function businessList(pageNum,pageSize,businessType){
     return request.post('/business/businessList',
         {
@@ -192,54 +198,6 @@ export function selectBusiness(pageNum,pageSize,customerName,businessType){
 
         });
 }
-export function businessToDoList(pageNum,pageSize){
-    return request.post('/business/businessToDoList',
-        {
-            pageNum:pageNum,
-            pageSize:pageSize,
-        });
-}
-
-export function selectBusinessToDo(pageNum,pageSize,customerName){
-    return request.post('/business/selectBusinessToDo',
-        {
-            pageNum:pageNum,
-            pageSize:pageSize,
-            customerName:customerName,
-
-        });
-}
-
-export function businessAnalysisList(pageNum,pageSize){
-    return request.post('/business/businessAnalysisList',        {
-        pageNum:pageNum,
-        pageSize:pageSize,
-    });
-}
-export function selectBusinessAnalysis(pageNum,pageSize,customerName){
-    return request.post('/business/selectBusinessAnalysis',
-        {
-            pageNum:pageNum,
-            pageSize:pageSize,
-            customerName:customerName,
-
-        });
-}
-export function businessFailList(pageNum,pageSize) {
-    return request.post('/business/businessFailList', {
-        pageNum: pageNum,
-        pageSize: pageSize,
-    });
-}
-export function selectBusinessFail(pageNum,pageSize,customerName){
-    return request.post('/business/selectBusinessFail',
-        {
-            pageNum:pageNum,
-            pageSize:pageSize,
-            customerName:customerName,
-
-        });
-}
 export function modelDefineList(){
     return request.get('/model_define/modelDefineList');
 }

src/router/index.js

@@ -363,7 +363,7 @@ var routes = [{
                 meta: {
                     keepAlive: false,
                     show: true,
-                    menu: 'businessInfo'
+                    menu: 'business'
                 }
             },
             {

src/views/system/business.vue

@@ -9,20 +9,20 @@
         </el-button>
 
         <el-menu
-          default-active="1"
+          :default-active="activeIndex"
           class="el-menu-vertical-demo"
-
+          @select="handleMenuSelect"
           :collapse="isCollapse"
           >
-          <el-menu-item  @click="gotolink1" class="vertical-center" index="1">
+          <el-menu-item  class="vertical-center" index="1">
             <i class="el-icon-location"></i>
             <span slot="title">待办业务</span>
           </el-menu-item>
-          <el-menu-item @click="gotolink2" class="vertical-center" index="2">
+          <el-menu-item  class="vertical-center" index="2">
             <i class="el-icon-menu"></i>
             <span slot="title">解析业务</span>
           </el-menu-item>
-          <el-menu-item  @click="gotolink3" class="vertical-center" index="3">
+          <el-menu-item  class="vertical-center" index="3">
             <i class="el-icon-setting"></i>
             <span slot="title">失败业务</span>
           </el-menu-item>
@@ -127,6 +127,7 @@ export default {
   components: {},
   data() {
     return {
+      activeIndex:'1',
       activeKey: 0,
       activeName: "second",
       currentPage: 1,
@@ -145,19 +146,27 @@ export default {
       input:'',
       showSize:'',
       totalSize:'',
-      businessType:0,
+      businessType:1,
     }
   },
   watch: {},
   computed: {},
   beforeCreate() {},
   created() {
-    
+    this.activeIndex = this.$route.query.activeIndex || 1; // 使用默认值 1
   },
   beforeMount() {},
   mounted()
   {
-    businessList(this.currentPage,this.pagesize,this.businessType).then(
+    this.handleMenuSelect(this.activeIndex);
+  },
+  beforeUpdate() {},
+  updated() {},
+  destroyed() {},
+  methods: {
+    handleMenuSelect(index) {
+      this.activeIndex = index;
+      businessList(this.currentPage,this.pagesize,this.activeIndex).then(
           res=>
           {
             this.businessData=res.data.business_list.list;
@@ -168,11 +177,8 @@ export default {
 
           }
       )
-  },
-  beforeUpdate() {},
-  updated() {},
-  destroyed() {},
-  methods: {
+
+    },
     toggleCollapse(){
       this.isCollapse = !this.isCollapse;
     },
@@ -259,55 +265,52 @@ export default {
           console.error(error);
         }
       },
-      gotolink1()
-      {
-        this.businessType=0;
-        businessList(this.currentPage,this.pagesize,this.businessType).then(
-          res=>
-          {
-            this.businessData=res.data.business_list.list;
-            this.businessShowData = this.businessData
-            var j = parseInt(res.data.business_list.total)
-            this.totalSize = j
-            this.showSize = this.totalSize
+      // gotolink1()
+      // {
+      //   this.businessType=0;
+      //   businessList(this.currentPage,this.pagesize,this.businessType).then(
+      //     res=>
+      //     {
+      //       this.businessData=res.data.business_list.list;
+      //       this.businessShowData = this.businessData
+      //       var j = parseInt(res.data.business_list.total)
+      //       this.totalSize = j
+      //       this.showSize = this.totalSize
   
-          }
-      )
-      },
-      gotolink2()
-      {
-        this.businessType=1;
-        businessList(this.currentPage,this.pagesize,this.businessType).then(
-          res=>
-          {
-            this.businessData=res.data.business_list.list;
-            this.businessShowData = this.businessData
-            var j = parseInt(res.data.business_list.total)
-            this.totalSize = j
-            this.showSize = this.totalSize
-            console.log("阿斯蒂芬贵哦")
-
-            console.log(this.businessShowData)
-          }
-      )
-      },
-      gotolink3()
-      {
-        this.businessType=2;
-        businessList(this.currentPage,this.pagesize,this.businessType).then(
-          res=>
-          {
-            this.businessData=res.data.business_list.list;
-            this.businessShowData = this.businessData
-            var j = parseInt(res.data.business_list.total)
-            this.totalSize = j
-            this.showSize = this.totalSize
-            console.log("阿斯蒂芬贵哦")
-
-            console.log(this.businessShowData)
+      //     }
+      // )
+      // },
+      // gotolink2()
+      // {
+      //   this.businessType=1;
+      //   businessList(this.currentPage,this.pagesize,this.businessType).then(
+      //     res=>
+      //     {
+      //       this.businessData=res.data.business_list.list;
+      //       this.businessShowData = this.businessData
+      //       var j = parseInt(res.data.business_list.total)
+      //       this.totalSize = j
+      //       this.showSize = this.totalSize
+      //       console.log("阿斯蒂芬贵哦")
+
+      //       console.log(this.businessShowData)
+      //     }
+      // )
+      // },
+      // gotolink3()
+      // {
+      //   this.businessType=2;
+      //   businessList(this.currentPage,this.pagesize,this.businessType).then(
+      //     res=>
+      //     {
+      //       this.businessData=res.data.business_list.list;
+      //       this.businessShowData = this.businessData
+      //       var j = parseInt(res.data.business_list.total)
+      //       this.totalSize = j
+      //       this.showSize = this.totalSize
   
-          })
-      },
+      //     })
+      // },
     tables:function () { //在你的数据表格中定义tabels
       const input = this.input
       if (input) {
@@ -329,7 +332,8 @@ export default {
           headInfId:row.headInfId,
           rptNo:row.rptNo,
           businessId:row.businessId,
-          cooperatorName:row.cooperatorName
+          cooperatorName:row.cooperatorName,
+          activeIndex: this.activeIndex
         }
       })
     },

src/views/system/businessInfo.vue

@@ -9,19 +9,19 @@
                        class="el-icon-s-fold">
           </el-button>
           <el-menu
-              default-active="1"
+              :default-active="activeIndex"
               class="el-menu-vertical-demo"
-  
+              @select="handleMenuSelect"
           >
-            <el-menu-item  @click="gotolink1" class="vertical-center" index="1">
+            <el-menu-item   class="vertical-center" index="1">
               <i class="el-icon-location"></i>
               <span slot="title">待办业务</span>
             </el-menu-item>
-            <el-menu-item @click="gotolink2" class="vertical-center" index="2">
+            <el-menu-item class="vertical-center" index="2">
               <i class="el-icon-menu"></i>
               <span slot="title">解析业务</span>
             </el-menu-item>
-            <el-menu-item  @click="gotolink3" class="vertical-center" index="3">
+            <el-menu-item   class="vertical-center" index="3">
               <i class="el-icon-setting"></i>
               <span slot="title">失败业务</span>
             </el-menu-item>
@@ -36,7 +36,7 @@
   
           <el-tabs v-model="activeName" @tab-click="handleClick" >
             <el-tab-pane label="业务信息" name="first">
-              <el-descriptions style="margin-top: 20px"  :column="1" border>
+              <el-descriptions style="margin-top: 20px" direction="vertical" :column="1" border>
                 <el-descriptions-item label="业务编号">
                   <p>
                     {{this.businessInfoData.businessNum }}
@@ -62,7 +62,7 @@
             </el-tab-pane>
   
             <el-tab-pane label="客户信息" name="second">
-              <el-descriptions style="margin-top: 20px"  :column="1" border>
+              <el-descriptions style="margin-top: 20px" direction="vertical" :column="1" border>
                 <el-descriptions-item label="客户编号">
                   <p>
                     {{this.customInfoData.customerNum }}
@@ -194,7 +194,10 @@
             <!--            yuan-->
   
           </el-tabs>
-          <el-button type="primary" round @click="onButtonClickReturn" size="small" style="margin-left: 350px">返回</el-button>
+          <div class = "bottom-bar" style="margin-top: 20px" >
+                <el-button round type="primary" size="medium" style="position: absolute; left: 55%;" @click="onButtonClickReturn" >返回</el-button>
+            </div>
+          <!-- <el-button type="primary" round @click="onButtonClickReturn" size="small" style="margin-left: 350px">返回</el-button> -->
   
   
   
@@ -267,6 +270,7 @@
     components: {},
     data() {
       return {
+        activeIndex:this.$route.query.activeIndex,
         activeKey: 0,
         activeName: "first",
         currentPage1: 1,
@@ -387,6 +391,16 @@
     updated() {},
     destroyed() {},
     methods: {
+      handleMenuSelect(index) {
+      this.activeIndex = index;
+      this.$router.push({
+        path: '/business',
+        query: {
+          activeIndex: this.activeIndex
+        }
+      })
+     
+    },
       request() {},
       toggleCollapse(){
         this.isCollapse = !this.isCollapse;
@@ -453,42 +467,31 @@
         location.reload();
   
       },
-      gotolink1()
-      {
-        this.$router.replace('/business');
-        this.selected1 = false;
-        this.selected2 = true;
-        this.selected3 = true;
-        this.selected4 = false;
-        this.selected5 = true;
-        this.selected6 = false;
-      },
+      // gotolink1()
+      // {
+      //   this.$router.replace('/business');
+      // },
   
-      gotolink2()
-      {
-        //指定跳转地址
-        this.$router.replace('/business');
-        this.selected1 = true;
-        this.selected2 = false;
-        this.selected3 = false;
-        this.selected4 = true;
-        this.selected5 = true;
-        this.selected6 = false;
-      },
-      gotolink3()
-      {
-        //指定跳转地址
-        this.$router.replace('/business');
-        this.selected1 = true;
-        this.selected2 = false;
-        this.selected3 = true;
-        this.selected4 = false;
-        this.selected5 = false;
-        this.selected6 = true;
-      },
+      // gotolink2()
+      // {
+      //   //指定跳转地址
+      //   this.$router.replace('/business');
+
+      // },
+      // gotolink3()
+      // {
+      //   //指定跳转地址
+      //   this.$router.replace('/business');
+
+      // },
       onButtonClickReturn()
       {
-        this.$router.replace('/business');
+        this.$router.push({
+          path: '/business',
+          query: {
+            activeIndex: this.activeIndex
+          }
+        })
       },
   
       //yuan

src/views/system/cooperatorProductInfoBase.vue

@@ -53,7 +53,7 @@
                 
             </el-descriptions>
             <div class = "bottom-bar" style="margin-top: 20px" >
-                <el-button round type="success" size="medium" style="position: absolute; left: 55%;" @click="gotolink2" >完成</el-button>
+                <el-button round type="primary" size="medium" style="position: absolute; left: 55%;" @click="gotolink2" >完成</el-button>
             </div>
           
         </el-main>

src/views/system/homePage.vue

@@ -82,7 +82,7 @@ import store from "@/store";
 import request from '@/utils/request.js'
 import { fieldInfo, modelInfo } from '../../api';
 import {
-  businessToDoList,businessAnalysisList,businessFailList
+  getBusinessSize
 } from '@/api/index.js'
 export default {
 
@@ -124,26 +124,26 @@ export default {
   beforeMount() {},
   mounted() 
   {
-    businessToDoList(1,1000).then(
+    getBusinessSize(1).then(
         res=>
         {
-          var j = parseInt(res.data.business_todo_list.total)
+          var j = parseInt(res.data.business_size)
           this.baseSize = j
 
         }
     )
 
-    businessAnalysisList(1,1000).then(
+    getBusinessSize(2).then(
         res=>
         {
-          var j = parseInt(res.data.business_analysis_list.total)
+          var j = parseInt(res.data.business_size)
           this.analysisSize = j
         }
     )
-    businessFailList(1,1000).then(
+    getBusinessSize(3).then(
         res=>
         {
-          var j = parseInt(res.data.business_fail_list.total)
+          var j = parseInt(res.data.business_size)
           this.failSize = j
         }
     )