Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Finance/Cost.vue

@@ -10,6 +10,18 @@
                             :key="item.value"
                             :label="item.label"
                             :value="item.value">
+                            <span style="color:red">{{item.label}}</span>
+                            </el-option>
+                          </el-select>
+                          &nbsp;
+                          分段类型：
+                           <el-select v-model="value" filterable placeholder="请选择">
+                            <el-option
+                            v-for="item in costType"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value">
+                            <span style="color:red">{{item.label}}</span>
                             </el-option>
                           </el-select>
                     </div>
@@ -926,6 +938,16 @@ export default {
                     },
                 ]
             }
+        ],
+        costType:[
+            {
+          value: '选项1',
+          label: '黄金糕'
+            },
+            {
+            value: '选项11',
+            label: '黄金糕1'
+            }
         ]
       };
     },

src/components/child/AuthorityJob.vue

@@ -2,12 +2,12 @@
     <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading">
         <div class="job-box">
             <div class="job-head">
-                <div>
-                    <el-select style="width: 250px;" @change="Inquirechange()" v-model="value" clearable placeholder="权限模块">
+                <div class="job-select" >
+                    <el-select @change="Inquirechange()" v-model="value" clearable placeholder="权限模块">
                         <el-option v-for="item in authority" :key="item.value" :label="item.name" :value="item.id">
                         </el-option>
                     </el-select>
-                    <el-select style="width: 250px;" v-model="pageValue" filterable placeholder="页面名称搜索"
+                    <el-select v-model="pageValue" filterable placeholder="页面名称搜索"
                         @change="pageChange">
                         <el-option v-for="item in pageOptions" :key="item.pageid" :label="item.pageName"
                             :value="item.pageid">
@@ -399,4 +399,8 @@ body {
 .job-input .el-select {
     margin-right: 5px;
 }
+
+.job-select .el-select{
+    width: 250px;
+}
 </style>

src/components/child/AuthorityUser.vue

@@ -2,12 +2,12 @@
     <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading">
         <div class="job-box">
             <div class="job-head">
-                <div>
-                    <el-select style="width: 250px;" @change="Inquirechange()" v-model="value" clearable placeholder="权限模块">
+                <div class="job-user" >
+                    <el-select  @change="Inquirechange()" v-model="value" clearable placeholder="权限模块">
                         <el-option v-for="item in authority" :key="item.value" :label="item.name" :value="item.id">
                         </el-option>
                     </el-select>
-                    <el-select style="width: 250px;" v-model="pageValue" filterable placeholder="页面名称搜索"
+                    <el-select  v-model="pageValue" filterable placeholder="页面名称搜索"
                         @change="pageChange">
                         <el-option v-for="item in pageOptions" :key="item.pageid" :label="item.pageName"
                             :value="item.pageid">
@@ -445,4 +445,7 @@ body {
 .job-input .el-select {
     margin-right: 5px;
 }
+.job-user .el-select{
+    width: 250px;
+}
 </style>