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

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

@@ -0,0 +1,13 @@
+eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+    health-check-url-path: /actuator/health
+    status-page-url-path: /actuator/info
+    prefer-ip-address: true
+    metadata-map:
+      user.name: ${spring.security.user.name}
+      user.password: ${spring.security.user.password}
+  client:
+    registryFetchIntervalSeconds: 5
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/MakeListDTO.java

@@ -16,6 +16,7 @@ public class MakeListDTO extends CommonBaseDTO implements Serializable {
 
     private Make main;
     private List<MakeMaterial> items;
+    private boolean codeModified;
 
     public Make getMain() {
         return main;
@@ -40,4 +41,12 @@ public class MakeListDTO extends CommonBaseDTO implements Serializable {
 
     public MakeListDTO() {
     }
+
+    public boolean isCodeModified() {
+        return codeModified;
+    }
+
+    public void setCodeModified(boolean codeModified) {
+        this.codeModified = codeModified;
+    }
 }

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/service/impl/MakeServiceImpl.java

@@ -96,7 +96,11 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
         Make make = makeListDTO.getMain();
         Long ma_id = make.getId();
         List<MakeMaterial> makeMaterialList = makeListDTO.getItems();
-        String code = pushMaxnubmer(make.getMa_code(), make.getId());
+        String code = make.getMa_code();
+        if (makeListDTO.isCodeModified()) {
+             code = pushMaxnubmer(code, make.getId());
+        }
+        make.setMa_code(code);
         DocBaseDTO docBaseDTO = null;
         //校验组合件和子件不允许相同
         if (makeMaterialList.size() > 0){
@@ -111,7 +115,6 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             //保存主表
             make.setCompanyId(BaseContextHolder.getCompanyId());
             make.setCreateTime(new Date());
-            make.setMa_code(code);
             getMapper().insertSelective(make);
             ma_id = make.getId();
             //录入人

applications/storage/storage-server/src/main/resources/config/application-dev.yml

@@ -0,0 +1,13 @@
+eureka:
+  instance:
+    leaseRenewalIntervalInSeconds: 10
+    health-check-url-path: /actuator/health
+    status-page-url-path: /actuator/info
+    prefer-ip-address: true
+    metadata-map:
+      user.name: ${spring.security.user.name}
+      user.password: ${spring.security.user.password}
+  client:
+    registryFetchIntervalSeconds: 5
+    serviceUrl:
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/

frontend/saas-portal-web/src/pages/invitation_mobile_join/invitation_mobile_join.html

@@ -171,7 +171,7 @@
             function addToast(msg,type){
                 $.Toast("", msg, type, {
                 	stack: false,
-                    has_icon:false,
+                    has_icon:true,
                     has_close_btn:false,
                     fullscreen:false,
                     timeout:2000,

frontend/saas-portal-web/static/css/invitation_mobile_join.css

@@ -7,9 +7,12 @@ body, html {
     min-height: 100%;
 }
 body {
-    position: fixed;
-    width: 100%;
+    background-repeat: no-repeat;
+    background-position: center;
+    background-attachment: fixed;
+    z-index: -1;
     height: 100%;
+    width: 100%;
     background-size: cover;
     background-image: url(../img/invitation_background.png);
 	font-family: Microsoft YaHei, 微软雅黑, simhei;
@@ -17,7 +20,7 @@ body {
 	color:#333;	
 }
 .x-join-bottom {
-    margin-top: -85px;
+    bottom: 0;
     width: 100%;
     position: absolute;
     height: 55px;

frontend/saas-portal-web/static/css/toast.style.css

@@ -20,7 +20,7 @@ i {
   -moz-osx-font-smoothing: grayscale; }
 
 .toast-icon-error:before {
-  content: ""; }
+  content: "×"; }
 
 .toast-icon-info:before {
   content: ""; }
@@ -29,10 +29,10 @@ i {
   content: ""; }
 
 .toast-icon-success:before {
-  content: ""; }
+  content: "√"; }
 
 .toast-icon-warning:before {
-  content: ""; }
+  content: "!"; }
 
 .toast-item-wrapper {
   min-width: 250px;
@@ -45,13 +45,15 @@ i {
   -ms-user-select: none;
   user-select: none; }
   .toast-item-wrapper i.toast-icon {
+    border-radius: 30px;
+    border: 1px solid #bdbdbd;
     position: absolute;
-    top: 12px;
-    left: 0;
-    width: 50px;
+    top: 4px;
+    left: 20px;
+    width: 24px;
     text-align: center;
     vertical-align: middle;
-    font-size: 2rem; }
+    font-size: 20px; }
   .toast-item-wrapper .toast-close {
     font-size: 1.2rem;
     position: absolute;
@@ -61,11 +63,27 @@ i {
     text-align: center;
     cursor: pointer; }
   .toast-item-wrapper.success {
-    background-color: #29ab9f;
-    border: 1px solid #1a9581; }
+    border-radius: 30px;
+    border: 1px solid #bdbdbd;
+    position: absolute;
+    top: 4px;
+    left: 20px;
+    width: 24px;
+    text-align: center;
+    vertical-align: middle;
+    font-size: 20px;
+  }
   .toast-item-wrapper.error {
-    background-color: #ff7946;
-    border: 1px solid #f35818; }
+    border-radius: 30px;
+    border: 1px solid #bdbdbd;
+    position: absolute;
+    top: 4px;
+    left: 20px;
+    width: 24px;
+    text-align: center;
+    vertical-align: middle;
+    font-size: 20px;
+  }
   .toast-item-wrapper.warning {
     background-color: #fff1c0;
     border: 1px solid #f0c948;
@@ -83,6 +101,12 @@ i {
     right: 20px;
     top: 20px; }
   .toast-item-wrapper.toast-top-center {
+    font-size: 15px;
+    padding: 5px;
+    color: #fff;
+    opacity: 0.39;
+    background: #050505;
+    border-radius: 8px;
     min-width: 240px !important;
     position: absolute;
     margin-left: 5px;
@@ -111,7 +135,7 @@ i {
     margin: 0; }
   .toast-item-wrapper .toast-message {
     text-align: center;
-    font-size: 0.87rem; }
+    font-size: 15px; }
   .toast-item-wrapper .toast-progress {
     width: 0;
     height: 3px;

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

@@ -34,6 +34,7 @@ Ext.define('saas.view.core.form.FormPanel', {
     invalidText: '表单校验有误，请检查后重试', // 校验未通过提示内容
     dirtyAuditText: '表单数据有修改，是否先保存修改？', // 有修改时点击审核提示内容
     noDirtySaveText: '表单数据无修改', // 无修改点击保存提示内容
+    dirtyCloseText: '表单数据有修改，确认要离开吗？', // 有修改时点击关闭提示内容
 
     auditTexts: {
         auditCode: 'AUDITED',
@@ -617,15 +618,12 @@ Ext.define('saas.view.core.form.FormPanel', {
         controller = me.getController();
 
         if(me.isDirty()) {
-            return saas.util.BaseUtil.showConfirm('提示', '表单数据有修改，离开前要保存吗？', {
-                buttons: Ext.Msg.YESNOCANCEL
+            return saas.util.BaseUtil.showConfirm('提示', me.dirtyCloseText, {
+                buttons: Ext.Msg.YESNO
             }).then(function(yes) {
                 if(yes === 'yes') {
-                    controller.onSave();
-                    return false;
-                }else if(yes === 'no') {
                     return true;
-                }else {
+                }else if(yes === 'no') {
                     return false
                 }
             })

frontend/saas-web/app/view/core/form/FormPanel.scss

@@ -74,6 +74,7 @@
             font-weight: bold;
             height: 100%;
             line-height: 100%;
+            font-size: 14px;
             vertical-align: middle;
 
             &:before {

frontend/saas-web/app/view/core/form/field/DetailGridField.js

@@ -68,15 +68,19 @@ Ext.define('saas.view.core.form.field.DetailGridField', {
             listeners: {
                 boxready: function(g) {
                     var f = g.ownerCt,
-                    ih = g.initialConfig.height,
+                    ih = g.initialConfig.height || 0,
+                    iminh = g.initialConfig.minHeight || 0,
+                    // 最小高度等于设定的最小高度或者设定的高度
+                    minh = ih ? (iminh ? Math.min(ih, iminh) : 0) : iminh,
                     c = f.detailCount || 1,
                     fb = f.getBox(),
                     fh = fb.height,
                     h = (fh * 0.5) / c;
 
-                    if(ih) {
-                        g.setMinHeight(ih);
-                        h = ih;
+                    // 当自适应高度比设定的最小高度还要小时取设定的最小高度
+                    if(minh && h < minh) {
+                        g.setMinHeight(minh);
+                        h = minh;
                     }
                     g.setHeight(h);
                 },

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

@@ -235,12 +235,13 @@ Ext.define('saas.view.document.customer.FormPanel', {
                 name : "cu_remark",
                 columnWidth : 1
             }, {
-                xtype : "detailGridField", 
+                xtype : "detailGridField",
+                name: 'detailGridField',
                 storeModel:'saas.model.document.customercontact',
                 detnoColumn: 'cc_detno',
                 showCount: false,
                 deleteDetailUrl:'/api/document/customer/deletecontact',
-                // minHeight:145,
+                minHeight:145,
                 emptyRows: 3,
                 columns : [
                     {
@@ -300,12 +301,13 @@ Ext.define('saas.view.document.customer.FormPanel', {
                         xtype : "yncolumn"
                     }]
             } ,{
-                xtype : "detailGridField", 
+                xtype : "detailGridField",
+                name: 'detailGridField',
                 storeModel:'saas.model.document.customeraddress',
                 detnoColumn: 'ca_detno',
                 showCount: false,
                 deleteDetailUrl:'/api/document/customer/deleteaddress',
-                // height:145,
+                minHeight:145,
                 emptyRows: 3,
                 columns : [
                     {

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

@@ -397,6 +397,36 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 name: "sa_auditdate",
                 fieldLabel: "审核日期",
                 readOnly: true
+            }, {
+                xtype: "textfield",
+                name: "sa_text1",
+                fieldLabel: "自定义字段1",
+                hidden: true,
+                initHidden: false
+            }, {
+                xtype: "textfield",
+                name: "sa_text2",
+                fieldLabel: "自定义字段2",
+                hidden: true,
+                initHidden: false
+            }, {
+                xtype: "textfield",
+                name: "sa_text3",
+                fieldLabel: "自定义字段3",
+                hidden: true,
+                initHidden: false
+            }, {
+                xtype: "textfield",
+                name: "sa_text4",
+                fieldLabel: "自定义字段4",
+                hidden: true,
+                initHidden: false
+            }, {
+                xtype: "textfield",
+                name: "sa_text5",
+                fieldLabel: "自定义字段5",
+                hidden: true,
+                initHidden: false
             }],
             toolBtns: [{
                 xtype: 'button',