Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper into master

fhKeeper/formulahousekeeper/timesheet/src/views/project/finance.vue

@@ -30,7 +30,7 @@
             </el-form-item>
             </el-form>
         </el-col>
-        <el-button @click="getCustomColumn()">测试</el-button>
+        
         <!--列表-->
         <!-- 222 -->
         <el-table :data="list" highlight-current-row v-loading="listLoading" 
@@ -65,9 +65,6 @@
             <el-table-column prop="field2" :label="customCols.field2" ></el-table-column>
             <el-table-column prop="field3" :label="customCols.field3" ></el-table-column> -->
 
-            <!-- <el-table-column v-for="(item,index) in customFieldList" :prop="item.prop" :label="item.label" :key="index">
-                
-            </el-table-column> -->
             <!-- <el-table-column prop="others" label="其他" ></el-table-column> -->
             <!-- <el-table-column :label="item.fieldName" v-for="(item, index) in customCols" :key="item.id" :prop="index==0?'customField1':(index==1?'customField2':(index==2?'customField3':''))">
                 <template slot-scope="scope">
@@ -337,12 +334,8 @@
                 myChart: null,
                 params: null,
                 totalPercent:0,
-                // 111
-                aaaaa:[
-                    {label: "工资1"},
-                    {label: "工资2"},
-                    {label: "工资3"},
-                ]
+                
+                
             };
         },
         methods: {
@@ -636,21 +629,7 @@
                         }});
                     
             },
-            // 222
-            // dynamicTable(){
-            //     this.customFieldList = [
-            //         {label : this.customCols.monthCost,prop : "monthCost"},
-            //         {label : this.customCols.bonus,prop:"bonus"},
-            //         {label : this.customCols.allowance,prop:"allowance"},
-            //         {label : this.customCols.insuranceOld,prop:"insuranceOld"},
-            //         {label : this.customCols.insuranceMedical,prop:"insuranceMedical"},
-            //         {label : this.customCols.insuranceLosejob,prop:"insuranceLosejob"},
-            //         {label : this.customCols.insuranceInjury,prop:"insuranceInjury"},
-            //         {label : this.customCols.houseFund,prop:"houseFund"},
-            //         {label : this.customCols.field1,prop:"field1"},
-            //         {label : this.customCols.field2,prop:"field2"},
-            //         {label : this.customCols.field3,prop:"field3"},
-            //     ]
+            
 
             // },
             // getProjects() {

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -338,11 +338,12 @@
         <!-- 子项目列表 -->
         <el-dialog title="子项目列表" show-header="false" v-if="subProjectVisible" :visible.sync="subProjectVisible" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <el-table :data="subProjectList" highlight-current-row  height="400" style="width: 100%;">
-            <el-table-column type="index" width="60" label="序号">
+            <!-- <el-table-column type="index" width="60" label="序号">
                 <template slot-scope="scope" >
                         {{scope.$index+1+(page-1)*size}}
                     </template>
-            </el-table-column>
+            </el-table-column> -->
+            <el-table-column width="120" label="子项目编号" prop="code"></el-table-column>
             <el-table-column prop="name" label="名称" ></el-table-column>
             <el-table-column label="操作" width="150">
                 <template slot-scope="scope" >
@@ -362,6 +363,9 @@
         <!-- 新增子项目弹出框 -->
         <el-dialog title="新增/修改子项目" v-if="addSubProject" :visible.sync="addSubProject" :close-on-click-modal="false" customClass="customWidth" width="500px">
             <el-form ref="form2" :model="addForm" :rules="rules" label-width="100px">
+                <el-form-item label="项目编号" prop="code">
+                    <el-input v-model="addForm.code" placeholder="请输入项目编号" clearable></el-input>
+                </el-form-item>
                 <el-form-item label="项目名称" prop="name">
                     <el-input v-model="addForm.name" placeholder="请输入项目名称" clearable></el-input>
                 </el-form-item>
@@ -577,10 +581,12 @@ a {
                     name: '',
                     userId: [],
                     level:1,
-                    taskGpIncharge: 0
+                    taskGpIncharge: 0,
+                    id: '',
+                    code: ''
                 },
                 rules: {
-                    name: [{ required: true, message: "请输入名称", trigger: "blur" }],
+                    name: [{ required: true, message: "请输入名称", trigger: "blur" }]
                 },
                 ause: [],
                 auseList: [],
@@ -1285,10 +1291,10 @@ a {
                     });
                 }
             },
-            number(){　　
+            number(){
         // 　　　  this.addForm.budget = this.addForm.budget.replace(/[^\.\d]/g,'');
         //         this.addForm.budget = this.addForm.budget.replace('.','');
-        　　},
+            },
             deleteSubPro(subProject) {
                 this.$confirm("确定要删除子项目" + subProject.name + "吗?","删除子项目", {
                     confirmButtonText: "确定",
@@ -1331,7 +1337,7 @@ a {
                 this.getList();
             },
             addNewSubProject(subProject) {
-                console.log(123);
+                console.log("sub",subProject);
                 if (subProject == null) {
                     this.addForm = {projectId: this.currentProject.id, level:1}
                 } else {
@@ -1349,6 +1355,7 @@ a {
                 res => {
                     if (res.code == "ok") {
                         this.subProjectList = res.data;
+                        console.log("子项目 请求",res.data);
                     } else {
                         this.$message({
                         message: res.msg,