Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-eom into test

src/utils/page-tab-util.js

@@ -4,7 +4,7 @@
 import store from '@/store';
 import router from '@/router';
 import { Message } from 'element-ui';
-import { removeToken,removeCurrentUser } from '@/utils/token-util';
+import { removeToken, removeCurrentUser } from '@/utils/token-util';
 import { setDocumentTitle } from '@/utils/document-title-util';
 import { SYSTEM_NAME } from '@/config/setting';
 import {
@@ -245,11 +245,11 @@ export function logout(route, from) {
   removeCurrentUser();
   if (route) {
     router.push({
-      path: '/login',
-      query: from ? { from } : void 0
+      path: '/login'
+      // query: from ? { from } : void 0
     });
   } else {
     // 这样跳转避免再次登录重复注册动态路由
-    location.replace(BASE_URL + 'login' + (from ? '?from=' + from : ''));
+    location.replace(window.location.origin + '/login');
   }
 }

src/views/saleManage/saleOrder/accountstatement/components/inventoryTable.vue

@@ -162,7 +162,7 @@
                         :min="0"
                         :max="100"
                         :disabled="item.orderCategory != 4 || dialogType === 'view'"
-                        @input="getDiscountRatioPrice(scope.row, scope.$index)"
+                        @input="getDiscountRatioPrice(scope.row, scope.$index, item, index)"
                       >
                         <template slot="append">%</template>
                       </el-input>