浏览代码

Merge branch 'master' of http://git.tjyourong.com.cn/ctop/adsp-vue

朱鑫波 4 年之前
父节点
当前提交
daa181905e

+ 2 - 2
src/views/modules/BatchCreate/newCreate.vue

@@ -926,7 +926,7 @@
         align-self: flex-start;
         line-height: 20px;
         height: 20px;
-        margin-top: 5px;
+        margin-top: 9px;
       }
 
       .row-item .label-item {
@@ -935,7 +935,7 @@
         align-self: flex-start;
         line-height: 20px;
         height: 20px;
-        margin-top: 7px;
+        margin-top: 10px;
         width: 80px;
         min-width: 80px;
 

+ 2 - 2
src/views/modules/BatchCreate/newPlan.vue

@@ -1411,7 +1411,7 @@ export default {
       align-self: flex-start;
       line-height: 20px;
       height: 20px;
-      margin-top: 5px;
+      margin-top: 9px;
     }
     .row-item .label-item {
       position: relative;
@@ -1419,7 +1419,7 @@ export default {
       align-self: flex-start;
       line-height: 20px;
       height: 20px;
-      margin-top: 7px;
+      margin-top: 10px;
       width: 80px;
       min-width: 80px;
       .text-item {

+ 28 - 21
src/views/modules/LaunchHousekeeper/LaunchHousekeeperList.vue

@@ -4,26 +4,32 @@
             <span class="OptinItem topOpt">
                 <!-- <Treeselect :appId.sync="accountID" :multiple="false" request="2,4" reqUrl='/ctop/projectMember/getProjectAccountByUserId' ref="treeSelect" style="margin-bottom:8px " /> -->
 
-                <a-tree-select
-                    v-model="accountIds"
-                    show-search
+                <!-- <a-tree-select
+                    v-model="accountIds"                   
+                    multiple
+                    tree-checkable
                     style="width: 600px;height:30px"
                     :dropdownMatchSelectWidth='true'
                     :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"              
-                    tree-checkable
-                    searchPlaceholder='请输入账户关键字搜索'
                     :show-checked-strategy="SHOW_PARENT"
                     placeholder="请选择项目和账户或搜索账户关键字"
                     treeNodeFilterProp="title"
                     :allowClear="true"
-                    @change="treeChange"
-                                       
-                    :maxTagCount='1'    
-                    :tree-data="treeData"
-                    :filterOption='filterOption'
-                >
+                    :maxTagCount='1'   
+                    @change="treeChange"                                                        
+                    :tree-data="treeData"                   
+                /> -->
               
-                </a-tree-select>
+                <a-tree-select
+                    v-model="accountIds"
+                    style="width: 600px;height:30px"
+                    :tree-data="treeData"
+                    tree-checkable
+                    :dropdownMatchSelectWidth='true'
+                    :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }" 
+                    :show-checked-strategy="SHOW_PARENT"
+                    search-placeholder="Please select"
+                />
             </span>
             <span class="OptinItem">
                 <a-select  style="width: 120px" v-model="statusValue" @change="statusChange" placeholder="请选择状态">
@@ -164,8 +170,9 @@
 <script>
 import moment from 'moment';
 import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
-const SHOW_PARENT = TreeSelect.SHOW_PARENT;
 import { TreeSelect } from 'ant-design-vue';
+const SHOW_PARENT = TreeSelect.SHOW_PARENT;
+
 import qs from 'qs'
 const columns = [
   {
@@ -405,19 +412,19 @@ export default {
         },
         
         
-        filterOption(input, option){
-        console.log(input, option)
-        return (
-            option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
-            );
-        },
+        // filterOption(input, option){
+        // console.log(input, option)
+        // return (
+        //     option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+        //     );
+        // },
     
         //请求项目和账户内容
         accountHttp(){
             this.treeData=[];
             this.accountIds=[];
             getAction('/ctop/projectMember/getProjectAccountByUserId?mediaType=1', {}).then(res => {
-            if(res.success){
+                if(res.success){
                     // console.log(res);
                     if(res.result){
                         res.result.forEach((element,index) => {
@@ -443,7 +450,7 @@ export default {
                         // console.log(this.treeData)
                         
                     }
-            }
+                }
             })
         },
 

+ 2 - 2
src/views/modules/LaunchHousekeeper/newProject.vue

@@ -623,7 +623,7 @@ export default {
       align-self: flex-start;
       line-height: 20px;
       height: 20px;
-      margin-top: 5px;
+      margin-top: 9px;
     }
     .row-item .label-item {
       position: relative;
@@ -631,7 +631,7 @@ export default {
       align-self: flex-start;
       line-height: 20px;
       height: 20px;
-      margin-top: 7px;
+      margin-top: 10px;
       width: 80px;
       min-width: 80px;
       .text-item {

+ 2 - 2
src/views/modules/LaunchHousekeeper/setProjectBudget.vue

@@ -603,7 +603,7 @@ export default {
       align-self: flex-start;
       line-height: 20px;
       height: 20px;
-      margin-top: 5px;
+      margin-top: 9px;
     }
     .row-item .label-item {
       position: relative;
@@ -611,7 +611,7 @@ export default {
       align-self: flex-start;
       line-height: 20px;
       height: 20px;
-      margin-top: 7px;
+      margin-top: 10px;
       width: 80px;
       min-width: 80px;
       .text-item {

+ 2 - 2
src/views/modules/LaunchHousekeeper/setProjectConvert.vue

@@ -661,7 +661,7 @@ export default {
       align-self: flex-start;
       line-height: 20px;
       height: 20px;
-      margin-top: 5px;
+      margin-top: 9px;
     }
     .row-item .label-item {
       position: relative;
@@ -669,7 +669,7 @@ export default {
       align-self: flex-start;
       line-height: 20px;
       height: 20px;
-      margin-top: 7px;
+      margin-top: 10px;
       width: 80px;
       min-width: 80px;
       .text-item {

+ 2 - 2
src/views/modules/LaunchHousekeeper/setProjectCreate.vue

@@ -1389,7 +1389,7 @@ let MonitoringTypeColumns=[
         align-self: flex-start;
         line-height: 20px;
         height: 20px;
-        margin-top: 5px;
+        margin-top: 9px;
       }
 
       .row-item .label-item {
@@ -1398,7 +1398,7 @@ let MonitoringTypeColumns=[
         align-self: flex-start;
         line-height: 20px;
         height: 20px;
-        margin-top: 7px;
+        margin-top: 10px;
         width: 80px;
         min-width: 80px;
 

+ 2 - 2
src/views/modules/LaunchHousekeeper/setProjectDirectional.vue

@@ -985,7 +985,7 @@ export default {
       align-self: flex-start;
       line-height: 20px;
       height: 20px;
-      margin-top: 5px;
+      margin-top: 9px;
     }
     .row-item .label-item {
       position: relative;
@@ -993,7 +993,7 @@ export default {
       align-self: flex-start;
       line-height: 20px;
       height: 20px;
-      margin-top: 7px;
+      margin-top: 10px;
       width: 80px;
       min-width: 80px;
       .text-item {