4
0

2 Commitit f8736d349c ... 58c44b07cc

Tekijä SHA1 Viesti Päivämäärä
  maqingyang 58c44b07cc Merge remote-tracking branch 'origin/develop' into develop 1 vuosi sitten
  maqingyang 483007251a fixed some bugs in cooperatorDetailed 1 vuosi sitten

+ 41 - 14
src/views/system/cooperatorDetailed.vue

@@ -25,12 +25,12 @@
           <el-form  label-position="labelPosition" class="model_add_button" label-width="150px">
 
             <el-row>
-              <el-col span="12" >
+              <el-col span="10" >
                 <el-form-item label="合作方名称: " width="100px">
                 <span>{{cooperatorName}}</span>
                 </el-form-item>
               </el-col>
-              <el-col span="12"  >
+              <el-col span="10"  >
                 <el-form-item label="合作方证件类型: " width="100px">
                 <span>{{corp_certificate_type_name}}</span>
                 </el-form-item>
@@ -38,19 +38,19 @@
             </el-row>
 
             <el-row>
-              <el-col span="12" >
+              <el-col span="10" >
                 <el-form-item label="合作方编号: " width="100px">
                 <span>{{cooperatorId}}</span>
                 </el-form-item>
               </el-col>
-              <el-col span="12"  >
+              <el-col span="10"  >
                 <el-form-item label="合作方证件编号: " width="100px">
                 <span>{{corpCertificateNum}}</span>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row>
-              <el-col span="4">
+              <!-- <el-col span="4">
                   
                   <el-button type="primary" round @click="onButtonClickApply()" size="medium" >合作方产品申请</el-button>
                 
@@ -60,29 +60,46 @@
                 
                   <el-button type="primary" round @click="onButtonClickEdit()" size="medium" >编辑合作方信息</el-button>
                 
-              </el-col>
-              <el-col span="6" >
+              </el-col> -->
+              <el-col span="10" >
                 <el-form-item label="模板名称:" width="100px">
                 <span>{{templateName}}</span>
                 </el-form-item>
               </el-col>
-              <el-col span="7"  >
+              <el-col span="10"  >
                 <el-form-item label="创建时间:" width="100px">
                 <span>{{createTime}}</span>
                 </el-form-item>
               </el-col>
 
             </el-row>
+            <!-- <el-row>
+              <el-col span="10">
+                  
+                  <el-button type="primary" round @click="onButtonClickApply()" size="medium" >合作方产品申请</el-button>
+                
+              </el-col>
+
+              <el-col span="10" >
+                
+                  <el-button type="primary" round @click="onButtonClickEdit()" size="medium" >编辑合作方信息</el-button>
+                
+              </el-col>
+            </el-row> -->
 
           </el-form>
 
         </div>
+        <div class="button_bar">
+          <el-button type="primary" round @click="onButtonClickApply()" size="small" style="margin-left:60px;">合作方产品申请</el-button>
+          <el-button type="primary" round @click="onButtonClickEdit()" size="small" style="margin-left:30px;">编辑合作方信息</el-button>
+        </div>
 
         <el-divider></el-divider>
 
         <el-tabs v-model="activeName2" @tab-click="handleClick1"  stretch>
         <el-tab-pane label="合作方字段列表" name="first">
-          <el-table :data="cooperatorFieldShow" style="width: 100%;">
+          <el-table :data="cooperatorFieldShow" style="width: 100%;" stripe>
           <el-table-column align="center" label="字段类型" >
             <template v-slot="{row}">
               <span>{{ row.type}}</span>
@@ -248,6 +265,10 @@ export default {
       showFieldTotal:'',
       productTotal:'',
       showProductTotal:'',
+      type_list: [
+                "统一社会信用代码",
+                "组织机构代码",
+            ],
     }
   },
   watch: {},
@@ -430,12 +451,11 @@ export default {
       this.$router.push({
         path: '/cooperatorEdit',
         query: {
-          'corpCertificateType':this.corpCertificateType,
           'cooperatorId' : this.cooperatorId,
           'cooperatorNum' : this.cooperatorNum,
           'cooperatorName' : this.cooperatorName,
           'corpCertificateNum' : this.corpCertificateNum,
-
+          'corpCertificateType':this.corpCertificateType,
           'createTime' : this.createTime,
           'templateName':this.templateName,
           'templateId':this.templateId,
@@ -448,12 +468,11 @@ export default {
       this.$router.push({
         path: '/cooperatorProductApply',
         query: {
-          'corpCertificateType':this.corpCertificateType,
           'cooperatorId' : this.cooperatorId,
           'cooperatorNum' : this.cooperatorNum,
-          'corpCertificateNum' : this.corpCertificateNum,
-
           'cooperatorName' : this.cooperatorName,
+          'corpCertificateNum' : this.corpCertificateNum,
+          'corpCertificateType':this.corpCertificateType,
           'createTime' : this.createTime,
           'templateName':this.templateName,
           'templateId':this.templateId,
@@ -521,5 +540,13 @@ export default {
   margin-left: 0em;
   background:#000000;
 }
+/deep/ .el-table th {
+  /* 样式设置 */
+  background: #f2f2f2;
+  color: #333;
+}
+.button_bar {
+    display: flex;
+}
 .container {  }
 </style>

+ 5 - 4
src/views/system/cooperatorEdit.vue

@@ -29,10 +29,10 @@
               <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:200px"></el-input>
+                  <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:400px"></el-input>
+                  <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">
@@ -124,8 +124,8 @@ export default {
       corpCertificateType:this.$route.query.corpCertificateType,
       templateId:this.$route.query.templateId,
       templateName:this.$route.query.templateName,
-
-      fieldTemplateId:this.$route.query.templateId
+      fieldTemplateId:this.$route.query.templateName,
+      corpCertificateNum : this.$route.query.corpCertificateNum,
 
     }
   },
@@ -232,6 +232,7 @@ export default {
           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,
         }// 要传递的参数

+ 2 - 0
src/views/system/cooperatorProductApply.vue

@@ -374,6 +374,7 @@ export default {
           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,
         }// 要传递的参数
@@ -391,6 +392,7 @@ export default {
                 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,
               }// 要传递的参数