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

applications/document/document-dto/src/main/java/com.usoftchina.saas.document.dto/ProductDTO.java

@@ -8,7 +8,7 @@ import java.util.Date;
 @Data
 public class ProductDTO implements Serializable {
 
-    private Long pr_id;
+    private Long id;
     private String pr_code;
     private String pr_detail;
     private String pr_spec;

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

@@ -42,7 +42,7 @@
     <result column="pd_yqty" jdbcType="INTEGER" property="pd_yqty" />
     <result column="pd_ioid" jdbcType="INTEGER" property="pd_ioid" />
     <association property="productDTO" javaType="com.usoftchina.saas.document.dto.ProductDTO">
-      <id column="pr_id" property="pr_id"/>
+      <id column="pr_id" property="id"/>
       <result column="pr_code" property="pr_code"/>
       <result column="pr_detail" property="pr_detail"/>
       <result column="pr_spec" property="pr_spec"/>

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

@@ -51,7 +51,8 @@
     </resultMap>
 
     <select id="selectPurchaseListByCondition" resultMap="BaseResultMap">
-        select  *  from sale left join saledetail on sa_id=sd_said
+        select  *  from sale left join saledetail on sa_id=sd_said left join product
+        on sd_prodid = pr_id and sale.companyId = product.companyid
         <where>
             <if test="con != null">
                 ${con}

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

@@ -37,7 +37,8 @@ Ext.define('saas.util.FormUtil', {
                     Ext.Array.each(items, function(item) {
 
                         if(item.xtype == 'datefield') {
-                            item.format = 'Y-m-d H:i:s'
+                            item.format = 'Y-m-d';
+                            item.formatText = '';
                         }
 
                         if(item.xtype == 'numberfield') {
@@ -87,8 +88,12 @@ Ext.define('saas.util.FormUtil', {
                                 }
 
                                 if(c.xtype == 'datecolumn') {
-                                    Ext.apply(c.xtype, {
-                                        format: 'Y-m-d H:i:s'
+                                    Ext.apply(c, {
+                                        format: 'Y-m-d'
+                                    });
+                                }else if(c.xtype == 'numbercolumn') {
+                                    Ext.applyIf(c, {
+                                        align: 'end'
                                     });
                                 }
                                 

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

@@ -53,6 +53,7 @@ Ext.define('saas.view.core.form.ConDateField', {
             xtype: 'datefield',
             name: me.name + '_from',
             format: 'Y-m-d',
+            formatText: '',
             allowBlank: allowBlank,
             flex: 1,
             fieldStyle: me.fieldStyle,
@@ -86,6 +87,7 @@ Ext.define('saas.view.core.form.ConDateField', {
             name: me.name + '_to',
             allowBlank: allowBlank,
             format: 'Y-m-d',
+            formatText: '',
             flex: 1,
             fieldStyle: me.fieldStyle,
             listeners: {

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

@@ -85,7 +85,8 @@ Ext.define('saas.view.core.form.FormPanel', {
                     }
                 }, {
                     xtype: 'tbtext',
-                    html: '已审核',
+                    // html: '已审核',
+                    html: auditTexts.auditText,
                     cls: 'x-audited',
                     hidden: true,
                     bind: {

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

@@ -1,9 +1,30 @@
 .x-detailgridfield {
 
     .x-grid-view {
-        
+
         .x-grid-empty {
             padding: 8px 10px;
         }
     }
+}
+
+.x-column-header{
+    text-align: center !important;
+    border-width: 1px;
+}
+.x-column-header .x-column-header-text {
+    font: "microsoft yahei";
+    text-align: center;
+    font-size:14px;
+    font-weight: 500;
+}
+.x-grid-necessary .x-column-header-text:before{
+    content: '*';
+    font-size: 130%;
+    color: #ff0000;
+    width: 5px;
+    height: 5px;
+    margin-top: 4px;
+    margin-left: -10px;
+    position: absolute;
 }

frontend/saas-web/app/view/main/Main.scss

@@ -127,26 +127,6 @@ $treelist-nav-ui: (
     color:#fff !important;
 }
 
-.x-grid-necessary .x-column-header-text:before{
-    content: '*';
-    font-size: 130%;
-    color: #ff0000;
-    width: 5px;
-    height: 5px;
-    margin-top: 4px;
-    margin-left: -10px;
-    position: absolute;
-}
-.x-grid-necessary{
-    text-align: center !important;
-    border-width: 1px;
-}
-.x-grid-necessary .x-column-header-text {
-    font: "microsoft yahei";
-    text-align: center;
-    font-size:14px;
-    font-weight: 500;
-}
 .x-query-menu {
     width:68px !important;
 }

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

@@ -181,8 +181,7 @@ Ext.define('saas.view.purchase.purchase.QueryPanel', {
             text: '已转数',
             dataIndex: 'pd_ytqy',
             xtype: 'numbercolumn',
-            width: 120,
-            flex: 1
+            width: 120
         }]
     }
 });

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

@@ -186,7 +186,6 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 editor : {
                     xtype : ""
                 },
-                flex : 1.0,
             }
         ]
     }, {

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

@@ -124,12 +124,11 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         }, {
             text: '收货地址',
             dataIndex: 'sa_toplace',
-            width: 200
+            width: 380
         }, {
             text: '备注',
             dataIndex: 'sa_remark',
-            width: 250,
-            flex:1
+            width: 250
         }
     ],
         relativeColumn: [ {
@@ -191,8 +190,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         }, {
             text: '备注',
             dataIndex: 'sd_remark',
-            width: 250,
-            flex: 1
+            width: 250
         }]
     }
 });