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

src/views/system/cooperatorAdd.vue

@@ -6,53 +6,63 @@
         <el-container>
           <el-aside width="250px">
 
-            <button @click="gotolink2" v-bind:class="{ button: selected3, buttonselected: selected4 }">合作方</button>
-            <button @click="gotolink3" v-bind:class="{ button: selected5, buttonselected: selected6 }">合作产品</button>
+            <el-menu
+                  default-active="1"
+                  class="el-menu-vertical-demo"
+                  >
+                  <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-aside>
 <!--          <div class="line" />-->
 
           <el-main>
-<!--            <el-divider></el-divider>-->
-
-
-          
-        
             <div class="submit_view">
-              <span>新增合作方</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-form-item>
-                <el-form-item label="证件号码" width="100px">
-                  <el-input v-model="cooperatorNum" style="width:400px"></el-input>
-                </el-form-item>
-                <el-form-item label="证件类型" width="100px">
-                  <select name="art-cate" v-model="corp_certificate_type_name" style="height:35px">
-                      <option disabled selected style="display: block;" >请选择证件类型</option>
-                      <option v-for="item in arr "
-                              :key="item" :label="item"
-                              :value="item"></option>
-
-                  </select>
-                </el-form-item>
+            <span style="display: block; margin-bottom: 20px;">新增合作方</span>
+<!--            <el-divider></el-divider>-->
+            <el-form  class="model_add_button" ref="form"  label-width="90px">
+              <el-form-item label="合作方名称"  width="200px">
+                <el-input v-model="cooperator_name" style="width:215px"></el-input>
+              </el-form-item>
+              <el-form-item label="证件号码" width="200px">
+                <el-input v-model="cooperatorNum" style="width:215px"></el-input>
+              </el-form-item>
+              <el-form-item label="证件类型" width="200px">
+                <el-select name="art-cate" v-model="corp_certificate_type_name" style="height:35px">
+                    <option disabled selected style="display: block;" >请选择证件类型</option>
+                    <option v-for="item in arr "
+                            :key="item" :label="item"
+                            :value="item"></option>
 
-                <el-form-item label="所属字段表" width="100px">
-                  <select name="art-cate" v-model="fieldTemplateNo"style="height:35px" >
-                      <option disabled selected style="display: block;">请选择字段表</option>
-                      <option v-for="(item,index) in fieldTemplateList " 
-                              :key="index" 
-                              :value="item.templateNo">{{item.templateName}}</option>
+                </el-select>
+              </el-form-item>
 
-                  </select>
-                </el-form-item>
+              <el-form-item label="所属字段表" width="200px">
+                <el-select name="art-cate" v-model="fieldTemplateNo" style="height:35px" >
+                    <option disabled selected style="display: block;">请选择字段表</option>
+                    <option v-for="(item,index) in fieldTemplateList " 
+                            :key="index" 
+                            :value="item.templateNo">{{item.templateName}}</option>
 
-              </el-form>
-             
-              <el-button class="model_add_button " type="primary" @click="submit()">完成</el-button>
-              <el-button class="model_add_button " type="primary" @click="return_page()">返回</el-button>
+                </el-select>
+              </el-form-item>
 
-            </div>
+            </el-form>
+          </div>
+            <div class="upper_bottom_bar" style="margin-top: 20px">
+                    <el-button round class="model_add_button " type="primary" size="medium" style="margin-right: 10px;" @click="submit()" >
+                      完成
+                    </el-button>
+                    <el-button round class="model_add_button " type="danger" size="medium" style="margin-right: 10px;" @click="return_page()">返回
+                    </el-button>
+                </div>
           </el-main>
         </el-container>
 
@@ -294,7 +304,15 @@ export default {
     height:50px;
     font-weight: 900
 }
-
+.el-menu-vertical-demo{
+  font-weight: bold;
+}
+.upper_bottom_bar {
+    display: flex;
+}
+.line-between-divs {
+    border-bottom: 1px solid #ccc; /* 设置横线的样式，颜色可以根据需要调整 */
+  }
 .line{
   float: left;
   width: 0.1em;

src/views/system/cooperatorDetailed.vue

@@ -21,9 +21,73 @@
 <!--      <div class="line" />-->
 
       <el-main>
-
         <div class="output_view">
-          <el-row>
+          <el-form  label-position="labelPosition" class="model_add_button" label-width="150px">
+
+            <el-row>
+              <el-col span="12" >
+                <el-form-item label="合作方名称: " width="100px">
+                <span>{{cooperatorName}}</span>
+                </el-form-item>
+              </el-col>
+              <el-col span="12"  >
+                <el-form-item label="合作方证件类型: " width="100px">
+                <span>{{corpCertificateType}}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col span="12" >
+                <el-form-item label="合作方编号: " width="100px">
+                <span>{{cooperatorId}}</span>
+                </el-form-item>
+              </el-col>
+              <el-col span="12"  >
+                <el-form-item label="合作方证件编号: " width="100px">
+                <span>{{corpCertificateNum}}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col span="4">
+                  
+                  <el-button type="primary" round @click="onButtonClickApply()" size="medium" >合作方产品申请</el-button>
+                
+              </el-col>
+
+              <el-col span="4" >
+                
+                  <el-button type="primary" round @click="onButtonClickEdit()" size="medium" >编辑合作方信息</el-button>
+                
+              </el-col>
+              <el-col span="6" >
+                <el-form-item label="模板名称：" width="100px">
+                <span>{{templateName}}</span>
+                </el-form-item>
+              </el-col>
+              <el-col span="7"  >
+                <el-form-item label="创建时间：" width="100px">
+                <span>{{createTime}}</span>
+                </el-form-item>
+              </el-col>
+
+            </el-row>
+            <!-- <el-row>
+                  <el-col span="8" :offset="2">
+                  
+                      <el-button type="primary" round @click="onButtonClickApply()" size="medium" >合作方产品申请</el-button>
+                    
+                  </el-col>
+
+                  <el-col span="8" :offset="4" >
+                    
+                      <el-button type="primary" round @click="onButtonClickEdit()" size="medium" >编辑合作方信息</el-button>
+                    
+                  </el-col>
+            </el-row> -->
+          </el-form>
+          <!-- <el-row>
             <el-col >
               <el-form  label-position="labelPosition" class="model_add_button" label-width="150px">
 
@@ -43,18 +107,26 @@
               </el-form>
             </el-col>
           </el-row>
-<!-- 
           <el-row>
-            <el-col span="20">
-              <el-form  label-position="labelPosition" class="model_add_button" label-width="120px">
+            <el-col >
+              <el-form  label-position="labelPosition" class="model_add_button" label-width="150px">
 
                 <el-row>
-                  
+                  <el-col span="10" offset="0">
+                    <el-form-item label="合作方证件类型" width="100px">
+                    <span>{{corpCertificateType}}</span>
+                    </el-form-item>
+                  </el-col>
+                  <el-col span="10"  :offset="4">
+                    <el-form-item label="合作方证件编号" width="100px">
+                    <span>{{corpCertificateNum}}</span>
+                    </el-form-item>
+                  </el-col>
 
                 </el-row>
               </el-form>
             </el-col>
-          </el-row> -->
+          </el-row>
 
           <el-row>
             <el-col>
@@ -72,6 +144,11 @@
                       <el-button type="primary" round @click="onButtonClickEdit()" size="mini" >编辑合作方信息</el-button>
                     
                   </el-col>
+                  <el-col span="10" :offset="1">
+                    <el-form-item label="模板名称" width="100px">
+                      <span>{{templateName}}</span>
+                    </el-form-item>
+                  </el-col>
 
                   <el-col span="10" :offset="4">
                     <el-form-item label="创建时间" width="100px">
@@ -81,7 +158,7 @@
                 </el-row>
               </el-form>
             </el-col>
-          </el-row>
+          </el-row> -->
         </div>
 
         <el-divider></el-divider>
@@ -225,7 +302,9 @@ export default {
       cooperatorName : this.$route.query.cooperatorName,
       cooperatorNum : this.$route.query.cooperatorNum,
       corpCertificateType:this.$route.query.corpCertificateType,
+      corpCertificateNum:this.$route.query.corpCertificateNum,
       createTime : this.$route.query.createTime,
+      templateName : this.$route.query.templateName,
       cooperatorData : [],
       selected1: true,
       selected2: false,

src/views/system/cooperatorEdit.vue

@@ -7,16 +7,26 @@
 
         <el-container>
           <el-aside width="250px">
-
-            <button @click="gotolink2" v-bind:class="{ button: selected3, buttonselected: selected4 }">合作方</button>
-            <button @click="gotolink3" v-bind:class="{ button: selected5, buttonselected: selected6 }">合作产品</button>
-
+            <el-menu
+              default-active="1"
+              class="el-menu-vertical-demo"
+              
+              >
+              <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>
 <!--          <div class="line" />-->
 
           <el-main>
             <div class="submit_view">
-              <span>编辑合作方</span>
+              <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>
@@ -25,7 +35,7 @@
                   <el-input v-model="corp_certificate_num" style="width:400px"></el-input>
                 </el-form-item>
                 <el-form-item label="证件类型" width="100px">
-                  <select name="art-cate" v-model="corp_certificate_type_name"style="height:35px">
+                  <select name="art-cate" v-model="corp_certificate_type_name" style="height:35px">
                       <option disabled selected style="display: block;">请选择证件类型</option>
                       <option v-for="(item,index) in arr " 
                               :key="index" 
@@ -295,5 +305,8 @@ export default {
   margin-left: 0em;
   background:#000000;
 }
+.el-menu-vertical-demo{
+  font-weight: bold;
+}
 .container {  }
 </style>

src/views/system/cooperatorInfo.vue

@@ -41,6 +41,12 @@
                   </template>
                 </el-table-column>
 
+                <el-table-column align="center" label="证件号码">
+                  <template v-slot="{row}">
+                    <span>{{ row.corpCertificateNum}}</span>
+                  </template>
+                </el-table-column>
+
       
                 <el-table-column align="center" label="创建时间">
                   <template v-slot="{row}">
@@ -48,7 +54,6 @@
                   </template>
                 </el-table-column>
 
-
               </el-table>
             </div>
             <div class="yema">
@@ -262,7 +267,9 @@ export default {
           cooperatorName: row.cooperatorName,
           cooperatorNum : row.cooperatorNum,
           corpCertificateType:row.corpCertificateType,
-          createTime : row.createTime
+          corpCertificateNum:row.corpCertificateNum,
+          createTime : row.createTime,
+          templateName : row.templateName,
         }// 要传递的参数
       })
     },

src/views/system/cooperatorProductApply.vue

@@ -6,10 +6,20 @@
 
         <el-container>
           <el-aside width="250px">
-
-            <button @click="gotolink2" v-bind:class="{ button: selected3, buttonselected: selected4 }">合作方</button>
-            <button @click="gotolink3" v-bind:class="{ button: selected5, buttonselected: selected6 }">合作产品</button>
-
+            <el-menu
+              default-active="1"
+              class="el-menu-vertical-demo"
+              
+              >
+              <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>
 <!--          <div class="line" />-->
 
@@ -380,5 +390,8 @@ export default {
   margin-left: 0em;
   background:#000000;
 }
+.el-menu-vertical-demo{
+  font-weight: bold;
+}
 .container {  }
 </style>

src/views/system/fieldDerive.vue

@@ -23,7 +23,7 @@
         <div class = "filter-container">
           <el-input v-model="input" placeholder="衍生字段名称" style="width: 30%" size="small" clearable/>
           <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" @click="filterTable">查询</el-button>
-          <el-button type="primary" round @click="onButtonClickAdd" size="small" style="margin-left: 350px">新增</el-button>
+          <el-button type="primary" round @click="onButtonClickAdd" size="small" style="margin-left: auto">新增</el-button>
         </div>
         <el-divider></el-divider>
 
@@ -69,12 +69,12 @@
                   <span>{{ row.status}}</span>
                 </template>
               </el-table-column>
-
+<!-- 
               <el-table-column align="center" label="创建者" >
                 <template v-slot="{row}">
                   <span>{{ row.createBy}}</span>
                 </template>
-              </el-table-column>
+              </el-table-column> -->
 
               <el-table-column align="center" label="创建时间" >
                 <template v-slot="{row}">
@@ -82,7 +82,7 @@
                 </template>
               </el-table-column>
 
-                  <el-table-column align="center" label="操作" >
+                  <el-table-column align="center" label="操作" :min-width="85">
                     <template v-slot="{row}">
                       <el-button size="mini" type="primary" @click.stop="edit(row)">编辑</el-button>
                       <el-button size="mini" type="danger" @click.stop="fieldDelete(row)">删除</el-button>
@@ -453,5 +453,8 @@ export default {
 .el-menu-vertical-demo{
   font-weight: bold;
 }
+.filter-container{
+  display: flex;
+}
 .container {  }
 </style>

src/views/system/fieldTemplate.vue

@@ -24,7 +24,7 @@
         <div class = "filter-container">
           <el-input v-model="input" placeholder="字段名称" style="width: 30%" size="small" clearable/>
           <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 10px" @click="filterTable">查询</el-button>
-          <el-button type="primary" round @click="onButtonClickAdd" size="small" style="margin-left: 350px">新增</el-button>
+          <el-button type="primary" round @click="onButtonClickAdd" size="small" style="margin-left: auto">新增</el-button>
         </div>
         <el-divider></el-divider>
 
@@ -438,5 +438,8 @@ export default {
   background: #f2f2f2;
   color: #333;
 }
+.filter-container{
+  display: flex;
+}
 .container {  }
 </style>

src/views/system/userinfo.vue

@@ -34,7 +34,7 @@
                             style=" margin-left: 3%; height: 32px"
                             @click="filterTable">查询
                     </el-button>
-                    <el-button type="primary" round @click="addUserModel" size="small" style="margin-left:28%; height: 32px">新增
+                    <el-button type="primary" round @click="addUserModel" size="small" style="margin-left: auto; height: 32px">新增
                     </el-button>
                 </div>
                 <el-divider></el-divider>