Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/management/nstruction/index.vue

@@ -366,7 +366,7 @@
               prop="payForTypeName"
               :show-overflow-tooltip="true"
             />
-            <el-table-column label="金额" align="center" prop="payForMoney" />
+            <el-table-column label="金额(单位:万元)" align="center" prop="payForMoney" />
             <el-table-column label="到资证明" align="center" prop="photo">
               <!-- class-name="small-padding fixed-width" -->
               <template slot-scope="scope">
@@ -631,7 +631,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="到资金额" prop="payForMoney">
+        <el-form-item label="到资金额(单位:万元)" prop="payForMoney">
           <el-input
             v-model="formther.payForMoney"
             placeholder="输入数字"

ruoyi-ui/src/views/management/row/index.vue

@@ -338,7 +338,6 @@ export default {
     changeTab(index) {
       console.log(34);
       this.tabIndex = index.index;
-
       this.currentContent = index.component;
       // this.$router.push('/tab');
     },
@@ -347,20 +346,111 @@ export default {
 </script>
 
   <style  >
+ .text-color {
+    color: white;
+  }
 
+  /*步骤条样式修改------------start----------*/
+  /*is-finish 圆圈颜色*/
+ .el-steps--horizontal  .is-horizontal  .is-finish {
+    color: red !important;
+    border-color: red !important;
+  }
 
-  .el-steps.el-steps--horizontal /deep/ .el-step.is-horizontal.is-center /deep/ .el-step__head.is-finish {
-      color: #EB6F67 !important;
-      border-color: #EB6F67 !important;
-    }
-  
-    .el-steps.el-steps--horizontal /deep/ .el-step.is-horizontal.is-center /deep/ .el-step__title.is-finish {
-      color: #666666;
-    }
-    .el-steps.el-steps--horizontal /deep/ .el-step.is-horizontal.is-center /deep/.el-step__description.is-finish {
-      color: #999999;
-    }
+  /*is-process 圆圈颜色*/
+  .el-steps--horizontal.is-horizontal  .is-process {
+    color: red !important;
+    border-color: red !important;
+  }
+  .el-step__title.is-process{
+     color: red !important;
+  }
+
+  /*is-wait 圆圈颜色*/
+  .el-steps--horizontal  .is-horizontal  .is-wait {
+   /* color: red !important;
+    color: red !important; */
+  }
+
+  /*is-finish title 颜色*/
+  .el-steps--horizontal .is-horizontal .el-step__title{
+   /* color: red !important;
+     color: red !important; */
+    font-weight: 700;
+    /* color: red !important; */
+  }
+   /*is-process  title 颜色*/
+  .el-steps--horizontal[data-v-9ebad220] .is-horizontal  .is-process {
+    font-weight: 700;
+    color: red !important;
+  }
+  /*description 颜色*/
+  .el-steps--horizontal  .is-horizontal .el-step__description {
+    color: red !important;
+      /* color: red !important; */
+  }
+  /*is-finish 进程结束，is-process 状态颜色非加粗*/
+  .el-steps--horizontal  .is-horizontal .el-step__title {
+    font-weight: 700;
+    /* color: red !important; */
+  }
+
+  /* is-finish line连线粗细*/
+  .el-steps.el-steps--horizontal /deep/ .el-step.is-horizontal.is-center /deep/ .el-step__head.is-finish /deep/ .el-step__line {
+    position: absolute;
+    border-color: inherit;
+    background-color: $is-finish-background;
+    margin-top: $el-step-icon-margin;
+    border: $border-sizes solid;
+  }
 
+  /* is-process line连线粗细*/
+  .el-steps.el-steps--horizontal /deep/ .el-step.is-horizontal.is-center /deep/ .el-step__head.is-process /deep/ .el-step__line {
+    border-color: inherit;
+    background-color: $background_color;
+    margin-top: $el-step-icon-margin;
+    border: $border-sizes solid;
+  }
+
+  /* is-wait line连线粗细*/
+  .el-steps.el-steps--horizontal /deep/ .el-step.is-horizontal.is-center /deep/ .el-step__head.is-wait /deep/ .el-step__line {
+    border-color: inherit;
+    background-color: $background_color;
+    margin-top: $el-step-icon-margin;
+    border: $border-sizes solid;
+  }
+
+  /* 已完成 圆圈大小修改*/
+  .el-steps.el-steps--horizontal /deep/ .el-step.is-horizontal.is-center /deep/ .el-step__head.is-finish /deep/ .el-step__icon {
+    z-index: 1;
+    width: $el-step-icon-width;
+    height: $el-step-icon-height;
+    font-size: $el-step-icon-font-size;
+    border: $border-sizes solid;
+    background: $el-step-icon-background;
+  }
+
+  /* 过度点 圆圈大小修改*/
+  .el-steps--horizontal  .is-horizontal .is-process  .el-step__icon {
+    z-index: 1;
+    width: $el-step-icon-width;
+    height: $el-step-icon-height;
+    border: $border-sizes solid;
+    font-size: $el-step-icon-font-size;
+    background:$el-step-icon-background;
+    color: red!important;
+    border-color: red !important;
+  }
+
+  /* 未完成 圆圈大小修改*/
+  .el-steps.el-steps--horizontal /deep/ .el-step.is-horizontal.is-center /deep/ .el-step__head.is-wait /deep/ .el-step__icon {
+    z-index: 1;
+    width: $el-step-icon-width;
+    height: $el-step-icon-height;
+    font-size: $el-step-icon-font-size;
+    border: $border-sizes solid;
+    background:$el-step-icon-background;
+  }
  </style>
 
 

ruoyi-ui/src/views/under/index.vue

@@ -179,10 +179,10 @@
           <el-form-item label="投资分配额:"  style="width: 18%;" class="fenpe" prop="investmentAllcocation">
             <el-input
               v-model="queryParams.referralList[0].investmentAllcocation"
-              placeholder="输入数字"
+              placeholder="数"
               clearable
               size="small"
-              style="width:66px"
+              style="width:66px; padding: 0;"
               @keyup.enter.native="handleQuery"
             />
             <span class="souu">%</span>
@@ -218,10 +218,10 @@
           <el-form-item label="投资分配额:" style="width: 18%;" class="fenpe" prop="investmentAllcocation">
             <el-input
               v-model="queryParams.referralList[1].investmentAllcocation"
-              placeholder="输入数字"
+              placeholder="数"
               clearable
               size="small"
-              style="width:66px"
+              style="width:66px;padding: 0;"
               @keyup.enter.native="handleQuery"
             />
             <span class="souu">%</span>