修改细节

src/api/costTeamApi.js

@@ -1,7 +1,7 @@
 import request from 'utils/request'
 import { baseApi } from 'utils/config' 
 
-//获取收入支出类别信息
+//获取收入支出类型信息
 export function getCostTeamList () {
   return request({
     url: baseApi + 'manageBase/company',
@@ -12,7 +12,7 @@ export function getCostTeamList () {
   })
 }
 
-//新增收入支出类别
+//新增收入支出类型
 export function addCostTeam (data) {
   return request({
     url: baseApi + 'manageBase/company',
@@ -20,7 +20,7 @@ export function addCostTeam (data) {
     data,
   })
 }
-//修改收入支出类别
+//修改收入支出类型
 export function setCostTeam (data) {
   return request({
     url: baseApi + 'manageBase/company',

src/pages/costTeam/index.vue

@@ -30,10 +30,12 @@
             <el-button
               size="mini"
               @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+              <!--
             <el-button
               size="mini"
               type="danger"
               @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+              -->
           </template>
         </el-table-column>
       </el-table>
@@ -46,16 +48,15 @@
         <el-form-item label="收入部门名称" prop="name" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
           <el-input v-model="form.name" autocomplete="off"></el-input>
         </el-form-item>
+        <!--
         <el-form-item label="收入部门状态" prop="status" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
           <el-select v-model="form.status" placeholder="请选择状态值">
             <el-option label="正常" value="NORMAL"></el-option>
             <el-option label="已删除" value="DEL"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="收入部门排序" prop="sort" :label-width="formLabelWidth" :rules="[
-        { required: true, message: '排序不能为空'},
-        { type: 'number', message: '排序必须为数字值'}
-        ]">
+        -->
+        <el-form-item label="收入部门排序" prop="sort" :label-width="formLabelWidth" >
           <el-input v-model.number="form.sort" autocomplete="off"></el-input>
         </el-form-item>             
       </el-form>
@@ -78,7 +79,7 @@ export default {
       form: {
         code: '',
         name: '',
-        status: '',
+        status: 'NORMAL',
         sort: ''
       },
       formLabelWidth: '120px',
@@ -100,7 +101,7 @@ export default {
     handleEdit(index, row) {
       this.form.code = row.code;
       this.form.name = row.name;
-      this.form.status = row.status;
+      // this.form.status = row.status;
       this.form.sort = row.sort;
       this.id = row.id;
       this.index = index;
@@ -141,7 +142,12 @@ export default {
           return false;
         }
       });
-    }  
+    },
+    // 取消
+    resetForm (formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }    
   }, 
 }
 </script>

src/pages/costType/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="cost-type">
-    <el-button type="primary" class="add" @click="append">增加类别</el-button>
+    <el-button type="primary" class="add" @click="append">增加类型</el-button>
     <el-card class="right-card">
       <el-table
       :data="costTypeData"
@@ -8,21 +8,21 @@
         <el-table-column type="expand">
           <template slot-scope="props">
             <el-form label-position="left" inline class="demo-table-expand">
-              <el-form-item label="类别名称">
+              <el-form-item label="类型名称">
                 <span>{{ props.row.name }}</span>
               </el-form-item>
-              <el-form-item label="类别 ID">
+              <el-form-item label="类型 ID">
                 <span>{{ props.row.id }}</span>
               </el-form-item>
             </el-form>
           </template>
         </el-table-column>
         <el-table-column
-          label="类别 ID"
+          label="类型 ID"
           prop="id">
         </el-table-column>
         <el-table-column
-          label="类别名称"
+          label="类型名称"
           prop="name">
         </el-table-column>
         <el-table-column label="操作">
@@ -30,32 +30,33 @@
             <el-button
               size="mini"
               @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+              <!--
             <el-button
               size="mini"
               type="danger"
               @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+              -->
           </template>
         </el-table-column>
       </el-table>
     </el-card>
-    <el-dialog title="新增类别" :visible.sync="dialogFormVisible">     
+    <el-dialog title="新增类型" :visible.sync="dialogFormVisible">     
       <el-form :model="form" ref="form">
-        <el-form-item label="类别编码" prop="code" :label-width="formLabelWidth" :rules="[{ required: true, message: '编码不能为空'}]">
+        <el-form-item label="类型编码" prop="code" :label-width="formLabelWidth" :rules="[{ required: true, message: '编码不能为空'}]">
           <el-input v-model="form.code" autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="类别名称" prop="name" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
+        <el-form-item label="类型名称" prop="name" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
           <el-input v-model="form.name" autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="类别状态" prop="status" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
+        <!--
+        <el-form-item label="类型状态" prop="status" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
           <el-select v-model="form.status" placeholder="请选择状态值">
             <el-option label="正常" value="NORMAL"></el-option>
             <el-option label="已删除" value="DEL"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="类别排序" prop="sort" :label-width="formLabelWidth" :rules="[
-        { required: true, message: '排序不能为空'},
-        { type: 'number', message: '排序必须为数字值'}
-        ]">
+        -->
+        <el-form-item label="类型排序" prop="sort" :label-width="formLabelWidth">
           <el-input v-model.number="form.sort" autocomplete="off"></el-input>
         </el-form-item>             
       </el-form>
@@ -78,7 +79,7 @@ export default {
       form: {
         code: '',
         name: '',
-        status: '',
+        status: 'NORMAL',
         sort: ''
       },
       formLabelWidth: '120px',
@@ -91,32 +92,32 @@ export default {
     });
   },
   methods: {
-    // 新增类别
+    // 新增类型
     append() {
       this.addFlag = true;
       this.dialogFormVisible = true;
     },
-    // 编辑类别
+    // 编辑类型
     handleEdit(index, row) {
       this.form.code = row.code;
       this.form.name = row.name;
-      this.form.status = row.status;
+      // this.form.status = row.status;
       this.form.sort = row.sort;
       this.id = row.id;
       this.index = index;
       this.dialogFormVisible = true;
       this.addFlag = false;
     },
-    //删除类别
-    handleDelete(index, row) {
-      console.log(index, row);
-      setCostType({
-        id: row.id,
-        status: 'DEL'
-      }).then(res => {
-        console.log(res);
-      })
-    },
+    //删除类型
+    // handleDelete(index, row) {
+    //   console.log(index, row);
+    //   setCostType({
+    //     id: row.id,
+    //     status: 'DEL'
+    //   }).then(res => {
+    //     console.log(res);
+    //   })
+    // },
     // 提交新增
     submitForm(formName) {
       //验证表单
@@ -141,6 +142,11 @@ export default {
           return false;
         }
       });
+    },
+    // 取消
+    resetForm (formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
     }  
   }, 
 }

src/pages/layout/nav/Nav.vue

@@ -11,7 +11,7 @@
             <span slot="title">产品</span>
         </el-menu-item>
         <el-menu-item index="/costType/index">
-            <span slot="title">成本/收入类别</span>
+            <span slot="title">成本/收入类型</span>
         </el-menu-item>
         <el-menu-item index="/costTeam/index">
             <span slot="title">成本/收入部门</span>

src/pages/manage/index.vue

@@ -50,10 +50,12 @@
             <el-button
               size="mini"
               @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <!--
             <el-button
               size="mini"
               type="danger"
               @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+              -->
           </template>
         </el-table-column>
       </el-table>
@@ -79,21 +81,6 @@
               :value="item.id">
             </el-option>        
           </el-select> 
-        </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>
-        </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-form-item>
-        <el-form-item label="名称" prop="name" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
-          <el-input v-model="form.name" autocomplete="off"></el-input>
-        </el-form-item>
-        <el-form-item label="金额" prop="amount" :label-width="formLabelWidth" :rules="[
-        { required: true, message: '编码不能为空'}, 
-        { type: 'number', message: '排序必须为数字值'}
-        ]">
-          <el-input v-model.number="form.amount" autocomplete="off"></el-input>
         </el-form-item>
         <el-form-item v-if="type == 'INCOME'" label="选择产品" prop="productId" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
             <el-select v-model="form.productId" placeholder="请选择产品">
@@ -114,7 +101,7 @@
               :value="item.id">
             </el-option> 
           </el-select>
-        </el-form-item> 
+        </el-form-item>
         <el-form-item v-if="type == 'INCOME'" label="收入状态" prop="incomeStatus" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
           <el-select v-model="form.incomeStatus" placeholder="请选择状态值">
             <el-option label="开票/应收" value="INVOICE"></el-option>
@@ -136,20 +123,34 @@
               :value="item.id">
             </el-option> 
           </el-select>
-        </el-form-item>         
-        <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
+        </el-form-item>                  
+        <el-form-item label="金额" prop="amount" :label-width="formLabelWidth" :rules="[
+        { required: true, message: '编码不能为空'}, 
+        { type: 'number', message: '排序必须为数字值'}
+        ]">
+          <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-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>
+        </el-form-item>                   
+        <el-form-item label="名称" prop="name" :label-width="formLabelWidth">
+          <el-input v-model="form.name" autocomplete="off"></el-input>
+        </el-form-item>               
+        <el-form-item label="添加备注" prop="remark" :label-width="formLabelWidth">
           <el-input v-model="form.remark" autocomplete="off"></el-input>
-        </el-form-item>        
+        </el-form-item> 
+        <!--       
         <el-form-item label="状态" prop="status" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
           <el-select v-model="form.status" placeholder="请选择状态值">
             <el-option label="正常" value="NORMAL"></el-option>
             <el-option label="已删除" value="DEL"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="排序" prop="sort" :label-width="formLabelWidth" :rules="[
-        { required: true, message: '排序不能为空'},
-        { type: 'number', message: '排序必须为数字值'}
-        ]">
+        -->
+        <el-form-item label="排序" prop="sort" :label-width="formLabelWidth">
           <el-input v-model.number="form.sort" autocomplete="off"></el-input>
         </el-form-item>             
       </el-form>
@@ -183,7 +184,7 @@ export default {
         amount: '',
         code: '',
         name: '',
-        status: '',
+        status: 'NORMAL',
         sort: ''
       },
       formLabelWidth: '120px',
@@ -258,7 +259,7 @@ export default {
       this.form.remark = row.remark;
       this.form.amount = row.amount;
       this.form.name = row.name;
-      this.form.status = row.status;
+      // this.form.status = row.status;
       this.form.sort = row.sort;
       this.form.costTypeId = row.costTypeId;
       this.form.companyId = row.companyId;
@@ -297,7 +298,12 @@ export default {
           return false;
         }
       });
-    } 
+    },
+    // 取消
+    resetForm (formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
+    }   
   }
 }
 </script>

src/pages/product/index.vue

@@ -5,6 +5,7 @@
       <el-table
       :data="productData"
       style="width: 100%">
+      <!--
         <el-table-column type="expand">
           <template slot-scope="props">
             <el-form label-position="left" inline class="demo-table-expand">
@@ -17,6 +18,7 @@
             </el-form>
           </template>
         </el-table-column>
+        -->
         <el-table-column
           label="产品 ID"
           prop="id">
@@ -30,10 +32,12 @@
             <el-button
               size="mini"
               @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+              <!--
             <el-button
               size="mini"
               type="danger"
               @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+              -->
           </template>
         </el-table-column>
       </el-table>
@@ -46,16 +50,15 @@
         <el-form-item label="产品名称" prop="name" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
           <el-input v-model="form.name" autocomplete="off"></el-input>
         </el-form-item>
+        <!--
         <el-form-item label="产品状态" prop="status" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
           <el-select v-model="form.status" placeholder="请选择状态值">
             <el-option label="正常" value="NORMAL"></el-option>
             <el-option label="已删除" value="DEL"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="产品排序" prop="sort" :label-width="formLabelWidth" :rules="[
-        { required: true, message: '排序不能为空'},
-        { type: 'number', message: '排序必须为数字值'}
-        ]">
+        -->
+        <el-form-item label="产品排序" prop="sort" :label-width="formLabelWidth">
           <el-input v-model.number="form.sort" autocomplete="off"></el-input>
         </el-form-item>             
       </el-form>
@@ -78,7 +81,7 @@ export default {
       form: {
         code: '',
         name: '',
-        status: '',
+        status: 'NORMAL',
         sort: ''
       },
       formLabelWidth: '120px',
@@ -100,7 +103,7 @@ export default {
     handleEdit(index, row) {
       this.form.code = row.code;
       this.form.name = row.name;
-      this.form.status = row.status;
+      // this.form.status = row.status;
       this.form.sort = row.sort;
       this.id = row.id;
       this.index = index;
@@ -141,6 +144,11 @@ export default {
           return false;
         }
       });
+    },
+    // 取消
+    resetForm (formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
     }  
   }, 
 }

src/pages/project/index.vue

@@ -5,6 +5,7 @@
       <el-table
       :data="projectData"
       style="width: 100%">
+      <!--
         <el-table-column type="expand">
           <template slot-scope="props">
             <el-form label-position="left" inline class="demo-table-expand">
@@ -17,6 +18,7 @@
             </el-form>
           </template>
         </el-table-column>
+        -->
         <el-table-column
           label="项目 ID"
           prop="id">
@@ -30,10 +32,12 @@
             <el-button
               size="mini"
               @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
+            <!--  
             <el-button
               size="mini"
               type="danger"
               @click="handleDelete(scope.$index, scope.row)">删除</el-button>
+            -->
           </template>
         </el-table-column>
       </el-table>
@@ -46,16 +50,15 @@
         <el-form-item label="项目名称" prop="name" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
           <el-input v-model="form.name" autocomplete="off"></el-input>
         </el-form-item>
+        <!--
         <el-form-item label="项目状态" prop="status" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
           <el-select v-model="form.status" placeholder="请选择状态值">
             <el-option label="正常" value="NORMAL"></el-option>
             <el-option label="已删除" value="DEL"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="项目排序" prop="sort" :label-width="formLabelWidth" :rules="[
-        { required: true, message: '排序不能为空'},
-        { type: 'number', message: '排序必须为数字值'}
-        ]">
+        -->
+        <el-form-item label="项目排序" prop="sort" :label-width="formLabelWidth">
           <el-input v-model.number="form.sort" autocomplete="off"></el-input>
         </el-form-item>             
       </el-form>
@@ -78,7 +81,7 @@ export default {
       form: {
         code: '',
         name: '',
-        status: '',
+        status: 'NORMAL',
         sort: ''
       },
       formLabelWidth: '120px',
@@ -101,7 +104,7 @@ export default {
     handleEdit(index, row) {
       this.form.code = row.code;
       this.form.name = row.name;
-      this.form.status = row.status;
+      // this.form.status = row.status;
       this.form.sort = row.sort;
       this.id = row.id;
       this.index = index;
@@ -109,15 +112,15 @@ export default {
       this.addFlag = false;
     },
     //删除项目
-    handleDelete(index, row) {
-      console.log(index, row);
-      setProject({
-        id: row.id,
-        status: 'DEL'
-      }).then(res => {
-        console.log(res);
-      })
-    },
+    // handleDelete(index, row) {
+    //   console.log(index, row);
+    //   setProject({
+    //     id: row.id,
+    //     status: 'DEL'
+    //   }).then(res => {
+    //     console.log(res);
+    //   })
+    // },
     // 提交新增
     submitForm(formName) {
       //验证表单
@@ -142,6 +145,11 @@ export default {
           return false;
         }
       });
+    },
+    // 取消
+    resetForm (formName) {
+      this.$refs[formName].resetFields();
+      this.dialogFormVisible = false;
     }  
   }, 
 }

src/pages/team/index.vue

@@ -86,16 +86,15 @@
         <el-form-item label="部门名称" prop="name" :label-width="formLabelWidth" :rules="[{ required: true, message: '名称不能为空'}]">
           <el-input v-model="form.name" autocomplete="off"></el-input>
         </el-form-item>
-        <el-form-item label="部门状态" prop="status" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
+        <!--
+          <el-form-item label="部门状态" prop="status" :label-width="formLabelWidth" :rules="[{ required: true, message: '状态不能为空'}]">
           <el-select v-model="form.status" placeholder="请选择状态值">
             <el-option label="正常" value="NORMAL"></el-option>
             <el-option label="已删除" value="DEL"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="部门排序" prop="sort" :label-width="formLabelWidth" :rules="[
-        { required: true, message: '排序不能为空'},
-        { type: 'number', message: '排序必须为数字值'}
-        ]">
+        -->
+        <el-form-item label="部门排序" prop="sort" :label-width="formLabelWidth" >
           <el-input v-model.number="form.sort" autocomplete="off"></el-input>
         </el-form-item>             
       </el-form>
@@ -120,7 +119,7 @@ export default {
         path: '',
         code: '',
         name: '',
-        status: '',
+        status: 'NORMAL',
         sort: ''
       },
       formLabelWidth: '120px',
@@ -166,7 +165,7 @@ export default {
       console.log(index, row);
       this.form.code = row.code;
       this.form.name = row.name;
-      this.form.status = row.status;
+      // this.form.status = row.status;
       this.form.sort = row.sort;
       this.form.path = row.path;
       this.id = row.id;
@@ -207,6 +206,10 @@ export default {
           return false;
         }
       });
+    },
+    resetForm(formName) {
+        this.dialogFormVisible = false;
+        this.$refs[formName].resetFields();
     }  
   }, 
 }