Browse Source

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

# Conflicts:
#	src/views/system/cooperatorEdit.vue
Danj0rr 11 months ago
parent
commit
b4aecead72

+ 10 - 8
src/views/system/business.vue

@@ -153,11 +153,12 @@ export default {
   computed: {},
   beforeCreate() {},
   created() {
-    this.activeIndex = this.$route.query.activeIndex || 1; // 使用默认值 1
+  
   },
   beforeMount() {},
   mounted()
   {
+    this.activeIndex = this.$route.query.activeIndex || 1; // 使用默认值 1
     this.handleMenuSelect(this.activeIndex);
   },
   beforeUpdate() {},
@@ -177,7 +178,7 @@ export default {
 
           }
       )
-     
+
     },
     toggleCollapse(){
       this.isCollapse = !this.isCollapse;
@@ -217,7 +218,7 @@ export default {
     handleCurrentChange:function(currentPage){
       this.currentPage=currentPage;
       if(!this.input){
-        businessList(this.currentPage,this.pagesize,this.businessType).then(
+        businessList(this.currentPage,this.pagesize,this.activeIndex).then(
               res=>
               {
                 this.businessData=res.data.business_list.list;
@@ -227,7 +228,7 @@ export default {
           )
         }
       else {
-        selectBusiness(this.currentPage,this.pagesize,this.input,this.businessType).then(
+        selectBusiness(this.currentPage,this.pagesize,this.input,this.activeIndex).then(
               res=>
               {
                 this.selectBusinessData=res.data.select_business_list.list;
@@ -239,7 +240,7 @@ export default {
     handleSizeChange:function(size){
       this.pagesize=size;
       if(!this.input){
-        businessList(this.currentPage,this.pagesize,this.businessType).then(
+        businessList(this.currentPage,this.pagesize,this.activeIndex).then(
               res=>
               {
                 this.businessData=res.data.business_list.list;
@@ -248,7 +249,7 @@ export default {
           )
         }
         else {
-          selectBusiness(this.currentPage,this.pagesize,this.input,this.businessType).then(
+          selectBusiness(this.currentPage,this.pagesize,this.input,this.activeIndex).then(
               res=>
               {
                 this.selectBusinessData=res.data.select_business_list.list;
@@ -333,6 +334,7 @@ export default {
           rptNo:row.rptNo,
           businessId:row.businessId,
           cooperatorName:row.cooperatorName,
+          customerName:row.customerName,
           activeIndex: this.activeIndex
         }
       })
@@ -341,7 +343,7 @@ export default {
     filterTable(){
 
       if (this.input.trim() === '') {
-          businessList(this.currentPage,this.pagesize,this.businessType).then(
+          businessList(this.currentPage,this.pagesize,this.activeIndex).then(
               res=>
               {
                 this.businessData=res.data.business_list.list;
@@ -352,7 +354,7 @@ export default {
         // 如果输入框为空,显示所有数据
       } else {
         // 否则,只显示与输入文本匹配的数据
-        selectBusiness(this.currentPage,this.pagesize,this.input,this.businessType).then(
+        selectBusiness(this.currentPage,this.pagesize,this.input,this.activeIndex).then(
               res=>
               {
                 this.selectBusinessData=res.data.select_business_list.list;

+ 30 - 11
src/views/system/businessInfo.vue

@@ -75,7 +75,7 @@
                 </el-descriptions-item>
                 <el-descriptions-item label="证件类型">
                   <p>
-                    {{this.customInfoData.idTypeCode }}
+                    {{this.idTypeName }}
                   </p>
                 </el-descriptions-item>
                 <el-descriptions-item label="证件号码">
@@ -112,7 +112,7 @@
   
               <div class="top_show" style="margin-top: 20px">
                 <span> 解析文件:</span>
-                <el-button size="small" class="el-icon-upload" type="primary" round style="position: absolute; right: 10%;" @click="add_file_show=true">上传</el-button>
+                <el-button size="small" class="el-icon-upload" type="primary" round style="position: absolute; right: 10%;" @click="fileUp()">上传</el-button>
                 <el-button size="small" class="el-icon-download" type="primary" round style="position: absolute; right: 1%;" @click="fileDown()">下载</el-button>
   
               </div>
@@ -284,7 +284,7 @@
   
         selectedAll:false,
         selectedAll2:false,
-  
+        idTypeName:"",
   
         reportFileData : [],
         reportFileData1 : [],
@@ -316,7 +316,8 @@
         rptNo : this.$route.query.rptNo,
         businessId : this.$route.query.businessId,
         cooperatorName : this.$route.query.cooperatorName,
-  
+        customerName : this.$route.query.customerName,
+
       }
     },
     watch: {},
@@ -339,6 +340,8 @@
               {
                 if(res.data.custom_info){
                 this.customInfoData=res.data.custom_info;}
+                if(this.customInfoData.idTypeCode==10)
+                  this.idTypeName = "身份证"
               }
           )
       reportFileList(this.businessNum).then(
@@ -499,10 +502,22 @@
         // console.log(fileList)
       },
   
-  
+      fileUp: function (){
+        if(this.headInfId){
+        this.add_file_show=true}
+        else {
+          this.$alert("失败业务不进行上传文件操作");
+          return;
+        }
+      },
+
       // 文件下载
       fileDown: function (){
-        if (this.downSelected2.length+this.downSelected.length==0) {
+        if(!this.headInfId) {
+          this.$alert("失败业务不进行下载文件操作");
+          return;
+        }
+          if (this.downSelected2.length+this.downSelected.length==0) {
           this.$alert("请选择下载文件");
           return;
         }
@@ -558,28 +573,32 @@
   
       //1.2 上传方法具体实现重写
       upload(){
+
         let fd = new FormData();
-  
         this.fileList.forEach(item=>{
           //文件信息中raw才是真的文件
           fd.append("files",item.raw);
+          fd.append("customerName",this.customerName);
+          fd.append("headInfId",this.headInfId);
+
           if(this.model_type == "模型文件"){
             this.fileNameModel = "1"
           }
+          else {
           if(item.raw.name.toString().endsWith("txt")){
             this.fileNameTxt = "1"
           }
           else if(item.raw.name.toString().endsWith("xml")){
             this.fileNameXml = "1"
           }
-          else {
+          else if(this.model_type != "模型文件"){
             {
               this.$alert("请上传正确的文件类型");
               return;
             }
-          }
+          }}
           request.post('/report/fileReportAdd',{
-            file_name : item.raw.name,
+            file_name : this.customerName+"_"+this.headInfId+"_"+item.raw.name,
             fileModel:this.fileNameModel,
             fileNameTxt:this.fileNameTxt,
             fileNameXml:this.fileNameXml,
@@ -589,7 +608,7 @@
             businessNum:this.businessNum,
           })
           console.log("模型类")
-  
+
           console.log(this.fileNameModel)
           if(this.model_type == "模型文件") {
             request.post('/up/uploadMod', fd).then(res => {

+ 1 - 1
src/views/system/cooperatorDetailed.vue

@@ -48,7 +48,7 @@
             <el-row>
               <el-col span="10" >
                 <el-form-item label="合作方编号: " width="100px">
-                <span>{{cooperatorId}}</span>
+                <span>{{cooperatorNum}}</span>
                 </el-form-item>
               </el-col>
               <el-col span="10"  >

+ 312 - 316
src/views/system/cooperatorEdit.vue

@@ -1,322 +1,321 @@
 <template>
-    <div class="container" style="min-height: 100%; padding-bottom: 100px;">
-
-        <el-tabs v-model="activeName" @tab-click="handleClick" stretch>
-
-
-            <el-container>
-                <el-aside :width="isCollapse?'65px':'150px'">
-                    <el-button @click="toggleCollapse" type="primary"
-                               style="display:block;margin:0 auto"
-                               size="medium"
-                               class="el-icon-s-fold">
-                    </el-button>
-                    <el-menu
-                            default-active="1"
-                            class="el-menu-vertical-demo"
-                            :collapse="isCollapse"
-
-                    >
-                        <el-menu-item @click="gotolink2" class="vertical-center" index="1">
-                            <i class="el-icon-location"></i>
-                            <span slot="title">合作方</span>
-                        </el-menu-item>
-                        <el-menu-item @click="gotolink3" class="vertical-center" index="2">
-                            <i class="el-icon-menu"></i>
-                            <span slot="title">合作产品</span>
-                        </el-menu-item>
-                    </el-menu>
-                </el-aside>
-                <el-divider direction="vertical"></el-divider>
-
-                <!--          <div class="line" />-->
-
-                <el-main>
-                    <div class="submit_view">
-                        <span style="display: block; margin-bottom: 20px;">编辑合作方</span>
-                        <el-form class="model_add_button" ref="form" label-width="120px">
-                            <el-form-item label="合作方名称" width="100px">
-                                <el-input v-model="cooperator_name" style="width:215px"></el-input>
-                            </el-form-item>
-                            <el-form-item label="证件号码" width="100px">
-                                <el-input v-model="corp_certificate_num" style="width:215px"></el-input>
-                            </el-form-item>
-                            <el-form-item label="证件类型" width="100px">
-                                <el-select name="art-cate" v-model="corp_certificate_type_name"
-                                           placeholder="选择证件类型" style="height:35px">
-                                    <el-option v-for='item in type_list' :key="item.key" :label="item.label"
-                                               :value="item.label"
-                                    />
-                                </el-select>
-                            </el-form-item>
-                            <el-form-item label="所属字段表模板" width="200px">
-                                <el-select name="art-cate" v-model="fieldTemplateId" placeholder="请选择字段表模板"
-                                           style="height:35px">
-                                    <el-option v-for="(item,index) in fieldTemplateList "
-                                               :key="index"
-                                               :label="item.templateName"
-                                               :value="item.id"
-                                    />
-
-                                </el-select>
-                            </el-form-item>
-                        </el-form>
-
-                        <el-button class="model_add_button " size="small" round type="primary" @click="submit()">完成
-                        </el-button>
-                        <el-button class="model_add_button " size="small" round type="danger" @click="return_page()">
-                            返回
-                        </el-button>
-
-                    </div>
-                </el-main>
-            </el-container>
-
-
-        </el-tabs>
-
-    </div>
+  <div class="container" style="min-height: 100%; padding-bottom: 100px;">
+
+    <el-tabs v-model="activeName" @tab-click="handleClick"  stretch>
+
+
+
+        <el-container>
+          <el-aside :width="isCollapse?'65px':'150px'">
+            <el-button   @click = "toggleCollapse" type="primary"
+                         style="display:block;margin:0 auto"
+                         size="medium"
+                         class="el-icon-s-fold">
+            </el-button>                <el-menu
+              default-active="1"
+              class="el-menu-vertical-demo"
+              :collapse="isCollapse"
+
+            >
+              <el-menu-item @click="gotolink2" class="vertical-center" index="1">
+                <i class="el-icon-location"></i>
+                <span slot="title">合作方</span>
+              </el-menu-item>
+              <el-menu-item  @click="gotolink3" class="vertical-center" index="2">
+                <i class="el-icon-menu"></i>
+                <span slot="title">合作产品</span>
+              </el-menu-item>
+            </el-menu>
+          </el-aside>
+          <el-divider direction="vertical"></el-divider>
+
+          <!--          <div class="line" />-->
+
+          <el-main>
+            <div class="submit_view">
+              <span style="display: block; margin-bottom: 20px;">编辑合作方</span>
+              <el-form  class="model_add_button" ref="form"  label-width="120px">
+                <el-form-item label="合作方名称" width="100px">
+                  <el-input v-model="cooperator_name" style="width:215px"></el-input>
+                </el-form-item>
+                <el-form-item label="证件号码" width="100px">
+                  <el-input v-model="corp_certificate_num" style="width:215px"></el-input>
+                </el-form-item>
+                <el-form-item label="证件类型" width="100px">
+                  <el-select name="art-cate" v-model="corp_certificate_type_name" placeholder="选择证件类型" style="height:35px">
+                    <el-option v-for='item in type_list' :key="item.key" :label="item.label"
+                               :value="item.label"
+                    />
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="所属字段表模板" width="200px">
+                  <el-select name="art-cate" v-model="fieldTemplateId" placeholder="请选择字段表模板" style="height:35px" >
+                    <el-option v-for="(item,index) in fieldTemplateList "
+                               :key="index"
+                               :label="item.templateName"
+                               :value="item.id"
+                    />
+
+                  </el-select>
+                </el-form-item>
+              </el-form>
+             
+              <el-button class="model_add_button " size="small" round type="primary" @click="submit()">完成</el-button>
+              <el-button class="model_add_button " size="small" round type="danger" @click="return_page()">返回</el-button>
+
+            </div>
+          </el-main>
+        </el-container>
+
+
+    </el-tabs>
+    
+  </div>
 </template>
 
 <script>
 
 import {
-    fieldTemplateLists, cooperatorEdit
+  fieldTemplateLists, cooperatorEdit
 } from '@/api/index.js'
 import store from "@/store";
 import request from '@/utils/request.js'
-import {fieldInfo, modelInfo} from '../../api';
+import { fieldInfo, modelInfo } from '../../api';
 
 export default {
 
-    name: "cooperatorInfo",
-    props: [],
-    components: {},
-    data() {
-        return {
-            activeKey: 0,
-            activeName: "third",
-            activeKey: 1,
-            activeName: "third",
-            currentPage: 1,
-            cooperatorData: [],
-            selected1: true,
-            selected2: false,
-            selected3: false,
-            selected4: true,
-            selected5: true,
-            selected6: false,
-            input: '',
-
-            isCollapse: false,
-
-            cooperatorField: [],
-            cooperatorProduct: [],
-            productStatus: "",
-            arr: [{name: '统一社会信用代码'}, {name: '组织机构代码'},],
-            type_list: [
-                {
-                    key: 20,
-                    label: "统一社会信用代码"
-                },
-                {
-                    key: 30,
-                    label: "组织机构代码"
-                }
-            ],
-            cooperator_name: this.$route.query.cooperatorName,
-            corp_certificate_num: this.$route.query.corpCertificateNum,
-            corp_certificate_type_name: "",
-            corp_certificate_type: "",
-            fieldTemplateList: "",
-            fieldTemplateNa: "",
-            cooperatorId: this.$route.query.cooperatorId,
-            cooperatorName: this.$route.query.cooperatorName,
-            cooperatorNum: this.$route.query.cooperatorNum,
-            createTime: this.$route.query.createTime,
-            corpCertificateType: this.$route.query.corpCertificateType,
-            templateId: this.$route.query.templateId,
-            templateName: this.$route.query.templateName,
-            fieldTemplateId: this.$route.query.templateName,
-            corpCertificateNum: this.$route.query.corpCertificateNum,
-
+  name: "cooperatorInfo",
+  props: [],
+  components: {},
+  data() {
+    return {
+      activeKey: 0,
+      activeName: "third",
+      activeKey: 1,
+      activeName: "third",
+      currentPage: 1,
+      cooperatorData : [],
+      selected1: true,
+      selected2: false,
+      selected3: false,
+      selected4: true,
+      selected5: true,
+      selected6: false,
+      input:'',
+
+      isCollapse: false,
+
+      cooperatorField : [],
+      cooperatorProduct : [],
+      productStatus : "",
+      arr: [{ name: '统一社会信用代码' }, { name: '组织机构代码' }, ],
+      type_list: [
+        {
+          key: 20,
+          label: "统一社会信用代码"
+        },
+        {
+          key: 30,
+          label: "组织机构代码"
         }
+      ],
+      cooperator_name : this.$route.query.cooperatorName,
+      corp_certificate_num : this.$route.query.corpCertificateNum,
+      corp_certificate_type_name : "",
+      corp_certificate_type : "",
+      fieldTemplateList : "",
+      fieldTemplateNa : "",
+      cooperatorId : this.$route.query.cooperatorId,
+      cooperatorName : this.$route.query.cooperatorName,
+      cooperatorNum : this.$route.query.cooperatorNum,
+      createTime : this.$route.query.createTime,
+      corpCertificateType:this.$route.query.corpCertificateType,
+      templateId:this.$route.query.templateId,
+      templateName:this.$route.query.templateName,
+      fieldTemplateId:this.$route.query.templateName,
+      corpCertificateNum : this.$route.query.corpCertificateNum,
+
+    }
+  },
+  watch: {},
+  computed: {},
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() 
+  {
+    if(this.corpCertificateType == "20")
+      this.corp_certificate_type_name = "统一社会信用代码"
+    else
+      this.corp_certificate_type_name =  "组织机构代码"
+    fieldTemplateLists().then(
+      res=>
+      {
+        this.fieldTemplateList=res.data.field_template_list;
+        console.log("asfafs的")
+
+        console.log(this.fieldTemplateList)
+      }
+    )
+  },
+  beforeUpdate() {},
+  updated() {},
+  destroyed() {},
+  methods: {
+    request() {},
+
+    toggleCollapse(){
+      this.isCollapse = !this.isCollapse;
     },
-    watch: {},
-    computed: {},
-    beforeCreate() {
+    handleClick(tab, event) {
+      if(tab.name=='first'){
+        this.gotolinkHome();
+      }
+      if(tab.name=='second'){
+        this.gotolinkbusiness();
+      }
+      if(tab.name=='third'){
+        this.gotolinkCooperator();
+      }
+      if(tab.name=='fourth'){
+        this.gotolinkField();
+      }
     },
-    created() {
+    gotolinkHome()
+    {
+      this.$router.replace('/homePage');
     },
-    beforeMount() {
+    gotolinkbusiness()
+    {
+      this.$router.replace('/businesstodo');
+    },
+    gotolinkCooperator()
+    {
+      this.$router.replace('/cooperatorInfo');
     },
-    mounted() {
-        if (this.corpCertificateType == "20")
-            this.corp_certificate_type_name = "统一社会信用代码"
-        else
-            this.corp_certificate_type_name = "组织机构代码"
-        fieldTemplateLists().then(
-            res => {
-                this.fieldTemplateList = res.data.field_template_list;
-                console.log("asfafs的")
 
-                console.log(this.fieldTemplateList)
-            }
-        )
+    gotolinkField()
+    {
+      this.$router.replace('/fieldInfo');
     },
-    beforeUpdate() {
+    handleCurrentChange() {},
+    handleSizeChange() {},
+
+    gotolink2()
+    {
+      //指定跳转地址
+      this.$router.replace('/cooperatorInfo');
+      this.selected1 = true;
+      this.selected2 = false;
+      this.selected3 = false;
+      this.selected4 = true;
+      this.selected5 = true;
+      this.selected6 = false;
     },
-    updated() {
+    gotolink3()
+    {
+      //指定跳转地址
+      this.$router.replace('/cooperatorProductInfo');
+      this.selected1 = true;
+      this.selected2 = false;
+      this.selected3 = true;
+      this.selected4 = false;
+      this.selected5 = false;
+      this.selected6 = true;
     },
-    destroyed() {
+    tables:function () { //在你的数据表格中定义tabels
+      const input = this.input
+      if (input) {
+        // console.log("input输入的搜索内容:" + this.input)
+        return this.cooperatorData.filter(data => {
+          console.log("object:" + Object.keys(data))
+          return Object.keys(data).some(key => {
+            return String(data[key]).indexOf(input) > -1
+          })
+        })
+      }
+      return this.cooperatorData
     },
-    methods: {
-        request() {
-        },
-
-        toggleCollapse() {
-            this.isCollapse = !this.isCollapse;
-        },
-        handleClick(tab, event) {
-            if (tab.name == 'first') {
-                this.gotolinkHome();
-            }
-            if (tab.name == 'second') {
-                this.gotolinkbusiness();
-            }
-            if (tab.name == 'third') {
-                this.gotolinkCooperator();
-            }
-            if (tab.name == 'fourth') {
-                this.gotolinkField();
-            }
-        },
-        gotolinkHome() {
-            this.$router.replace('/homePage');
-        },
-        gotolinkbusiness() {
-            this.$router.replace('/businesstodo');
-        },
-        gotolinkCooperator() {
-            this.$router.replace('/cooperatorInfo');
-        },
-
-        gotolinkField() {
-            this.$router.replace('/fieldInfo');
-        },
-        handleCurrentChange() {
-        },
-        handleSizeChange() {
-        },
-
-        gotolink2() {
-            //指定跳转地址
-            this.$router.replace('/cooperatorInfo');
-            this.selected1 = true;
-            this.selected2 = false;
-            this.selected3 = false;
-            this.selected4 = true;
-            this.selected5 = true;
-            this.selected6 = false;
-        },
-        gotolink3() {
-            //指定跳转地址
-            this.$router.replace('/cooperatorProductInfo');
-            this.selected1 = true;
-            this.selected2 = false;
-            this.selected3 = true;
-            this.selected4 = false;
-            this.selected5 = false;
-            this.selected6 = true;
-        },
-        tables: function () { //在你的数据表格中定义tabels
-            const input = this.input
-            if (input) {
-                // console.log("input输入的搜索内容:" + this.input)
-                return this.cooperatorData.filter(data => {
-                    console.log("object:" + Object.keys(data))
-                    return Object.keys(data).some(key => {
-                        return String(data[key]).indexOf(input) > -1
-                    })
-                })
-            }
-            return this.cooperatorData
-        },
-        return_page() {
+    return_page (){
+      this.$router.push({
+        path: '/cooperatorDetailed',
+        query: {
+
+
+          cooperatorId : this.cooperatorId,
+          cooperatorName : this.cooperatorName,
+          cooperatorNum : this.cooperatorNum,
+          createTime : this.createTime,
+          corpCertificateNum:this.corpCertificateNum,
+          corpCertificateType:this.corpCertificateType,
+          templateId:this.templateId,
+        }// 要传递的参数
+      })
+    },
+    submit (){
+        if(this.corp_certificate_type_name == "统一社会信用代码")
+          this.corp_certificate_type = "20"
+        else
+          this.corp_certificate_type =  "30"
+      if(this.cooperator_name=="")
+      {
+        this.$alert("请输入合作方名称");
+        return;
+      }
+      if(this.corpCertificateNum=="")
+      {
+        this.$alert("请输入证件号码");
+        return;
+      }
+      if(this.corp_certificate_type=="")
+      {
+        this.$alert("请选择证件类型");
+        return;
+      }
+      // if(this.fieldTemplateNo=="")
+      // {
+      //   this.$alert("请选择所属字段表");
+      //   return;
+      // }
+      this.$message({
+        message: '编辑成功',
+        type: 'success'
+      });
+      if(this.templateName==this.fieldTemplateId){
+        this.fieldTemplateId = this.templateId
+      }
+        cooperatorEdit(this.cooperatorId, this.cooperator_name, this.corp_certificate_num, this.corp_certificate_type,this.fieldTemplateId).then(
+          res=>
+          {
             this.$router.push({
-                path: '/cooperatorDetailed',
-                query: {
-
-
-                    cooperatorId: this.$route.query.cooperatorId,
-                    cooperatorName: this.$route.query.cooperatorName,
-                    cooperatorNum: this.$route.query.cooperatorNum,
-                    createTime: this.$route.query.createTime,
-                    corpCertificateNum: this.$route.query.corpCertificateNum,
-                    corpCertificateType: this.$route.query.corpCertificateType,
-                    templateId: this.$route.query.templateId,
-                }// 要传递的参数
+              path: '/cooperatorInfo',
+              query: {
+                
+              }
             })
-        },
-        submit() {
-            if (this.corp_certificate_type_name == "统一社会信用代码")
-                this.corp_certificate_type = "20"
-            else
-                this.corp_certificate_type = "30"
-            if (this.cooperator_name == "") {
-                this.$alert("请输入合作方名称");
-                return;
-            }
-            if (this.corpCertificateNum == "") {
-                this.$alert("请输入证件号码");
-                return;
-            }
-            if (this.corp_certificate_type == "") {
-                this.$alert("请选择证件类型");
-                return;
-            }
-            // if(this.fieldTemplateNo=="")
-            // {
-            //   this.$alert("请选择所属字段表");
-            //   return;
-            // }
-
-            if (this.templateName == this.fieldTemplateId) {
-                this.fieldTemplateId = this.templateId
-            }
-            cooperatorEdit(this.cooperatorId, this.cooperator_name, this.corp_certificate_num, this.corp_certificate_type, this.fieldTemplateId).then(
-                res => {
-                    this.$message({
-                        message: '编辑成功',
-                        type: 'success'
-                    });
-                    this.$router.push({
-                        path: '/cooperatorInfo',
-                        query: {}
-                    })
-                },
-            ),
-                console.log('111')
-        },
-
+          },
+        ),
+        console.log('111')
     },
-    fillter: {},
+
+  },
+  fillter: {},
 }
 </script>
 
 <style scoped>
 /* 竖线 */
-.line {
-    float: left;
-    width: 0.1em;
-    height: 19.5em;
-    margin-right: 1em;
-    margin-left: 0em;
-    background: #000000;
+.line{
+  float: left;
+  width: 0.1em;
+  height: 19.5em;
+  margin-right: 1em;
+  margin-left: 0em;
+  background:#000000;
 }
 
 .button {
-    background-color: white;
+    background-color: white; 
     border: none;
     color: black;
     padding: 15px 32px;
@@ -324,13 +323,13 @@ export default {
     text-decoration: none;
     display: inline-block;
     font-size: 16px;
-    width: 180px;
-    height: 50px;
+    width:180px;
+    height:50px;
     font-weight: normal
 }
 
 .buttonselected {
-    background-color: white;
+    background-color: white; 
     border: none;
     color: black;
     padding: 15px 32px;
@@ -338,40 +337,37 @@ export default {
     text-decoration: none;
     display: inline-block;
     font-size: 18px;
-    width: 180px;
-    height: 50px;
+    width:180px;
+    height:50px;
     font-weight: 900
 }
 
-.line {
-    float: left;
-    width: 0.1em;
-    height: 19.5em;
-    margin-right: 1em;
-    margin-left: 0em;
-    background: #000000;
+.line{
+  float: left;
+  width: 0.1em;
+  height: 19.5em;
+  margin-right: 1em;
+  margin-left: 0em;
+  background:#000000;
 }
-
-.el-menu-vertical-demo {
-    font-weight: bold;
+.el-menu-vertical-demo{
+  font-weight: bold;
 }
 
-.el-icon-s-fold {
-    background: rgb(255, 255, 255);
-    /*font-size: 10px;*/
-    /*Tine-height: 24px;*/
-    color: black;
-    border: none;
-    text-align: center;
-    letter-spacing: 0.2rem;
-    cursor: pointer;
+.el-icon-s-fold
+{
+  background: rgb(255,255,255);
+  /*font-size: 10px;*/
+  /*Tine-height: 24px;*/
+  color: black;
+  border: none;
+  text-align: center;
+  letter-spacing: 0.2rem;
+  cursor: pointer;
 }
-
 .el-divider--vertical {
-    height: 47em;
-    margin-left: 20px;
-}
-
-.container {
+  height: 47em;
+  margin-left: 20px;
 }
+.container {  }
 </style>

+ 1 - 1
src/views/system/cooperatorInfo.vue

@@ -38,7 +38,7 @@
               <el-table :data="cooperatorShowData" style="width: 100%;" @row-click="onButtonClick" stripe>
                 <el-table-column align="center" label="合作方编号" >
                   <template v-slot="{row}">
-                    <span>{{ row.id}}</span>
+                    <span>{{ row.cooperatorNum}}</span>
                   </template>
                 </el-table-column>
 

+ 1 - 1
src/views/system/cooperatorProductInfoBase.vue

@@ -166,7 +166,7 @@ import { Row } from 'element-ui';
       gotolink2()
       {
         //指定跳转地址
-        this.$router.push('/cooperatorProductInfo');
+        this.$router.push('/cooperatorInfo');
         this.selected1 = false;
         this.selected2 = true;
         this.selected3 = false;