Browse Source

费用报销样式调整,新增编辑删除功能

Lljy-ai 4 years ago
parent
commit
53f36c7663

+ 11 - 9
fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -2,16 +2,18 @@ var path = require('path')
 
  //var ip = '127.0.0.1'
 
+ 
+var ip = '47.100.37.243'
 
-var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
-for (var i in ifaces) {
-    for (var j in ifaces[i]) {
-        var val = ifaces[i][j]
-        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-            ip = val.address
-        }
-    }
-}
+// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+// for (var i in ifaces) {
+//     for (var j in ifaces[i]) {
+//         var val = ifaces[i][j]
+//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+//             ip = val.address
+//         }
+//     }
+// }
 
 module.exports = {
   build: {

+ 12 - 0
fhKeeper/formulahousekeeper/timesheet/src/routes.js

@@ -150,6 +150,18 @@ export const manageRouter = [
             { path: '/review', component: review, name: '报告审核' },
         ]
     },
+
+    // {
+    //             path: '/',
+    //             component: Home,
+    //             name: '费用报销',
+    //             iconCls: 'iconfont firerock-iconbaoxiao',
+    //             leaf: true,
+    //             children: [
+    //                 { path: '/expense', component: expense, name: '费用报销' }
+    //             ]
+    //         },
+
     //成本统计
     {
         path: '/',

+ 20 - 7
fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -257,14 +257,14 @@
             <el-form-item label="发票张数">
               <el-input v-enter-number v-model="ParticularsList.ticketNum" :disabled="flg"></el-input>
             </el-form-item>
-            <el-form-item label="费用类型">
+            <el-form-item label="费用类型" style="width: 270px">
                 <el-select v-model="ParticularsList.type" placeholder="请选择" :disabled="flg">
                   <el-option label="一般" :value="0"></el-option>
                   <el-option label="差旅" :value="1"></el-option>
                   <el-option label="外包" :value="2"></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="备注">
+            <el-form-item label="备注" style="width: 280px">
               <el-input v-model="ParticularsList.remark" :disabled="flg"></el-input>
             </el-form-item>
             <el-form-item label="总成本">
@@ -331,6 +331,14 @@
                 <span v-else>{{scope.row.remark}}</span>
               </template>
             </el-table-column>
+            <!-- 删除 -->
+            <el-table-column fixed="right"
+              label="操作" v-if="!flg">
+              <template slot-scope="scope">
+                <el-button  type="default" size="mini" style="display: inline-block;margin-left:0;margin-top: 3px" @click="delec(scope.$index)">删除</el-button>
+              </template>
+            </el-table-column>
+            
           </el-table>
         </div>
         <!-- 取消和确定 -->
@@ -431,10 +439,6 @@ export default {
       this.flg = false,
       delete val.invoiceList
       this.getParticulars(val.id)
-      // this.getUsers() // 获取人员信息
-      // console.log(this.ParticularsList.ownerName, '看看打印的');
-      // console.log(this.users, '看看打印的');
-      // var k = this.users.filter(p => p.id == this.ParticularsList.ownerName)
     },
     staffs() { // 控制员工费用报表
       this.displayTable = false;
@@ -447,7 +451,16 @@ export default {
       this.dialog = false
       this.adds();
     },
-
+    // 删除操作
+    delec(ids) {
+      // console.log('删除操作', ids);
+      this.ParticularsList.invoiceList.splice(ids, 1)
+      this.$message({
+        message: '删除成功',
+        type: "success"
+      });
+      // 发起删除请求
+    },
      adds() {
       // happenDate
       this.ParticularsList.items = JSON.stringify(this.ParticularsList.invoiceList)//这里要传发票列表的json转string