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

README.md

@@ -81,11 +81,11 @@
 
 | 数据库      | 类型   | 地址   |  账号  |  密码  |  说明  |
 | --------   | :-----: | :-----:  | :----:  | :----: | :------  |
-| saas_account | mysql | 10.1.81.54:3306 |  root  | select111*** |  账户中心  |
-| saas_auth | mysql | 10.1.81.54:3306 |  root  | select111*** |  鉴权系统  |
-| saas_file | mysql | 10.1.81.54:3306 |  root  | select111*** |  文件系统  |
-| saas_mail | mysql | 10.1.81.54:3306 |  root  | select111*** |  邮件系统  |
-| saas_biz | mysql | 10.1.81.54:3306 |  root  | select111*** |  业务系统  |
+| saas_account | mysql | 10.1.81.79:3306 |  root  | select111*** |  账户中心  |
+| saas_auth | mysql | 10.1.81.79:3306 |  root  | select111*** |  鉴权系统  |
+| saas_file | mysql | 10.1.81.79:3306 |  root  | select111*** |  文件系统  |
+| saas_mail | mysql | 10.1.81.79:3306 |  root  | select111*** |  邮件系统  |
+| saas_biz | mysql | 10.1.81.79:3306 |  root  | select111*** |  业务系统  |
 | saas_ui | mongo | 10.1.81.63:27017 |    |  |  UI配置  |
 
 > 中间件
@@ -100,7 +100,7 @@
 
 | IP      |  账号  |  密码  |  环境  |  资源  |
 | --------   | :----:  | :----: | :------:  | :------:  |
-| 10.1.81.54 |  root  | select123*** |  CentOS7, MySQL  | Cpu: 8, Mem: 16G, Disk: 80G |
+| 10.1.81.79 |  root  | select123*** |  CentOS7, MySQL  | Cpu: 8, Mem: 16G, Disk: 80G |
 | 10.1.81.75 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
 | 10.1.81.78 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |
 | 10.1.81.76 |  root  | select123*** |  CentOS7, Docker  | Cpu: 4, Mem: 8G, Disk: 20G |

applications/commons/commons-server/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.79:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

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

@@ -9,7 +9,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.79:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

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/money/money-server/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.79:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

applications/purchase/purchase-server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.79:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

applications/sale/sale-server/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.79:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

applications/sale/sale-server/src/main/resources/mapper/SaleMapper.xml

@@ -717,6 +717,7 @@
   </select>
 
   <update id="updateDelivery" parameterType="long">
-    update saledetail set sd_delivery = (select sa_delivery from sale where sa_id=#{id}) where sd_said=#{id} and sa_delivery is null
+    update saledetail set sd_delivery = (select sa_delivery from sale where sa_id =#{id}  and sa_delivery is not null)
+     where  sd_said = #{id}  and sd_delivery is null and exists (select 1 from sale where sa_id =#{id}  and sa_delivery is not null)
   </update>
 </mapper>

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/application.yml

@@ -9,7 +9,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.79:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

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/

base-servers/account/account-server/src/main/resources/application.yml

@@ -24,7 +24,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_account?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.1.81.79:3306/saas_account?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:

base-servers/auth/auth-server/src/main/resources/application.yml

@@ -24,7 +24,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_auth?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.1.81.79:3306/saas_auth?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:

base-servers/datacenter/datacenter-server/src/main/resources/application.yml

@@ -24,7 +24,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_manage?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.1.81.79:3306/saas_manage?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:

base-servers/file/file-server/src/main/resources/application.yml

@@ -22,7 +22,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_file?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.1.81.79:3306/saas_file?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:

base-servers/mail/mail-server/src/main/resources/application.yml

@@ -22,7 +22,7 @@ spring:
       probability: 1.0
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_mail?characterEncoding=utf-8&useSSL=false
+    url: jdbc:mysql://10.1.81.79:3306/saas_mail?characterEncoding=utf-8&useSSL=false
     username: root
     password: select111***
     hikari:

base-servers/sms/sms-server/src/main/resources/application.yml

@@ -9,7 +9,7 @@ spring:
       password: select111***
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://10.1.81.54:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
+    url: jdbc:mysql://10.1.81.79:3306/saas_biz?characterEncoding=utf-8&useSSL=false&allowMultiQueries=true
     username: root
     password: select111***
     hikari:

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

@@ -1,11 +1,15 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <title>U企云服 - 邀请加入</title>
         <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0,maximum-scale=1.0, user-scalable=no"/>
-        <!-- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <meta name="renderer" content="webkit|ie-comp|ie-stand"> -->
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+        <meta name="description" content="">
+        <meta name="keywords" content="">
+        <meta name="viewport"
+                content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+        <meta name="renderer" content="webkit">
+        <meta http-equiv="Cache-Control" content="no-siteapp"/>
+        <title>U企云服 - 邀请加入</title>
         <!-- 浏览器图标 -->
         <link type="image/x-icon" href="../../../static/img/logo.png" rel="shortcut icon">
         <link rel="stylesheet" type="text/css" href="../../../static/css/invitation_mobile_join.css">
@@ -167,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,
@@ -180,41 +184,44 @@
         </script> 
     </head>
     <body>
-        <div class="x-join-center" hidden>
-            <div class="subtitle">U企云服</div>
-            <div style="margin:15px 0 0 0px">
-                <!-- 邀请人姓名 -->
-                <span id="sendman" style="padding:0 0 0 2px;color: #fff;"></span>
+        <div class="x-join" style="width:100%;height:100%">
+            <div class="x-join-center" hidden>
+                <div class="subtitle">U企云服</div>
+                <div style="margin:30px 0 0 0px">
+                    <!-- 邀请人姓名 -->
+                    <span id="sendman" style="padding:0 0 0 2px;color: #fff;"></span>
+                    </br>
+                    <!-- 邀请语 -->
+                    <span id="sendmsg" style="padding:10px 0 0 2px;margin:10px 0 0 0;color: #fff;"></span>
+                    </br>
+                </div>
+                <input id="myMobile" style="margin-bottom: 0px !important;margin: 50px auto;" class="input_style" type="text" onBlur="checkMobile()" placeholder="请输入手机号码"></input>
+                <input class="input_style" id="selectCode" type="text" placeholder="请输入验证码"></input>
+                <button style="position: absolute;" class="btn-check" type="button" id="checkBtn" onclick="getCode()">获取验证码</button>
+                <input class="input_style" id="selectName" type="text" placeholder="请输入姓名"></input>
+                <select class="input_style " id="selectJob" placeholder="请选择岗位(必填)"></select>
+                <button style="position: absolute;" class="expand_icon" type="button" ></button>
+                <button class="btn-submit" style="border-radius: 30px;width: 80%;      margin-top: 40px;   font-size: 18px; height: 47px;" type="button" id="joinBtn" onclick="join();">提 交</button>
+            </div>
+            <div class="x-join-bottom" style="    height: 55px;">
+                <span style="font-size:16px;padding:0 0 0 5px;color: #999;">U企云服 | 电子行业企业管理云端方案</span>
                 </br>
-                <!-- 邀请语 -->
-                <span id="sendmsg" style="padding:10px 0 0 2px;margin:10px 0 0 0;color: #fff;"></span>
+                <span style="font-size:16px;padding:0 0 0 5px;color: #999;">深圳市优软科技有限公司</span>
+            </div>
+            <div class="x-join-error" hidden>
+                </br></br></br></br>
+                <span id="error_code" style="padding:0 0 0 5px;color: #2f2c27;">访问链接已失效</span>
+            </div>
+            <div id="dialog-message" hidden>
+                <p style="font-size: 15px;">
+                    提交成功，欢迎你加入U企云服，通过https://saas.usoftchina.com访问U企云服，立即畅享轻松工作！
+                </p>
                 </br>
+                <p style="font-size: 13px;    color: #999;">
+                    新用户登录密码随后将发送短信通知<br>
+                    请注意查收
+                </p>
             </div>
-            <input id="myMobile" class="input_style" type="text" onBlur="checkMobile()" placeholder="请输入手机号码"></input>
-            <input class="input_style" id="selectCode" type="text" placeholder="请输入验证码"></input>
-            <button style="position: absolute;" class="btn-check" type="button" id="checkBtn" onclick="getCode()">获取验证码</button>
-            <input class="input_style" id="selectName" type="text" placeholder="请输入姓名"></input>
-            <select class="input_style" id="selectJob" style="width:100%;margin-top: 30px;opacity: 0.8;border-radius: 0px;" placeholder="请选择岗位(必填)"></select>
-			<button class="btn-submit" style="margin-left: 12px;border-radius: 30px;width: 240px;" type="button" id="joinBtn" onclick="join();">提 交</button>
-        </div>
-        <div class="x-join-bottom">
-            <span style="font-size:16px;padding:0 0 0 5px;color: #999;">U企云服 | 电子行业企业管理云端方案</span>
-            </br>
-            <span style="font-size:16px;padding:0 0 0 5px;color: #999;">深圳市优软科技有限公司</span>
-        </div>
-        <div class="x-join-error" hidden>
-            </br></br></br></br>
-            <span id="error_code" style="padding:0 0 0 5px;color: #2f2c27;">访问链接已失效</span>
-        </div>
-        <div id="dialog-message" hidden>
-            <p style="font-size: 15px;">
-                提交成功，欢迎你加入U企云服，通过https://saas.usoftchina.com访问U企云服，立即畅享轻松工作！
-            </p>
-            </br>
-            <p style="font-size: 13px;    color: #999;">
-                新用户登录密码随后将发送短信通知<br>
-                请注意查收
-            </p>
         </div>
     </body>
 </html>

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

@@ -3,7 +3,16 @@
 	padding: 0;
 	box-sizing: border-box
 }
+body, html {
+    min-height: 100%;
+}
 body {
+    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;
@@ -11,9 +20,9 @@ body {
 	color:#333;	
 }
 .x-join-bottom {
-	width: 100%;
-	position: fixed;
-	bottom: 0;
+    bottom: 0;
+    width: 100%;
+    position: absolute;
     height: 55px;
 	text-align: center;
 	background-color: #fff;
@@ -32,15 +41,13 @@ body {
 }
 .x-join-center {
 	width: 100%;
-    height: 400px;
-    position: absolute;
-    top: 50%;
+    height: 100%;
     /* left: 50%; */
-    margin-top: -200px;
     /* margin-left: -140px; */
     text-align: center;
 }
 .x-join-center .subtitle {
+    margin-top: 30px;
     margin-left: -15px;
 	display: block;
     height: 50px;
@@ -89,12 +96,14 @@ body {
 	margin: 15px 5px 0 30px;
 }
 .input_style{
+    -webkit-appearance: none;
+    font-size: 14.5px;
     margin: 0 auto;
     padding-top: 3px;
     padding-left: 13px;
-    width: 240px;
-    margin-top: 10px;
-    height: 36px;
+    width: 80%;
+    margin-top: 18px;
+    height: 40px;
 	display: block;
     color: #555;
     background-color: #fff;
@@ -107,10 +116,21 @@ body {
     -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
     transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
 }
-
+.expand_icon{
+    border: none;
+    margin-left: 292px;
+    position: absolute;
+    margin-top: -26px;
+    display: block;
+    height: 16px;
+    width: 28px;
+    background: url(../img/assets/expand.png)no-repeat right;
+}
 .btn-check{
+    border-top-right-radius: 30px;
+    border-bottom-right-radius: 30px;
     margin-top: -33px;
-    margin-left: 1px;
+    margin-left: 30px;
     line-height: 20px;
     height: 30px;
     background: #fff;
@@ -121,7 +141,7 @@ body {
     display: inline-block;
     /* padding: 0px; */
     margin-bottom: 0;
-    font-size: 14px;
+    font-size: 16px;
     font-weight: 400;
     text-align: center;
     white-space: nowrap;

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,10 +101,17 @@ 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;
-    top: 10%;
+    top: 0%;
+    margin-top: 180px;
     left: 50%;
     -ms-transform: translate(-50%,-50%);
     -moz-transform: translate(-50%,-50%);
@@ -110,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.json

@@ -286,7 +286,8 @@
                     "https": "https://saas-api-dev.usoftchina.com:5443",
                     "http": "http://10.1.81.61:8560"
                 },
-                "urlPattern": "^\/api\/"
+                "urlPattern": "^\/api\/",
+                "sso": "https://test-sso.uuzcc.cn"
             }
         },
         "test": {
@@ -297,7 +298,8 @@
                     "https": "https://saas-api-test.usoftchina.com:5443",
                     "http": "http://trade-test.usoftchina.com:5443"
                 },
-                "urlPattern": "^\/api\/"
+                "urlPattern": "^\/api\/",
+                "sso": "https://test-sso.uuzcc.cn"
             }
         },
         "prod": {
@@ -305,7 +307,8 @@
                 "accountCenter":"https://saas.usoftchina.com",
                 "accountEnterprise":"https://saas.usoftchina.com/#/enterprise",
                 "basePath": "https://saas-api.usoftchina.com",
-                "urlPattern": "^\/api\/"
+                "urlPattern": "^\/api\/",
+                "sso": "https://sso.ubtob.com"
             }
         }
     },

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/document/product/FormPanel.js

@@ -61,7 +61,7 @@ Ext.define('saas.view.document.product.FormPanel', {
             },{
                 xtype: 'textfield',
                 name: 'pr_detail',
-                fieldLabel: '名称',
+                fieldLabel: '物料名称',
                 allowBlank: false,
                 group: '基础信息',
             },{
@@ -188,6 +188,7 @@ Ext.define('saas.view.document.product.FormPanel', {
                 allowBlank : true, 
                 columnWidth : 0.25,
                 decimalPrecision: 4,
+                thousandSeparator: ',',
                 minValue:0,
                 group: '管理信息',
             },{
@@ -209,6 +210,7 @@ Ext.define('saas.view.document.product.FormPanel', {
                 name : "pr_saleprice", 
                 fieldLabel : "最新售价(元)", 
                 decimalPrecision: 4,
+                thousandSeparator: ',',
                 minValue:0,
                 group: '管理信息',
             },{  

frontend/saas-web/app/view/home/infoCardList/Payment.js

@@ -23,7 +23,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
     }, {
         text: '单据类型',
         dataIndex: 'pd_piclass',
-        width: 0
+        hidden: true
     }, {
         text: '单据日期',
         dataIndex: 'pi_date',
@@ -32,7 +32,7 @@ Ext.define('saas.view.home.infoCardList.Payment', {
     }, {
         text: '供应商编号',
         dataIndex: 'pi_vendcode',
-        width: 0
+        hidden: true
     }, {
         text: '供应商名称',
         dataIndex: 'pi_vendname',

frontend/saas-web/app/view/home/infoCardList/PurchaseIn.js

@@ -14,7 +14,6 @@ Ext.define('saas.view.home.infoCardList.PurchaseIn', {
     listColumns: [{
         text: 'id',
         dataIndex: 'pu_id',
-        width: 0,
         hidden: true
     }, {
         text: '采购单号',

frontend/saas-web/app/view/home/infoCardList/UnauditCheckIn.js

@@ -23,7 +23,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
     }, {
         text: '单据类型',
         dataIndex: 'pd_piclass',
-        width: 0
+        hidden: true
     }, {
         text: '单据日期',
         dataIndex: 'pi_date',
@@ -32,7 +32,7 @@ Ext.define('saas.view.home.infoCardList.UnauditCheckIn', {
     }, {
         text: '供应商编号',
         dataIndex: 'pi_vendcode',
-        width: 0
+        hidden: true
     }, {
         text: '供应商名称',
         dataIndex: 'pi_vendname',

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

@@ -241,6 +241,10 @@ Ext.define('saas.view.main.MainController', {
     },
 
     shareCompany:function(){
+        if(this.getViewModel()._parent.data.account.companyId==2){
+            saas.util.BaseUtil.showErrorToast('演示账套无法分享');
+            return false;
+        }
         //打开分享窗口
         var win = Ext.create('Ext.window.Window', {  
             cls:'x-window-dbfind', 

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -60,11 +60,11 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 }, {
                     text: "转出账户ID",
                     dataIndex: "ftd_bankid",
-                    width: 0
+                    hidden: true
                 }, {
                     text: "转出账户编号",
                     dataIndex: "ftd_bankcode",
-                    width: 0
+                    hidden: true
                 }, {
                     text: "转出账户",
                     width: 200.0,
@@ -92,11 +92,11 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                 }, {
                     text: "转入账户ID",
                     dataIndex: "ftd_inbankid",
-                    width: 0
+                    hidden: true
                 }, {
                     text: "转入账户编号",
                     dataIndex: "ftd_inbankcode",
-                    width: 0
+                    hidden: true
                 }, {
                     text: "转入账户",
                     width: 200.0,

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -113,7 +113,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         }, {
             text: '结算号',
             dataIndex: 'ftd_paycode',
-            width: 0
+            hidden: true
         },{
             text: '审核状态',
             dataIndex: 'ft_status',

frontend/saas-web/app/view/money/payBalance/QueryPanel.js

@@ -71,7 +71,6 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             {
                 text: 'id',
                 dataIndex: 'id',
-                width: 0,
                 xtype: 'numbercolumn',
                 hidden: true
             }, {
@@ -104,7 +103,6 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         relativeColumn: [{
             text: 'id',
             dataIndex: 'id',
-            width: 0,
             xtype: 'numbercolumn',
             hidden: true
         }, {

frontend/saas-web/app/view/money/verification/FormPanel.js

@@ -61,6 +61,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
 
         detail1: {
             xtype: "detailGridField",
+            name: 'detail1',
             storeModel: 'saas.model.money.Verification1',
             detnoColumn: 'vd_detno',
             deleteDetailUrl: '/api/money/verification/deleteDetail1',
@@ -159,6 +160,7 @@ Ext.define('saas.view.money.verification.FormPanel', {
         },
         detail2: {
             xtype: "detailGridField",
+            name: 'detail2',
             storeModel: 'saas.model.money.Verification2',
             detnoColumn: 'vcd_detno',
             deleteDetailUrl: '/api/money/verification/deleteDetail2',

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

@@ -97,7 +97,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         {
             text: 'id',
             dataIndex: 'pu_id',
-            width: 0,
             xtype: 'numbercolumn',
             hidden:true
         }, {
@@ -161,7 +160,6 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
         {
             text: 'id',
             dataIndex: 'pu_id',
-            width: 0,
             hidden: true
         }, {
             text: '采购单号',

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

@@ -111,7 +111,7 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         },{
             text: '单据类型',
             dataIndex: 'pi_class',
-            width: 0
+            hidden: true
         },{
             text: '单据日期',
             dataIndex: 'pi_date',

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

@@ -117,7 +117,7 @@ Ext.define('saas.view.purchase.purchaseOut.QueryPanel', {
         }, {
             text: '单据类型',
             dataIndex: 'pi_class',
-            width: 0
+            hidden: true
         }, {
             text: '单据日期',
             dataIndex: 'pi_date',

frontend/saas-web/app/view/purchase/report/Purchase.js

@@ -52,6 +52,7 @@ Ext.define('saas.view.purchase.report.Purchase', {
     }, {
         text: '业务状态',
         dataIndex: 'pu_acceptstatus',
+        align: 'center',
         width: 80
     }, {
         text: '采购员',
@@ -62,6 +63,16 @@ Ext.define('saas.view.purchase.report.Purchase', {
         xtype: 'datecolumn',
         dataIndex: 'pu_date',
         width: 110
+    }, {
+        text: '序号',
+        xtype: 'numbercolumn',
+        dataIndex: 'pd_detno',
+        align: 'center',
+        exportFormat: 'Integer',
+        width: 65,
+        renderer : function(v) {
+            return saas.util.BaseUtil.numberFormat(v, 0, true);
+        }
     }, {
         text: '物料编号',
         dataIndex: 'pd_prodcode',

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

@@ -109,7 +109,7 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 }, {
                     text: "物料id",
                     dataIndex: "sd_prodid",
-                    width: 0
+                    hidden: true
                 }, {
                     text: "物料编号",
                     width: 150.0,
@@ -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',

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -149,7 +149,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
             dataIndex: 'pi_prstatus',
             width: 80
         }, {
-            text: '关联出货号',
+            text: '关联出货单号',
             dataIndex: 'pi_iocode',
             width: 150
         }, {

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

@@ -126,7 +126,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 }, {
                     text: "物料id",
                     dataIndex: "pd_prodid",
-                    width: 0
+                    hidden: true
                 }, {
                     text: "物料编号",
                     width: 150.0,

frontend/saas-web/app/view/stock/inventory/EditDataList.js

@@ -46,7 +46,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         xtype: 'warehouseDbfindTrigger',
         name: 'wh_description',
         bind: '{form.wh_description}',
-        emptyText: '仓库',
+        emptyText: '请输入仓库名称',
         dbfinds:[{
             from:'wh_description',to:'wh_description'
         }],
@@ -57,7 +57,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         storeUrl:'/api/document/producttype/getCombo',
         name : "pr_kind",
         bind: '{form.pr_kind}',
-        emptyText : "类型",
+        emptyText : "物料类型",
         hiddenBtn:true,
         //width:150
     },{
@@ -184,7 +184,7 @@ Ext.define('saas.view.stock.inventory.EditDataList', {
         text : "盘盈盘亏", 
         dataIndex : "st_num", 
         width : 110.0, 
-        aligin: 'right',
+        align: 'right',
         renderer : function(v) {
             return saas.util.BaseUtil.numberFormat(v, 3, true);
         }  

frontend/saas-web/app/view/stock/make/QueryPanel.js

@@ -153,7 +153,7 @@ Ext.define('saas.view.stock.make.QueryPanel', {
             text: '单位成本',
             dataIndex: 'ma_total',
             xtype: 'numbercolumn',
-            width: 0,
+            hidden: true,
         }],
         relativeColumn: []
     }

frontend/saas-web/app/view/stock/report/ProdinoutCount.js

@@ -14,8 +14,7 @@ Ext.define('saas.view.stock.report.ProdinoutCount', {
     searchItems: [{		
         xtype: 'textfield',
         name: 'wh_description',
-        fieldLabel: '仓库',
-        emptyText:'输入仓库编号或名称',
+        emptyText:'输入仓库编号',
         columnWidth: 0.2,
         getCondition: function(value) {
            return  ' (wh_description like\'%' + value + '%\' or wh_code like \'%'+value+'%\') ';

frontend/saas-web/app/view/viewport/ViewportController.js

@@ -265,7 +265,7 @@ Ext.define('saas.view.viewport.ViewportController', {
         if (this.ipc) {
             // window.close();
         } else {
-            window.location.href = Ext.manifest.server.accountCenter;
+            window.location.href = Ext.manifest.server.sso+'/logquit?appId=sp&returnURL='+Ext.manifest.server.accountCenter
         }
     }
 });