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

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/ProdInOutDTO.java

@@ -35,13 +35,15 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private String pi_pucode;
 
-    private Integer pi_said;
+    private Long pi_said;
 
     private String pi_sacode;
 
     private Double pi_total;
 
-    private Integer pi_recordmanid;
+    private Double pi_nettotal;
+
+    private Long pi_recordmanid;
 
     private String pi_recordman;
 
@@ -75,4 +77,8 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private Long pi_ioid;
 
+    private String pi_macode;
+
+    private Long pi_maid;
+
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOut.java

@@ -8,6 +8,7 @@ import java.util.Date;
 @Data
 public class ProdInOut extends CommonBaseEntity implements Serializable {
 
+
     private String pi_inoutno;
 
     private String pi_class;
@@ -30,13 +31,15 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private String pi_pucode;
 
-    private Integer pi_said;
+    private Long pi_said;
 
     private String pi_sacode;
 
     private Double pi_total;
 
-    private Integer pi_recordmanid;
+    private Double pi_nettotal;
+
+    private Long pi_recordmanid;
 
     private String pi_recordman;
 
@@ -70,4 +73,8 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private Long pi_ioid;
 
+    private String pi_macode;
+
+    private Long pi_maid;
+
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/PurchaseServiceImpl.java

@@ -486,8 +486,6 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 purchasedetailMapper.updateByPrimaryKeySelective(purchaseDetail);
             }
         }
-        //更新默认仓库
-//        prodInOutService.getDefaultWarehouseByProduct(pi_id);
         //采购验收单相关计算
         prodInOutService.calcProdInout(pi_id,"采购验收单");
         DocBaseDTO baseDTO = new DocBaseDTO(pi_id, piInoutno, BillCodeSeq.PURCHASEIN.getName());
@@ -510,6 +508,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         purchase.setPu_acceptstatuscode(Status.UNAUDITED.name());
         purchase.setUpdateTime(new Date());
         purchase.setUpdaterId(BaseContextHolder.getUserId());
+        getMapper().updateByPrimaryKeySelective(purchase);
         //更新存在字段
         //日志
         messageLogService.audit(docBaseDTO);

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

@@ -33,7 +33,7 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private String pi_custname;
 
-    private Integer pi_puid;
+    private Long pi_puid;
 
     private String pi_pucode;
 
@@ -43,7 +43,9 @@ public class ProdInOutDTO extends CommonBaseDTO implements Serializable {
 
     private Double pi_total;
 
-    private Integer pi_recordmanid;
+    private Double pi_nettotal;
+
+    private Long pi_recordmanid;
 
     private String pi_recordman;
 

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

@@ -31,13 +31,15 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private String pi_pucode;
 
-    private Integer pi_said;
+    private Long pi_said;
 
     private String pi_sacode;
 
     private Double pi_total;
 
-    private Integer pi_recordmanid;
+    private Double pi_nettotal;
+
+    private Long pi_recordmanid;
 
     private String pi_recordman;
 
@@ -70,4 +72,8 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
     private String pi_remark;
 
     private Long pi_ioid;
+
+    private String pi_macode;
+
+    private Long pi_maid;
 }

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

@@ -290,7 +290,7 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
         updateMake.setMa_statuscode(Status.AUDITED.name());
         updateMake.setUpdateTime(new Date());
         updateMake.setUpdaterId(BaseContextHolder.getUserId());
-        updateMake.setMa_auditman("");
+        updateMake.setMa_auditman(BaseContextHolder.getUserName());
         updateMake.setMa_auditdate(new Date());
         getMapper().updateByPrimaryKeySelective(updateMake);
         DocBaseDTO docBaseDTO = generateMsgObj(make.getId(), make.getMa_code());
@@ -316,7 +316,8 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
                 makeListDTO.setItems(makeMaterials);
                 singleAudit(makeListDTO);
             } catch (Exception e){
-                errorMsg.append("编号：" + base.getCode() + "处理失败," + e.getMessage());
+                String msg = BizExceptionCode.DEAL_FAILED.getMessage();
+                errorMsg.append(String.format(msg, base.getCode(), e.getMessage()));
             }
         }
         return errorMsg.toString();
@@ -348,7 +349,8 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             prodInOut.setPi_auditman("");               //审核人
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());  //单据状态
             prodInOut.setPi_statuscode(Status.UNAUDITED.name());    //单据状态码
-            prodInOut.setPi_text1(make.getMa_code());       //自定义字段1   赋值为制造单号
+            prodInOut.setPi_macode(make.getMa_code());       //制造单号
+            prodInOut.setPi_maid(make.getId());             //制造单ID
             prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
             prodInOut.setCreateTime(new Date());
             prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
@@ -408,7 +410,8 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             prodInOut.setPi_auditman("");               //审核人
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());  //单据状态
             prodInOut.setPi_statuscode(Status.UNAUDITED.name());    //单据状态码
-            prodInOut.setPi_text1(make.getMa_code());       //自定义字段1   赋值为制造单号
+            prodInOut.setPi_macode(make.getMa_code());       //制造单号
+            prodInOut.setPi_maid(make.getId());             //制造单ID
             prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
             prodInOut.setCreateTime(new Date());
             prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
@@ -459,7 +462,8 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             prodInOut.setPi_auditman("");               //审核人
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());  //单据状态
             prodInOut.setPi_statuscode(Status.UNAUDITED.name());    //单据状态码
-            prodInOut.setPi_text1(make.getMa_code());       //自定义字段1   赋值为制造单号
+            prodInOut.setPi_macode(make.getMa_code());       //制造单号
+            prodInOut.setPi_maid(make.getId());             //制造单ID
             prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
             prodInOut.setCreateTime(new Date());
             prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
@@ -517,7 +521,8 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             prodInOut.setPi_auditman("");               //审核人
             prodInOut.setPi_status(Status.UNAUDITED.getDisplay());  //单据状态
             prodInOut.setPi_statuscode(Status.UNAUDITED.name());    //单据状态码
-            prodInOut.setPi_text1(make.getMa_code());       //自定义字段1   赋值为制造单号
+            prodInOut.setPi_macode(make.getMa_code());       //制造单号
+            prodInOut.setPi_maid(make.getId());             //制造单ID
             prodInOut.setCompanyId(BaseContextHolder.getCompanyId());   //公司ID
             prodInOut.setCreateTime(new Date());
             prodInOut.setCreatorId(BaseContextHolder.getUserId());      //创建人ID
@@ -612,7 +617,8 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
                 Long id =  base.getId();
                 singleUnAudit(id);
             }catch (Exception e) {
-                errorMsg.append("编号：" + base.getCode() + "处理失败," + e.getMessage());
+                String msg = BizExceptionCode.DEAL_FAILED.getMessage();
+                errorMsg.append(String.format(msg, base.getCode(), e.getMessage()));
             }
         }
         return errorMsg.toString();
@@ -687,8 +693,9 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
         if(!StringUtils.isEmpty(map.get("result"))){
             throw new BizException(76203, map.get("result").toString());
         }
-        prodInOutMapper.deleteByInOutNo(inCode, "完工入库单", BaseContextHolder.getCompanyId());
         prodIODetailMapper.deleteByInOutNo(inCode, "完工入库单", BaseContextHolder.getCompanyId());
+        prodInOutMapper.deleteByInOutNo(inCode, "完工入库单", BaseContextHolder.getCompanyId());
+
 
         if ("拆件".equals(type)){
             map.put("class", "拆件领料单");
@@ -703,11 +710,11 @@ public class MakeServiceImpl extends CommonBaseServiceImpl<MakeMapper, Make> imp
             throw new BizException(76204, map.get("result").toString());
         }
         if ("拆件".equals(type)){
-            prodInOutMapper.deleteByInOutNo(outCode, "拆件领料单", BaseContextHolder.getCompanyId());
             prodIODetailMapper.deleteByInOutNo(outCode, "拆件领料单", BaseContextHolder.getCompanyId());
+            prodInOutMapper.deleteByInOutNo(outCode, "拆件领料单", BaseContextHolder.getCompanyId());
         }else if ("组装".equals(type)){
-            prodInOutMapper.deleteByInOutNo(outCode, "生产领料单", BaseContextHolder.getCompanyId());
             prodIODetailMapper.deleteByInOutNo(outCode, "生产领料单", BaseContextHolder.getCompanyId());
+            prodInOutMapper.deleteByInOutNo(outCode, "生产领料单", BaseContextHolder.getCompanyId());
         }
     }
 

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

@@ -131,8 +131,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         prodInOut.setCreatorId(userId);
         prodInOut.setCreateTime(prodInOut.getPi_recorddate()==null?new Date():prodInOut.getPi_recorddate());
         prodInOut.setPi_date(prodInOut.getPi_date()==null?new Date():prodInOut.getPi_date());
-        prodInOut.setPi_puid(main.getPi_puid());
-        prodInOut.setPi_pucode(main.getPi_pucode());
         //编号获取
         pi_inoutno = pushMaxnubmer(prodInOut);
         prodInOut.setPi_inoutno(pi_inoutno);

applications/storage/storage-server/src/main/resources/mapper/MakeMapper.xml

@@ -414,7 +414,7 @@
     </select>
 
     <select id="selectMakeInOutCode" resultType="string">
-        SELECT PI_INOUTNO FROM PRODINOUT WHERE COMPANYID=#{companyId} AND PI_TEXT1=#{code} AND PI_CLASS=#{type}
+        SELECT PI_INOUTNO FROM PRODINOUT WHERE COMPANYID=#{companyId} AND PI_MACODE=#{code} AND PI_CLASS=#{type}
     </select>
 
   <update id="calcMakePriceAndTotal" parameterType="long" >

applications/storage/storage-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -189,6 +189,12 @@
       <if test="pi_ioid != null">
         pi_ioid,
       </if>
+        <if test="pi_maid != null">
+            pi_maid,
+        </if>
+        <if test="pi_macode != null">
+            pi_macode,
+        </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -305,6 +311,12 @@
       <if test="pi_ioid != null">
         #{pi_ioid,jdbcType=INTEGER},
       </if>
+        <if test="pi_maid != null">
+            #{pi_maid,jdbcType=INTEGER},
+        </if>
+        <if test="pi_macode != null">
+            #{pi_macode,jdbcType=VARCHAR},
+        </if>
     </trim>
   </insert>
 

base-servers/account/account-server/src/main/java/com/usoftchina/saas/account/controller/AccountController.java

@@ -318,7 +318,7 @@ public class AccountController {
      * @return
      */
     @PostMapping("/bind/roles")
-    public Result bindRoles(@RequestParam long accountId, @RequestParam String roleIds) {
+    public Result bindRoles(@RequestParam("accountId") Long accountId, @RequestParam("roleIds") String roleIds) {
         accountService.bindRoles(accountId, roleIds);
         accountService.clearCache(accountId);
         return Result.success();

base-servers/account/account-server/src/main/resources/mapper/AccountRoleMapper.xml

@@ -32,6 +32,6 @@
         group by a.id,a.username,a.realname,a.email,a.mobile
     </select>
     <delete id="unBindRolesById" parameterType="java.lang.Long">
-        DELETE FROM AC_ACCOUNT_COMPANY WHERE ACCOUNT_ID = #{id}
+        DELETE FROM AC_ACCOUNT_ROLE WHERE ACCOUNT_ID = #{id}
     </delete>
 </mapper>

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

@@ -104,6 +104,10 @@ spring:
         - Path=/api/commons/**
         filters:
         - RewritePath=/api/commons/(?<segment>.*), /$\{segment}
+      - id: SOCKET-SERVER
+        uri: lb:ws://SOCKET-SERVER
+        predicates:
+        - Path=/ws/**
   redis:
     host: 192.168.253.12
     port: 6379
@@ -175,6 +179,8 @@ auth:
   public-key: auth/pub.key
   ignores:
     - /api/auth/authorize
+    - /api/auth/sso/callback/**
     - /api/account/account/register
     - /api/auth/info
+    - /ws/**
     - /api/file/download

frontend/saas-web/app/Application.scss

@@ -230,10 +230,10 @@ body.launching {
 }
 
 .x-panel-default-outer-border-rl {
-  border-right-color: #ABDAFF;
-  border-right-width: 1px;
-  border-left-color: #ABDAFF;
-  border-left-width: 1px;
+  border-right-color: #ABDAFF !important;
+  border-right-width: 1px !important;
+  border-left-color: #ABDAFF !important;
+  border-left-width: 1px !important;
 }
 
 .x-grid-item-alt {

frontend/saas-web/app/view/core/base/BasePanel.js

@@ -13,8 +13,8 @@ Ext.define('saas.view.core.base.BasePanel', {
     //基础属性
     frame:false,
     autoScroll: true,
-    border: 1,
-    bodyPadding: 5,
+    border: 0,
+    bodyPadding: 0,
     layout: 'fit',
     
     fieldDefaults: {
@@ -46,10 +46,12 @@ Ext.define('saas.view.core.base.BasePanel', {
                 xtype: 'toolbar',
                 dock: 'top',
                 style: {
-                    'border-bottom': '1px solid #35baf6 !important'
+                    // 'border-bottom': '1px solid #35baf6 !important',
+                    margin: '0 0 12px 0',
+                    padding: '10px 0 14px 8px',
                 },
                 items: me.searchField.concat([{
-                    cls:'x-formpanel-btn-orange',
+                    // cls:'x-formpanel-btn-orange',
                     xtype: 'button',
                     text: '查询',
                     handler: 'query'
@@ -58,6 +60,7 @@ Ext.define('saas.view.core.base.BasePanel', {
             items: [{
                 layout: 'fit',
                 xtype: 'core-base-gridpanel',
+                padding: '8 12',
                 dataUrl: gridDataUrl,
                 idField: gridIdField,
                 codeField: gridCodeField,

frontend/saas-web/app/view/core/base/BasePanel.scss

@@ -1,4 +1,6 @@
 .core-base-basepanel{
+    background: #EEF4F9;
+
     .x-panel-default-outer-border-trl {
         border-top-color: #fff !important;
         border-top-width: 1px !important;

frontend/saas-web/app/view/core/base/GridPanel.js

@@ -222,7 +222,7 @@ Ext.define('saas.view.core.base.GridPanel', {
     insertFirstColumn:function(columns){
         var me=this;
         if(columns.length>0 && columns[0].xtype!='actioncolumn'){
-            return Ext.Array.insert(columns,0,[{
+            Ext.Array.insert(columns,0,[{
                 xtype:'actioncolumn',
                 width:70,
                 dataIndex:'actioncolumn',
@@ -239,6 +239,12 @@ Ext.define('saas.view.core.base.GridPanel', {
                 }]
             }]);
         }
+        if(columns[columns.length - 1].flex != 1) {
+            columns.push({
+                flex: 1,
+                allowBlank: true
+            });
+        }
         return columns;
     },
 

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

@@ -18,53 +18,31 @@ Ext.define('saas.view.core.form.DataMultiCombo', {
             Ext.Ajax.request({  
                 url : me.dataUrl,
                 timeout: 100000000,  
-                method : 'post',  
-                params : {}  ,
+                async:false,
                 headers:{
                     'Access-Control-Allow-Origin': '*',
-                    'Authorization':  saas.util.State.get('session').token
+                    'Authorization':  saas.util.State.get('session').token,
+                    "Content-Type": 'application/json;charset=UTF-8'
                 },
                 success: function(fp, o){
-                    // if(o.result.error){
-                    //     showError(o.result.error);
-                    // } else {
-                    //     var msg = Ext.getCmp('baseform').ownerCt.ownerCt.down('htmleditor[name=msg]');
-                    //     var imgel=msg.getEl().dom.getElementsByTagName('iframe')[0].contentWindow.document.body;
-                    //     if(imgel.getElementsByTagName('img').length>0){
-                    //       imgel.removeChild(imgel.getElementsByTagName('img')[0]);
-                    //     }
-                    //     //Ext.getCmp('baseform').ownerCt.ownerCt.down('hidden').setValue('../../../'+o.result.path);
-                    //     Ext.getCmp('baseform').ownerCt.setValue(o.result.path);
-                    //     var element = document.createElement("img");
-                    //     element.src = basePath + 'common/download.action?path=' + o.result.path.replace(/\+/g, '%2B');
-                    //     element.style="width:100%;height:100%";            
-                    //     element.title = '&img' + o.result.filepath + ";";
-                    //     msg.setValue('<img src="'+element.src+'" style=width:100%;height:100%;>');
-                    // }
+                    var res = Ext.decode(fp.responseText);
+                    var data = res.data,datas=[];
+                    if(data.length>0){
+                        Ext.each(data, function(item, index){
+                            var o = [];
+                            o[0] = item.name;
+                            o[1] = item.id;
+                            datas.push(o);
+                        });
+                    }else{
+                        saas.util.BaseUtil.showToast('下拉框读取数据为空！');
+                    }
+                    me.datas = datas;
                 },
                 failure: function (response, opts) {
                     saas.util.BaseUtil.showToast('上传失败: ' + response.responseText);
                 }
             });
-            me.BaseUtil.request({
-                url: me.dataUrl,
-                params: '',
-                method: 'POST',
-                async:false
-            })
-            .then(function(localJson) {
-                if(localJson.success){
-                }
-            })
-            .catch(function(res) {
-                console.error(res);
-                saas.util.BaseUtil.showToast('保存失败: ' + res.message);
-            });
-
-            // datas: [
-            //     ["已审核", "已审核"],
-            //     ["未审核", "未审核"]
-            // ]
         }
         me.callParent(arguments);
     },
@@ -114,12 +92,12 @@ Ext.define('saas.view.core.form.DataMultiCombo', {
         for (; i < itemsLn; i++) {
             item = items[i];
             var checked = !!value.find(function(v) {
-                return v.value = iem[0];
+                return v.value == item[1];
             });
             menuItem = new Ext.menu.CheckItem({
-                text: item[1],
+                text: item[0],
                 checked: checked,
-                checkValue:item[0],
+                checkValue:item[1],
                 hideOnClick: false,
                 checkHandler: this.onCheckChange,
                 scope: this
@@ -155,8 +133,8 @@ Ext.define('saas.view.core.form.DataMultiCombo', {
                     return d[0] == item;
                 });
                 items[index] = {
-                    text: data[1],
-                    value: data[0]
+                    text: data[0],
+                    value: data[1]
                 }
             }
         })

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

@@ -132,7 +132,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
         modelData = viewModel.getData();
 
         //form里面数据
-        var formData = form.getFormData();
+        var formData = form.getDirtyData();
 
         var params = {
             main:formData.main

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

@@ -61,7 +61,7 @@ Ext.define('saas.view.core.form.MultiCombo', {
         for (; i < itemsLn; i++) {
             item = items[i];
             var checked = !!value.find(function(v) {
-                return v.value = iem[0];
+                return v.value == iem[0];
             });
             menuItem = new Ext.menu.CheckItem({
                 text: item[1],

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

@@ -155,6 +155,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                     handler: me.onAudit,
                     menu: {
                         cls:'x-query-menu',
+                        anchor: '100%',
                         items: [{
                             text:'反审核',
                             handler:function(){
@@ -243,6 +244,7 @@ Ext.define('saas.view.core.query.QueryGridPanel', {
                 }]
             }, {
                 xtype: 'pagingtoolbar',
+                cls: 'core-query-pagingtoolbar',
                 dock: 'bottom',
                 displayInfo: true,
                 store: me.store

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

@@ -4,8 +4,32 @@
 
         .x-grid-cell-inner {
             text-decoration: underline;
-            color: blue;
+            color: #3E80F6;
             cursor: pointer;
         }
     }
+
+    .x-panel-default-outer-border-trl {
+        border-top-color: #fff !important;
+        border-top-width: 1px !important;
+        border-right-color: #fff !important;
+        border-right-width: 1px !important;
+        border-left-color: #fff !important;
+        border-left-width: 1px !important;
+    }
+    .x-panel-default-outer-border-rbl {
+        border-top-color: #fff !important;
+        border-top-width: 1px !important;
+        border-right-color: #fff !important;
+        border-right-width: 1px !important;
+        border-left-color: #fff !important;
+        border-left-width: 1px !important;
+        border-bottom-color: #fff !important;
+        border-bottom-width: 1px !important;
+    }
+
+    .core-query-pagingtoolbar {
+        border:1px solid #abdaff !important;
+        border-top-width: 0 !important;
+    }
 }

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

@@ -46,31 +46,27 @@ Ext.define('saas.view.document.employee.BasePanel', {
             text : "账号", 
             width : 200.0, 
             dataIndex : "em_code", 
-            xtype : "", 
         }, 
         {
             text : "姓名", 
             dataIndex : "em_name", 
-            width : 120.0, 
-            xtype : "", 
+            width : 180.0, 
         },
         {
             text : "密码", 
             dataIndex : "em_password", 
-            width : 120.0, 
-            xtype : ""
+            width : 180.0, 
         }, 
         {
             text : "类型", 
             dataIndex : "em_class", 
-            width : 0, 
-            xtype : ""
+            width : 120.0, 
+            hidden : true,
         }, 
         {
             text : "电话", 
             dataIndex : "em_mobile", 
-            width : 120.0, 
-            xtype : "",
+            width : 120.0,
         }]
     },
 

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -222,7 +222,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         accountinformation:{
             items:[{
                 xtype:'hidden',
-                name:'roleIds',
+                name:'accountId',
                 hidden:true,
             },{
                 xtype:'datamulticombo',
@@ -235,6 +235,8 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 fieldLabel: '联系电话',
                 name: 'mobile',
+                readOnly:true,
+                editable:false,
                 allowBlank:true,
                 maxLength: 30,
                 beforeLabelTextTpl: "",
@@ -242,6 +244,8 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 fieldLabel: '联系邮件',
                 name: 'email',
+                readOnly:true,
+                editable:false,
                 allowBlank:true,
                 maxLength: 30,
                 beforeLabelTextTpl: "",
@@ -313,7 +317,8 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 xtype:'textfield',
                 fieldLabel: '单据前缀',
                 name: 'mn_leadcode',
-                allowBlank:false,
+                beforeLabelTextTpl: '',
+                allowBlank:true,
                 maxLength: 20
             },{
                 xtype:'combo',
@@ -384,6 +389,13 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         var combo = this._combo;
         var params = {};
         var names = belong.columns.map(column => column.dataIndex);
+
+        //账户资料特殊保存逻辑
+        if(me.dataKind=='accountinformation'){
+            me.accountinformation();
+            return;
+        }
+
         Ext.Array.each(names,function(name) {
             if(name){
                 var dataField = form.down('[name='+name+']');
@@ -425,5 +437,64 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
     },
     onCancel:function(){
         this.hide();
+    },
+    accountinformation:function(){
+        var me = this;
+        var belong = this.belong;
+        me.setLoading(true);
+        var form=this.down('form');
+        var combo = this._combo;
+        var params = {};
+        var names = belong.columns.map(column => column.dataIndex);
+
+        Ext.Array.each(names,function(name) {
+            if(name){
+                var dataField = form.down('[name='+name+']');
+                if(dataField&&dataField.value){
+                    params[name] = dataField.value;
+                    params._value = dataField.value;
+                }
+            }
+        });
+
+        //更改参数
+        var o = '';
+        Ext.Array.each(params.roleNames,function(item) {
+            o+=item.value+','
+        });
+        o = o.substring(0,o.length-1);
+
+        var _params = {
+            accountId:Number(params['accountId']),
+            roleIds:o,
+        };
+
+        //保存接口
+        saas.util.BaseUtil.request({
+            url: belong.reqUrl,
+            params: _params,
+            method: 'POST'
+        })
+        .then(function(localJson) {
+            me.setLoading(false);
+            if(localJson.success){
+                saas.util.BaseUtil.showToast('保存成功');
+                var grid = form.ownerCt._parent.lookup('document-kind-Grid');
+                if(grid){
+                    grid.store.load();
+                }
+                if(combo){
+                    combo.store.load(function() {
+                        typeof combo.setValue == 'function' && combo.setValue(params._value);
+                    });
+                }
+                form.ownerCt.close();
+            }
+        })
+        .catch(function(res) {
+            me.setLoading(false);
+            console.error(res);
+            saas.util.BaseUtil.showToast('保存失败: ' + res.message);
+        });
     }
 });

frontend/saas-web/app/view/document/kind/Kind.js

@@ -246,6 +246,18 @@ Ext.define('saas.view.document.kind.Kind', {
             reqUrl:'/api/account/role/save',
             updateUrl:'/api/account/role/update',
         },
+        accountinformation:{
+            columns:[{
+                dataIndex:'accountId',
+            },{
+                dataIndex: 'roleNames',
+            },{
+                dataIndex: 'mobile',
+            },{
+                dataIndex: 'email',
+            }],
+            reqUrl:'http://192.168.253.31:8560/api/account/account/bind/roles',
+        },
         warehouse:{
             columns: [{
                 text: '编号',

frontend/saas-web/app/view/home/charts/MonthIO.js

@@ -9,7 +9,7 @@ Ext.define('saas.view.home.charts.MonthIO', {
         Ext.apply(me, {
             items: [{
                 xtype: 'cartesian',
-                reference: 'chart',
+                insetPadding: '28 0 0 0',
                 colors: [
                     '#2C82BE',
                     '#82CCFF'
@@ -38,6 +38,9 @@ Ext.define('saas.view.home.charts.MonthIO', {
                     adjustByMajorUnit: true,
                     fields: ['main'],
                     minimum: 0,
+                    label: {
+                        fillStyle: '#485465'
+                    },
                     grid: {
                         even: {
                             stroke: '#F7F8FA'
@@ -54,6 +57,9 @@ Ext.define('saas.view.home.charts.MonthIO', {
                     type: 'category',
                     position: 'bottom',
                     fields: ['x'],
+                    label: {
+                        fillStyle: '#485465'
+                    },
                     style: {
                         fill: '#F7F8FA',
                         strokeStyle: 'transparent'

frontend/saas-web/app/view/home/charts/MonthPurchase.js

@@ -10,6 +10,7 @@ Ext.define('saas.view.home.charts.MonthPurchase', {
         Ext.apply(me, {
             items: [{
                 xtype: 'cartesian',
+                insetPadding: '28 0 0 0',
                 colors: [
                     '#34BAF6'
                 ],
@@ -18,12 +19,10 @@ Ext.define('saas.view.home.charts.MonthPurchase', {
                     captions: {
                         title: {
                             text: '本月采购额（万元）：{month_purchase_amount}',
+                            align: 'left',
                             style: {
-                                'font-size': '14px',
                                 'color': '#485465',
-                                'letter-spacing': '-0.07px'
                             },
-                            align: 'left'
                         }
                     },
                 },
@@ -31,6 +30,9 @@ Ext.define('saas.view.home.charts.MonthPurchase', {
                     type: 'category',
                     fields: ['x'],
                     position: 'bottom',
+                    label: {
+                        fillStyle: '#485465'
+                    },
                     style: {
                         fill: '#F7F8FA',
                         strokeStyle: 'transparent'
@@ -48,6 +50,10 @@ Ext.define('saas.view.home.charts.MonthPurchase', {
                             stroke: '#F7F8FA',
                         }
                     },
+                    label: {
+                        fillStyle: '#485465',
+                        textAlign: 'end'
+                    },
                     style: {
                         fill: '#fff',
                         strokeStyle: 'transparent'

frontend/saas-web/app/view/home/charts/MonthSale.js

@@ -10,7 +10,8 @@ Ext.define('saas.view.home.charts.MonthSale', {
         Ext.apply(me, {
             items: [{
                 xtype: 'polar',
-                reference: 'chart',
+                width: '100%',
+                height: '100%',
                 bind: {
                     captions: {
                         title: {
@@ -49,33 +50,45 @@ Ext.define('saas.view.home.charts.MonthSale', {
                     '#1E90FF',
                     '#B0E0E6'
                 ],
-                width: '100%',
-                innerPadding: 20,
-                // legend: {
-                //     type: 'dom',
-                //     docked: 'right'
-                // },
+                innerPadding: 0,
+                legend: {
+                    type: 'dom',
+                    docked: 'right',
+                    width: 120,
+                    padding: 0,
+                    bodyPadding: 0,
+                    border: 0,
+                    // liveDrag: true,
+                    cls: 'x-pie-legend'
+                },
                 style: {
+                    lineWidth: 0,
                     stroke: "#789"
                 },
-                interactions: ['rotate', 'itemhighlight'],
+                // interactions: [{
+                //     type: 'panzoom',
+                //     zoomOnPan: true
+                // }],
                 series: [{
                     type: 'pie',
                     angleField: 'y',
                     donut: 55,
                     label: {
                         field: 'x',
-                        renderer: me.onLabelRender
+                        display: 'inside',
+                        renderer: me.onLabelRender,
+                        color: '#fff',
+                        font: '12px Microsoft YaHei'
                     },
+                    // label: {
+                    //     field: 'x',
+                    //     renderer: me.onLabelRender
+                    // },
                     highlight: true,
                     tooltip: {
                         trackMouse: true,
                         renderer: me.onSeriesTooltipRender
-                    },
-                    style: {
-                        lineWidth: 0,
-                        strokeStyle: 'transparent',
-                    },
+                    }
                 }]
             }],
         });
@@ -86,7 +99,10 @@ Ext.define('saas.view.home.charts.MonthSale', {
     onLabelRender: function(text, sprite, config, rendererData, index) {
         var homeModel = Ext.getCmp('home').getViewModel();
         var monthSaleAmount = homeModel.get('month_sale_amount');
-        return text;
+        var store = rendererData.store;
+        var data = store.getAt(index);
+        var v = data.get('y');
+        return Ext.util.Format.number((v/monthSaleAmount)*100, '0.00') + '%';
     },
 
     onSeriesTooltipRender: function (tooltip, record, item) {

frontend/saas-web/app/view/home/charts/MonthSale.scss

@@ -0,0 +1,19 @@
+.x-pie-legend {
+
+    .x-legend-inner {
+        padding: 0;
+
+        .x-legend-container {
+
+            .x-legend-item {
+                border: none !important;
+                outline: none !important;
+                text-align: left;
+
+                .x-legend-item-marker {
+                    border-radius: 50%;
+                }
+            }
+        }
+    }
+}

frontend/saas-web/app/view/home/charts/PurchaseTrend.js

@@ -10,21 +10,22 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
         Ext.apply(me, {
             items: [{
                 xtype: 'cartesian',
+                insetPadding: '28 0 0 0',
                 colors: [
                     '#34BAF6'
                 ],
-                captions: {
-                    title: {
-                        text: '采购金额（万元）',
-                        style: {
-                            'font-size': '14px',
-                            'color': '#485465',
-                            'letter-spacing': '-0.07px'
-                        },
-                        align: 'left'
-                    }
-                },
                 bind: {
+                    captions: {
+                        title: {
+                            text: '采购金额（万元）',
+                            style: {
+                                'font-size': '14px',
+                                'color': '#485465',
+                                'letter-spacing': '-0.07px'
+                            },
+                            align: 'left'
+                        }
+                    },
                     store: '{purchase_trend}',
                 },
                 axes: [{
@@ -35,6 +36,9 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                     type: 'category',
                     fields: ['x'],
                     position: 'bottom',
+                    label: {
+                        fillStyle: '#485465'
+                    },
                     style: {
                         fill: '#F7F8FA',
                         strokeStyle: 'transparent'
@@ -52,6 +56,9 @@ Ext.define('saas.view.home.charts.PurchaseTrend', {
                             stroke: '#F7F8FA',
                         }
                     },
+                    label: {
+                        fillStyle: '#485465'
+                    },
                     style: {
                         fill: '#fff',
                         strokeStyle: 'transparent'

frontend/saas-web/app/view/home/charts/SaleTrend.js

@@ -10,22 +10,23 @@ Ext.define('saas.view.home.charts.SaleTrend', {
         Ext.apply(me, {
             items: [{
                 xtype: 'cartesian',
+                insetPadding: '28 0 0 0',
                 colors: [
                     '#64B0E4',
                     '#FF1038'
                 ],
-                captions: {
-                    title: {
-                        text: '销售趋势图',
-                        style: {
-                            'font-size': '14px',
-                            'color': '#485465',
-                            'letter-spacing': '-0.07px'
-                        },
-                        align: 'left'
-                    }
-                },
                 bind: {
+                    captions: {
+                        title: {
+                            text: '销售趋势图',
+                            style: {
+                                'font-size': '14px',
+                                'color': '#485465',
+                                'letter-spacing': '-0.07px'
+                            },
+                            align: 'left'
+                        }
+                    },
                     store: '{sale_trend}',
                 },
                 // legend: {
@@ -42,9 +43,7 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                     fields: ['x'],
                     position: 'bottom',
                     label: {
-                        style: {
-                            fontSize: 12,
-                        }
+                        fillStyle: '#485465',
                     },
                     style: {
                         fill: '#F7F8FA',
@@ -63,6 +62,9 @@ Ext.define('saas.view.home.charts.SaleTrend', {
                             stroke: '#F7F8FA',
                         }
                     },
+                    label: {
+                        fillStyle: '#485465',
+                    },
                     style: {
                         fill: '#fff',
                         strokeStyle: 'transparent'

frontend/saas-web/app/view/home/charts/StockAmount.js

@@ -10,21 +10,22 @@ Ext.define('saas.view.home.charts.StockAmount', {
         Ext.apply(me, {
             items: [{
                 xtype: 'cartesian',
+                insetPadding: '28 0 0 0',
                 colors: [
                     '#34BAF6'
                 ],
-                captions: {
-                    title: {
-                        text: '库存金额（万元）',
-                        style: {
-                            'font-size': '14px',
-                            'color': '#485465',
-                            'letter-spacing': '-0.07px'
-                        },
-                        align: 'left'
-                    }
-                },
                 bind: {
+                    captions: {
+                        title: {
+                            text: '库存金额（万元）',
+                            style: {
+                                'font-size': '14px',
+                                'color': '#485465',
+                                'letter-spacing': '-0.07px'
+                            },
+                            align: 'left'
+                        }
+                    },
                     store: '{stock_amount}',
                 },
                 axes: [{
@@ -35,6 +36,9 @@ Ext.define('saas.view.home.charts.StockAmount', {
                     type: 'category',
                     fields: ['x'],
                     position: 'bottom',
+                    label: {
+                        fillStyle: '#485465'
+                    },
                     style: {
                         fill: '#F7F8FA',
                         strokeStyle: 'transparent'
@@ -52,6 +56,9 @@ Ext.define('saas.view.home.charts.StockAmount', {
                             stroke: '#F7F8FA',
                         }
                     },
+                    label: {
+                        fillStyle: '#485465'
+                    },
                     style: {
                         fill: '#fff',
                         strokeStyle: 'transparent'

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

@@ -221,26 +221,42 @@ body > .x-mask {
     filter: grayscale(100%);
     filter: gray;
 }
+ .x-main-menu{
+    background: #f8fbff;
+    border: 2px solid #34baf6;
+ }
+ .x-main-menu .x-menu-item-text-default{
+    font-family: PingFangSC-Regular;
+    //font-size: 14px;
+    color: #34BAF6;
+    letter-spacing: 0;
+    text-align: center;
+ }
 .x-main-menu::before{
     content: ' ';
     display: block;
     border-style: solid;
-    box-shadow: 0px 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(15, 136, 232, 0.6);
+    background-color: white;
+    transform: rotate(45deg);
+    box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(15, 136, 232, 0.6);
     box-shadow: aliceblue;
-    border-width: 17px;
-    border-color: #cccccc;
+    border-width: 2px;
+    border-color: #34BAF6;
     /* border-color: #cccccc #6e838e #9c9d9e #bdc3c5; */
     position: fixed;
+    width: 14px;
+    height: 14px;
     /* left: 100%; */
-    top: 26px;
+    top: 25px;
     -moz-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
-    -webkit-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
+    /* -webkit-clip-path: polygon(100% 0px, 0 50%, 100% 100%); */
     -o-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
     -ms-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
     -khtml-clip-path: polygon(100% 0px, 0 50%, 100% 100%);
-    clip-path: polygon(0 100%, 50% 0, 100% 100%);
+    clip-path: polygon(0% 0,100% 0%,0 100%);
     margin-top: 17px;
     margin-left: 7px;
+    z-index: 99;
 }
 .x-main-menu2::before{
     content: ' ';

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

@@ -81,6 +81,10 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     valueField : "value", 
                     xtype : "dbfindtrigger"
                 }
+            },{
+                text : "转出账户余额", 
+                dataIndex : "bk_outthisamount", 
+                ignore:true
             }, {
                 text : "转入账户ID", 
                 dataIndex : "ftd_inbankid", 
@@ -108,11 +112,15 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     valueField : "value", 
                     xtype : "dbfindtrigger"
                 }
+            },{
+                text : "转入账户余额", 
+                dataIndex : "bk_inthisamount", 
+                ignore:true
             }, {
-                text : "金额", 
+                text : "本次转出金额", 
                 xtype: 'numbercolumn',
                 dataIndex : "ftd_nowbalance", 
-                width : 120.0, 
+                width : 150.0, 
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 2
@@ -133,7 +141,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
             }, {
                 text : "结算方式号", 
                 dataIndex : "ftd_paycode", 
-                width : 100,
+                width : 110,
                 editor:{
                     xtype: ''  
                 }
@@ -175,30 +183,48 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         fieldLabel : "备注", 
         allowBlank : true, 
         columnWidth : 0.75
-    }, {
-        xtype : "textfield", 
+    },{
+        xtype : "hidden", 
         name : "creatorId", 
         fieldLabel : "录入人ID", 
-        hidden:true
-    }, {
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
         name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "createTime",
+        name : "createTime", 
         fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
         readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     },{
         xtype: 'textfield',
         name: 'ft_auditman',
         fieldLabel: '审核人',
-        hidden: true
+        readOnly: true
     },{
         xtype: "datefield",
         name: "ft_auditdate",
         fieldLabel: "审核日期",
-        hidden: true
+        readOnly: true
     }]
 });

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

@@ -4,7 +4,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
     init: function (form) {
         var me = this;
         this.control({
-            //放大镜赋值关系 以及 tpl模板
+            //出
             'dbfindtrigger[name=ftd_bankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
@@ -17,7 +17,9 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                         },{
                             from:'bk_bankname',to:'ftd_bankname'
                         },{
-                            from:'id',to:'ftd_bankid'
+                            from:'id',to:'ftd_bankid',ignore:true
+                        },{
+                            from:'bk_thisamount',to:'bk_outthisamount'
                         }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100
@@ -74,6 +76,7 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                     }) ;
                 }
             },
+            //入
             'dbfindtrigger[name=ftd_inbankname]':{
                 beforerender:function(f){
                     Ext.apply(f,{
@@ -86,7 +89,9 @@ Ext.define('saas.view.money.fundtransfer.FormPanelController', {
                         },{
                             from:'bk_bankname',to:'ftd_inbankname'
                         },{
-                            from:'id',to:'ftd_inbankid'
+                            from:'id',to:'ftd_inbankid',ignore:true
+                        },{
+                            from:'bk_inthisamount',to:'bk_inthisamount'
                         }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100

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

@@ -26,12 +26,20 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         columnWidth: 0.5
     },{
         xtype: 'multicombo',
-        name: 'ft_status',
+        name: 'ft_statuscode',
         fieldLabel: '审核状态',
         datas: [
-            ["已审核", "已审核"],
-            ["未审核", "未审核"]
-        ]
+            ["ALL", "全部"],
+            ["AUDITED", "已审核"],
+            ["UNAUDITED", "未审核"]
+        ],
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return 'ft_statuscode=\'' + value + '\'';
+            }
+        }
     },{
         name : "ft_status",
         fieldLabel : "结算方式",
@@ -59,6 +67,10 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         xtype : "dbfindtrigger",
         name : "ftd_inbankname",
         fieldLabel : "转入账号",
+    },{
+        xtype: 'textfield',
+        name: 'creatorName',
+        fieldLabel: '录入人'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -17,7 +17,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanelController', {
                             },{
                                 from:'bk_bankname',to:'ftd_bankname'
                             },{
-                                from:'id',to:'ftd_bankid'
+                                from:'id',to:'ftd_bankid',ignore:true
                             }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100
@@ -86,7 +86,7 @@ Ext.define('saas.view.money.fundtransfer.QueryPanelController', {
                             },{
                                 from:'bk_bankname',to:'ftd_inbankname'
                             },{
-                                from:'id',to:'ftd_inbankid'
+                                from:'id',to:'ftd_inbankid',ignore:true
                             }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100

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

@@ -150,25 +150,48 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
         fieldLabel : "备注", 
         allowBlank : true, 
         columnWidth : 0.75
-    }, {
+    },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
-        name : "or_recorder", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "or_recorddate",
+        name : "createTime", 
         fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
         readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     },{
         xtype: 'textfield',
         name: 'or_auditman',
         fieldLabel: '审核人',
-        hidden: true
+        readOnly:true
     },{
         xtype: "datefield",
         name: "or_auditdate",
         fieldLabel: "审核日期",
-        hidden: true
+        readOnly:true
     }]
 });

frontend/saas-web/app/view/money/othreceipts/FormPanelController.js

@@ -14,7 +14,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                         defaultCondition: "cu_statuscode='OPEN'",
                         dbfinds: [{
                             from: 'id',
-                            to: 'or_custid'
+                            to: 'or_custid',ignore:true
                         }, {
                             from: 'cu_code',
                             to: 'or_custcode'
@@ -39,77 +39,74 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             allowBlank: true,
                             columnWidth: 0.25
                         }],
-                        dbColumns: [{
-                            conditionCode: 'id',
-                            "text": "客户ID",
-                            "flex": 0,
-                            "dataIndex": "id",
-                            "width": 0,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode: 'cu_code',
-                            "text": "客户编号",
-                            "flex": 1,
-                            "dataIndex": "cu_code",
-                            "width": 100,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode: 'cu_name',
-                            "text": "客户名称",
-                            "flex": 1,
-                            "dataIndex": "cu_name",
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            conditionCode: 'cu_type',
-                            "text": "客户类型",
-                            "flex": 1,
-                            "dataIndex": "cu_type",
-                            "width": 200,
-                            "xtype": "",
-                            "items": null
-                        }, {
-                            "text": "业务员编号",
-                            "flex": 1,
-                            "dataIndex": "cu_sellercode",
-                            "width": 100
-                        }, {
-                            "text": "业务员",
-                            "flex": 1,
-                            "dataIndex": "cu_sellername",
-                            "width": 100
-                        }, {
-                            "text": "税率",
-                            "flex": 1,
-                            "dataIndex": "cu_taxrate",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "承付天数",
-                            "flex": 1,
-                            "dataIndex": "cu_promisedays",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end', 
-                            renderer : function(v) {
-                                return Ext.util.Format.number(v, '0');
-                            }
-                        }, {
-                            "text": "额度",
-                            "flex": 1,
-                            "dataIndex": "cu_credit",
-                            "width": 100,
-                            xtype: 'numbercolumn',
-                            align:'end'
-                        }, {
-                            "text": "客户地址",
-                            "flex": 1,
-                            "dataIndex": "ca_address",
-                            "width": 250
-                        }]
+                        dbColumns:[
+                            {
+                                "text": "客户ID",
+                                "flex": 0,
+                                "dataIndex": "id",
+                                "width": 0,
+                                "xtype": "",
+                                "items": null
+                            },{
+                                "text": "客户编号",
+                                "flex": 1,
+                                "dataIndex": "cu_code",
+                                "width": 100,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "客户名称",
+                                "flex": 1,
+                                "dataIndex": "cu_name",
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "客户类型",
+                                "flex": 1,
+                                "dataIndex": "cu_type",
+                                "width": 200,
+                                "xtype": "",
+                                "items": null
+                            }, {
+                                "text": "业务员编号",
+                                "flex": 1,
+                                "dataIndex": "cu_sellercode",
+                                "width": 100
+                            }, {
+                                "text": "业务员",
+                                "flex": 1,
+                                "dataIndex": "cu_sellername",
+                                "width": 100
+                            }, {
+                                "text": "税率",
+                                "flex": 1,
+                                "dataIndex": "cu_taxrate",
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align:'end'
+                            }, {
+                                "text": "承付天数",
+                                "flex": 1,
+                                "dataIndex": "cu_promisedays",
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align:'end', 
+                                renderer : function(v) {
+                                    return Ext.util.Format.number(v, '0');
+                                }
+                            }, {
+                                "text": "额度",
+                                "flex": 1,
+                                "dataIndex": "cu_credit",
+                                "width": 100,
+                                xtype: 'numbercolumn',
+                                align:'end'
+                            }, {
+                                "text": "客户地址",
+                                "flex": 2,
+                                "dataIndex": "ca_address",
+                                "width": 300
+                            }]
                     });
 
                 }
@@ -129,7 +126,7 @@ Ext.define('saas.view.money.othreceipts.FormPanelController', {
                             to: 'or_bankname'
                         }, {
                             from: 'id',
-                            to: 'or_bankid'
+                            to: 'or_bankid',ignore:true
                         }],
                         // defaultCondition: "bk_statuscode='OPEN'",
                         dbtpls: [{

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

@@ -40,7 +40,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
     },  {
         xtype: 'dbfindtrigger',
         name: 'or_bankname',
-        fieldLabel: '账户名称'
+        fieldLabel: '结算账户'
     }, {
         xtype: 'condatefield',
         name: 'or_date',
@@ -49,17 +49,29 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         operation: 'between'
     }, {
         xtype: 'multicombo',
-        name: 'or_status',
+        name: 'or_statuscode',
         fieldLabel: '审核状态',
         datas: [
-            ["已审核", "已审核"],
-            ["未审核", "未审核"]
-        ]
+            ["ALL", "全部"],
+            ["AUDITED", "已审核"],
+            ["UNAUDITED", "未审核"]
+        ],
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return 'or_statuscode=\'' + value + '\'';
+            }
+        }
     }, {
         name: 'ord_type',
         fieldLabel: '收入类别',
         xtype : "remotecombo",
         storeUrl:'/api/document/fundinouttype/getCombo?condition=收入',
+    },{
+        xtype: 'textfield',
+        name: 'creatorName',
+        fieldLabel: '录入人'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
@@ -69,7 +81,6 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         addXtype: 'money-othreceipts-formpanel',
         defaultCondition:'',
         baseVastUrl: '/api/money/othreceipts/',
-        // baseVastUrl: 'http://192.168.253.35:8880/othreceipts/',
         baseColumn: [{
             text: 'id',
             dataIndex: 'id',
@@ -93,7 +104,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             dataIndex: 'or_custname',
             width: 120
         },  {
-            text: '结算账号',
+            text: '结算账户',
             dataIndex: 'or_bankname',
             width: 120
         },{

frontend/saas-web/app/view/money/othreceipts/QueryPanelController.js

@@ -12,7 +12,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                         addXtype: 'document-customer-formpanel',
                         addTitle: '客户资料',
                         dbfinds:[{
-                            from:'id',to:'or_custid'
+                            from:'id',to:'or_custid',ignore:true
                         },{
                             from:'cu_code',to:'or_custcode'
                         },{
@@ -23,9 +23,18 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                         },{
                             field:'cu_name',width:100
                         }],
+                        dbSearchFields: [{
+                            emptyText: '输入客户编号或客户名称',
+                            xtype: "textfield",
+                            name: "search",
+                            getCondition: function (v) {
+                                return "(upper(cu_code) like '%"+v.toUpperCase()+"%' or upper(cu_name) like '%"+v.toUpperCase()+"%')";
+                            },
+                            allowBlank: true,
+                            columnWidth: 0.25
+                        }],
                         dbColumns:[
                             {
-                                conditionCode:'id',
                                 "text": "客户ID",
                                 "flex": 0,
                                 "dataIndex": "id",
@@ -33,7 +42,6 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                                 "xtype": "",
                                 "items": null
                             },{
-                                conditionCode:'cu_code',
                                 "text": "客户编号",
                                 "flex": 1,
                                 "dataIndex": "cu_code",
@@ -41,14 +49,12 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_name',
                                 "text": "客户名称",
                                 "flex": 1,
                                 "dataIndex": "cu_name",
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_type',
                                 "text": "客户类型",
                                 "flex": 1,
                                 "dataIndex": "cu_type",
@@ -115,7 +121,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanelController', {
                         },{
                             from:'bk_bankname',to:'or_bankname'
                         },{
-                            from:'id',to:'or_bankid'
+                            from:'id',to:'or_bankid',ignore:true
                         }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100

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

@@ -150,25 +150,48 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
         fieldLabel : "备注", 
         allowBlank : true, 
         columnWidth : 0.75
-    }, {
+    },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
-        name : "os_recorder", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "os_recorddate",
+        name : "createTime", 
         fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
         readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     },{
         xtype: 'textfield',
         name: 'os_auditman',
         fieldLabel: '审核人',
-        hidden: true
+        readOnly:true
     },{
         xtype: "datefield",
         name: "os_auditdate",
         fieldLabel: "审核日期",
-        hidden: true
+        readOnly:true
     }]
 });

frontend/saas-web/app/view/money/othspendings/FormPanelController.js

@@ -13,7 +13,8 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                         addTitle: '供应商资料',
                         dbfinds: [{
                             from: 'id',
-                            to: 'os_vendid'
+                            to: 'os_vendid',
+                            ignore:true
                         }, {
                             from: 've_code',
                             to: 'os_vendcode'
@@ -102,7 +103,7 @@ Ext.define('saas.view.money.othspendings.FormPanelController', {
                             to: 'os_bankname'
                         }, {
                             from: 'id',
-                            to: 'os_bankid'
+                            to: 'os_bankid',ignore:true
                         }],
                         dbtpls: [{
                             field: 'bk_bankcode',

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

@@ -48,17 +48,29 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         fieldLabel: '单据日期'
     },{
         xtype: 'multicombo',
-        name: 'os_status',
+        name: 'os_statuscode',
         fieldLabel: '审核状态',
         datas: [
-            ["已审核", "已审核"],
-            ["未审核", "未审核"]
-        ]
+            ["ALL", "全部"],
+            ["AUDITED", "已审核"],
+            ["UNAUDITED", "未审核"]
+        ],
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return 'os_statuscode=\'' + value + '\'';
+            }
+        }
     },{
         name: 'ord_type',
         fieldLabel: '支出类别',
         xtype : "remotecombo",
         storeUrl:'/api/document/fundinouttype/getCombo?condition=支出',
+    },{
+        xtype: 'textfield',
+        name: 'creatorName',
+        fieldLabel: '录入人'
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

frontend/saas-web/app/view/money/othspendings/QueryPanelController.js

@@ -103,7 +103,7 @@ Ext.define('saas.view.money.othspendings.QueryPanelController', {
                         },{
                             from:'bk_bankname',to:'os_bankname'
                         },{
-                            from:'id',to:'os_bankid'
+                            from:'id',to:'os_bankid',ignore:true
                         }],
                         dbtpls:[{
                             field:'bk_bankcode',width:100

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

@@ -20,13 +20,6 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
     _auditUrl: '/api/money/paybalance/audit/',
     _unAuditUrl: '/api/money/paybalance/unAudit/',
     _deleteUrl: '/api/money/paybalance/delete/',
-
-    // _readUrl: 'http://192.168.253.35:8880/paybalance/read/',
-    // _saveUrl: 'http://192.168.253.129:8940/money/paybalance/save/',
-    // _auditUrl: 'http://192.168.253.35:8880/paybalance/audit/',
-    // _unAuditUrl: 'http://192.168.253.35:8880/paybalance/unAudit/',
-    // _deleteUrl: 'http://192.168.253.129:8940/money/paybalance/delete/',
-    
     initId: 0,
 
     toolBtns: [],
@@ -97,7 +90,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         storeModel: 'saas.model.money.PayBalance1',
         detnoColumn: 'pd_detno',
         deleteDetailUrl: '/api/money/paybalance/deleteDetail1/',
-        columns: [{
+        columns: [
+        {
             text: 'ID',
             dataIndex: 'id',
             hidden: true
@@ -188,7 +182,8 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         detnoColumn: 'pbd_detno',
         allowEmpty: true,
         deleteDetailUrl: '/api/money/paybalance/deleteDetail2/',
-        columns: [{
+        columns: [
+        {
             text: 'ID',
             dataIndex: 'id',
             hidden: true
@@ -327,33 +322,48 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         columnWidth: 1,
         fieldLabel: '备注'
     }, {
-        xtype: 'hidden',
-        name: 'pb_recorderid',
-        fieldLabel: '创建人ID'
-    }, {
-        xtype: 'hidden',
-        name: 'pb_recorder',
-        fieldLabel: '录入人'
-    }, {
-        xtype: "hidden",
-        name: "pb_recorddate",
-        fieldLabel: "录入日期"
-    }, {
-        xtype: "hidden",
-        name: "updatedate",
-        fieldLabel: "更新日期"
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
+        xtype : "textfield", 
+        name : "creatorName", 
+        fieldLabel : "录入人", 
+        readOnly:true
     }, {
-        xtype: "hidden",
-        readOnly: true,
-        editable: false,
-        name: "pb_status",
-        fieldLabel: "单据状态"
+        xtype : "datefield", 
+        name : "createTime", 
+        fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
+        readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
     }, {
-        xtype: "hidden",
-        readOnly: true,
-        editable: false,
-        name: "pb_statuscode",
-        fieldLabel: "单据状态码"
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype: 'textfield',
+        name: 'pb_auditman',
+        fieldLabel: '审核人',
+        readOnly: true
+    },{
+        xtype: "datefield",
+        name: "pb_auditdate",
+        fieldLabel: "审核日期",
+        readOnly: true
     }, {
         xtype: 'hidden',
         name: 'pb_text1',
@@ -374,16 +384,6 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         xtype: 'hidden',
         name: 'pb_text5',
         fieldLabel: '自定义字段5'
-    },{
-        xtype: 'textfield',
-        name: 'pb_auditman',
-        fieldLabel: '审核人',
-        hidden: true
-    },{
-        xtype: "datefield",
-        name: "pb_auditdate",
-        fieldLabel: "审核日期",
-        hidden: true
     }],
 
     beforeAudit: function() {

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

@@ -23,7 +23,8 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                             to: 've_leftamount'
                         },{
                             from: 'id',
-                            to: 'pb_vendid'
+                            to: 'pb_vendid',
+                            ignore:true
                         }],
                         dbtpls: [{
                             field: 've_code',
@@ -196,7 +197,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                         addTitle: '资金账户',
                         dbfinds: [{
                             from: 'id',
-                            to: 'pd_bankid'
+                            to: 'pd_bankid',ignore:true
                         }, {
                             from: 'bk_bankcode',
                             to: 'pd_bankcode'

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

@@ -30,13 +30,29 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         columnWidth: 0.5,
         operation: 'between'
     },{
-        xtype: 'multicombo',
-        name: 'pb_status',
+        xtype: 'combobox',
+        name: 'pb_statuscode',
         fieldLabel: '审核状态',
-        datas: [
-            ["已审核", "已审核"],
-            ["未审核", "未审核"]
-        ]
+        queryMode: 'local',
+        displayField: 'name',
+        valueField: 'value',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+            fields: ['value', 'name'],
+            data: [
+                ["ALL", "全部"],
+                ["AUDITED", "已审核"],
+                ["UNAUDITED", "未审核"]
+            ]
+        }),
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return 'pb_statuscode=\'' + value + '\'';
+            }
+        }
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -186,7 +186,7 @@ Ext.define('saas.view.money.paybalance.QueryPanelController', {
                         addTitle: '资金账户',
                         dbfinds: [{
                             from: 'id',
-                            to: 'pd_bankid'
+                            to: 'pd_bankid',ignore:true
                         }, {
                             from: 'bk_bankcode',
                             to: 'pd_bankcode'

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

@@ -21,13 +21,6 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
     _auditUrl: '/api/money/recbalance/audit/',
     _unAuditUrl: '/api/money/recbalance/unAudit/',
     _deleteUrl: '/api/money/recbalance/delete/',
-
-    // _saveUrl: 'http://192.168.253.35:8880/recbalance/save/',
-    // _readUrl: 'http://192.168.253.35:8880/recbalance/read/',
-    // _auditUrl: 'http://192.168.253.35:8880/recbalance/audit/',
-    // _unAuditUrl: 'http://192.168.253.35:8880/recbalance/unAudit/',
-
-
     initId: 0,
 
     defaultItems: [{
@@ -318,41 +311,49 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         name: 'rb_remark',
         fieldLabel: '备注',
         columnWidth: 1
+    },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
+        xtype : "textfield", 
+        name : "creatorName", 
+        fieldLabel : "录入人", 
+        readOnly:true
     }, {
-        xtype: 'numberfield',
-        name: 'rb_recorderid',
-        fieldLabel: '录入人ID',
-        hidden: true
-    }, {
-        xtype: 'textfield',
-        name: 'rb_recorder',
-        fieldLabel: '录入人',
-        hidden: true
-    }, {
-        xtype: 'numberfield',
-        name: 'updaterId',
-        fieldLabel: '更新人ID',
-        hidden: true
-    }, {
-        xtype: 'datefield',
-        name: 'updatedate',
-        fieldLabel: '更新日期',
-        hidden: true
+        xtype : "datefield", 
+        name : "createTime", 
+        fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
+        readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
     }, {
-        xtype: "datefield",
-        name: "rb_recorddate",
-        fieldLabel: "录入日期",
-        hidden: true
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype: 'textfield',
         name: 'rb_auditman',
         fieldLabel: '审核人',
-        hidden: true
+        readOnly: true
     },{
         xtype: "datefield",
         name: "rb_auditdate",
         fieldLabel: "审核日期",
-        hidden: true
+        readOnly: true
     }],
 
     beforeAudit: function() {

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

@@ -14,7 +14,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                         addTitle: '客户资料',
                         //赋值 
                         dbfinds:[{
-                            from: 'id', to: 'rb_custid'
+                            from: 'id', to: 'rb_custid',ignore:true
                         }, {
                             from:'cu_code', to:'rb_custcode'
                         },{
@@ -276,7 +276,7 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
                         addTitle: '资金账户',
                         dbfinds: [{
                             from: 'id',
-                            to: 'rd_bankid'
+                            to: 'rd_bankid',ignore:true
                         }, {
                             from: 'bk_bankcode',
                             to: 'rd_bankcode'

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

@@ -38,13 +38,29 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
         columnWidth: 0.5,
         operation: 'between'
     },{
-        xtype: 'multicombo',
-        name: 'rb_status',
+        xtype: 'combobox',
+        name: 'rb_statuscode',
         fieldLabel: '审核状态',
-        datas: [
-            ["已审核", "已审核"],
-            ["未审核", "未审核"]
-        ]
+        queryMode: 'local',
+        displayField: 'name',
+        valueField: 'value',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+            fields: ['value', 'name'],
+            data: [
+                ["ALL", "全部"],
+                ["AUDITED", "已审核"],
+                ["UNAUDITED", "未审核"]
+            ]
+        }),
+        getCondition: function(value) {
+            if(value == 'ALL') {
+                return '1=1';
+            }else {
+                return 'rb_statuscode=\'' + value + '\'';
+            }
+        }
     }],
     moreQueryFormItems: [],
     queryGridConfig: {

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

@@ -199,7 +199,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 8 ? 8 :(arr[1].length < 2? 2 : arr[1].length))).fill('0');
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 },
@@ -360,7 +360,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "createtime", 
+        name : "createTime", 
         fieldLabel : "录入日期",
         readOnly:true, 
         defaultValue: new Date()
@@ -376,7 +376,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         readOnly:true
     }, {
         xtype : "hidden", 
-        name : "updatetime", 
+        name : "updateTime", 
         fieldLabel : "更新日期",
         readOnly:true, 
         defaultValue: new Date()

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

@@ -97,7 +97,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         //数据接口
                         dataUrl:'/api/document/employee/list',
                         addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
+                        addTitle: '人员资料',
                         //赋值 
                         dbfinds:[{
                             from:'id',to:'pu_buyerid',ignore:true

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

@@ -355,7 +355,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "createtime", 
+        name : "createTime", 
         fieldLabel : "录入日期",
         readOnly:true, 
         defaultValue: new Date()
@@ -371,7 +371,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         readOnly:true
     }, {
         xtype : "hidden", 
-        name : "updatetime", 
+        name : "updateTime", 
         fieldLabel : "更新日期",
         readOnly:true, 
         defaultValue: new Date()

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

@@ -340,7 +340,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "createtime", 
+        name : "createTime", 
         fieldLabel : "录入日期",
         readOnly:true, 
         defaultValue: new Date()
@@ -356,7 +356,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         readOnly:true
     }, {
         xtype : "hidden", 
-        name : "updatetime", 
+        name : "updateTime", 
         fieldLabel : "更新日期",
         readOnly:true, 
         defaultValue: new Date()

frontend/saas-web/app/view/sale/report/SaleController.js

@@ -38,7 +38,6 @@ Ext.define('saas.view.sale.report.SaleController', {
                         }],
                         dbColumns:[
                             {
-                                conditionCode:'id',
                                 "text": "客户ID",
                                 "flex": 0,
                                 "dataIndex": "id",
@@ -46,7 +45,6 @@ Ext.define('saas.view.sale.report.SaleController', {
                                 "xtype": "",
                                 "items": null
                             },{
-                                conditionCode:'cu_code',
                                 "text": "客户编号",
                                 "flex": 1,
                                 "dataIndex": "cu_code",
@@ -54,14 +52,12 @@ Ext.define('saas.view.sale.report.SaleController', {
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_name',
                                 "text": "客户名称",
                                 "flex": 1,
                                 "dataIndex": "cu_name",
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_type',
                                 "text": "客户类型",
                                 "flex": 1,
                                 "dataIndex": "cu_type",

frontend/saas-web/app/view/sale/report/SaleProfitController.js

@@ -38,7 +38,6 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                         }],
                         dbColumns:[
                             {
-                                conditionCode:'id',
                                 "text": "客户ID",
                                 "flex": 0,
                                 "dataIndex": "id",
@@ -46,7 +45,6 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                                 "xtype": "",
                                 "items": null
                             },{
-                                conditionCode:'cu_code',
                                 "text": "客户编号",
                                 "flex": 1,
                                 "dataIndex": "cu_code",
@@ -54,14 +52,12 @@ Ext.define('saas.view.sale.report.SaleProfitController', {
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_name',
                                 "text": "客户名称",
                                 "flex": 1,
                                 "dataIndex": "cu_name",
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_type',
                                 "text": "客户类型",
                                 "flex": 1,
                                 "dataIndex": "cu_type",

frontend/saas-web/app/view/sale/report/SaleRecController.js

@@ -38,7 +38,6 @@ Ext.define('saas.view.sale.report.SaleRecController', {
                         }],
                         dbColumns:[
                             {
-                                conditionCode:'id',
                                 "text": "客户ID",
                                 "flex": 0,
                                 "dataIndex": "id",
@@ -46,7 +45,6 @@ Ext.define('saas.view.sale.report.SaleRecController', {
                                 "xtype": "",
                                 "items": null
                             },{
-                                conditionCode:'cu_code',
                                 "text": "客户编号",
                                 "flex": 1,
                                 "dataIndex": "cu_code",
@@ -54,14 +52,12 @@ Ext.define('saas.view.sale.report.SaleRecController', {
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_name',
                                 "text": "客户名称",
                                 "flex": 1,
                                 "dataIndex": "cu_name",
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_type',
                                 "text": "客户类型",
                                 "flex": 1,
                                 "dataIndex": "cu_type",

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

@@ -199,14 +199,10 @@ Ext.define('saas.view.sale.sale.FormPanel', {
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
-                    var xr = (new Array(arr[1].length > 8 ? 8 : arr[1].length)).fill('0');
+                    var xr = (new Array(arr[1].length > 8 ? 8 :(arr[1].length < 2? 2 : arr[1].length))).fill('0');
                     var format = '0,000.' + xr.join();
-                    if(!v){
-                        return Ext.util.Format.number(v, '0.00');
-                    }else{
-                        return Ext.util.Format.number(v, format);
-                    }
-                }
+                    return Ext.util.Format.number(v, format);
+               }
             }, 
             {
                 text : "税率", 
@@ -314,17 +310,39 @@ Ext.define('saas.view.sale.sale.FormPanel', {
         fieldLabel : '出货状态', 
         hidden : true,
         readOnly:true
-     }, {
+     },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
         name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "sa_recorddate", 
+        name : "createTime", 
         fieldLabel : "录入日期",
         readOnly:true, 
         defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
+        readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "sa_auditman", 

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

@@ -39,7 +39,6 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         }],
                         dbColumns:[
                             {
-                                conditionCode:'id',
                                 "text": "客户ID",
                                 "flex": 0,
                                 "dataIndex": "id",
@@ -47,7 +46,6 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                                 "xtype": "",
                                 "items": null
                             },{
-                                conditionCode:'cu_code',
                                 "text": "客户编号",
                                 "flex": 1,
                                 "dataIndex": "cu_code",
@@ -55,14 +53,12 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_name',
                                 "text": "客户名称",
                                 "flex": 1,
                                 "dataIndex": "cu_name",
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_type',
                                 "text": "客户类型",
                                 "flex": 1,
                                 "dataIndex": "cu_type",
@@ -119,7 +115,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                         //数据接口
                         dataUrl:'/api/document/employee/list',
                         addXtype: 'document-vendor-formpanel',
-                        addTitle: '供应商资料',
+                        addTitle: '人员资料',
                         //赋值 
                         dbfinds:[{
                             from:'id',to:'id',ignore:true

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

@@ -36,7 +36,6 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                         }],
                         dbColumns:[
                             {
-                                conditionCode:'id',
                                 "text": "客户ID",
                                 "flex": 0,
                                 "dataIndex": "id",
@@ -44,7 +43,6 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                                 "xtype": "",
                                 "items": null
                             },{
-                                conditionCode:'cu_code',
                                 "text": "客户编号",
                                 "flex": 1,
                                 "dataIndex": "cu_code",
@@ -52,14 +50,12 @@ Ext.define('saas.view.sale.sale.QueryPanelController', {
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_name',
                                 "text": "客户名称",
                                 "flex": 1,
                                 "dataIndex": "cu_name",
                                 "xtype": "",
                                 "items": null
                             }, {
-                                conditionCode:'cu_type',
                                 "text": "客户类型",
                                 "flex": 1,
                                 "dataIndex": "cu_type",

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

@@ -279,16 +279,38 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
         name : "pi_remark", 
         fieldLabel : "备注", 
         columnWidth : 0.75
-    }, {
+    },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
-        name : "pi_recordman", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "pi_recorddate", 
+        name : "createTime", 
         fieldLabel : "录入日期",
-        readOnly:true,
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
+        readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
         defaultValue: new Date()
     }, {
         xtype : "textfield", 

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

@@ -40,7 +40,6 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                         }],
                         dbColumns:[
                         {
-                            conditionCode:'id',
                             "text": "客户ID",
                             "flex": 0,
                             "dataIndex": "id",
@@ -48,7 +47,6 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                             "xtype": "",
                             "items": null
                         },{
-                            conditionCode:'cu_code',
                             "text": "客户编号",
                             "flex": 1,
                             "dataIndex": "cu_code",
@@ -56,14 +54,12 @@ Ext.define('saas.view.sale.saleIn.FormPanelController', {
                             "xtype": "",
                             "items": null
                         }, {
-                            conditionCode:'cu_name',
                             "text": "客户名称",
                             "flex": 1,
                             "dataIndex": "cu_name",
                             "xtype": "",
                             "items": null
                         }, {
-                            conditionCode:'cu_type',
                             "text": "客户类型",
                             "flex": 1,
                             "dataIndex": "cu_type",

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

@@ -229,6 +229,9 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                     decimalPrecision: 0,
                     minValue: 0,
                     maxValue: 100
+                }, 
+                renderer : function(v) {
+                    return Ext.util.Format.number(v, '0');
                 }
             },
             {
@@ -282,16 +285,38 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         name : "pi_remark", 
         fieldLabel : "备注", 
         columnWidth : 0.75
-    }, {
+    },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
-        name : "pi_recordman", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
         xtype : "datefield", 
-        name : "pi_recorddate", 
+        name : "createTime", 
         fieldLabel : "录入日期",
-        readOnly:true,
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
+        readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
         defaultValue: new Date()
     }, {
         xtype : "textfield", 

frontend/saas-web/app/view/stock/appropriationInOut/FormPanel.js

@@ -236,7 +236,13 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
         name : "pi_remark", 
         fieldLabel : "备注", 
         columnWidth : 1
-    }, {
+    },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
         name : "creatorName", 
         fieldLabel : "录入人", 
@@ -245,7 +251,24 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
         readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_auditman", 

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

@@ -341,15 +341,38 @@ Ext.define('saas.view.stock.make.FormPanel', {
                 },
             }]
     },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
-        name : "ma_recorder", 
+        name : "creatorName", 
         fieldLabel : "录入人", 
         readOnly:true
     }, {
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
         readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "ma_auditman", 

frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -22,14 +22,6 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
     _auditUrl:'/api/storage/prodinout/audit',
     _unAuditUrl: '/api/storage/prodinout/unAudit/',
     _deleteUrl:'/api/storage/prodinout/delete/',
-
-    // _relationColumn: 'pd_piid',
-    // _readUrl:'http://localhost:9000/prodinout/read/',
-    // _saveUrl:'http://localhost:9000/prodinout/save',
-    // _auditUrl:'http://localhost:9000/prodinout/audit',
-    // _unAuditUrl:'http://localhost:9000/prodinout/unAudit',
-    // _deleteUrl:'http://localhost:9000/prodinout/delete/',
-
     initId:0,
 
     toolBtns: [],
@@ -301,6 +293,12 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             }
         ]
     },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
         name : "creatorName", 
         fieldLabel : "录入人", 
@@ -309,7 +307,24 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
         readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_auditman", 

frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -21,13 +21,6 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
     _auditUrl: '/api/storage/prodinout/audit',
     _unAuditUrl: '/api/storage/prodinout/unAudit/',
     _deleteUrl: '/api/storage/prodinout/delete/',
-
-    // _relationColumn: 'pd_piid',
-    // _readUrl:'http://localhost:9000/prodinout/read/',
-    // _saveUrl:'http://localhost:9000/prodinout/save',
-    // _auditUrl:'http://localhost:9000/prodinout/audit',
-    // _deleteUrl:'http://localhost:9000/prodinout/delete/',
-
     initId: 0,
 
     toolBtns: [],
@@ -283,6 +276,12 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             }
         ]
     },{
+        xtype : "hidden", 
+        name : "creatorId", 
+        fieldLabel : "录入人ID", 
+        readOnly:true
+    },
+    {
         xtype : "textfield", 
         name : "creatorName", 
         fieldLabel : "录入人", 
@@ -291,7 +290,24 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
         xtype : "datefield", 
         name : "createTime", 
         fieldLabel : "录入日期",
+        readOnly:true, 
+        defaultValue: new Date()
+    },{
+        xtype : "hidden", 
+        name : "updaterId", 
+        fieldLabel : "更新人ID", 
         readOnly:true
+    },{
+        xtype : "hidden", 
+        name : "updaterName", 
+        fieldLabel : "更新人", 
+        readOnly:true
+    }, {
+        xtype : "hidden", 
+        name : "updateTime", 
+        fieldLabel : "更新日期",
+        readOnly:true, 
+        defaultValue: new Date()
     }, {
         xtype : "textfield", 
         name : "pi_auditman", 

frontend/saas-web/app/view/sys/baseconfig/FormPanel.js

@@ -10,8 +10,8 @@ Ext.define('saas.view.sys.baseconfig.FormPanel', {
     
     //字段属性
     _idField: 'id',
-    _readUrl:'http://192.168.253.31:8560/api/account/company/read/current',
-    _saveUrl:'http://192.168.253.31:8560/api/account/company/save',
+    _readUrl:'/api/commons/configs/list',
+    _saveUrl:'/api/commons/configs/update',
 
     //基础属性
     frame:true,
@@ -38,274 +38,53 @@ Ext.define('saas.view.sys.baseconfig.FormPanel', {
         },'->']
     },
 
-    items: [{
-        bind:'{id}',
-        xtype: 'hidden',
-        name: 'id',
-        fieldLabel: 'id',
-        allowBlank: true,
-        width:600
-    },{
-        bind:'{name}',
-        xtype: 'textfield',
-        name: 'name',
-        fieldLabel: '公司名称',
-        allowBlank: true,
+    items: [{ 
+        bind:'{cucaltor}',
+        displayField : "display", 
         editable:false,
-        readOnly:true,
-        width:600
-    },{
-        bind:'{address}',
-        xtype: 'textfield',
-        name: 'address',
-        fieldLabel: '公司地址',
-        beforeLabelTextTpl : "<font color=\"red\" style=\"position:relative; top:2px;right:2px; font-weight: bolder;\">*</font>",
-        allowBlank: false,
-        width:600
-    },{
-        bind:'{tel}',
-        xtype: 'textfield',
-        name: 'tel',
-        fieldLabel: '电话',
+        hideTrigger : false, 
+        maxLength : 100.0, 
+        width:500,
+        minValue : null, 
+        queryMode : "local", 
+        valueField : "value", 
+        xtype : "combo",
+        value:'WACC',
+        store:{
+            fields: ['display', 'value'],
+            data : [
+                {"display":"加权平均法", "value":'WACC'},
+                {"display":"先进先出法", "value":'FIFO'}
+            ]
+        },
+        name : "cucaltor", 
         beforeLabelTextTpl : "<font color=\"red\" style=\"position:relative; top:2px;right:2px; font-weight: bolder;\">*</font>",
-        allowBlank: false,
-        width:500
+        fieldLabel : "库存计算方式", 
+        allowBlank : false, 
     },{
-        bind:'{fax}',
-        xtype: 'textfield',
-        name: 'fax',
-        fieldLabel: '传真',
-        allowBlank: true,
+        bind:'{printUrl}',
+        xtype : "textfield", 
+        name : "printUrl",
+        fieldLabel : "打印地址Url", 
+        allowBlank : false, 
         width:500
-    }
-    // ,{
-    //     bind:'{en_begindate}',
-    //     xtype : "datefield", 
-    //     name : "en_begindate",
-    //     format:'Y-m-d H:i:s', 
-    //     fieldLabel : "开账日期", 
-    //     allowBlank : true, 
-    //     editable:false,
-    //     hideTrigger:true,
-    //     readOnly:true,
-    //     width:500
-    // }
-    // ,{ 
-    //     bind:'{en_pricemethod}',
-    //     displayField : "display", 
-    //     editable:false,
-    //     hideTrigger : false, 
-    //     maxLength : 100.0, 
-    //     width:500,
-    //     minValue : null, 
-    //     queryMode : "local", 
-    //     valueField : "value", 
-    //     xtype : "combo",
-    //     value:'WACC',
-    //     store:{
-    //         fields: ['display', 'value'],
-    //         data : [
-    //             {"display":"加权平均法", "value":'WACC'},
-    //             {"display":"先进先出法", "value":'FIFO'}
-    //         ]
-    //     },
-    //     name : "en_pricemethod", 
-    //     beforeLabelTextTpl : "<font color=\"red\" style=\"position:relative; top:2px;right:2px; font-weight: bolder;\">*</font>",
-    //     fieldLabel : "库存计算方式", 
-    //     allowBlank : false, 
-    // }
-    // ,{  
-    //     ignore:true,
-    //     bind:'{updateTime}',
-    //     xtype : "datefield", 
-    //     name : "updateTime", 
-    //     fieldLabel : "更新时间", 
-    //     allowBlank : true, 
-    //     hideTrigger:true,
-    //     format:'Y-m-d H:i:s',
-    //     editable:false,
-    //     readOnly:true,
-    //     width:500,
-    // }
-    ,{
-        xtype: 'form',
-		width:600,
-		frame: false,
-		border: false,
-		minHeight: 22,
-		bodyStyle: 'padding:2px;',
-        layout: 'hbox',
-        items:[{
-            bind:'{signet}',
-            name : "signet", 
-            allowBlank : true, 
-            hidden:true,
-            xtype:'numberfield'
-        },{
-            allowBlank : true, 
-            width:500,
-            fieldLabel:'打印章上传',
-            xtype: 'filefield',
-            emptyText: '请选择图片',
-            buttonText: '',
-            buttonConfig: {
-                iconCls: 'x-fa fa-picture-o',
-            },
-            createFileInput : function() {
-                    var me = this;
-                    me.fileInputEl = me.button.el.createChild({
-                    name: me.getName(),
-                    cls: Ext.baseCSSPrefix + 'form-file-input',
-                    tag: 'input',
-                    type: 'file',
-                    size: 1,
-                    accept:"image/*"
-                }).on('change', me.onFileChange, me);
-            },
-            listeners: {
-                afterrender:function(field,ops){
-                    var fileEl = field.fileInputEl.dom;
-                    fileEl.setAttribute("accept","image/*");
-                },
-                change: function(field){
-                    var form = field.ownerCt.ownerCt;
-                    var myForm = field.ownerCt;
-                    var fileEl = field.fileInputEl.dom;
-                    var fd = new FormData();
-                    fd.append('file', fileEl.files[0]);
-                    form.setLoading(true);
-                    Ext.Ajax.request({
-                        url: 'http://192.168.253.31:8560/api/file/upload',//这里是填写需要跨域访问的URL
-                        cors: true,
-                        useDefaultXhrHeader: false,
-                        method: 'post',
-                        rawData: fd,
-                        headers: {
-                            'Access-Control-Allow-Origin': '*',
-                            'Authorization':  saas.util.State.get('session').token,
-                            //"Content-Type": 'multipart/form-data'  //文件上传的格式， 
-                            "Content-Type":null
-                        },
-                        success: function (response, opts) {
-                            form.setLoading(false);
-                            saas.util.BaseUtil.showToast('上传成功');
-                            var res = Ext.decode(response.responseText);
-                            if(res.success){
-                                var data = res.data;
-                                var name = data.name + "  (" + Ext.util.Format.fileSize(data.size) + ")";
-                                myForm.down('[name=signet]').setValue(data.id);
-                                field.setRawValue(name);
-                            }else{
-                                saas.util.BaseUtil.showToast('上传失败: ' + res.message);
-                            }
-                        },
-                        failure: function (response, opts) {
-                            form.setLoading(false);
-                            var res = Ext.decode(response.responseText);
-                            saas.util.BaseUtil.showToast('上传失败: ' + res.message);
-                        }
-                    });
-                }
-            }
-        },{
-            hidden:true,
-            name:'showSignetPhoto',
-            xtype:'button',
-            iconCls: 'x-fa fa-picture-o'
-        }]
-    },{
-        xtype: 'form',
-		width:600,
-		frame: false,
-		border: false,
-		minHeight: 22,
-		bodyStyle: 'padding:2px;',
-        layout: 'hbox',
-        items:[{
-            bind:'{logoUrl}',
-            name : "logoUrl", 
-            allowBlank : true, 
-            hidden:true,
-            xtype:'numberfield'
-        },{
-            allowBlank : true, 
-            width:500,
-            fieldLabel:'Logo上传',
-            xtype: 'filefield',
-            emptyText: '请选择图片',
-            buttonText: '',
-            buttonConfig: {
-                iconCls: 'x-fa fa-picture-o',
-            },
-            createFileInput : function() {
-                    var me = this;
-                    me.fileInputEl = me.button.el.createChild({
-                    name: me.getName(),
-                    cls: Ext.baseCSSPrefix + 'form-file-input',
-                    tag: 'input',
-                    type: 'file',
-                    size: 1,
-                    accept:"image/*"
-                }).on('change', me.onFileChange, me);
-            },
-            listeners: {
-                change: function(field){
-                    var form = field.ownerCt.ownerCt;
-                    var myForm = field.ownerCt;
-                    var fileEl = field.fileInputEl.dom;
-                    var fd = new FormData();
-                    fd.append('file', fileEl.files[0]);
-                    form.setLoading(true);
-                    Ext.Ajax.request({
-                        url: 'http://192.168.253.31:8560/api/file/upload',//这里是填写需要跨域访问的URL
-                        cors: true,
-                        useDefaultXhrHeader: false,
-                        method: 'post',
-                        rawData: fd,
-                        headers: {
-                            'Access-Control-Allow-Origin': '*',
-                            'Authorization':  saas.util.State.get('session').token,
-                            //"Content-Type": 'multipart/form-data'  //文件上传的格式， 
-                            "Content-Type":null
-                        },
-                        success: function (response, opts) {
-                            form.setLoading(false);
-                            saas.util.BaseUtil.showToast('上传成功');
-                            var res = Ext.decode(response.responseText);
-                            if(res.success){
-                                var data = res.data;
-                                var name = data.name + "  (" + Ext.util.Format.fileSize(data.size) + ")";
-                                myForm.down('[name=logoUrl]').setValue(data.id);
-                                field.setRawValue(name);
-                            }else{
-                                saas.util.BaseUtil.showToast('上传失败: ' + res.message);
-                            }
-                        },
-                        failure: function (response, opts) {
-                            form.setLoading(false);
-                            var res = Ext.decode(response.responseText);
-                            saas.util.BaseUtil.showToast('上传失败: ' + res.message);
-                        }
-                    });
-                }
-            }
-        },{
-            hidden:true,
-            name:'showLogoPhoto',
-            xtype:'button',
-            iconCls: 'x-fa fa-picture-o'
-        }]
     }],
 
     initComponent: function () {
         var me = this,
         viewModel = me.getViewModel();
         var url = me._readUrl;
-        me.BaseUtil.request({url })
+        saas.util.BaseUtil.request({url })
         .then(function(res) {
             if(res.success) {
-                var d = res.data;
-                viewModel.setData(d)
+                var list = res.data.list;
+                if(list.length>0){
+                    var d = {};
+                    Ext.each(list, function(item, index){
+                        d[item.code] = item.data;
+                    });
+                    viewModel.setData(d);
+                }
             }
         })
         .catch(function(response) {

frontend/saas-web/app/view/sys/baseconfig/FormPanelController.js

@@ -30,12 +30,18 @@ Ext.define('saas.view.sys.baseconfig.FormPanelController', {
             saas.util.BaseUtil.showToast('未修改数据，请修改后保存');
             return false;
         }
-        
         viewModel = me.getViewModel();
-        var formData = viewModel.data;
-        formData.en_name = null;
-        formData.updateTime = null;
-        me.BaseUtil.request({
+        var formData = [];
+
+        var items = me.view.getForm().getFields().items;
+        Ext.each(items, function(item, index){
+            formData.push({
+                code:item.name,
+                data:item.value
+            })
+        });
+
+        saas.util.BaseUtil.request({
             url: form._saveUrl,
             params: JSON.stringify(formData),
             method: 'POST',
@@ -45,11 +51,17 @@ Ext.define('saas.view.sys.baseconfig.FormPanelController', {
                 saas.util.BaseUtil.showToast('保存成功');
                 viewModel = form.getViewModel();
                 var url = form._readUrl;
-                form.BaseUtil.request({url })
+                saas.util.BaseUtil.request({url })
                 .then(function(res) {
                     if(res.success) {
-                        var d = res.data;
-                        viewModel.setData(d)
+                        var list = res.data.list;
+                        if(list.length>0){
+                            var d = {};
+                            Ext.each(list, function(item, index){
+                                d[item.code] = item.data;
+                            });
+                            viewModel.setData(d);
+                        }
                     }
                 })
                 .catch(function(response) {
@@ -62,5 +74,4 @@ Ext.define('saas.view.sys.baseconfig.FormPanelController', {
             saas.util.BaseUtil.showToast('保存失败: ' + res.message);
         });
     }
-
 });

frontend/saas-web/app/view/sys/config/FormPanel.js

@@ -131,23 +131,21 @@ Ext.define('saas.view.sys.config.FormPanel', {
 		border: false,
 		minHeight: 22,
 		bodyStyle: 'padding:2px;',
-        layout: 'hbox',
+        layout: 'vbox',
         items:[{
             bind:'{signet}',
             name : "signet", 
             allowBlank : true, 
             hidden:true,
-            xtype:'numberfield'
+            xtype:'textfield'
         },{
             allowBlank : true, 
-            width:500,
+            width:150,
+            buttonOnly:true,
             fieldLabel:'打印章上传',
             xtype: 'filefield',
-            emptyText: '请选择图片',
-            buttonText: '',
-            buttonConfig: {
-                iconCls: 'x-fa fa-picture-o',
-            },
+            name:'signetFilefield',
+            buttonText: '选择图片',
             createFileInput : function() {
                     var me = this;
                     me.fileInputEl = me.button.el.createChild({
@@ -190,8 +188,15 @@ Ext.define('saas.view.sys.config.FormPanel', {
                             if(res.success){
                                 var data = res.data;
                                 var name = data.name + "  (" + Ext.util.Format.fileSize(data.size) + ")";
-                                myForm.down('[name=signet]').setValue(data.id);
+                                myForm.down('[name=signet]').setValue(data.fullPath);
                                 field.setRawValue(name);
+                                //读取图片
+                                if(data.id){
+                                    var img = myForm.down('[name=SignetPhoto]');
+                                    img.el.dom.src = 'http://192.168.253.31:8560/api/file/download?path='+data.fullPath;
+                                    var showSignetPhoto = form.down('[name=showSignetPhoto]');
+                                    showSignetPhoto.show();
+                                }
                             }else{
                                 saas.util.BaseUtil.showToast('上传失败: ' + res.message);
                             }
@@ -205,10 +210,44 @@ Ext.define('saas.view.sys.config.FormPanel', {
                 }
             }
         },{
-            hidden:true,
+            xtype:'displayfield',
+            margin:'0 0 0 150',
+            value:'支持 JPG、JPEG、PNG、BMP 格式 , 图片小于10M ',  
+        },{
+            xtype: 'image',
+            width: 100,
+            height: 100,
+            margin:'0 0 5 150',
+            src:'resources/images/default/basePhoto.png',
+            name:'SignetPhoto',
+        },{
+            margin:'0 0 5 151',
+            xtype:'container',
             name:'showSignetPhoto',
-            xtype:'button',
-            iconCls: 'x-fa fa-picture-o'
+            cls:'x-container-group',
+            hidden:true,
+            items:[{
+                width: 45,
+                height: 24,
+                xtype:'button',
+                text:'查看',
+                handler:function(b){
+                    var form = b.ownerCt.ownerCt.ownerCt;
+                    var img = form.down('[name=SignetPhoto]');
+                    form.lookPic(img);
+                }
+            },{
+                margin:'0 0 0 10',
+                width: 45,
+                height: 24,
+                xtype:'button',
+                text:'下载',
+                handler:function(b){
+                    var form = b.ownerCt.ownerCt.ownerCt;
+                    var path = form.down('[name=signet]').value;
+                    form.downLoad(path);
+                }
+            }]
         }]
     },{
         xtype: 'form',
@@ -217,23 +256,21 @@ Ext.define('saas.view.sys.config.FormPanel', {
 		border: false,
 		minHeight: 22,
 		bodyStyle: 'padding:2px;',
-        layout: 'hbox',
+        layout: 'vbox',
         items:[{
             bind:'{logoUrl}',
             name : "logoUrl", 
             allowBlank : true, 
             hidden:true,
-            xtype:'numberfield'
+            xtype:'textfield'
         },{
             allowBlank : true, 
-            width:500,
+            width:150,
+            buttonOnly:true,
             fieldLabel:'Logo上传',
+            name:'logoFilefield',
             xtype: 'filefield',
-            emptyText: '请选择图片',
-            buttonText: '',
-            buttonConfig: {
-                iconCls: 'x-fa fa-picture-o',
-            },
+            buttonText: '选择图片',
             createFileInput : function() {
                     var me = this;
                     me.fileInputEl = me.button.el.createChild({
@@ -276,8 +313,14 @@ Ext.define('saas.view.sys.config.FormPanel', {
                             if(res.success){
                                 var data = res.data;
                                 var name = data.name + "  (" + Ext.util.Format.fileSize(data.size) + ")";
-                                myForm.down('[name=logoUrl]').setValue(data.id);
-                                field.setRawValue(name);
+                                myForm.down('[name=logoUrl]').setValue(data.fullPath);
+                                //读取图片
+                                if(data.id){
+                                    var img = myForm.down('[name=LogoPhoto]');
+                                    img.el.dom.src = 'http://192.168.253.31:8560/api/file/download?path='+data.fullPath;
+                                    var showLogoPhoto = form.down('[name=showLogoPhoto]');
+                                    showLogoPhoto.show();
+                                }
                             }else{
                                 saas.util.BaseUtil.showToast('上传失败: ' + res.message);
                             }
@@ -291,10 +334,45 @@ Ext.define('saas.view.sys.config.FormPanel', {
                 }
             }
         },{
-            hidden:true,
+            xtype:'displayfield',
+            margin:'0 0 0 150',
+            value:'支持 JPG、JPEG、PNG、BMP 格式 , 图片小于10M ',  
+        },{
+            xtype: 'image',
+            style:'border:1px solid #f7f7f7;',
+            width: 100,
+            height: 100,
+            margin:'0 0 5 150',
+            src:'resources/images/default/basePhoto.png',
+            name:'LogoPhoto',
+        },{
             name:'showLogoPhoto',
-            xtype:'button',
-            iconCls: 'x-fa fa-picture-o'
+            margin:'0 0 5 151',
+            xtype:'container',
+            cls:'x-container-group',
+            hidden:true,
+            items:[{
+                width: 45,
+                height: 24,
+                xtype:'button',
+                text:'查看',
+                handler:function(b){
+                    var form = b.ownerCt.ownerCt.ownerCt;
+                    var img = form.down('[name=LogoPhoto]');
+                    form.lookPic(img);
+                }
+            },{
+                margin:'0 0 0 10',
+                width: 45,
+                height: 24,
+                xtype:'button',
+                text:'下载',
+                handler:function(b){
+                    var form = b.ownerCt.ownerCt.ownerCt;
+                    var path = form.down('[name=logoUrl]').value;
+                    form.downLoad(path);
+                }
+            }]
         }]
     }],
 
@@ -306,7 +384,9 @@ Ext.define('saas.view.sys.config.FormPanel', {
         .then(function(res) {
             if(res.success) {
                 var d = res.data;
-                viewModel.setData(d)
+                viewModel.setData(d);
+                viewModel.notify();
+                me.load(me);
             }
         })
         .catch(function(response) {
@@ -318,5 +398,90 @@ Ext.define('saas.view.sys.config.FormPanel', {
 
     refresh:function(){
         this.ownerCt.setTitle('参数设置')
+    },
+
+    load:function(form){
+        //打印章
+        var signet = form.down('[name=signet]').value;
+        if(signet&&signet!=''){
+            var img = form.down('[name=SignetPhoto]');
+            img.el.dom.src = 'http://192.168.253.31:8560/api/file/download?path='+signet;
+            // var name = data.name + "  (" + Ext.util.Format.fileSize(data.size) + ")";
+            // myForm.down('[name=signet]').setValue(data.fullPath);
+            // field.setRawValue(name);
+            var showSignetPhoto = form.down('[name=showSignetPhoto]');
+            showSignetPhoto.show();
+        }
+        //Logo
+        var logoUrl = form.down('[name=logoUrl]').value;
+        if(logoUrl&&logoUrl!=''){
+            var img = form.down('[name=LogoPhoto]');
+            img.el.dom.src = 'http://192.168.253.31:8560/api/file/download?path='+logoUrl;
+            var showLogoPhoto = form.down('[name=showLogoPhoto]');
+            showLogoPhoto.show();
+        }
+        //文件名称
+        // var viewModel = form.getViewModel();
+        // if(viewModel.data.fileInfoList&&viewModel.data.fileInfoList.length!=0){
+        //     var logo = viewModel.data.fileInfoList[0].logo;
+        //     var logoName = logo.name + "  (" + Ext.util.Format.fileSize(logo.size) + ")";
+        //     var signet = viewModel.data.fileInfoList[0].signet;
+        //     var signetName = signet.name + "  (" + Ext.util.Format.fileSize(signet.size) + ")";
+        // }
+    },
+
+    lookPic:function(img){
+        var me = this, resizer = me.resizer,
+        imageframe = document.getElementById('ext-image-frame');
+        var src = img.el.dom.src;
+        if (!imageframe) {
+            var el = Ext.DomHelper.append(document.body, '<img id="ext-image-frame" src="' + src +
+                    '" width="500" height="400" style="position:absolute;left:0;top:0px;"/>', true);
+            imageframe = el.dom;
+        } else {
+            imageframe.src = src;
+        }
+        if (!resizer) {
+            resizer = this.resizer = Ext.create('Ext.resizer.Resizer', {
+                target: 'ext-image-frame',
+                pinned: true,
+                width: 410,
+                height: 310,
+                minWidth: 100,
+                minHeight: 80,
+                preserveRatio: true,
+                handles: 'all',
+                dynamic: true,
+                constrainTo:me.getEl()
+            });
+            var resizerEl = resizer.getEl();
+            resizerEl.on('dblclick', function(){
+                resizerEl.hide(true);
+            });
+        }
+        resizer.getEl().center();
+        resizer.getEl().show(true);
+        Ext.DomHelper.applyStyles(imageframe, 'position:absolute;z-index:100;');
+    },
+
+    downLoad:function(path){
+        //ajax 响应下载必须要创建一个form实例
+
+        window.location.href = 'http://192.168.253.31:8560/api/file/download?path='+path;
+
+        // if (!Ext.fly('ext-attach-download')) {  
+		// 	var frm = document.createElement('form');  
+		// 	frm.id = 'ext-attach-download';  
+		// 	frm.name = id;  
+		// 	frm.className = 'x-hidden';
+		// 	document.body.appendChild(frm);
+        // }
+		// Ext.Ajax.request({
+		// 	url: 'http://192.168.253.31:8560/api/file/download?path='+path,  
+		// 	method: 'post',
+		// 	form: Ext.fly('ext-attach-download'),
+		// 	isUpload: true,
+		// 	params: ''
+		// });
     }
 });

frontend/saas-web/app/view/sys/feedback/FormPanel.js

@@ -8,34 +8,46 @@ Ext.define('saas.view.sys.feedback.FormPanel', {
     viewName: 'sys-feedback-formpanel',
     caller:'feedBack',
     
-    defaultType: 'textfield',
-        fieldDefaults: {
-            labelWidth: 60
-        },
+    layout: 'column',
+    autoScroll: true,
 
-        layout: {
-            type: 'vbox',
-            align: 'stretch'
-        },
-
-        bodyPadding: 10,
-        border: false,
+    fieldDefaults: {
+        margin: '0 0 10 0',
+        labelAlign: 'right',
+        labelWidth: 90,
+        columnWidth: 0.25,
+    },
+    bodyPadding: 10,
+    border: false,
 
     items: [{
         xtype: 'hidden',
         name: 'id',
-        fieldLabel: 'id'
+        fieldLabel: 'id',
+        readOnly:true,
+        defaultVale:saas.util.BaseUtil.getCurrentUser().id
     }, {
         xtype : "textfield", 
         name : "fb_name", 
-        fieldLabel : "姓名"
+        fieldLabel : "姓名",
+        readOnly:true,
+        defaultVale:saas.util.BaseUtil.getCurrentUser().realname
     }, {
         xtype : "textfield", 
         name : "fb_mobile", 
-        fieldLabel : "联系方式"
+        fieldLabel : "手机号",
+        defaultVale:saas.util.BaseUtil.getCurrentUser().mobile
+    }, {
+        xtype : "textfield", 
+        name : "fb_QQ", 
+        fieldLabel : "QQ"
+    }, {
+        xtype : "textfield", 
+        name : "fb_wechat", 
+        fieldLabel : "微信"
     }, {
-        xtype : "textarea", 
-        name : "fb_email", 
+        xtype : "html", 
+        name : "fb_msg", 
         fieldLabel : "反馈内容",
         flex: 1
     }],buttons: [{

frontend/saas-web/app/view/sys/guide/FormPanel.js

@@ -157,9 +157,18 @@ Ext.define('saas.view.sys.guide.FormPanel', {
     },
 
     refresh:function(){
-        this.ownerCt.setTitle('新手指引');
-        this.view.store.load();
+        this.ownerCt.setTitle('新手导航');
         //刷新store数据
+        this.view.store.load();
+        //刷新窗口
+        var win = this.down('[name=messagebox]');
+        if(win){
+            win.show({
+                title : '模块介绍',
+                msg : win.msg.html,
+                icon : win._icon
+            });
+        }
     },
 
     showInformation:function(type,value){
@@ -168,37 +177,37 @@ Ext.define('saas.view.sys.guide.FormPanel', {
         var icon = 'x-gudie-information';
         var title = '';
         if(type=='baseSet'){
-            message = '<h4>您可以在参数设置中编辑公司的信息。</br>'+
-            '录入完成后切换到“新手导航”页签继续下一步。</h4>';
-            xtype = 'sys-config-formpanel';
+            message = '<span>您可以在参数设置中编辑公司的信息。</br>'+
+            '录入完成后切换到“新手导航”页签继续下一步。</span>';
+            xtype = 'sys-manager-formpanel';
         }
         if(type=='warehouse'){
-            message = '<h4>因为新增物料时需要告知该物料所属仓库是哪里，所以需要首先进行仓库管理。</br>'+
-            '录入完成后切换到“新手导航”页签继续下一步。</h4>';
+            message = '<span>因为新增物料时需要告知该物料所属仓库是哪里，所以需要首先进行仓库管理。</br>'+
+            '录入完成后切换到“新手导航”页签继续下一步。</span>';
             xtype = 'other-warehouse';
             title = '仓库资料'
         }
         if(type=='product'){
-            message = '<h4>录入物料及其期初数量；开账后也可通过录采购单对物料库存进行增加，</br>录销售单物料库存相应减少。</br>'+
-            '录入完成后切换到“新手导航”页签继续下一步。</h4>';
+            message = '<span>录入物料及其期初数量；开账后也可通过录采购单对物料库存进行增加，</br>录销售单物料库存相应减少。</br>'+
+            '录入完成后切换到“新手导航”页签继续下一步。</span>';
             xtype = 'document-product-basepanel';
             title = '物料资料'
         }
         if(type=='customer'){
-            message = '<h4>对客户资料进行录入及管理。</br>'+
-            '录入完成后切换到“新手导航”页签继续下一步。</h4>';
+            message = '<span>对客户资料进行录入及管理。</br>'+
+            '录入完成后切换到“新手导航”页签继续下一步。</span>';
             xtype = 'document-customer-basepanel';
             title = '客户资料'
         }
         if(type=='vendor'){
-            message = '<h4>录采购单时需选择供应商，在单据页面选择供应商时</br>也提供供应商新增功能，您也可以跳过此步。</br>'+
-            '录入完成后切换到“新手导航”页签继续下一步。</h4>';
+            message = '<span>录采购单时需选择供应商，在单据页面选择供应商时</br>也提供供应商新增功能，您也可以跳过此步。</br>'+
+            '录入完成后切换到“新手导航”页签继续下一步。</span>';
             xtype = 'document-vendor-basepanel';
             title = '供应商资料'
         }
         if(type=='begin'){
-            message = '<h4>欢迎您使用优企云进销存！</br>'+
-            '温馨提示：开账后您还是可以通过左侧菜单栏对基础资料进行维护。</h4>';
+            message = '<span>欢迎您使用优企云进销存！</br>'+
+            '温馨提示：开账后您还是可以通过左侧菜单栏对基础资料进行维护。</span>';
             xtype = "begin";
             icon = 'x-gudie-end';
             if(value=='false'){
@@ -214,6 +223,9 @@ Ext.define('saas.view.sys.guide.FormPanel', {
         var width = box.width;
 
         var win = form.add(Ext.create('Ext.window.MessageBox', {
+            name:'messagebox',
+            closeAction:'destroy',
+            _icon:icon,
             msg:message,
             buttonAlign : 'right',
             height:0.5*height,

frontend/saas-web/app/view/sys/manager/FormPanel.scss

@@ -32,6 +32,15 @@
             width:100px !important;
         }
     }
+    .x-img-default{
+        border: 1px solid #bdbdbd !important;
+    }
+    .x-container-group{
+        .x-btn-inner-default-small {
+            margin-bottom: 9px !important;
+            padding: 0 !important; 
+        }
+    }
 }
 .sys-account-datalist{
     .x-grid-body{

frontend/saas-web/ext/packages/modern-locale/overrides/zh_CN/field/Date.js

@@ -6,7 +6,7 @@ Ext.define('Ext.locale.zh_CN.field.Date', {
     override: 'Ext.form.field.Date',
 
     config: {
-        formatText: '当前日期格式为 {0}.',
+        formatText: '',//当前日期格式为 {0}.
         minDateMessage: '该输入项的日期必须在 {0} 之后',
         maxDateMessage: '该输入项的日期必须在 {0} 之前',
         minText: "日期必须大于等于 {0}",

frontend/saas-web/resources/json/navigation.json

@@ -140,11 +140,6 @@
             "text": "收款单",
             "addType": "money-recbalance-formpanel",
             "viewType": "money-recbalance-querypanel"
-        }, {
-            "id": "verification",
-            "text": "核销单",
-            "addType": "money-verification-formpanel",
-            "viewType": "money-verification-querypanel"
         }, {
             "id": "othReceipts",
             "text": "其它收入单",
@@ -272,10 +267,6 @@
             "text": "收支类别",
             "viewType": "document-kind",
             "leaf": true
-        }, {
-            "text": "用户角色",
-            "viewType": "mainlist",
-            "leaf": true
         }]
     }]
 },{