Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/commons/commons-server/src/main/resources/config/application-docker-prod.yml

@@ -24,7 +24,7 @@ logging:
 b2b:
   baseUrl:
     inquiry: https://api-inquiry.usoftchina.com
-    Component: https://mall.usoftchina.com
+    Component: https://mall2.usoftchina.com/
     product: http://api-product.usoftchina.com
     common: https://b2b-api.usoftchina.com
     post: https://b2b-post.usoftchina.com

applications/document/document-server/src/main/resources/config/application-docker-prod.yml

@@ -24,7 +24,7 @@ logging:
 b2b:
   baseUrl:
     inquiry: https://api-inquiry.usoftchina.com
-    Component: https://mall.usoftchina.com
+    Component: https://mall2.usoftchina.com/
     product: http://api-product.usoftchina.com
     common: https://b2b-api.usoftchina.com
     post: https://b2b-post.usoftchina.com

applications/money/money-server/src/main/resources/config/application-docker-prod.yml

@@ -24,7 +24,7 @@ logging:
 b2b:
   baseUrl:
     inquiry: https://api-inquiry.usoftchina.com
-    Component: https://mall.usoftchina.com
+    Component: https://mall2.usoftchina.com/
     product: http://api-product.usoftchina.com
     common: https://b2b-api.usoftchina.com
     post: https://b2b-post.usoftchina.com

applications/purchase/purchase-server/src/main/resources/config/application-docker-prod.yml

@@ -24,7 +24,7 @@ logging:
 b2b:
   baseUrl:
     inquiry: https://api-inquiry.usoftchina.com
-    Component: https://mall.usoftchina.com
+    Component: https://mall2.usoftchina.com/
     product: http://api-product.usoftchina.com
     common: https://b2b-api.usoftchina.com
     post: https://b2b-post.usoftchina.com

applications/sale/sale-server/src/main/resources/config/application-docker-prod.yml

@@ -24,7 +24,7 @@ logging:
 b2b:
   baseUrl:
     inquiry: https://api-inquiry.usoftchina.com
-    Component: https://mall.usoftchina.com
+    Component: https://mall2.usoftchina.com/
     product: http://api-product.usoftchina.com
     common: https://b2b-api.usoftchina.com
     post: https://b2b-post.usoftchina.com

applications/transfers/mall-api/src/test/resources/application.yml

@@ -10,7 +10,7 @@ b2b:
 #b2b:
 #  baseUrl:
 #    inquiry: https://api-inquiry.usoftchina.com
-#    Component: https://mall.usoftchina.com
+#    Component: https://mall2.usoftchina.com/
 #    product: http://api-product.usoftchina.com
 #    common: https://b2b-api.usoftchina.com
 #    post: https://b2b-post.usoftchina.com

applications/transfers/transfers-server/src/main/resources/config/application-docker-prod.yml

@@ -24,7 +24,7 @@ logging:
 b2b:
   baseUrl:
     inquiry: https://api-inquiry.usoftchina.com
-    Component: https://mall.usoftchina.com
+    Component: https://mall2.usoftchina.com/
     product: http://api-product.usoftchina.com
     common: https://b2b-api.usoftchina.com
     post: https://b2b-post.usoftchina.com

frontend/saas-portal-web/src/components/footer/footer.vue

@@ -13,7 +13,7 @@
 						<ul>
 							<li><span>产品</span></li>
 							<li><a href="#" @click="gohome">U企云服</a></li>
-							<li><a href="https://mall.usoftchina.com/" target="_blank">U软商城</a></li>
+							<li><a href="https://mall2.usoftchina.com//" target="_blank">U软商城</a></li>
 							<li><a href="https://fin.yitoa-fintech.com/" target="_blank">U智融</a></li>
 							<li><a href="https://zb.usoftchina.com/" target="_blank">闯客网</a></li>
 						</ul>
@@ -34,7 +34,7 @@
 							<li><a class="no-link">联系我们</a></li>
 						</ul>
 					</div>
-					
+
 					<div class="qr">
 						<div class="qr-top">
 							<div class="qr-tech qr-code">
@@ -46,7 +46,7 @@
 						</div>
 					</div>
 				</div>
-				
+
 			</div>
 		</div>
 		<div class="friend-link">
@@ -77,4 +77,4 @@
 
 <style scoped>
 
-</style>
+</style>

frontend/saas-web/app.json

@@ -306,7 +306,7 @@
         },
         "prod": {
             "server": {
-                "mail":"https://mall.usoftchina.com",
+                "mail":"https://mall2.usoftchina.com/",
                 "accountCenter":"https://saas.usoftchina.com",
                 "accountEnterprise":"https://saas.usoftchina.com/#/enterprise",
                 "basePath": "https://saas-api.usoftchina.com",

frontend/saas-web/app/util/FormUtil.js

@@ -216,12 +216,11 @@ Ext.define('saas.util.FormUtil', {
                             }
                         }
                     });
-                    
-                }
-                //附件名称的自定义字段 使用附件类型
-                if(item.fieldLabel == '附件' && item.name.indexOf('_text')>-1){
-                    item.xtype = 'mfilefield'
-                    form.renderMF = item.name
+                    //附件名称的自定义字段 使用附件类型
+                    if(item.fieldLabel == '附件' && item.name.indexOf('_text')>-1){
+                        item.xtype = 'mfilefield'
+                        form.renderMF = item.name
+                    }
                 }
             });
 

frontend/saas-web/app/view/core/form/FormPanelController.js

@@ -208,6 +208,11 @@ Ext.define('saas.view.core.form.FormPanelController', {
 
                 saas.util.BaseUtil.showSuccessToast('保存成功');
                 form.fireEvent('aftersave', true, form, localJson);
+
+                //附件类型清除dirty属性
+                if(form.renderMF){
+                    form.down('[name='+form.renderMF+']').dirty = false
+                }
             }
         })
         .catch(function(e) {

frontend/saas-web/app/view/document/customer/BasePanel.js

@@ -104,6 +104,11 @@ Ext.define('saas.view.document.customer.BasePanel', {
                     text : "类型", 
                     dataIndex : "cu_type", 
                     width : 100.0
+                }, {
+                    text: '币别',
+                    dataIndex: 'cu_currency',
+                    align: 'center',
+                    width: 65
                 }, {
                     text : "税率(%)", 
                     dataIndex : "cu_taxrate", 
@@ -119,11 +124,6 @@ Ext.define('saas.view.document.customer.BasePanel', {
                     renderer : function(v, m, r) {
                         return Ext.util.Format.number(v, '0');
                     }
-                }, {
-                    text: '币别',
-                    dataIndex: 'cu_currency',
-                    align: 'center',
-                    width: 65
                 }, {
                     text : "业务员", 
                     dataIndex : "cu_sellername",

frontend/saas-web/app/view/document/vendor/BasePanel.js

@@ -94,6 +94,11 @@ Ext.define('saas.view.document.vendor.BasePanel', {
                     text: "类型",
                     dataIndex: "ve_type",
                     width: 100.0
+                }, {
+                    text: '币别',
+                    dataIndex: 've_currency',
+                    align: 'center',
+                    width: 65
                 }, {
                     text: "税率(%)",
                     xtype: 'numbercolumn',
@@ -110,11 +115,6 @@ Ext.define('saas.view.document.vendor.BasePanel', {
                     renderer: function(v, m, r) {
                         return Ext.util.Format.number(v, '0');
                     }
-                }, {
-                    text: '币别',
-                    dataIndex: 've_currency',
-                    align: 'center',
-                    width: 65
                 }, {
                     text: "备注",
                     dataIndex: "ve_remark",

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"
         },{