增加待办任务的详情，调整费用报销的税率

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -4,8 +4,8 @@ var path = require('path')
 // var ip = '192.168.2.31'
 
  
-// var ip = '47.100.37.243'
-var ip = '192.168.2.21'
+var ip = '47.100.37.243'
+// var ip = '192.168.2.21'
 
 // var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 // for (var i in ifaces) {

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

@@ -147,7 +147,7 @@
             </el-table-column>
             <el-table-column label="费用金额" width="135px">
               <template slot-scope="scope">
-                <el-input size="small" :id="'upam'+scope.$index" v-model="scope.row.amount" @change="shiqu(scope.row.amount)" @keyup.native="restrictNumber('upam'+scope.$index)"></el-input>
+                <el-input size="small" :id="'upam'+scope.$index" v-model="scope.row.amount" @input="zhi(scope.$index)" @change="shiqu(scope.row.amount)" @keyup.native="restrictNumber('upam'+scope.$index)"></el-input>
               </template>
             </el-table-column>
             <el-table-column prop="invoiceNo" label="发票号" width="135px">
@@ -157,12 +157,12 @@
             </el-table-column>
             <el-table-column label="税率%" width="135px">
               <template slot-scope="scope">
-                <el-input size="small"  v-model="scope.row.taxPercent"></el-input>
+                <el-input size="small" type= "number"  v-model="scope.row.taxPercent" @input="zhi(scope.$index)"></el-input>
               </template>
             </el-table-column>
             <el-table-column label="税额" width="135px">
               <template slot-scope="scope">
-                <el-input size="small" v-model="scope.row.taxValue"></el-input>
+                <el-input size="small" v-model="scope.row.taxValue" @input="zhis(scope.$index)"></el-input>
               </template>
             </el-table-column>
             <el-table-column label="备注" width="135px">
@@ -894,6 +894,18 @@ export default {
       this.ParticularsList.totalAmount = this.ParticularsList.invoiceList.reduce((prev, next) => {
         return prev + parseFloat(next.amount)
       }, 0)
+    },
+    zhi(e) {
+      var i = e
+      if(this.invoiceList[i].amount == null || this.invoiceList[i].amount == 'null' || this.invoiceList[i].taxPercent == null || this.invoiceList[i].taxPercent == 'null') {
+        return
+      }
+      this.invoiceList[i].taxValue = this.invoiceList[i].amount * this.invoiceList[i].taxPercent / 100
+      this.invoiceList[i].taxValue = this.invoiceList[i].taxValue.toFixed(2)
+    },
+    zhis(e) {
+      var i = e
+      this.invoiceList[i].taxValue = this.invoiceList[i].taxValue.toFixed(2)
     }
   },
 };

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

@@ -251,7 +251,7 @@
                     </el-select>
                 </el-form-item>
                 <el-form-item label="任务内容" prop="name">
-                    <el-input v-model="addForm.name" :disabled="this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id" placeholder="请输入任务内容" clearable></el-input>
+                    <el-input v-model="addForm.name" :maxlength="40" :disabled="this.addForm.id != null && user.id != this.addForm.createrId && currentProject.inchargerId != user.id" placeholder="请输入任务内容" clearable></el-input>
                 </el-form-item>
                 
                 <el-form-item label="执行人">
@@ -1402,6 +1402,7 @@
             },
             // 点击卡片事件
             editTask(task) {
+                console.log(task)
                 this.addFormVisible = true;
                 this.addLoading = false;
                 this.title = "编辑任务";