Home Explore Help
Register Sign In
LImengbo
/
efun-finance
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://gogs.efunbox.cn/LImengbo/efun-finance

# Conflicts:
#	src/pages/layout/nav/Nav.vue
孙志雷 6 years ago
parent
0cdca8f9ac edc92c0a55
commit
e7d9e8f185
10 changed files with 28 additions and 13 deletions
Split View Show Diff Stats
  1. 1 1
      .gitignore
  2. 1 1
      index.html
  3. 1 1
      src/api/teamApi.js
  4. 1 0
      src/pages/costTeam/index.vue
  5. 1 0
      src/pages/costType/index.vue
  6. 8 2
      src/pages/manage/index.vue
  7. 1 0
      src/pages/product/index.vue
  8. 2 1
      src/pages/project/index.vue
  9. 11 6
      src/pages/team/index.vue
  10. 1 1
      webpack.config.js

+ 1 - 1
.gitignore
View File 

@@ -1,2 +1,2 @@
 
 /node_modules/
 
-/dist/
 
+/manageWeb/

+ 1 - 1
index.html
View File 

@@ -21,6 +21,6 @@
 
 <body>
 
     <div id="app">   
     </div>
 
-    <script src="/dist/main.build.js"></script>
 
+    <script src="./main.build.js"></script>
 
 </body>
 
 </html>

+ 1 - 1
src/api/teamApi.js
View File 

@@ -7,7 +7,7 @@ export function getTeamList (deptId) {
 
     url: baseApi + 'manageBase/dept/tree',
 
     method: 'get',
 
     params: {
 
-      deptId: 0
 
+      deptId: 123456
 
     }
 
   })
 
 }

+ 1 - 0
src/pages/costTeam/index.vue
View File 

@@ -127,6 +127,7 @@ export default {
 
           if(this.addFlag) {
 
             addCostTeam(this.form).then(res => {
 
               this.costTeamData.unshift(res.data.data)
 
+              this.$refs[formName].resetFields();
 
             })
 
           } else {
 
             this.form.id = this.id;

+ 1 - 0
src/pages/costType/index.vue
View File 

@@ -127,6 +127,7 @@ export default {
 
           if(this.addFlag) {
 
             addCostType(this.form).then(res => {
 
               this.costTypeData.unshift(res.data.data)
 
+              this.$refs[formName].resetFields();
 
             })
 
           } else {
 
             this.form.id = this.id;

+ 8 - 2
src/pages/manage/index.vue
View File 

@@ -73,7 +73,7 @@
 
             </el-option>        
           </el-select>      
         </el-form-item>
 
-        <el-form-item label="选择项目" prop="projectId" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
 
+        <el-form-item label="选择项目" prop="projectId" :label-width="formLabelWidth">
 
           <el-select v-model="form.projectId" placeholder="请选择项目">
 
             <el-option
 
               v-for="item in projectSelectData"
 
@@ -132,7 +132,12 @@
 
           <el-input v-model.number="form.amount" autocomplete="off"></el-input>
 
         </el-form-item>
 
         <el-form-item label="创建时间" prop="happenTime" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
 
-          <el-input v-model="form.happenTime" autocomplete="off" placeholder="请输入格式2019/00/00"></el-input>
 
+          <!--<el-input v-model="form.happenTime" autocomplete="off" placeholder="请输入格式2019/00/00"></el-input>-->
 
+            <el-date-picker
 
+                v-model="form.happenTime"
 
+                type="datetime"
 
+                placeholder="选择日期时间">
 
+            </el-date-picker>
 
         </el-form-item>
 
         <el-form-item label="编码" prop="code" :label-width="formLabelWidth" :rules="[{ required: true, message: '编码不能为空'}]">
 
           <el-input v-model="form.code" autocomplete="off"></el-input>
 
@@ -291,6 +296,7 @@ export default {
 
               getManageList().then(res => {
 
                 this.manageData = res.data.data;
 
               })
 
+              this.$refs[formName].resetFields();
 
             })
 
           } else {
 
             this.form.id = this.id;

+ 1 - 0
src/pages/product/index.vue
View File 

@@ -129,6 +129,7 @@ export default {
 
           if(this.addFlag) {
 
             addProduct(this.form).then(res => {
 
               this.productData.unshift(res.data.data)
 
+              this.$refs[formName].resetFields();
 
             })
 
           } else {
 
             this.form.id = this.id;

+ 2 - 1
src/pages/project/index.vue
View File 

@@ -130,6 +130,7 @@ export default {
 
           if(this.addFlag) {
 
             addProject(this.form).then(res => {
 
               this.projectData.unshift(res.data.data)
 
+              this.$refs[formName].resetFields();
 
             })
 
           } else {
 
             this.form.id = this.id;
 
@@ -137,7 +138,7 @@ export default {
 
               console.log(res);
 
               console.log(this.index)
 
               this.projectData.splice(this.index, 1, res.data.data)
 
-              this.$refs[formName].resetFields();
 
+              this.$refs[formName].resetFields(); 
             })
 
           }
 
           this.dialogFormVisible = false;

+ 11 - 6
src/pages/team/index.vue
View File 

@@ -15,7 +15,7 @@
 
               type="text"
 
               size="mini"
 
               @click.stop="() => append(node, data)">
 
-              Append
 
+              添加
 
             </el-button>
 
             <!--
 
             <el-button
 
@@ -46,7 +46,7 @@
 
                 <span>{{ props.row.category }}</span>
 
               </el-form-item>
 
               <el-form-item label="上级部门">
 
-                <span>{{ props.row.desc }}</span>
 
+                <span>{{ props.row.father.name }}</span>
 
               </el-form-item>
 
             </el-form>
 
           </template>
 
@@ -61,7 +61,7 @@
 
         </el-table-column>
 
         <el-table-column
 
           label="上级部门"
 
-          prop="desc">
 
+          prop="father.name">
 
         </el-table-column>
 
         <el-table-column label="操作" width="80">
 
           <template slot-scope="scope">
 
@@ -128,8 +128,8 @@ export default {
 
   },
 
   created () {
 
     getTeamList().then(res => {
 
-      console.log(res.data.data.children)
 
-      this.teamData = res.data.data.children
 
+      console.log(res.data.data)
 
+      this.teamData.push(res.data.data)
 
     });
 
   },
 
   methods: {
 
@@ -222,7 +222,12 @@ export default {
 
     box-sizing: border-box;
 
   }
 
   .left-card {
 
-    width: 25%;
 
+    width: 28%;
 
+  }
 
+  .custom-tree-node {
 
+    display: flex;
 
+    justify-content: space-between;
 
+    width: 100%;
 
   }
 
   .right-card {
 
     width: 70%;

+ 1 - 1
webpack.config.js
View File 

@@ -8,7 +8,7 @@ var config = {
 
     output: {
 
         path: path.resolve(__dirname + '/manageWeb'),//打包生成文件地址
 
         filename: '[name].build.js',//生成文件ming
 
-        publicPath: './'//文件输出的公共路径
 
+        // publicPath: './'//文件输出的公共路径
 
     },
 
     module: {
 
         rules: [