工时管家——项目管理修改

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

@@ -105,8 +105,8 @@
                     this.listLoading = false;
                     var _this = this;
                     if (res.code == "ok") {
-                        var xList = [] , yList = [] , list = res.data , array = [] , series = [];
-                        this.cost = res.data.totalMoneyCost;
+                        var xList = [] , yList = [] , list = res.data.list, array = [] , series = [];
+                        this.cost = res.data.totalCostMoney;
                         var num = list[0].project.length;
                         for(var i in list) {
                             xList.push(list[i].name);

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -114,7 +114,7 @@
                     <el-input v-model.number="insertForm.cost" placeholder="请输入成本 单位：元/小时" clearable></el-input>
                 </el-form-item>
                 <el-form-item label="部门" prop="departmentId">
-                    <el-cascader v-model="insertForm.departmentId" placeholder="请选择部门" style="width: 100%" @change="handleChange"
+                    <el-cascader v-model="insertForm.departmentId" placeholder="请选择部门" style="width: 100%"
                     :options="option" :props="{ checkStrictly: true }" :show-all-levels="false" clearable></el-cascader>
                 </el-form-item>
                 <el-form-item label="角色" prop="role">
@@ -135,6 +135,10 @@
                 <el-form-item label="成本" prop="cost">
                     <el-input v-model.number="insertForm.cost" placeholder="请输入成本 单位：元/小时" clearable></el-input>
                 </el-form-item>
+                <el-form-item label="部门" prop="departmentId">
+                    <el-cascader v-model="insertForm.departmentId" placeholder="请选择部门" style="width: 100%"
+                    :options="option" :props="{ checkStrictly: true }" :show-all-levels="false" clearable></el-cascader>
+                </el-form-item>
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible1=false">取消</el-button>
@@ -348,7 +352,6 @@
                         }
                         if (this.insertForm.departmentId != null) {
                             form.departmentId = this.insertForm.departmentId[this.insertForm.departmentId.length-1];
-                            // form.departmentCascade = this.insertForm.departmentId.join(",")
                         }
                         this.http.post( this.port.manage.insert, form,
                         res => {
@@ -446,12 +449,25 @@
 
             // 修改老板的成本
             openInsertDialog1(i) {
+                var list = JSON.parse(JSON.stringify(this.list[i])) , arr = [] , array = [];
+                if(list.departmentCascade!='0' && list.departmentCascade!=null) {
+                    if(list.departmentCascade.indexOf(",")>-1) {
+                        arr = list.departmentCascade.split(",");
+                    } else {
+                        arr = [].concat(list.departmentCascade)
+                    }
+                }
+                    
+                for(var i in arr) {
+                    array.push(parseInt(arr[i]))
+                }
                 this.insertForm = {
                     id: this.list[i].id,
                     name: this.list[i].name,
                     phone: this.list[i].phone,
                     role: this.list[i].role,
-                    cost: this.list[i].cost
+                    cost: this.list[i].cost,
+                    departmentId: array,
                 };
                 this.dialogVisible1 = true;
             },
@@ -467,6 +483,9 @@
                             role: this.insertForm.role,
                             cost: this.insertForm.cost
                         };
+                        if (this.insertForm.departmentId != null) {
+                            form.departmentId = this.insertForm.departmentId[this.insertForm.departmentId.length-1];
+                        }
                         this.http.post( this.port.manage.insert, form,
                         res => {
                             this.listLoading = false;
@@ -657,10 +676,6 @@
                 })
                 .catch(() => {});
             },
-
-            handleChange(value) {
-                // console.log(value);
-            }
         },
 
         created() {