11

src/store/index.js

@@ -8,6 +8,7 @@ import role from '@f/store/auth/role';
 import userMenu from '@f/store/auth/userMenu';
 import login from '@f/store/auth/login';
 import dictionary from '@f/store/system/dictionary';
+import user from '@f/store/personnel/user';
 import driver from '@f/store/personnel/driver';
 import util from '@f/store/util';
 import { menuParams, setMenuParams } from '@f/store/auth/menuParams';
@@ -27,5 +28,6 @@ export default new Vuex.Store({
     userMenu,
     dictionary,
     driver,
+    user,
   },
 });

src/views/client/contract.vue

@@ -107,7 +107,7 @@ export default {
         cycle: [{ required: true, message: '请输入结算周期', trigger: 'blur' }],
       },
       //客户列表
-      nameList: [{ name: '公司1' }, { name: '公司2' }, { name: '公司3' }, { name: '公司4' }, { name: '公司5' }],
+      nameList: [{ name: 'xxx有限公司' }, { name: '公司2' }, { name: '公司3' }, { name: '公司4' }, { name: '公司5' }],
       selected: [],
     };
   },

src/views/order/out.vue

@@ -231,7 +231,7 @@ export default {
       if (this.editableTabsValue == '0') {
         this.editableTabsValue = '1';
       }
-      this.editableTabs.push({});
+      this.editableTabs.push({ rate: '1' });
     },
     //删除选项卡
     removeTab(targetName) {
@@ -279,10 +279,13 @@ export default {
         let num3 = 0;
         let num4 = 0;
         for (let item of this.editableTabs) {
-          num1 = _.round(num1 + Number(item.cost1), 2);
-          num2 = _.round(num2 + Number(item.cost2), 2);
-          num3 = _.round(num3 + Number(item.cost3), 2);
-          num4 = _.round(num4 + Number(item.cost4), 2);
+          if (item.cost1) {
+            num1 = _.round(num1 + Number(item.cost1), 2);
+            num2 = _.round(num2 + Number(item.cost2), 2);
+            num3 = _.round(num3 + Number(item.cost3), 2);
+            num4 = _.round(num4 + Number(item.cost4), 2);
+          } else {
+          }
         }
         this.cost1 = num1;
         this.cost2 = num2;