fs-danaus
2022-05-25 ea472b9b5aa3629957c4e7cb698834a45adf718c
core.js
@@ -2107,21 +2107,10 @@
      } catch (e) { }
      var sf = GT.threePop.setupParms(to, tep, df, filter, _.id, alue, _.formParm, rec, " like", false, false, true, false, this.Data.seInfo, null, null, null, null, this);
      this.setGridInfoTOPop(_, this, row);
      // if (_.colType != undefined && _.colType == 46) {
      //    //打开序列号扫码界面
      //    sf += "@p@" + this.id;
      //    showLayerGrid("/general/SerialNumber/warehousing.jsp" + sf, "-1");
      // } else {
         _.path = _.path.replace("#spellPath#", spellPath);
         parent.addTab("", _.formid, _.wtype, "", _.path + sf);
      //}
   } else {
      // if(_.colType==46){
      //    document.getElementById(_.Name+"_color").click();
      //    return;
      // }else{
      this.popAttr(_, row, col, 1);
      //}
   }
};
@@ -3111,7 +3100,13 @@
   for (var c in this.Cols) {
      if(this.Cols[c].colType==46){
         V[c+"CanEdit"]=0;
         V[c+"HtmlPrefix"]="<div style=\"background:#ffffff\"><input title=\"&#x53CC;&#x51FB;&#x9009;&#x53D6;&#x989C;&#x8272;\" type=\"color\"  style=\"width: 100%;height:25;border: none;\" value=\"#ffffff\" id=\""+c+"_color\" onchange=\"Grids["+this.Index+"].setcolorby46(this);\"/></div>";
         V[c+"HtmlPrefix"]="<div style=\"background:#ffffff\"><input title=\"&#x53CC;&#x51FB;&#x9009;&#x53D6;&#x989C;&#x8272;\" type=\"color\"  style=\"width: 100%;height:25;border: none;\" value=\"#ffffff\" id=\""+c+"_color\" onchange=\"Grids["+this.Index+"].setcolorby46(this);\"/>";
         V[c+"HtmlPostfix"]="</div>";
      }
      if(this.Cols[c].colType==47){
         V[c+"CanEdit"]=0;
         V[c+"HtmlPrefix"]="<div class=\"progress\" style=\"height: 25;\"><div class=\"progress-bar\" style=\"width:0%\"></div>";
         V[c+"HtmlPostfix"]="</div>";
      }
   }
   this.RefreshRow(V);
@@ -3852,14 +3847,19 @@
            A[cl.Name+"_Orig46"]=A[cl.Name];
            A[cl.Name]="";
         }
         A[cl.Name+"CanEdit"]=0;
         if(cl.CanEdit==0){
            //直接设置只读的情况,增加这个标记
            cl.is46OnlyRead=1
         }
         A[cl.Name+"CanEdit"]=0;//不管有没设置只读也要设置为只读
         if(cl.is46OnlyRead==1){
            //只读情况
            A[cl.Name+"HtmlPrefix"]="<div style=\"background:"+color+";width: 100%;height:25;border: none;\"></div>";
            A[cl.Name+"HtmlPrefix"]="<div style=\"background:"+color+";width: 100%;height:25;border: none;\">";
            A[cl.Name+"HtmlPostfix"]="</div>";
         
         }else{
             A[cl.Name + "HtmlPrefix"]="<div style=\"background:"+color+"\"><input title=\"&#x53CC;&#x51FB;&#x9009;&#x53D6;&#x989C;&#x8272;\" type=\"color\"  style=\"width: 100%;height:25;border: none;\" value=\""+color+"\" id=\""+cl.Name+"_color\" onchange=\"Grids["+this.Index+"].setcolorby46(this);\"/></div>";
             A[cl.Name + "HtmlPrefix"]="<div style=\"height:25;background:"+color+"\"><input title=\"&#x53CC;&#x51FB;&#x9009;&#x53D6;&#x989C;&#x8272;\" type=\"color\"  style=\"width: 100%;height:25;border: none;\" value=\""+color+"\" id=\""+cl.Name+"_color\" onchange=\"Grids["+this.Index+"].setcolorby46(this);\"/>";
            A[cl.Name+"HtmlPostfix"]="</div>";
         }
      }
      if(cl.colType==47){
@@ -3872,9 +3872,14 @@
         }
         progress=progress>1?1:progress;
         progress=progress<0?0:progress;
         A[cl.Name]="";
         A[cl.Name]=null;
         A[cl.Name+"CanEdit"]=0;
         A[cl.Name + "HtmlPrefix"]="<div class=\"progress\" style=\"height: 25;\"><div class=\"progress-bar\" style=\"width:"+(progress*100)+"%\">"+(progress*100)+"%</div></div>";
         var htmlperfix="<div class=\"progress\" style=\"position: relative;height: 25;\"><div class=\"progress-bar\" style=\"width:"+(progress*100)+"%\"></div>";
         if(progress>0){
            htmlperfix+="<div style=\"line-height: 25px;position: absolute;float: left;left: 50%;\">"+(progress*100)+"%</div>";
         }
         A[cl.Name + "HtmlPrefix"]=htmlperfix;
         A[cl.Name+"HtmlPostfix"]="</div>";
      }
      //处理超链接问题,手机端和PC端需要用不同的方式
      if (this.browserRedirect()) {
@@ -5659,6 +5664,7 @@
            result = (n1 * n2) / (t1 * t2)
            return result
         case 'divide':
            //console.log("divide:(n1 / n2) / (t2/ t1)="+n1+","+n2+","+t1+","+t2);
            result = (n1 / n2) * (t2 / t1)
            return result
      }