Merge remote-tracking branch 'origin/dev' into dev

base-servers/account/account-dto/src/main/java/com/usoftchina/saas/account/dto/AccountCopyDTO.java

@@ -0,0 +1,104 @@
+package com.usoftchina.saas.account.dto;
+
+import java.io.Serializable;
+
+/**
+ * 用于从其他平台复制已注册用户信息过来的接口
+ *
+ * @author yingp
+ * @date 2018/11/15
+ */
+public class AccountCopyDTO implements Serializable{
+    private String username;
+    /**
+     * 密文密码
+     */
+    private String password;
+    private String salt;
+    private String realname;
+    private String email;
+    private String mobile;
+    /**
+     * 账号类型 0 - 管理员
+     */
+    private Integer type;
+    private Long uu;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getSalt() {
+        return salt;
+    }
+
+    public void setSalt(String salt) {
+        this.salt = salt;
+    }
+
+    public String getRealname() {
+        return realname;
+    }
+
+    public void setRealname(String realname) {
+        this.realname = realname;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    public Long getUu() {
+        return uu;
+    }
+
+    public void setUu(Long uu) {
+        this.uu = uu;
+    }
+
+    @Override
+    public String toString() {
+        return "AccountCopyDTO{" +
+                "username='" + username + '\'' +
+                ", password='" + password + '\'' +
+                ", salt='" + salt + '\'' +
+                ", realname='" + realname + '\'' +
+                ", email='" + email + '\'' +
+                ", mobile='" + mobile + '\'' +
+                ", type=" + type +
+                ", uu=" + uu +
+                '}';
+    }
+}

base-servers/account/account-dto/src/main/java/com/usoftchina/saas/account/dto/CompanyCopyDTO.java

@@ -0,0 +1,77 @@
+package com.usoftchina.saas.account.dto;
+
+import io.swagger.annotations.ApiModel;
+
+import java.io.Serializable;
+
+/**
+ * 用于从其他平台复制已注册企业信息过来的接口
+ *
+ * @author yingp
+ * @date 2018/11/15
+ */
+@ApiModel(value = "CompanyCopy", description = "公司注册信息")
+public class CompanyCopyDTO implements Serializable{
+    /**
+     * 唯一名称
+     */
+    private String name;
+    /**
+     * 商业登记证号
+     */
+    private String businessCode;
+    private String address;
+    private String logoUrl;
+    private Long uu;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getBusinessCode() {
+        return businessCode;
+    }
+
+    public void setBusinessCode(String businessCode) {
+        this.businessCode = businessCode;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getLogoUrl() {
+        return logoUrl;
+    }
+
+    public void setLogoUrl(String logoUrl) {
+        this.logoUrl = logoUrl;
+    }
+
+    public Long getUu() {
+        return uu;
+    }
+
+    public void setUu(Long uu) {
+        this.uu = uu;
+    }
+
+    @Override
+    public String toString() {
+        return "CompanyCopyDTO{" +
+                "name='" + name + '\'' +
+                ", businessCode='" + businessCode + '\'' +
+                ", address='" + address + '\'' +
+                ", logoUrl='" + logoUrl + '\'' +
+                ", uu=" + uu +
+                '}';
+    }
+}

frontend/saas-web/app/model/purchase/purchasedetail.js

@@ -22,6 +22,7 @@ Ext.define('saas.model.purchase.Purchasedetail', {
         { name: 'pd_salecode', type: 'string' },
         { name: 'pd_saledetno', type: 'int' },
         { name: 'pd_sdid', type: 'int' },
+        { name: 'pd_remark', type: 'string' },
         { name: 'companyid', type: 'int' },
         { name: 'updaterId', type: 'int' },
         { name: 'updatedate', type: 'date' },

frontend/saas-web/app/view/core/query/QueryGridPanel.js

@@ -92,13 +92,20 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                         viewModel = queryPanel.getViewModel(),
                         moreQuery = viewModel.get('moreQuery'),
                         condition = queryPanel.getConditions(moreQuery),
-                        defaultCondition = me.defaultCondition,
+                        defaultCondition1 = queryPanel.defaultCondition,
+                        defaultCondition2 = me.defaultCondition,
                         mode = queryPanel.getQueryMode();
 
-                        if(defaultCondition) {
+                        if(defaultCondition1) {
                             condition.push({
                                 type: 'condition',
-                                value: defaultCondition
+                                value: defaultCondition1
+                            });
+                        }
+                        if(defaultCondition2) {
+                            condition.push({
+                                type: 'condition',
+                                value: defaultCondition2
                             });
                         }
                         Ext.apply(store.proxy.extraParams, {
@@ -124,6 +131,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
             dockedItems: [{
                 xtype: 'toolbar',
                 dock: 'top',
+                hidden: !me.showtool,
                 defaults: { // defaults 将会应用所有的子组件上,而不是父容器
                     listeners: {
                         'mouseover':function(){

frontend/saas-web/app/view/core/query/QueryPanel.js

@@ -16,8 +16,9 @@ Ext.define('saas.view.core.query.QueryPanel', {
         reference: 'queryform',
         xtype: 'core-query-queryformpanel',
         width: '100%',
+        margin: '0 0 12 0',
     }, {
-        margin: '12 0 0 0',
+        // margin: '12 0 0 0',
         padding: '8 12 8 12',// padding: 8px 12px 8px 12px;
         reference: 'querygrid',
         xtype: 'core-query-querygridpanel',
@@ -27,11 +28,22 @@ Ext.define('saas.view.core.query.QueryPanel', {
 
     initComponent: function () {
         var me = this;
-        me.setQueryFormItems();
+        me.initQueryPanel();
+        // me.setQueryFormItems();
         me.setQuertGridConfigs();
         me.callParent(arguments);
     },
 
+    initQueryPanel: function() {
+        var me = this;
+        if(me.simpleMode) {
+            me.items[0].hidden = true;
+        }else {
+            me.items[0].hidden = false;
+            me.setQueryFormItems();
+        }
+    },
+
     getQueryForm: function () {
         var me = this,
         queryForm = me.items[0];
@@ -116,6 +128,7 @@ Ext.define('saas.view.core.query.QueryPanel', {
         }
 
         me.queryGridConfig['columns']=columns;
+        me.queryGridConfig['showtool'] = !me.simpleMode;
         Ext.apply(queryGrid,me.queryGridConfig);
     },
 
@@ -133,6 +146,10 @@ Ext.define('saas.view.core.query.QueryPanel', {
         condition,
         conditions = [];
 
+        if(me.simpleMode) {
+            return conditions;
+        }
+
         if(moreQuery) {
             for(k in moreItems) {
                 var item = Ext.Array.findBy(moreQueryFormItems, function(i) {
@@ -274,6 +291,10 @@ Ext.define('saas.view.core.query.QueryPanel', {
         formData = viewModelData['form'],
         detailModel = false;
 
+        if(me.simpleMode) {
+            return 'DETAIL';
+        }
+
         for(var i = 0; i < formItems.length; i++) {
             var item = formItems[i],
             showDetail = item.showDetail,

frontend/saas-web/app/view/home/InfoCard.js

@@ -34,27 +34,39 @@ Ext.define('saas.view.home.InfoCard', {
     cards: {
         unship: {
             title: '七天内待出货销售',
-            color: 'yellow'
+            color: 'yellow',
+            viewType: 'sale-sale-querypanel',
+            condition: '1=1'
         },
         unstorage: {
             title: '七天内待入库采购',
-            color: 'purple'
+            color: 'purple',
+            viewType: 'purchase-purchase-querypanel',
+            condition: '1=1'
         },
         unpay: {
             title: '七天内待付款',
-            color: 'red'
+            color: 'red',
+            viewType: 'money-paybalance-querypanel',
+            condition: '1=1'
         },
         unreceive: {
             title: '七天内待收款',
-            color: 'pink'
+            color: 'pink',
+            viewType: 'money-recbalance-querypanel',
+            condition: '1=1'
         },
         unauditcheck: {
             title: '未审核验收',
-            color: 'blue'
+            color: 'blue',
+            viewType: 'purchase-purchasein-querypanel',
+            condition: '1=1'
         },
         unauditship: {
             title: '未审核出货',
-            color: ''
+            color: 'default',
+            viewType: 'sale-saleout-querypanel',
+            condition: '1=1'
         }
     },
 
@@ -131,7 +143,15 @@ Ext.define('saas.view.home.InfoCard', {
             var view = Ext.create('Ext.view.View', {
                 store: store,
                 tpl: new Ext.XTemplate(me.cardTpl),
-                itemSelector: 'div.x-info-card-body',
+                itemSelector: 'div.x-box',
+                listeners: {
+                    itemclick: function(th, record, item, index, e, eOpts) {
+                        openTab(record.get('viewType'), record.get('title'), record.get('id'), {
+                            simpleMode: true,
+                            defaultCondition: record.get('condition')
+                        });
+                    }
+                }
             });
 
             var item = {

frontend/saas-web/app/view/home/InfoCard.scss

@@ -24,7 +24,12 @@ $max-card-width: 235px;
                         box-shadow: 0 0 1px rgba(0,0,0,.125), 0 1px 3px rgba(0,0,0,.2);
                         position: relative;
                         display: block;
+                        cursor: pointer;
             
+                        &:hover {
+                            opacity: 0.7;
+                        }
+
                         h3 {
                             font-size: 16px;
                         }

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

@@ -54,7 +54,7 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         codeField: 'pb_code',
         addTitle: '付款单',
         addXtype: 'money-paybalance-formpanel',
-        defaultCondition:'1=1',
+        defaultCondition:'',
         baseVastUrl: '/api/money/paybalance/',
         // baseVastUrl: 'http://192.168.253.35:8880/paybalance/',
         baseColumn: [{
@@ -202,5 +202,10 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
             },
         }],
         relativeColumn: []
+    },
+
+    // override
+    getQueryMode: function() {
+        return 'MAIN';
     }
 });

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

@@ -148,5 +148,10 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
             width: 120,
         },
         ]
+    },
+
+    // override
+    getQueryMode: function() {
+        return 'MAIN';
     }
 });