Merge remote-tracking branch 'origin/dev'

frontend/operation-web/app/view/statistical/LoginLog.js

@@ -12,7 +12,7 @@ Ext.define('saas.view.statistical.LoginLog', {
                 name: "username",
                 emptyText: '用户名/手机号',
                 getCondition: function (v) {
-                    return "(upper(CONCAT(username, '#', mobile) like '%" + v.toUpperCase() + "%' )";
+                    return "(upper(CONCAT(username, '#', mobile) like '%" + v.toUpperCase() + "%' ))";
                 },
             }],
 

frontend/saas-web/app/view/home/charts/MonthIO.js

@@ -69,7 +69,7 @@ Ext.define('saas.view.home.charts.MonthIO', {
                 orient: 'horizontal',
                 left: 0,
                 icon: 'circle',
-                data: ['主营业务', '其他业务'],
+                data: ['主营业务', '其它业务'],
                 itemWidth: 9,
                 itemHeight: 9
             },
@@ -117,7 +117,7 @@ Ext.define('saas.view.home.charts.MonthIO', {
                 data: main
             },
             {
-                name: '其他业务',
+                name: '其它业务',
                 type: 'bar',
                 stack: '合计',
                 barWidth: 25,

frontend/saas-web/app/view/main/MainContainerWrap.js

@@ -33,7 +33,7 @@ Ext.define('saas.view.main.MainContainerWrap', {
             plugins: [new Ext.ux.TabCloseMenu({
                 closeTabText: '关闭当前页',
                 closeAllTabsText: '关闭全部页',
-                closeOthersTabsText: '关闭其他页'
+                closeOthersTabsText: '关闭其它页'
             }), new Ext.ux.TabReorderer()],
             items: [{
                 iconCls: 'x-sa sa-home',

frontend/saas-web/app/view/money/report/OtherIODetail.js

@@ -14,7 +14,7 @@ Ext.define('saas.view.money.report.OtherIODetail', {
     groupHeaderTpl: '资金账户: {[values.rows[0].data.bl_bankname]}',
     listUrl: '/api/money/report/otheriodetail',
     defaultCondition: null,
-    reportTitle: '其他收支明细表',
+    reportTitle: '其它收支明细表',
     QueryWidth: 0.2,
     searchItems: [{
         xtype: 'bandinfoDbfindTrigger',

frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -105,16 +105,16 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                     });
                     this.dialog.show();
                 }
-            }, {
-                xtype: "textfield",
-                name: "b2bStatus",
-                fieldLabel: "上传状态",
-                columnWidth: 0.25,
-                readOnly: true,
-                bind: {
-                    hidden: '{!enableB2B}'
-                },
-                defaultValue: '待上传'
+            // }, {
+            //     xtype: "textfield",
+            //     name: "b2bStatus",
+            //     fieldLabel: "上传状态",
+            //     columnWidth: 0.25,
+            //     readOnly: true,
+            //     bind: {
+            //         hidden: '{!enableB2B}'
+            //     },
+            //     defaultValue: '待上传'
             }, {
                 name: "detailGridField",
                 xtype: "detailGridField",

frontend/saas-web/app/view/purchase/purchaseIn/FormPanel.js

@@ -112,16 +112,16 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 fieldLabel: "采购单号",
                 allowBlank: true,
                 columnWidth: 0.25
-            }, {
-                xtype: "textfield",
-                name: "b2bStatus",
-                fieldLabel: "上传状态",
-                columnWidth: 0.25,
-                readOnly: true,
-                bind: {
-                    hidden: '{!enableB2B}'
-                },
-                defaultValue: '待上传'
+            // }, {
+            //     xtype: "textfield",
+            //     name: "b2bStatus",
+            //     fieldLabel: "上传状态",
+            //     columnWidth: 0.25,
+            //     readOnly: true,
+            //     bind: {
+            //         hidden: '{!enableB2B}'
+            //     },
+            //     defaultValue: '待上传'
             }, {
                 name: "detailGridField",
                 xtype: "detailGridField",

frontend/saas-web/app/view/purchase/purchaseOut/FormPanel.js

@@ -108,16 +108,16 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 fieldLabel: "采购单号",
                 allowBlank: true,
                 columnWidth: 0.25
-            }, {
-                xtype: "textfield",
-                name: "b2bStatus",
-                fieldLabel: "上传状态",
-                columnWidth: 0.25,
-                readOnly: true,
-                bind: {
-                    hidden: '{!enableB2B}'
-                },
-                defaultValue: '待上传'
+            // }, {
+            //     xtype: "textfield",
+            //     name: "b2bStatus",
+            //     fieldLabel: "上传状态",
+            //     columnWidth: 0.25,
+            //     readOnly: true,
+            //     bind: {
+            //         hidden: '{!enableB2B}'
+            //     },
+            //     defaultValue: '待上传'
             }, {
                 name: "detailGridField",
                 xtype: "detailGridField",

frontend/saas-web/resources/json/navigation.json

@@ -239,7 +239,7 @@
             "id": "monry-report-accountdetails",
             "viewType":"monry-report-accountdetails"
         }, {
-            "text":"其他收支明细表",
+            "text":"其它收支明细表",
             "id":"money-report-otheriodetail",
             "viewType":"monry-report-otheriodetail"
         },{