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

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

@@ -2,36 +2,41 @@
   <section>
     <div>
     <div class="sidebars" ref="sidebars" style="width: 200px;display: block;background: #fff">
-      <el-col :span="12">
-        <el-menu
-          default-active="1-1"
-          class="el-menu-vertical-demo"
-          @select="staffs"
-          background-color="#ffffff"
-          text-color="#666666"
-          active-text-color="#20A0FF"
-          style="width:100%">
-          <el-submenu index="1">
-            <template slot="title">
-              <i class="iconfont firerock-iconbaobiao"></i>
-              <span>项目报表服务</span>
-            </template>
-              <el-menu-item index="1-1" ><p @click="ssl(0)">项目报表</p></el-menu-item>
-              <el-menu-item index="1-2" v-if="permissions.reportTask"><p @click="ssl(1)">项目任务报表</p></el-menu-item>
-              <el-menu-item index="1-3" v-if="permissions.reportCostOf"><p @click="ssl(2)">项目成本报表</p></el-menu-item>
-              <el-menu-item index="1-4" v-if="permissions.reportCostWarning"><p @click="ssl(7)">工时成本预警表</p></el-menu-item>
-              <el-menu-item index="1-5" v-if="permissions.reportBalance"><p @click="ssl(3)">项目收支平衡表</p></el-menu-item>
-              <el-menu-item index="1-6" v-if="user.company.packageCustomer == 1 && permissions.reportProfits"><p @click="ssl(4)">客户项目利润表</p></el-menu-item>
-              <el-menu-item index="1-7" v-if="permissions.reportPhase"><p @click="ssl(5)">项目阶段工时表</p></el-menu-item>
-              <el-menu-item index="1-8" v-if="permissions.reportOvertime"><p @click="ssl(6)">加班情况统计表</p></el-menu-item>
-            </el-submenu>
-          </el-menu>
-      </el-col>
+      <div ref="abbisd" style="width: 100%;overflow: hidden;">
+        <el-col :span="12">
+          <el-menu
+            default-active="1-1"
+            class="el-menu-vertical-demo"
+            @select="staffs"
+            background-color="#ffffff"
+            text-color="#666666"
+            active-text-color="#20A0FF"
+            style="width:100%">
+            <el-submenu index="1">
+              <template slot="title">
+                <i class="iconfont firerock-iconbaobiao"></i>
+                <span>项目报表服务</span>
+              </template>
+                <el-menu-item index="1-1" ><p @click="ssl(0)">项目报表</p></el-menu-item>
+                <el-menu-item index="1-2" v-if="permissions.reportTask"><p @click="ssl(1)">项目任务报表</p></el-menu-item>
+                <el-menu-item index="1-3" v-if="permissions.reportCostOf"><p @click="ssl(2)">项目成本报表</p></el-menu-item>
+                <el-menu-item index="1-4" v-if="permissions.reportCostWarning"><p @click="ssl(7)">工时成本预警表</p></el-menu-item>
+                <el-menu-item index="1-5" v-if="permissions.reportBalance"><p @click="ssl(3)">项目收支平衡表</p></el-menu-item>
+                <el-menu-item index="1-6" v-if="user.company.packageCustomer == 1 && permissions.reportProfits"><p @click="ssl(4)">客户项目利润表</p></el-menu-item>
+                <el-menu-item index="1-7" v-if="permissions.reportPhase"><p @click="ssl(5)">项目阶段工时表</p></el-menu-item>
+                <el-menu-item index="1-8" v-if="permissions.reportOvertime"><p @click="ssl(6)">加班情况统计表</p></el-menu-item>
+              </el-submenu>
+            </el-menu>
+        </el-col>
+      </div>
+      <div class="side" @click="side" ref="sid" style="left: 200px">
+        <div class="spans" ref="side" style="left: -19px;"><i  ref="sideI" class="el-icon-arrow-left"></i></div>
+      </div>
     </div>
      <!-- 侧边栏点击事件 -->
-      <div class="side" @click="side" ref="sid" style="left: 430px">
+      <!-- <div class="side" @click="side" ref="sid" style="left: 430px">
         <div class="spans" ref="side" style="left: -19px;"><i  ref="sideI" class="el-icon-arrow-left"></i></div>
-      </div>
+      </div> -->
     <!-- 内容主体区域 -->
   <div class="contents">
     <div class="headine" ref="headine">
@@ -1025,16 +1030,16 @@ export default {
     // 点击侧边栏事件
     side() {
       if(this.$refs.side.style.left < '0px') {
-        this.$refs.sidebars.style.display = 'none'
-        this.$refs.sid.style.left = '230px'
+        this.$refs.sidebars.style.width = '1px'
+        this.$refs.sid.style.left = '0px'
         this.$refs.side.style.left = '1px'
         this.$refs.sideI.className = 'el-icon-arrow-right'
         this.$refs.staff.style.margin = '5px 0px 0px 5px'
         this.$refs.staff.style.width = '100%'
         this.$refs.headHe.style.paddingLeft = '20px'
       } else {
-        this.$refs.sidebars.style.display = 'block'
-        this.$refs.sid.style.left = '430px'
+        this.$refs.sidebars.style.width = '200px'
+        this.$refs.sid.style.left = '200px'
         this.$refs.side.style.left = '-19px'
         this.$refs.sideI.className = 'el-icon-arrow-left'
         this.$refs.staff.style.margin = '5px 0px 0px 200px'

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -1,45 +1,50 @@
 <template>
   <section>
-    <div class="sidebars" ref="sidebars" style="width: 200px;display: block;background: #fff">
-      <h3><i class="iconfont firerock-iconbaoxiao" style="padding-right: 10px"></i>费用报销模块</h3>
-      <el-divider ></el-divider>
-      <el-col :span="12">
-        <el-menu
-          default-active="1-1"
-          class="el-menu-vertical-demo"
-          @select="staffs"
-          background-color="#ffffff"
-          text-color="#666666"
-          active-text-color="#20A0FF"
-          style="width:100%">
-          <el-submenu index="1">
-            <template slot="title">
-              <i class="iconfont firerock-icontianbao"></i>
-              <span>员工费用填报</span>
-            </template>
-              <el-menu-item index="1-1"><p @click="ssl(0)"> 一般费用填报</p></el-menu-item>
-              <el-menu-item index="1-2"><p @click="ssl(1)">差旅费用填报</p></el-menu-item>
-              <el-menu-item index="1-3"><p @click="ssl(2)">外包费用填报</p></el-menu-item>
-          </el-submenu>
-          <el-submenu index="2">
-            <template slot="title">
-              <i class="iconfont firerock-iconbaoxiaodan"></i>
-              <span>{{permissions.costAll?"报销凭证列表":"我的报销凭证"}}</span>
-            </template>
-            <el-menu-item index="2-1" ><p @click="bills(false)" >单据列表</p></el-menu-item>
-            <el-menu-item index="2-2" v-if="permissions.costAudit"><p @click="bills(true)">单据审核</p></el-menu-item>
-          </el-submenu>
-            <!-- <el-menu-item index="3" @select="bills" @click="bills(false)" v-if="user.role == 0">
-              <i class="iconfont firerock-iconbaoxiaodan"></i>
-              <span slot="title">{{user.role == 0?"我的报销凭证":"报销凭证列表"}}</span>
-            </el-menu-item> -->
-          </el-menu>
-      </el-col>
-    </div>
+      <div class="sidebars" ref="sidebars" style="width: 200px;display: block;background: #fff;">
+        <div ref="abbisd" style="width: 100%;overflow: hidden;">
+          <h3><i class="iconfont firerock-iconbaoxiao" style="padding-right: 10px"></i>费用报销模块</h3>
+          <el-divider ></el-divider>
+          <el-col :span="12">
+            <el-menu
+              default-active="1-1"
+              class="el-menu-vertical-demo"
+              @select="staffs"
+              background-color="#ffffff"
+              text-color="#666666"
+              active-text-color="#20A0FF"
+              style="width:100%">
+              <el-submenu index="1">
+                <template slot="title">
+                  <i class="iconfont firerock-icontianbao"></i>
+                  <span>员工费用填报</span>
+                </template>
+                  <el-menu-item index="1-1"><p @click="ssl(0)"> 一般费用填报</p></el-menu-item>
+                  <el-menu-item index="1-2"><p @click="ssl(1)">差旅费用填报</p></el-menu-item>
+                  <el-menu-item index="1-3"><p @click="ssl(2)">外包费用填报</p></el-menu-item>
+              </el-submenu>
+              <el-submenu index="2">
+                <template slot="title">
+                  <i class="iconfont firerock-iconbaoxiaodan"></i>
+                  <span>{{permissions.costAll?"报销凭证列表":"我的报销凭证"}}</span>
+                </template>
+                <el-menu-item index="2-1" ><p @click="bills(false)" >单据列表</p></el-menu-item>
+                <el-menu-item index="2-2" v-if="permissions.costAudit"><p @click="bills(true)">单据审核</p></el-menu-item>
+              </el-submenu>
+                <!-- <el-menu-item index="3" @select="bills" @click="bills(false)" v-if="user.role == 0">
+                  <i class="iconfont firerock-iconbaoxiaodan"></i>
+                  <span slot="title">{{user.role == 0?"我的报销凭证":"报销凭证列表"}}</span>
+                </el-menu-item> -->
+              </el-menu>
+          </el-col>
+        </div>
+        <div class="side" @click="side" ref="sid" style="left: 200px">
+            <div class="spans" ref="side" style="left: -19px;"><i  ref="sideI" class="el-icon-arrow-left"></i></div>
+        </div>
+      </div>
      <!-- 侧边栏点击事件 -->
-      <div class="side" @click="side" ref="sid" style="left: 430px">
+      <!-- <div class="side" @click="side" ref="sid" style="left: 430px">
         <div class="spans" ref="side" style="left: -19px;"><i  ref="sideI" class="el-icon-arrow-left"></i></div>
-      </div>
+      </div> -->
     <!-- 内容主体区域 -->
   <div class="contents">
     <div v-if="!displayTable" class="headine" ref="headine">
@@ -95,7 +100,7 @@
           <span v-else style="color:#606266;">总费用 ￥{{this.addForm.totalAmount | numberToCurrency}} 元</span>
           <span class="pu_bu_x" style="margin-left:10px;" @click="addxz"> <i class="el-icon-circle-plus-outline"></i> 新增发票</span>
         </div>
-
+  
         <!-- 表格 -->
         <div class="pu_table">
           <el-table
@@ -106,7 +111,7 @@
             @row-dblclick="dbclick">
             <el-table-column prop="projectName" label="所属项目" width="180">
               <template slot-scope="scope">
-                <el-select size="small" v-model="scope.row.projectId" placeholder="项目" style="width: 150px" >
+                <el-select size="small" v-model="scope.row.projectId" placeholder="项目" style="width: 150px" filterable>
                   <el-option v-for="(item, index) in projectList" :key="index" :label="item.projectName" :value="item.id" @click="ok(item)"></el-option>
                 </el-select>
               </template>
@@ -440,6 +445,7 @@ export default {
   props: {},
   data() {
     return {
+      muHeight: document.documentElement.clientHeight || document.body.clientHeight,
       imgs: [],
       addFormRules: {ownerId: [{ required: true, message: "请选择报销人", trigger: "blur" }]},      
       isAuditList: false,
@@ -962,8 +968,8 @@ export default {
     // 点击侧边栏事件
     side() {
       if(this.$refs.side.style.left < '0px') {
-        this.$refs.sidebars.style.display = 'none'
-        this.$refs.sid.style.left = '230px'
+        this.$refs.sidebars.style.width = '1px'
+        this.$refs.sid.style.left = '1px'
         this.$refs.side.style.left = '1px'
         this.$refs.sideI.className = 'el-icon-arrow-right'
         this.$refs.staff.style.margin = '20px 20px 0 20px'
@@ -971,8 +977,8 @@ export default {
         this.$refs.xiaomian.style.width = '100%'
         this.$refs.headHe.style.paddingLeft = '20px'
       } else {
-        this.$refs.sidebars.style.display = 'block'
-        this.$refs.sid.style.left = '430px'
+        this.$refs.sidebars.style.width = '200px'
+        this.$refs.sid.style.left = '200px'
         this.$refs.side.style.left = '-19px'
         this.$refs.sideI.className = 'el-icon-arrow-left'
         this.$refs.staff.style.margin = '20px 20px 0 220px'

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

@@ -1316,7 +1316,7 @@
                     projectId: this.curProjectId,
                 },
                 res => {
-                    if (res.code == "ok") {
+                    if (res.code == "ok") { 
                         console.log(res.data, '里程碑数据')
                         for(var i in res.data) {
                             if(res.data[i].taskStatus == 1) {

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

@@ -1937,6 +1937,9 @@ import delete$ from 'dingtalk-jsapi/api/biz/cspace/delete';
                 if(tab.name == 'costbaseline'){
                     this.$refs.costbaseline.refreshPage();
                 }
+                if(tab.name == 'info') {
+                    this.$refs.projectInfo.getMileStoneList()
+                }
             },
             showSubTaskList(task) {
                 this.subTaskVisible = true;