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

fhKeeper/formulahousekeeper/timesheet/src/routes.js

@@ -37,7 +37,7 @@ import Market from './views/market/list';
 import PdfView from './views/pdf/pdfview';
 
 // 费用报销
-// import expense from './views/expense/expense'
+import expense from './views/expense/expense'
 Vue.use(Router)
 
 export const fixedRouter = [
@@ -156,17 +156,17 @@ export const manageRouter = [
         ]
     },
     
-    // // 费用报销模块
-    // {
-    //     path: '/',
-    //     component: Home,
-    //     name: '费用报销',
-    //     iconCls: 'iconfont firerock-iconcaiwu',
-    //     leaf: true,
-    //     children: [
-    //         { path: '/expense', component: expense, name: '费用报销' }
-    //     ]
-    // },
+    // 费用报销模块
+    {
+        path: '/',
+        component: Home,
+        name: '费用报销',
+        iconCls: 'iconfont firerock-iconcaiwu',
+        leaf: true,
+        children: [
+            { path: '/expense', component: expense, name: '费用报销' }
+        ]
+    },
 
     //项目管理
     {

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

@@ -1,12 +1,43 @@
 <template>
-  <div class="layout-container">
-      费用报销模块
+  <div class="sidebars" style="width: 250px">
+    <h2><i class="iconfont firerock-iconcaiwu" style="padding-right: 10px"></i>费用报销模块</h2>
+    <el-col :span="12">
+      <el-menu
+        default-active="1-1"
+        class="el-menu-vertical-demo"
+        @open="handleOpen"
+        @close="handleClose"
+        background-color="#ffffff"
+        text-color="#666666"
+        active-text-color="#20A0FF"
+        style="width:100%">
+        <el-submenu index="1">
+          <template slot="title">
+            <i class="el-icon-location"></i>
+            <span>员工费用报表</span>
+          </template>
+            <el-menu-item index="1-1">一般费用填报</el-menu-item>
+            <el-menu-item index="1-2">差旅费用填报</el-menu-item>
+          </el-submenu>
+          
+          <el-submenu index="2">
+          <template slot="title">
+            <i class="el-icon-location"></i>
+            <span>费用报销单据</span>
+          </template>
+            <el-menu-item index="2-1">待处理单据</el-menu-item>
+            <el-menu-item index="2-2">待支付单据</el-menu-item>
+          </el-submenu>
+
+        </el-menu>
+    </el-col>
   </div>
+  <!-- 内容主体区域 -->
 </template>
 
 <script>
 export default {
-  name: "",
+  name: "expense",
   components: {},
   props: {},
   data() {
@@ -20,4 +51,20 @@ export default {
 };
 </script>
 <style scoped>
+.sidebars {
+  height: 100%;
+  position: absolute;
+  border-right: 1px solid #E6E6E6;
+}
+.sidebars h2 {
+  margin: 0;
+  line-height: 45px;
+  background: #20A0FF;
+  font-weight: normal;
+  color: #fff;
+  padding-left: 20px;
+}
+.sidebars .el-col-12 {
+  width: 100%
+}
 </style>

fhKeeper/formulahousekeeper/timesheet/src/views/expenseList/ordinary.vue

@@ -0,0 +1,21 @@
+<template>
+  <div class="layout-container"></div>
+</template>
+
+<script>
+export default {
+  name: "",
+  components: {},
+  props: {},
+  data() {
+    return {};
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {},
+};
+</script>
+<style scoped lang='less'>
+</style>

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

@@ -75,7 +75,7 @@
 
                     <el-divider ></el-divider>
                     <!--图形显示 -->
-                    <div id="chartPanel" style="height:300px;"></div>
+                    <div id="chartPanel" style="height: 300px;width: 1100px;"></div>
                 </div>
             </div>
             </el-col>
@@ -431,7 +431,7 @@
                 _this.stagesChart.resize();
                 _this.costChart.resize();
             });
-            this.getProfitSnapshot();
+            this.getProfitSnapshot(); // 调用图表方法
         }
     };
 </script>

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

@@ -284,8 +284,8 @@
                         <!-- <el-form :model="> -->
                         <el-radio-group v-model="radio">
                             <el-radio :label="0" class="rala1">状态正常</el-radio>
-                            <el-radio :label="1" class="rala2">风险提示</el-radio>
-                            <el-radio :label="2" class="rala3">高度危险</el-radio>
+                            <el-radio :label="1" class="rala2">存在风险</el-radio>
+                            <el-radio :label="2" class="rala3">进展预期</el-radio>
                         </el-radio-group>
 
                         <el-input
@@ -465,14 +465,14 @@
                     <div class="issue">
                         <!-- <el-input type="textarea" class="textareays" label-width="100%" label-height="140px"></el-input> -->
                         <div class="issue_fixation">
-                            <el-input
+                            <div class="inputDeep"><el-input
                             class="issue-input"
                             type="textarea"
                             placeholder="请输入内容"
                             :autosize="{ minRows: 6, maxRows: 6}"
                             v-model.trim="textarea2"
                             >
-                            </el-input>
+                            </el-input></div>
                             <el-button class="issue-button" type="primary" @click="release()">发布</el-button>
                         </div>
                     </div>
@@ -846,12 +846,6 @@
             },
             //创建任务进展
             addTaskProgress() {
-                if (this.text2.length <= 0) {
-                    return this.$message({
-                                message: '请输入内容',
-                                type: "error"
-                            });
-                }
                 console.log(this.taskIid, 'idididi');
                 // var param = {taskId:0,status:0,content:'输入进展内容',participatorIds:'1,2,3,4,5'};
                 // console.log(this.checkLists.toString(), '看看打印的是什么');
@@ -2335,14 +2329,22 @@
     }
     .issue-button {
         position: absolute;
-        bottom: 20px    ;
-        right: 0;
+        bottom: 20px;
+        right: 20px;
     }
 }
 .issue-input {
     position: absolute;
     bottom: 85px;    
 }
+.inputDeep>>>.el-input__inner {
+    border: 0;
+  }
+.inputDeep>>>.el-textarea__inner {
+    border: 0 !important;
+    resize: none !important;/* 这个是去掉 textarea 下面拉伸的那个标志，如下图 */
+  }
+
 .scop_span {
     display: inline-block;
     padding: 2px 5px;