Explorar el Código

放大镜联系

hy hace 7 años
padre
commit
fa40f5d16a

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

@@ -221,7 +221,7 @@ Ext.define('saas.util.FormUtil', {
                             var detnoColumn = grid.detnoColumn;
                             var datas = [];
                             
-                            Ext.Array.each(new Array(3), function() {
+                            Ext.Array.each(new Array(10), function() {
                                 detno += 1;
                                 var data = {};
                                 data[detnoColumn] = detno;

+ 14 - 6
frontend/saas-web/app/view/core/dbfind/DbfindTrigger.js

@@ -42,7 +42,7 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
                             if(i==0){
                                 span=span+'<span style="width:'+dbtpls[i].width+'px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;float:left;">{'+dbtpls[i].field+'}</span>';//display:block;
                             }else{
-                                span=span+'<span style="width:'+dbtpls[i].width+'px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;float:left;">{'+dbtpls[i].field+'}</span>';
+                                span=span+'<span style="padding:0 0 0 20px;width:'+dbtpls[i].width+'px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;float:left;">{'+dbtpls[i].field+'}</span>';
                             }
                             if(dbtpls[i].dbField=="true"){
                                 me.searchFieldArray=dbtpls[i].field;
@@ -68,11 +68,19 @@ Ext.define('saas.view.core.dbfind.DbfindTrigger', {
                 }
                 //加载数据
                 var data,dbCondition=[];
-                if(me.dbtplcondition){
-                    dbCondition = [{
-                        type: 'condition',
-                        value:me.dbtplcondition,
-                    }];
+                if(me.dbfinds){
+                    var dbtplcondition = "";
+                    for (let index = 0; index < dbfinds.length; index++) {
+                        var item = dbfinds[index].from;
+                        dbtplcondition+= "upper("+item+") like '%"+queryString.toUpperCase()+"%' or ";
+                    }
+                    dbtplcondition = "(" + dbtplcondition.substring(0,dbtplcondition.length-4) + ")";
+                    if(dbtplcondition.length>0){
+                        dbCondition = [{
+                            type: 'condition',
+                            value:dbtplcondition
+                        }];
+                    }
                 }
                 //添加默认条件
                 if(me.defaultCondition) {

+ 1 - 1
frontend/saas-web/app/view/document/product/FormController.js

@@ -86,7 +86,7 @@ Ext.define('saas.view.document.product.FormController', {
                         defaultCondition:"wh_statuscode='OPEN'",
                         //联想设置
                         dbtpls:[{
-                            field:'wh_code',width:100
+                            field:'wh_code',width:180
                         },{
                             field:'wh_description',width:100
                         }],

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

@@ -110,5 +110,16 @@ Ext.define('saas.view.sys.config.FormPanel', {
         allowBlank : true, 
         editable:false,
         columnWidth : 0.25
-    }]
+    }],
+
+    initComponent: function () {
+        var me = this,
+        viewModel = me.getViewModel();
+
+        viewModel.set('createTime', Ext.Date.format(new Date(), 'Y-m-d H:i:s'));
+        viewModel.set('updateTime', Ext.Date.format(new Date(), 'Y-m-d H:i:s'));
+        viewModel.setFormulas(o);
+        viewModel.set(statusCodeField, auditTexts.unAuditCode);
+        me.callParent(arguments);
+    }
 });