From 23a486c58b6b8a7dcb4e10e20792f088f8ccde64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 20 Aug 2019 23:49:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=95=E5=85=A5=E6=A8=A1=E6=9D=BF=E5=BC=95?=
 =?UTF-8?q?=E6=93=8E=EF=BC=8C=E4=BC=98=E5=8C=96=E5=8D=95=E6=8D=AE=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=BD=95=E5=85=A5=E4=BE=9B=E5=BA=94=E5=95=86=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 erp_web/js/handlebars.js                      | 2595 +++++++++++++++++
 erp_web/js/pages/materials/add_temp.js        |   35 +
 erp_web/js/pages/materials/in_out.js          |  199 +-
 .../pages/materials/allocation_out_list.html  |    2 +
 erp_web/pages/materials/assemble_list.html    |    2 +
 erp_web/pages/materials/disassemble_list.html |    7 +-
 erp_web/pages/materials/other_in_list.html    |  104 +-
 erp_web/pages/materials/other_out_list.html   |    2 +
 .../pages/materials/purchase_back_list.html   |  112 +-
 erp_web/pages/materials/purchase_in_list.html |  104 +-
 .../pages/materials/purchase_orders_list.html |  104 +-
 erp_web/pages/materials/retail_back_list.html |    2 +
 erp_web/pages/materials/retail_out_list.html  |  104 +-
 erp_web/pages/materials/sale_back_list.html   |    4 +-
 erp_web/pages/materials/sale_orders_list.html |  104 +-
 erp_web/pages/materials/sale_out_list.html    |  104 +-
 erp_web/pages/template/base.html              |   95 +
 17 files changed, 2867 insertions(+), 812 deletions(-)
 create mode 100644 erp_web/js/handlebars.js
 create mode 100644 erp_web/js/pages/materials/add_temp.js
 create mode 100644 erp_web/pages/template/base.html

diff --git a/erp_web/js/handlebars.js b/erp_web/js/handlebars.js
new file mode 100644
index 00000000..ba717929
--- /dev/null
+++ b/erp_web/js/handlebars.js
@@ -0,0 +1,2595 @@
+/*!
+
+ handlebars v1.1.2
+
+Copyright (C) 2011 by Yehuda Katz
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+@license
+*/
+var Handlebars = (function() {
+// handlebars/safe-string.js
+var __module4__ = (function() {
+  "use strict";
+  var __exports__;
+  // Build out our basic SafeString type
+  function SafeString(string) {
+    this.string = string;
+  }
+
+  SafeString.prototype.toString = function() {
+    return "" + this.string;
+  };
+
+  __exports__ = SafeString;
+  return __exports__;
+})();
+
+// handlebars/utils.js
+var __module3__ = (function(__dependency1__) {
+  "use strict";
+  var __exports__ = {};
+  var SafeString = __dependency1__;
+
+  var escape = {
+    "&": "&amp;",
+    "<": "&lt;",
+    ">": "&gt;",
+    '"': "&quot;",
+    "'": "&#x27;",
+    "`": "&#x60;"
+  };
+
+  var badChars = /[&<>"'`]/g;
+  var possible = /[&<>"'`]/;
+
+  function escapeChar(chr) {
+    return escape[chr] || "&amp;";
+  }
+
+  function extend(obj, value) {
+    for(var key in value) {
+      if(value.hasOwnProperty(key)) {
+        obj[key] = value[key];
+      }
+    }
+  }
+
+  __exports__.extend = extend;var toString = Object.prototype.toString;
+  __exports__.toString = toString;
+  // Sourced from lodash
+  // https://github.com/bestiejs/lodash/blob/master/LICENSE.txt
+  var isFunction = function(value) {
+    return typeof value === 'function';
+  };
+  // fallback for older versions of Chrome and Safari
+  if (isFunction(/x/)) {
+    isFunction = function(value) {
+      return typeof value === 'function' && toString.call(value) === '[object Function]';
+    };
+  }
+  var isFunction;
+  __exports__.isFunction = isFunction;
+  var isArray = Array.isArray || function(value) {
+    return (value && typeof value === 'object') ? toString.call(value) === '[object Array]' : false;
+  };
+  __exports__.isArray = isArray;
+
+  function escapeExpression(string) {
+    // don't escape SafeStrings, since they're already safe
+    if (string instanceof SafeString) {
+      return string.toString();
+    } else if (!string && string !== 0) {
+      return "";
+    }
+
+    // Force a string conversion as this will be done by the append regardless and
+    // the regex test will do this transparently behind the scenes, causing issues if
+    // an object's to string has escaped characters in it.
+    string = "" + string;
+
+    if(!possible.test(string)) { return string; }
+    return string.replace(badChars, escapeChar);
+  }
+
+  __exports__.escapeExpression = escapeExpression;function isEmpty(value) {
+    if (!value && value !== 0) {
+      return true;
+    } else if (isArray(value) && value.length === 0) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  __exports__.isEmpty = isEmpty;
+  return __exports__;
+})(__module4__);
+
+// handlebars/exception.js
+var __module5__ = (function() {
+  "use strict";
+  var __exports__;
+
+  var errorProps = ['description', 'fileName', 'lineNumber', 'message', 'name', 'number', 'stack'];
+
+  function Exception(/* message */) {
+    var tmp = Error.prototype.constructor.apply(this, arguments);
+
+    // Unfortunately errors are not enumerable in Chrome (at least), so `for prop in tmp` doesn't work.
+    for (var idx = 0; idx < errorProps.length; idx++) {
+      this[errorProps[idx]] = tmp[errorProps[idx]];
+    }
+  }
+
+  Exception.prototype = new Error();
+
+  __exports__ = Exception;
+  return __exports__;
+})();
+
+// handlebars/base.js
+var __module2__ = (function(__dependency1__, __dependency2__) {
+  "use strict";
+  var __exports__ = {};
+  /*globals Exception, Utils */
+  var Utils = __dependency1__;
+  var Exception = __dependency2__;
+
+  var VERSION = "1.1.2";
+  __exports__.VERSION = VERSION;var COMPILER_REVISION = 4;
+  __exports__.COMPILER_REVISION = COMPILER_REVISION;
+  var REVISION_CHANGES = {
+    1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
+    2: '== 1.0.0-rc.3',
+    3: '== 1.0.0-rc.4',
+    4: '>= 1.0.0'
+  };
+  __exports__.REVISION_CHANGES = REVISION_CHANGES;
+  var isArray = Utils.isArray,
+      isFunction = Utils.isFunction,
+      toString = Utils.toString,
+      objectType = '[object Object]';
+
+  function HandlebarsEnvironment(helpers, partials) {
+    this.helpers = helpers || {};
+    this.partials = partials || {};
+
+    registerDefaultHelpers(this);
+  }
+
+  __exports__.HandlebarsEnvironment = HandlebarsEnvironment;HandlebarsEnvironment.prototype = {
+    constructor: HandlebarsEnvironment,
+
+    logger: logger,
+    log: log,
+
+    registerHelper: function(name, fn, inverse) {
+      if (toString.call(name) === objectType) {
+        if (inverse || fn) { throw new Exception('Arg not supported with multiple helpers'); }
+        Utils.extend(this.helpers, name);
+      } else {
+        if (inverse) { fn.not = inverse; }
+        this.helpers[name] = fn;
+      }
+    },
+
+    registerPartial: function(name, str) {
+      if (toString.call(name) === objectType) {
+        Utils.extend(this.partials,  name);
+      } else {
+        this.partials[name] = str;
+      }
+    }
+  };
+
+  function registerDefaultHelpers(instance) {
+    instance.registerHelper('helperMissing', function(arg) {
+      if(arguments.length === 2) {
+        return undefined;
+      } else {
+        throw new Error("Missing helper: '" + arg + "'");
+      }
+    });
+
+    instance.registerHelper('blockHelperMissing', function(context, options) {
+      var inverse = options.inverse || function() {}, fn = options.fn;
+
+      if (isFunction(context)) { context = context.call(this); }
+
+      if(context === true) {
+        return fn(this);
+      } else if(context === false || context == null) {
+        return inverse(this);
+      } else if (isArray(context)) {
+        if(context.length > 0) {
+          return instance.helpers.each(context, options);
+        } else {
+          return inverse(this);
+        }
+      } else {
+        return fn(context);
+      }
+    });
+
+    instance.registerHelper('each', function(context, options) {
+      var fn = options.fn, inverse = options.inverse;
+      var i = 0, ret = "", data;
+
+      if (isFunction(context)) { context = context.call(this); }
+
+      if (options.data) {
+        data = createFrame(options.data);
+      }
+
+      if(context && typeof context === 'object') {
+        if (isArray(context)) {
+          for(var j = context.length; i<j; i++) {
+            if (data) {
+              data.index = i;
+              data.first = (i === 0)
+              data.last  = (i === (context.length-1));
+            }
+            ret = ret + fn(context[i], { data: data });
+          }
+        } else {
+          for(var key in context) {
+            if(context.hasOwnProperty(key)) {
+              if(data) { data.key = key; }
+              ret = ret + fn(context[key], {data: data});
+              i++;
+            }
+          }
+        }
+      }
+
+      if(i === 0){
+        ret = inverse(this);
+      }
+
+      return ret;
+    });
+
+    instance.registerHelper('if', function(conditional, options) {
+      if (isFunction(conditional)) { conditional = conditional.call(this); }
+
+      // Default behavior is to render the positive path if the value is truthy and not empty.
+      // The `includeZero` option may be set to treat the condtional as purely not empty based on the
+      // behavior of isEmpty. Effectively this determines if 0 is handled by the positive path or negative.
+      if ((!options.hash.includeZero && !conditional) || Utils.isEmpty(conditional)) {
+        return options.inverse(this);
+      } else {
+        return options.fn(this);
+      }
+    });
+
+    instance.registerHelper('unless', function(conditional, options) {
+      return instance.helpers['if'].call(this, conditional, {fn: options.inverse, inverse: options.fn, hash: options.hash});
+    });
+
+    instance.registerHelper('with', function(context, options) {
+      if (isFunction(context)) { context = context.call(this); }
+
+      if (!Utils.isEmpty(context)) return options.fn(context);
+    });
+
+    instance.registerHelper('log', function(context, options) {
+      var level = options.data && options.data.level != null ? parseInt(options.data.level, 10) : 1;
+      instance.log(level, context);
+    });
+  }
+
+  var logger = {
+    methodMap: { 0: 'debug', 1: 'info', 2: 'warn', 3: 'error' },
+
+    // State enum
+    DEBUG: 0,
+    INFO: 1,
+    WARN: 2,
+    ERROR: 3,
+    level: 3,
+
+    // can be overridden in the host environment
+    log: function(level, obj) {
+      if (logger.level <= level) {
+        var method = logger.methodMap[level];
+        if (typeof console !== 'undefined' && console[method]) {
+          console[method].call(console, obj);
+        }
+      }
+    }
+  };
+  __exports__.logger = logger;
+  function log(level, obj) { logger.log(level, obj); }
+
+  __exports__.log = log;var createFrame = function(object) {
+    var obj = {};
+    Utils.extend(obj, object);
+    return obj;
+  };
+  __exports__.createFrame = createFrame;
+  return __exports__;
+})(__module3__, __module5__);
+
+// handlebars/runtime.js
+var __module6__ = (function(__dependency1__, __dependency2__, __dependency3__) {
+  "use strict";
+  var __exports__ = {};
+  /*global Utils */
+  var Utils = __dependency1__;
+  var Exception = __dependency2__;
+  var COMPILER_REVISION = __dependency3__.COMPILER_REVISION;
+  var REVISION_CHANGES = __dependency3__.REVISION_CHANGES;
+
+  function checkRevision(compilerInfo) {
+    var compilerRevision = compilerInfo && compilerInfo[0] || 1,
+        currentRevision = COMPILER_REVISION;
+
+    if (compilerRevision !== currentRevision) {
+      if (compilerRevision < currentRevision) {
+        var runtimeVersions = REVISION_CHANGES[currentRevision],
+            compilerVersions = REVISION_CHANGES[compilerRevision];
+        throw new Error("Template was precompiled with an older version of Handlebars than the current runtime. "+
+              "Please update your precompiler to a newer version ("+runtimeVersions+") or downgrade your runtime to an older version ("+compilerVersions+").");
+      } else {
+        // Use the embedded version info since the runtime doesn't know about this revision yet
+        throw new Error("Template was precompiled with a newer version of Handlebars than the current runtime. "+
+              "Please update your runtime to a newer version ("+compilerInfo[1]+").");
+      }
+    }
+  }
+
+  // TODO: Remove this line and break up compilePartial
+
+  function template(templateSpec, env) {
+    if (!env) {
+      throw new Error("No environment passed to template");
+    }
+
+    var invokePartialWrapper;
+    if (env.compile) {
+      invokePartialWrapper = function(partial, name, context, helpers, partials, data) {
+        // TODO : Check this for all inputs and the options handling (partial flag, etc). This feels
+        // like there should be a common exec path
+        var result = invokePartial.apply(this, arguments);
+        if (result) { return result; }
+
+        var options = { helpers: helpers, partials: partials, data: data };
+        partials[name] = env.compile(partial, { data: data !== undefined }, env);
+        return partials[name](context, options);
+      };
+    } else {
+      invokePartialWrapper = function(partial, name /* , context, helpers, partials, data */) {
+        var result = invokePartial.apply(this, arguments);
+        if (result) { return result; }
+        throw new Exception("The partial " + name + " could not be compiled when running in runtime-only mode");
+      };
+    }
+
+    // Just add water
+    var container = {
+      escapeExpression: Utils.escapeExpression,
+      invokePartial: invokePartialWrapper,
+      programs: [],
+      program: function(i, fn, data) {
+        var programWrapper = this.programs[i];
+        if(data) {
+          programWrapper = program(i, fn, data);
+        } else if (!programWrapper) {
+          programWrapper = this.programs[i] = program(i, fn);
+        }
+        return programWrapper;
+      },
+      merge: function(param, common) {
+        var ret = param || common;
+
+        if (param && common && (param !== common)) {
+          ret = {};
+          Utils.extend(ret, common);
+          Utils.extend(ret, param);
+        }
+        return ret;
+      },
+      programWithDepth: programWithDepth,
+      noop: noop,
+      compilerInfo: null
+    };
+
+    return function(context, options) {
+      options = options || {};
+      var namespace = options.partial ? options : env,
+          helpers,
+          partials;
+
+      if (!options.partial) {
+        helpers = options.helpers;
+        partials = options.partials;
+      }
+      var result = templateSpec.call(
+            container,
+            namespace, context,
+            helpers,
+            partials,
+            options.data);
+
+      if (!options.partial) {
+        checkRevision(container.compilerInfo);
+      }
+
+      return result;
+    };
+  }
+
+  __exports__.template = template;function programWithDepth(i, fn, data /*, $depth */) {
+    var args = Array.prototype.slice.call(arguments, 3);
+
+    var prog = function(context, options) {
+      options = options || {};
+
+      return fn.apply(this, [context, options.data || data].concat(args));
+    };
+    prog.program = i;
+    prog.depth = args.length;
+    return prog;
+  }
+
+  __exports__.programWithDepth = programWithDepth;function program(i, fn, data) {
+    var prog = function(context, options) {
+      options = options || {};
+
+      return fn(context, options.data || data);
+    };
+    prog.program = i;
+    prog.depth = 0;
+    return prog;
+  }
+
+  __exports__.program = program;function invokePartial(partial, name, context, helpers, partials, data) {
+    var options = { partial: true, helpers: helpers, partials: partials, data: data };
+
+    if(partial === undefined) {
+      throw new Exception("The partial " + name + " could not be found");
+    } else if(partial instanceof Function) {
+      return partial(context, options);
+    }
+  }
+
+  __exports__.invokePartial = invokePartial;function noop() { return ""; }
+
+  __exports__.noop = noop;
+  return __exports__;
+})(__module3__, __module5__, __module2__);
+
+// handlebars.runtime.js
+var __module1__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
+  "use strict";
+  var __exports__;
+  var base = __dependency1__;
+
+  // Each of these augment the Handlebars object. No need to setup here.
+  // (This is done to easily share code between commonjs and browse envs)
+  var SafeString = __dependency2__;
+  var Exception = __dependency3__;
+  var Utils = __dependency4__;
+  var runtime = __dependency5__;
+
+  // For compatibility and usage outside of module systems, make the Handlebars object a namespace
+  var create = function() {
+    var hb = new base.HandlebarsEnvironment();
+
+    Utils.extend(hb, base);
+    hb.SafeString = SafeString;
+    hb.Exception = Exception;
+    hb.Utils = Utils;
+
+    hb.VM = runtime;
+    hb.template = function(spec) {
+      return runtime.template(spec, hb);
+    };
+
+    return hb;
+  };
+
+  var Handlebars = create();
+  Handlebars.create = create;
+
+  __exports__ = Handlebars;
+  return __exports__;
+})(__module2__, __module4__, __module5__, __module3__, __module6__);
+
+// handlebars/compiler/ast.js
+var __module7__ = (function(__dependency1__) {
+  "use strict";
+  var __exports__ = {};
+  var Exception = __dependency1__;
+
+  function ProgramNode(statements, inverseStrip, inverse) {
+    this.type = "program";
+    this.statements = statements;
+    this.strip = {};
+
+    if(inverse) {
+      this.inverse = new ProgramNode(inverse, inverseStrip);
+      this.strip.right = inverseStrip.left;
+    } else if (inverseStrip) {
+      this.strip.left = inverseStrip.right;
+    }
+  }
+
+  __exports__.ProgramNode = ProgramNode;function MustacheNode(rawParams, hash, open, strip) {
+    this.type = "mustache";
+    this.hash = hash;
+    this.strip = strip;
+
+    var escapeFlag = open[3] || open[2];
+    this.escaped = escapeFlag !== '{' && escapeFlag !== '&';
+
+    var id = this.id = rawParams[0];
+    var params = this.params = rawParams.slice(1);
+
+    // a mustache is an eligible helper if:
+    // * its id is simple (a single part, not `this` or `..`)
+    var eligibleHelper = this.eligibleHelper = id.isSimple;
+
+    // a mustache is definitely a helper if:
+    // * it is an eligible helper, and
+    // * it has at least one parameter or hash segment
+    this.isHelper = eligibleHelper && (params.length || hash);
+
+    // if a mustache is an eligible helper but not a definite
+    // helper, it is ambiguous, and will be resolved in a later
+    // pass or at runtime.
+  }
+
+  __exports__.MustacheNode = MustacheNode;function PartialNode(partialName, context, strip) {
+    this.type         = "partial";
+    this.partialName  = partialName;
+    this.context      = context;
+    this.strip = strip;
+  }
+
+  __exports__.PartialNode = PartialNode;function BlockNode(mustache, program, inverse, close) {
+    if(mustache.id.original !== close.path.original) {
+      throw new Exception(mustache.id.original + " doesn't match " + close.path.original);
+    }
+
+    this.type = "block";
+    this.mustache = mustache;
+    this.program  = program;
+    this.inverse  = inverse;
+
+    this.strip = {
+      left: mustache.strip.left,
+      right: close.strip.right
+    };
+
+    (program || inverse).strip.left = mustache.strip.right;
+    (inverse || program).strip.right = close.strip.left;
+
+    if (inverse && !program) {
+      this.isInverse = true;
+    }
+  }
+
+  __exports__.BlockNode = BlockNode;function ContentNode(string) {
+    this.type = "content";
+    this.string = string;
+  }
+
+  __exports__.ContentNode = ContentNode;function HashNode(pairs) {
+    this.type = "hash";
+    this.pairs = pairs;
+  }
+
+  __exports__.HashNode = HashNode;function IdNode(parts) {
+    this.type = "ID";
+
+    var original = "",
+        dig = [],
+        depth = 0;
+
+    for(var i=0,l=parts.length; i<l; i++) {
+      var part = parts[i].part;
+      original += (parts[i].separator || '') + part;
+
+      if (part === ".." || part === "." || part === "this") {
+        if (dig.length > 0) { throw new Exception("Invalid path: " + original); }
+        else if (part === "..") { depth++; }
+        else { this.isScoped = true; }
+      }
+      else { dig.push(part); }
+    }
+
+    this.original = original;
+    this.parts    = dig;
+    this.string   = dig.join('.');
+    this.depth    = depth;
+
+    // an ID is simple if it only has one part, and that part is not
+    // `..` or `this`.
+    this.isSimple = parts.length === 1 && !this.isScoped && depth === 0;
+
+    this.stringModeValue = this.string;
+  }
+
+  __exports__.IdNode = IdNode;function PartialNameNode(name) {
+    this.type = "PARTIAL_NAME";
+    this.name = name.original;
+  }
+
+  __exports__.PartialNameNode = PartialNameNode;function DataNode(id) {
+    this.type = "DATA";
+    this.id = id;
+  }
+
+  __exports__.DataNode = DataNode;function StringNode(string) {
+    this.type = "STRING";
+    this.original =
+      this.string =
+      this.stringModeValue = string;
+  }
+
+  __exports__.StringNode = StringNode;function IntegerNode(integer) {
+    this.type = "INTEGER";
+    this.original =
+      this.integer = integer;
+    this.stringModeValue = Number(integer);
+  }
+
+  __exports__.IntegerNode = IntegerNode;function BooleanNode(bool) {
+    this.type = "BOOLEAN";
+    this.bool = bool;
+    this.stringModeValue = bool === "true";
+  }
+
+  __exports__.BooleanNode = BooleanNode;function CommentNode(comment) {
+    this.type = "comment";
+    this.comment = comment;
+  }
+
+  __exports__.CommentNode = CommentNode;
+  return __exports__;
+})(__module5__);
+
+// handlebars/compiler/parser.js
+var __module9__ = (function() {
+  "use strict";
+  var __exports__;
+  /* Jison generated parser */
+  var handlebars = (function(){
+  var parser = {trace: function trace() { },
+  yy: {},
+  symbols_: {"error":2,"root":3,"statements":4,"EOF":5,"program":6,"simpleInverse":7,"statement":8,"openInverse":9,"closeBlock":10,"openBlock":11,"mustache":12,"partial":13,"CONTENT":14,"COMMENT":15,"OPEN_BLOCK":16,"inMustache":17,"CLOSE":18,"OPEN_INVERSE":19,"OPEN_ENDBLOCK":20,"path":21,"OPEN":22,"OPEN_UNESCAPED":23,"CLOSE_UNESCAPED":24,"OPEN_PARTIAL":25,"partialName":26,"partial_option0":27,"inMustache_repetition0":28,"inMustache_option0":29,"dataName":30,"param":31,"STRING":32,"INTEGER":33,"BOOLEAN":34,"hash":35,"hash_repetition_plus0":36,"hashSegment":37,"ID":38,"EQUALS":39,"DATA":40,"pathSegments":41,"SEP":42,"$accept":0,"$end":1},
+  terminals_: {2:"error",5:"EOF",14:"CONTENT",15:"COMMENT",16:"OPEN_BLOCK",18:"CLOSE",19:"OPEN_INVERSE",20:"OPEN_ENDBLOCK",22:"OPEN",23:"OPEN_UNESCAPED",24:"CLOSE_UNESCAPED",25:"OPEN_PARTIAL",32:"STRING",33:"INTEGER",34:"BOOLEAN",38:"ID",39:"EQUALS",40:"DATA",42:"SEP"},
+  productions_: [0,[3,2],[3,1],[6,2],[6,3],[6,2],[6,1],[6,1],[6,0],[4,1],[4,2],[8,3],[8,3],[8,1],[8,1],[8,1],[8,1],[11,3],[9,3],[10,3],[12,3],[12,3],[13,4],[7,2],[17,3],[17,1],[31,1],[31,1],[31,1],[31,1],[31,1],[35,1],[37,3],[26,1],[26,1],[26,1],[30,2],[21,1],[41,3],[41,1],[27,0],[27,1],[28,0],[28,2],[29,0],[29,1],[36,1],[36,2]],
+  performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
+
+  var $0 = $$.length - 1;
+  switch (yystate) {
+  case 1: return new yy.ProgramNode($$[$0-1]); 
+  break;
+  case 2: return new yy.ProgramNode([]); 
+  break;
+  case 3:this.$ = new yy.ProgramNode([], $$[$0-1], $$[$0]);
+  break;
+  case 4:this.$ = new yy.ProgramNode($$[$0-2], $$[$0-1], $$[$0]);
+  break;
+  case 5:this.$ = new yy.ProgramNode($$[$0-1], $$[$0], []);
+  break;
+  case 6:this.$ = new yy.ProgramNode($$[$0]);
+  break;
+  case 7:this.$ = new yy.ProgramNode([]);
+  break;
+  case 8:this.$ = new yy.ProgramNode([]);
+  break;
+  case 9:this.$ = [$$[$0]];
+  break;
+  case 10: $$[$0-1].push($$[$0]); this.$ = $$[$0-1]; 
+  break;
+  case 11:this.$ = new yy.BlockNode($$[$0-2], $$[$0-1].inverse, $$[$0-1], $$[$0]);
+  break;
+  case 12:this.$ = new yy.BlockNode($$[$0-2], $$[$0-1], $$[$0-1].inverse, $$[$0]);
+  break;
+  case 13:this.$ = $$[$0];
+  break;
+  case 14:this.$ = $$[$0];
+  break;
+  case 15:this.$ = new yy.ContentNode($$[$0]);
+  break;
+  case 16:this.$ = new yy.CommentNode($$[$0]);
+  break;
+  case 17:this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2], stripFlags($$[$0-2], $$[$0]));
+  break;
+  case 18:this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2], stripFlags($$[$0-2], $$[$0]));
+  break;
+  case 19:this.$ = {path: $$[$0-1], strip: stripFlags($$[$0-2], $$[$0])};
+  break;
+  case 20:this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2], stripFlags($$[$0-2], $$[$0]));
+  break;
+  case 21:this.$ = new yy.MustacheNode($$[$0-1][0], $$[$0-1][1], $$[$0-2], stripFlags($$[$0-2], $$[$0]));
+  break;
+  case 22:this.$ = new yy.PartialNode($$[$0-2], $$[$0-1], stripFlags($$[$0-3], $$[$0]));
+  break;
+  case 23:this.$ = stripFlags($$[$0-1], $$[$0]);
+  break;
+  case 24:this.$ = [[$$[$0-2]].concat($$[$0-1]), $$[$0]];
+  break;
+  case 25:this.$ = [[$$[$0]], null];
+  break;
+  case 26:this.$ = $$[$0];
+  break;
+  case 27:this.$ = new yy.StringNode($$[$0]);
+  break;
+  case 28:this.$ = new yy.IntegerNode($$[$0]);
+  break;
+  case 29:this.$ = new yy.BooleanNode($$[$0]);
+  break;
+  case 30:this.$ = $$[$0];
+  break;
+  case 31:this.$ = new yy.HashNode($$[$0]);
+  break;
+  case 32:this.$ = [$$[$0-2], $$[$0]];
+  break;
+  case 33:this.$ = new yy.PartialNameNode($$[$0]);
+  break;
+  case 34:this.$ = new yy.PartialNameNode(new yy.StringNode($$[$0]));
+  break;
+  case 35:this.$ = new yy.PartialNameNode(new yy.IntegerNode($$[$0]));
+  break;
+  case 36:this.$ = new yy.DataNode($$[$0]);
+  break;
+  case 37:this.$ = new yy.IdNode($$[$0]);
+  break;
+  case 38: $$[$0-2].push({part: $$[$0], separator: $$[$0-1]}); this.$ = $$[$0-2]; 
+  break;
+  case 39:this.$ = [{part: $$[$0]}];
+  break;
+  case 42:this.$ = [];
+  break;
+  case 43:$$[$0-1].push($$[$0]);
+  break;
+  case 46:this.$ = [$$[$0]];
+  break;
+  case 47:$$[$0-1].push($$[$0]);
+  break;
+  }
+  },
+  table: [{3:1,4:2,5:[1,3],8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],25:[1,15]},{1:[3]},{5:[1,16],8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],22:[1,13],23:[1,14],25:[1,15]},{1:[2,2]},{5:[2,9],14:[2,9],15:[2,9],16:[2,9],19:[2,9],20:[2,9],22:[2,9],23:[2,9],25:[2,9]},{4:20,6:18,7:19,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,8],22:[1,13],23:[1,14],25:[1,15]},{4:20,6:22,7:19,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,8],22:[1,13],23:[1,14],25:[1,15]},{5:[2,13],14:[2,13],15:[2,13],16:[2,13],19:[2,13],20:[2,13],22:[2,13],23:[2,13],25:[2,13]},{5:[2,14],14:[2,14],15:[2,14],16:[2,14],19:[2,14],20:[2,14],22:[2,14],23:[2,14],25:[2,14]},{5:[2,15],14:[2,15],15:[2,15],16:[2,15],19:[2,15],20:[2,15],22:[2,15],23:[2,15],25:[2,15]},{5:[2,16],14:[2,16],15:[2,16],16:[2,16],19:[2,16],20:[2,16],22:[2,16],23:[2,16],25:[2,16]},{17:23,21:24,30:25,38:[1,28],40:[1,27],41:26},{17:29,21:24,30:25,38:[1,28],40:[1,27],41:26},{17:30,21:24,30:25,38:[1,28],40:[1,27],41:26},{17:31,21:24,30:25,38:[1,28],40:[1,27],41:26},{21:33,26:32,32:[1,34],33:[1,35],38:[1,28],41:26},{1:[2,1]},{5:[2,10],14:[2,10],15:[2,10],16:[2,10],19:[2,10],20:[2,10],22:[2,10],23:[2,10],25:[2,10]},{10:36,20:[1,37]},{4:38,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,7],22:[1,13],23:[1,14],25:[1,15]},{7:39,8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,21],20:[2,6],22:[1,13],23:[1,14],25:[1,15]},{17:23,18:[1,40],21:24,30:25,38:[1,28],40:[1,27],41:26},{10:41,20:[1,37]},{18:[1,42]},{18:[2,42],24:[2,42],28:43,32:[2,42],33:[2,42],34:[2,42],38:[2,42],40:[2,42]},{18:[2,25],24:[2,25]},{18:[2,37],24:[2,37],32:[2,37],33:[2,37],34:[2,37],38:[2,37],40:[2,37],42:[1,44]},{21:45,38:[1,28],41:26},{18:[2,39],24:[2,39],32:[2,39],33:[2,39],34:[2,39],38:[2,39],40:[2,39],42:[2,39]},{18:[1,46]},{18:[1,47]},{24:[1,48]},{18:[2,40],21:50,27:49,38:[1,28],41:26},{18:[2,33],38:[2,33]},{18:[2,34],38:[2,34]},{18:[2,35],38:[2,35]},{5:[2,11],14:[2,11],15:[2,11],16:[2,11],19:[2,11],20:[2,11],22:[2,11],23:[2,11],25:[2,11]},{21:51,38:[1,28],41:26},{8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,3],22:[1,13],23:[1,14],25:[1,15]},{4:52,8:4,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,5],22:[1,13],23:[1,14],25:[1,15]},{14:[2,23],15:[2,23],16:[2,23],19:[2,23],20:[2,23],22:[2,23],23:[2,23],25:[2,23]},{5:[2,12],14:[2,12],15:[2,12],16:[2,12],19:[2,12],20:[2,12],22:[2,12],23:[2,12],25:[2,12]},{14:[2,18],15:[2,18],16:[2,18],19:[2,18],20:[2,18],22:[2,18],23:[2,18],25:[2,18]},{18:[2,44],21:56,24:[2,44],29:53,30:60,31:54,32:[1,57],33:[1,58],34:[1,59],35:55,36:61,37:62,38:[1,63],40:[1,27],41:26},{38:[1,64]},{18:[2,36],24:[2,36],32:[2,36],33:[2,36],34:[2,36],38:[2,36],40:[2,36]},{14:[2,17],15:[2,17],16:[2,17],19:[2,17],20:[2,17],22:[2,17],23:[2,17],25:[2,17]},{5:[2,20],14:[2,20],15:[2,20],16:[2,20],19:[2,20],20:[2,20],22:[2,20],23:[2,20],25:[2,20]},{5:[2,21],14:[2,21],15:[2,21],16:[2,21],19:[2,21],20:[2,21],22:[2,21],23:[2,21],25:[2,21]},{18:[1,65]},{18:[2,41]},{18:[1,66]},{8:17,9:5,11:6,12:7,13:8,14:[1,9],15:[1,10],16:[1,12],19:[1,11],20:[2,4],22:[1,13],23:[1,14],25:[1,15]},{18:[2,24],24:[2,24]},{18:[2,43],24:[2,43],32:[2,43],33:[2,43],34:[2,43],38:[2,43],40:[2,43]},{18:[2,45],24:[2,45]},{18:[2,26],24:[2,26],32:[2,26],33:[2,26],34:[2,26],38:[2,26],40:[2,26]},{18:[2,27],24:[2,27],32:[2,27],33:[2,27],34:[2,27],38:[2,27],40:[2,27]},{18:[2,28],24:[2,28],32:[2,28],33:[2,28],34:[2,28],38:[2,28],40:[2,28]},{18:[2,29],24:[2,29],32:[2,29],33:[2,29],34:[2,29],38:[2,29],40:[2,29]},{18:[2,30],24:[2,30],32:[2,30],33:[2,30],34:[2,30],38:[2,30],40:[2,30]},{18:[2,31],24:[2,31],37:67,38:[1,68]},{18:[2,46],24:[2,46],38:[2,46]},{18:[2,39],24:[2,39],32:[2,39],33:[2,39],34:[2,39],38:[2,39],39:[1,69],40:[2,39],42:[2,39]},{18:[2,38],24:[2,38],32:[2,38],33:[2,38],34:[2,38],38:[2,38],40:[2,38],42:[2,38]},{5:[2,22],14:[2,22],15:[2,22],16:[2,22],19:[2,22],20:[2,22],22:[2,22],23:[2,22],25:[2,22]},{5:[2,19],14:[2,19],15:[2,19],16:[2,19],19:[2,19],20:[2,19],22:[2,19],23:[2,19],25:[2,19]},{18:[2,47],24:[2,47],38:[2,47]},{39:[1,69]},{21:56,30:60,31:70,32:[1,57],33:[1,58],34:[1,59],38:[1,28],40:[1,27],41:26},{18:[2,32],24:[2,32],38:[2,32]}],
+  defaultActions: {3:[2,2],16:[2,1],50:[2,41]},
+  parseError: function parseError(str, hash) {
+      throw new Error(str);
+  },
+  parse: function parse(input) {
+      var self = this, stack = [0], vstack = [null], lstack = [], table = this.table, yytext = "", yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1;
+      this.lexer.setInput(input);
+      this.lexer.yy = this.yy;
+      this.yy.lexer = this.lexer;
+      this.yy.parser = this;
+      if (typeof this.lexer.yylloc == "undefined")
+          this.lexer.yylloc = {};
+      var yyloc = this.lexer.yylloc;
+      lstack.push(yyloc);
+      var ranges = this.lexer.options && this.lexer.options.ranges;
+      if (typeof this.yy.parseError === "function")
+          this.parseError = this.yy.parseError;
+      function popStack(n) {
+          stack.length = stack.length - 2 * n;
+          vstack.length = vstack.length - n;
+          lstack.length = lstack.length - n;
+      }
+      function lex() {
+          var token;
+          token = self.lexer.lex() || 1;
+          if (typeof token !== "number") {
+              token = self.symbols_[token] || token;
+          }
+          return token;
+      }
+      var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
+      while (true) {
+          state = stack[stack.length - 1];
+          if (this.defaultActions[state]) {
+              action = this.defaultActions[state];
+          } else {
+              if (symbol === null || typeof symbol == "undefined") {
+                  symbol = lex();
+              }
+              action = table[state] && table[state][symbol];
+          }
+          if (typeof action === "undefined" || !action.length || !action[0]) {
+              var errStr = "";
+              if (!recovering) {
+                  expected = [];
+                  for (p in table[state])
+                      if (this.terminals_[p] && p > 2) {
+                          expected.push("'" + this.terminals_[p] + "'");
+                      }
+                  if (this.lexer.showPosition) {
+                      errStr = "Parse error on line " + (yylineno + 1) + ":\n" + this.lexer.showPosition() + "\nExpecting " + expected.join(", ") + ", got '" + (this.terminals_[symbol] || symbol) + "'";
+                  } else {
+                      errStr = "Parse error on line " + (yylineno + 1) + ": Unexpected " + (symbol == 1?"end of input":"'" + (this.terminals_[symbol] || symbol) + "'");
+                  }
+                  this.parseError(errStr, {text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, loc: yyloc, expected: expected});
+              }
+          }
+          if (action[0] instanceof Array && action.length > 1) {
+              throw new Error("Parse Error: multiple actions possible at state: " + state + ", token: " + symbol);
+          }
+          switch (action[0]) {
+          case 1:
+              stack.push(symbol);
+              vstack.push(this.lexer.yytext);
+              lstack.push(this.lexer.yylloc);
+              stack.push(action[1]);
+              symbol = null;
+              if (!preErrorSymbol) {
+                  yyleng = this.lexer.yyleng;
+                  yytext = this.lexer.yytext;
+                  yylineno = this.lexer.yylineno;
+                  yyloc = this.lexer.yylloc;
+                  if (recovering > 0)
+                      recovering--;
+              } else {
+                  symbol = preErrorSymbol;
+                  preErrorSymbol = null;
+              }
+              break;
+          case 2:
+              len = this.productions_[action[1]][1];
+              yyval.$ = vstack[vstack.length - len];
+              yyval._$ = {first_line: lstack[lstack.length - (len || 1)].first_line, last_line: lstack[lstack.length - 1].last_line, first_column: lstack[lstack.length - (len || 1)].first_column, last_column: lstack[lstack.length - 1].last_column};
+              if (ranges) {
+                  yyval._$.range = [lstack[lstack.length - (len || 1)].range[0], lstack[lstack.length - 1].range[1]];
+              }
+              r = this.performAction.call(yyval, yytext, yyleng, yylineno, this.yy, action[1], vstack, lstack);
+              if (typeof r !== "undefined") {
+                  return r;
+              }
+              if (len) {
+                  stack = stack.slice(0, -1 * len * 2);
+                  vstack = vstack.slice(0, -1 * len);
+                  lstack = lstack.slice(0, -1 * len);
+              }
+              stack.push(this.productions_[action[1]][0]);
+              vstack.push(yyval.$);
+              lstack.push(yyval._$);
+              newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
+              stack.push(newState);
+              break;
+          case 3:
+              return true;
+          }
+      }
+      return true;
+  }
+  };
+
+
+  function stripFlags(open, close) {
+    return {
+      left: open[2] === '~',
+      right: close[0] === '~' || close[1] === '~'
+    };
+  }
+
+  /* Jison generated lexer */
+  var lexer = (function(){
+  var lexer = ({EOF:1,
+  parseError:function parseError(str, hash) {
+          if (this.yy.parser) {
+              this.yy.parser.parseError(str, hash);
+          } else {
+              throw new Error(str);
+          }
+      },
+  setInput:function (input) {
+          this._input = input;
+          this._more = this._less = this.done = false;
+          this.yylineno = this.yyleng = 0;
+          this.yytext = this.matched = this.match = '';
+          this.conditionStack = ['INITIAL'];
+          this.yylloc = {first_line:1,first_column:0,last_line:1,last_column:0};
+          if (this.options.ranges) this.yylloc.range = [0,0];
+          this.offset = 0;
+          return this;
+      },
+  input:function () {
+          var ch = this._input[0];
+          this.yytext += ch;
+          this.yyleng++;
+          this.offset++;
+          this.match += ch;
+          this.matched += ch;
+          var lines = ch.match(/(?:\r\n?|\n).*/g);
+          if (lines) {
+              this.yylineno++;
+              this.yylloc.last_line++;
+          } else {
+              this.yylloc.last_column++;
+          }
+          if (this.options.ranges) this.yylloc.range[1]++;
+
+          this._input = this._input.slice(1);
+          return ch;
+      },
+  unput:function (ch) {
+          var len = ch.length;
+          var lines = ch.split(/(?:\r\n?|\n)/g);
+
+          this._input = ch + this._input;
+          this.yytext = this.yytext.substr(0, this.yytext.length-len-1);
+          //this.yyleng -= len;
+          this.offset -= len;
+          var oldLines = this.match.split(/(?:\r\n?|\n)/g);
+          this.match = this.match.substr(0, this.match.length-1);
+          this.matched = this.matched.substr(0, this.matched.length-1);
+
+          if (lines.length-1) this.yylineno -= lines.length-1;
+          var r = this.yylloc.range;
+
+          this.yylloc = {first_line: this.yylloc.first_line,
+            last_line: this.yylineno+1,
+            first_column: this.yylloc.first_column,
+            last_column: lines ?
+                (lines.length === oldLines.length ? this.yylloc.first_column : 0) + oldLines[oldLines.length - lines.length].length - lines[0].length:
+                this.yylloc.first_column - len
+            };
+
+          if (this.options.ranges) {
+              this.yylloc.range = [r[0], r[0] + this.yyleng - len];
+          }
+          return this;
+      },
+  more:function () {
+          this._more = true;
+          return this;
+      },
+  less:function (n) {
+          this.unput(this.match.slice(n));
+      },
+  pastInput:function () {
+          var past = this.matched.substr(0, this.matched.length - this.match.length);
+          return (past.length > 20 ? '...':'') + past.substr(-20).replace(/\n/g, "");
+      },
+  upcomingInput:function () {
+          var next = this.match;
+          if (next.length < 20) {
+              next += this._input.substr(0, 20-next.length);
+          }
+          return (next.substr(0,20)+(next.length > 20 ? '...':'')).replace(/\n/g, "");
+      },
+  showPosition:function () {
+          var pre = this.pastInput();
+          var c = new Array(pre.length + 1).join("-");
+          return pre + this.upcomingInput() + "\n" + c+"^";
+      },
+  next:function () {
+          if (this.done) {
+              return this.EOF;
+          }
+          if (!this._input) this.done = true;
+
+          var token,
+              match,
+              tempMatch,
+              index,
+              col,
+              lines;
+          if (!this._more) {
+              this.yytext = '';
+              this.match = '';
+          }
+          var rules = this._currentRules();
+          for (var i=0;i < rules.length; i++) {
+              tempMatch = this._input.match(this.rules[rules[i]]);
+              if (tempMatch && (!match || tempMatch[0].length > match[0].length)) {
+                  match = tempMatch;
+                  index = i;
+                  if (!this.options.flex) break;
+              }
+          }
+          if (match) {
+              lines = match[0].match(/(?:\r\n?|\n).*/g);
+              if (lines) this.yylineno += lines.length;
+              this.yylloc = {first_line: this.yylloc.last_line,
+                             last_line: this.yylineno+1,
+                             first_column: this.yylloc.last_column,
+                             last_column: lines ? lines[lines.length-1].length-lines[lines.length-1].match(/\r?\n?/)[0].length : this.yylloc.last_column + match[0].length};
+              this.yytext += match[0];
+              this.match += match[0];
+              this.matches = match;
+              this.yyleng = this.yytext.length;
+              if (this.options.ranges) {
+                  this.yylloc.range = [this.offset, this.offset += this.yyleng];
+              }
+              this._more = false;
+              this._input = this._input.slice(match[0].length);
+              this.matched += match[0];
+              token = this.performAction.call(this, this.yy, this, rules[index],this.conditionStack[this.conditionStack.length-1]);
+              if (this.done && this._input) this.done = false;
+              if (token) return token;
+              else return;
+          }
+          if (this._input === "") {
+              return this.EOF;
+          } else {
+              return this.parseError('Lexical error on line '+(this.yylineno+1)+'. Unrecognized text.\n'+this.showPosition(),
+                      {text: "", token: null, line: this.yylineno});
+          }
+      },
+  lex:function lex() {
+          var r = this.next();
+          if (typeof r !== 'undefined') {
+              return r;
+          } else {
+              return this.lex();
+          }
+      },
+  begin:function begin(condition) {
+          this.conditionStack.push(condition);
+      },
+  popState:function popState() {
+          return this.conditionStack.pop();
+      },
+  _currentRules:function _currentRules() {
+          return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules;
+      },
+  topState:function () {
+          return this.conditionStack[this.conditionStack.length-2];
+      },
+  pushState:function begin(condition) {
+          this.begin(condition);
+      }});
+  lexer.options = {};
+  lexer.performAction = function anonymous(yy,yy_,$avoiding_name_collisions,YY_START) {
+
+
+  function strip(start, end) {
+    return yy_.yytext = yy_.yytext.substr(start, yy_.yyleng-end);
+  }
+
+
+  var YYSTATE=YY_START
+  switch($avoiding_name_collisions) {
+  case 0:
+                                     if(yy_.yytext.slice(-2) === "\\\\") {
+                                       strip(0,1);
+                                       this.begin("mu");
+                                     } else if(yy_.yytext.slice(-1) === "\\") {
+                                       strip(0,1);
+                                       this.begin("emu");
+                                     } else {
+                                       this.begin("mu");
+                                     }
+                                     if(yy_.yytext) return 14;
+                                   
+  break;
+  case 1:return 14;
+  break;
+  case 2:
+                                     if(yy_.yytext.slice(-1) !== "\\") this.popState();
+                                     if(yy_.yytext.slice(-1) === "\\") strip(0,1);
+                                     return 14;
+                                   
+  break;
+  case 3:strip(0,4); this.popState(); return 15;
+  break;
+  case 4:return 25;
+  break;
+  case 5:return 16;
+  break;
+  case 6:return 20;
+  break;
+  case 7:return 19;
+  break;
+  case 8:return 19;
+  break;
+  case 9:return 23;
+  break;
+  case 10:return 22;
+  break;
+  case 11:this.popState(); this.begin('com');
+  break;
+  case 12:strip(3,5); this.popState(); return 15;
+  break;
+  case 13:return 22;
+  break;
+  case 14:return 39;
+  break;
+  case 15:return 38;
+  break;
+  case 16:return 38;
+  break;
+  case 17:return 42;
+  break;
+  case 18:/*ignore whitespace*/
+  break;
+  case 19:this.popState(); return 24;
+  break;
+  case 20:this.popState(); return 18;
+  break;
+  case 21:yy_.yytext = strip(1,2).replace(/\\"/g,'"'); return 32;
+  break;
+  case 22:yy_.yytext = strip(1,2).replace(/\\'/g,"'"); return 32;
+  break;
+  case 23:return 40;
+  break;
+  case 24:return 34;
+  break;
+  case 25:return 34;
+  break;
+  case 26:return 33;
+  break;
+  case 27:return 38;
+  break;
+  case 28:yy_.yytext = strip(1,2); return 38;
+  break;
+  case 29:return 'INVALID';
+  break;
+  case 30:return 5;
+  break;
+  }
+  };
+  lexer.rules = [/^(?:[^\x00]*?(?=(\{\{)))/,/^(?:[^\x00]+)/,/^(?:[^\x00]{2,}?(?=(\{\{|$)))/,/^(?:[\s\S]*?--\}\})/,/^(?:\{\{(~)?>)/,/^(?:\{\{(~)?#)/,/^(?:\{\{(~)?\/)/,/^(?:\{\{(~)?\^)/,/^(?:\{\{(~)?\s*else\b)/,/^(?:\{\{(~)?\{)/,/^(?:\{\{(~)?&)/,/^(?:\{\{!--)/,/^(?:\{\{![\s\S]*?\}\})/,/^(?:\{\{(~)?)/,/^(?:=)/,/^(?:\.\.)/,/^(?:\.(?=([=~}\s\/.])))/,/^(?:[\/.])/,/^(?:\s+)/,/^(?:\}(~)?\}\})/,/^(?:(~)?\}\})/,/^(?:"(\\["]|[^"])*")/,/^(?:'(\\[']|[^'])*')/,/^(?:@)/,/^(?:true(?=([~}\s])))/,/^(?:false(?=([~}\s])))/,/^(?:-?[0-9]+(?=([~}\s])))/,/^(?:([^\s!"#%-,\.\/;->@\[-\^`\{-~]+(?=([=~}\s\/.]))))/,/^(?:\[[^\]]*\])/,/^(?:.)/,/^(?:$)/];
+  lexer.conditions = {"mu":{"rules":[4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30],"inclusive":false},"emu":{"rules":[2],"inclusive":false},"com":{"rules":[3],"inclusive":false},"INITIAL":{"rules":[0,1,30],"inclusive":true}};
+  return lexer;})()
+  parser.lexer = lexer;
+  function Parser () { this.yy = {}; }Parser.prototype = parser;parser.Parser = Parser;
+  return new Parser;
+  })();__exports__ = handlebars;
+  return __exports__;
+})();
+
+// handlebars/compiler/base.js
+var __module8__ = (function(__dependency1__, __dependency2__) {
+  "use strict";
+  var __exports__ = {};
+  var parser = __dependency1__;
+  var AST = __dependency2__;
+
+  __exports__.parser = parser;
+
+  function parse(input) {
+    // Just return if an already-compile AST was passed in.
+    if(input.constructor === AST.ProgramNode) { return input; }
+
+    parser.yy = AST;
+    return parser.parse(input);
+  }
+
+  __exports__.parse = parse;
+  return __exports__;
+})(__module9__, __module7__);
+
+// handlebars/compiler/javascript-compiler.js
+var __module11__ = (function(__dependency1__) {
+  "use strict";
+  var __exports__;
+  var COMPILER_REVISION = __dependency1__.COMPILER_REVISION;
+  var REVISION_CHANGES = __dependency1__.REVISION_CHANGES;
+  var log = __dependency1__.log;
+
+  function Literal(value) {
+    this.value = value;
+  }
+
+  function JavaScriptCompiler() {}
+
+  JavaScriptCompiler.prototype = {
+    // PUBLIC API: You can override these methods in a subclass to provide
+    // alternative compiled forms for name lookup and buffering semantics
+    nameLookup: function(parent, name /* , type*/) {
+      var wrap,
+          ret;
+      if (parent.indexOf('depth') === 0) {
+        wrap = true;
+      }
+
+      if (/^[0-9]+$/.test(name)) {
+        ret = parent + "[" + name + "]";
+      } else if (JavaScriptCompiler.isValidJavaScriptVariableName(name)) {
+        ret = parent + "." + name;
+      }
+      else {
+        ret = parent + "['" + name + "']";
+      }
+
+      if (wrap) {
+        return '(' + parent + ' && ' + ret + ')';
+      } else {
+        return ret;
+      }
+    },
+
+    appendToBuffer: function(string) {
+      if (this.environment.isSimple) {
+        return "return " + string + ";";
+      } else {
+        return {
+          appendToBuffer: true,
+          content: string,
+          toString: function() { return "buffer += " + string + ";"; }
+        };
+      }
+    },
+
+    initializeBuffer: function() {
+      return this.quotedString("");
+    },
+
+    namespace: "Handlebars",
+    // END PUBLIC API
+
+    compile: function(environment, options, context, asObject) {
+      this.environment = environment;
+      this.options = options || {};
+
+      log('debug', this.environment.disassemble() + "\n\n");
+
+      this.name = this.environment.name;
+      this.isChild = !!context;
+      this.context = context || {
+        programs: [],
+        environments: [],
+        aliases: { }
+      };
+
+      this.preamble();
+
+      this.stackSlot = 0;
+      this.stackVars = [];
+      this.registers = { list: [] };
+      this.compileStack = [];
+      this.inlineStack = [];
+
+      this.compileChildren(environment, options);
+
+      var opcodes = environment.opcodes, opcode;
+
+      this.i = 0;
+
+      for(var l=opcodes.length; this.i<l; this.i++) {
+        opcode = opcodes[this.i];
+
+        if(opcode.opcode === 'DECLARE') {
+          this[opcode.name] = opcode.value;
+        } else {
+          this[opcode.opcode].apply(this, opcode.args);
+        }
+
+        // Reset the stripNext flag if it was not set by this operation.
+        if (opcode.opcode !== this.stripNext) {
+          this.stripNext = false;
+        }
+      }
+
+      // Flush any trailing content that might be pending.
+      this.pushSource('');
+
+      return this.createFunctionContext(asObject);
+    },
+
+    preamble: function() {
+      var out = [];
+
+      if (!this.isChild) {
+        var namespace = this.namespace;
+
+        var copies = "helpers = this.merge(helpers, " + namespace + ".helpers);";
+        if (this.environment.usePartial) { copies = copies + " partials = this.merge(partials, " + namespace + ".partials);"; }
+        if (this.options.data) { copies = copies + " data = data || {};"; }
+        out.push(copies);
+      } else {
+        out.push('');
+      }
+
+      if (!this.environment.isSimple) {
+        out.push(", buffer = " + this.initializeBuffer());
+      } else {
+        out.push("");
+      }
+
+      // track the last context pushed into place to allow skipping the
+      // getContext opcode when it would be a noop
+      this.lastContext = 0;
+      this.source = out;
+    },
+
+    createFunctionContext: function(asObject) {
+      var locals = this.stackVars.concat(this.registers.list);
+
+      if(locals.length > 0) {
+        this.source[1] = this.source[1] + ", " + locals.join(", ");
+      }
+
+      // Generate minimizer alias mappings
+      if (!this.isChild) {
+        for (var alias in this.context.aliases) {
+          if (this.context.aliases.hasOwnProperty(alias)) {
+            this.source[1] = this.source[1] + ', ' + alias + '=' + this.context.aliases[alias];
+          }
+        }
+      }
+
+      if (this.source[1]) {
+        this.source[1] = "var " + this.source[1].substring(2) + ";";
+      }
+
+      // Merge children
+      if (!this.isChild) {
+        this.source[1] += '\n' + this.context.programs.join('\n') + '\n';
+      }
+
+      if (!this.environment.isSimple) {
+        this.pushSource("return buffer;");
+      }
+
+      var params = this.isChild ? ["depth0", "data"] : ["Handlebars", "depth0", "helpers", "partials", "data"];
+
+      for(var i=0, l=this.environment.depths.list.length; i<l; i++) {
+        params.push("depth" + this.environment.depths.list[i]);
+      }
+
+      // Perform a second pass over the output to merge content when possible
+      var source = this.mergeSource();
+
+      if (!this.isChild) {
+        var revision = COMPILER_REVISION,
+            versions = REVISION_CHANGES[revision];
+        source = "this.compilerInfo = ["+revision+",'"+versions+"'];\n"+source;
+      }
+
+      if (asObject) {
+        params.push(source);
+
+        return Function.apply(this, params);
+      } else {
+        var functionSource = 'function ' + (this.name || '') + '(' + params.join(',') + ') {\n  ' + source + '}';
+        log('debug', functionSource + "\n\n");
+        return functionSource;
+      }
+    },
+    mergeSource: function() {
+      // WARN: We are not handling the case where buffer is still populated as the source should
+      // not have buffer append operations as their final action.
+      var source = '',
+          buffer;
+      for (var i = 0, len = this.source.length; i < len; i++) {
+        var line = this.source[i];
+        if (line.appendToBuffer) {
+          if (buffer) {
+            buffer = buffer + '\n    + ' + line.content;
+          } else {
+            buffer = line.content;
+          }
+        } else {
+          if (buffer) {
+            source += 'buffer += ' + buffer + ';\n  ';
+            buffer = undefined;
+          }
+          source += line + '\n  ';
+        }
+      }
+      return source;
+    },
+
+    // [blockValue]
+    //
+    // On stack, before: hash, inverse, program, value
+    // On stack, after: return value of blockHelperMissing
+    //
+    // The purpose of this opcode is to take a block of the form
+    // `{{#foo}}...{{/foo}}`, resolve the value of `foo`, and
+    // replace it on the stack with the result of properly
+    // invoking blockHelperMissing.
+    blockValue: function() {
+      this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
+
+      var params = ["depth0"];
+      this.setupParams(0, params);
+
+      this.replaceStack(function(current) {
+        params.splice(1, 0, current);
+        return "blockHelperMissing.call(" + params.join(", ") + ")";
+      });
+    },
+
+    // [ambiguousBlockValue]
+    //
+    // On stack, before: hash, inverse, program, value
+    // Compiler value, before: lastHelper=value of last found helper, if any
+    // On stack, after, if no lastHelper: same as [blockValue]
+    // On stack, after, if lastHelper: value
+    ambiguousBlockValue: function() {
+      this.context.aliases.blockHelperMissing = 'helpers.blockHelperMissing';
+
+      var params = ["depth0"];
+      this.setupParams(0, params);
+
+      var current = this.topStack();
+      params.splice(1, 0, current);
+
+      // Use the options value generated from the invocation
+      params[params.length-1] = 'options';
+
+      this.pushSource("if (!" + this.lastHelper + ") { " + current + " = blockHelperMissing.call(" + params.join(", ") + "); }");
+    },
+
+    // [appendContent]
+    //
+    // On stack, before: ...
+    // On stack, after: ...
+    //
+    // Appends the string value of `content` to the current buffer
+    appendContent: function(content) {
+      if (this.pendingContent) {
+        content = this.pendingContent + content;
+      }
+      if (this.stripNext) {
+        content = content.replace(/^\s+/, '');
+      }
+
+      this.pendingContent = content;
+    },
+
+    // [strip]
+    //
+    // On stack, before: ...
+    // On stack, after: ...
+    //
+    // Removes any trailing whitespace from the prior content node and flags
+    // the next operation for stripping if it is a content node.
+    strip: function() {
+      if (this.pendingContent) {
+        this.pendingContent = this.pendingContent.replace(/\s+$/, '');
+      }
+      this.stripNext = 'strip';
+    },
+
+    // [append]
+    //
+    // On stack, before: value, ...
+    // On stack, after: ...
+    //
+    // Coerces `value` to a String and appends it to the current buffer.
+    //
+    // If `value` is truthy, or 0, it is coerced into a string and appended
+    // Otherwise, the empty string is appended
+    append: function() {
+      // Force anything that is inlined onto the stack so we don't have duplication
+      // when we examine local
+      this.flushInline();
+      var local = this.popStack();
+      this.pushSource("if(" + local + " || " + local + " === 0) { " + this.appendToBuffer(local) + " }");
+      if (this.environment.isSimple) {
+        this.pushSource("else { " + this.appendToBuffer("''") + " }");
+      }
+    },
+
+    // [appendEscaped]
+    //
+    // On stack, before: value, ...
+    // On stack, after: ...
+    //
+    // Escape `value` and append it to the buffer
+    appendEscaped: function() {
+      this.context.aliases.escapeExpression = 'this.escapeExpression';
+
+      this.pushSource(this.appendToBuffer("escapeExpression(" + this.popStack() + ")"));
+    },
+
+    // [getContext]
+    //
+    // On stack, before: ...
+    // On stack, after: ...
+    // Compiler value, after: lastContext=depth
+    //
+    // Set the value of the `lastContext` compiler value to the depth
+    getContext: function(depth) {
+      if(this.lastContext !== depth) {
+        this.lastContext = depth;
+      }
+    },
+
+    // [lookupOnContext]
+    //
+    // On stack, before: ...
+    // On stack, after: currentContext[name], ...
+    //
+    // Looks up the value of `name` on the current context and pushes
+    // it onto the stack.
+    lookupOnContext: function(name) {
+      this.push(this.nameLookup('depth' + this.lastContext, name, 'context'));
+    },
+
+    // [pushContext]
+    //
+    // On stack, before: ...
+    // On stack, after: currentContext, ...
+    //
+    // Pushes the value of the current context onto the stack.
+    pushContext: function() {
+      this.pushStackLiteral('depth' + this.lastContext);
+    },
+
+    // [resolvePossibleLambda]
+    //
+    // On stack, before: value, ...
+    // On stack, after: resolved value, ...
+    //
+    // If the `value` is a lambda, replace it on the stack by
+    // the return value of the lambda
+    resolvePossibleLambda: function() {
+      this.context.aliases.functionType = '"function"';
+
+      this.replaceStack(function(current) {
+        return "typeof " + current + " === functionType ? " + current + ".apply(depth0) : " + current;
+      });
+    },
+
+    // [lookup]
+    //
+    // On stack, before: value, ...
+    // On stack, after: value[name], ...
+    //
+    // Replace the value on the stack with the result of looking
+    // up `name` on `value`
+    lookup: function(name) {
+      this.replaceStack(function(current) {
+        return current + " == null || " + current + " === false ? " + current + " : " + this.nameLookup(current, name, 'context');
+      });
+    },
+
+    // [lookupData]
+    //
+    // On stack, before: ...
+    // On stack, after: data, ...
+    //
+    // Push the data lookup operator
+    lookupData: function() {
+      this.push('data');
+    },
+
+    // [pushStringParam]
+    //
+    // On stack, before: ...
+    // On stack, after: string, currentContext, ...
+    //
+    // This opcode is designed for use in string mode, which
+    // provides the string value of a parameter along with its
+    // depth rather than resolving it immediately.
+    pushStringParam: function(string, type) {
+      this.pushStackLiteral('depth' + this.lastContext);
+
+      this.pushString(type);
+
+      if (typeof string === 'string') {
+        this.pushString(string);
+      } else {
+        this.pushStackLiteral(string);
+      }
+    },
+
+    emptyHash: function() {
+      this.pushStackLiteral('{}');
+
+      if (this.options.stringParams) {
+        this.register('hashTypes', '{}');
+        this.register('hashContexts', '{}');
+      }
+    },
+    pushHash: function() {
+      this.hash = {values: [], types: [], contexts: []};
+    },
+    popHash: function() {
+      var hash = this.hash;
+      this.hash = undefined;
+
+      if (this.options.stringParams) {
+        this.register('hashContexts', '{' + hash.contexts.join(',') + '}');
+        this.register('hashTypes', '{' + hash.types.join(',') + '}');
+      }
+      this.push('{\n    ' + hash.values.join(',\n    ') + '\n  }');
+    },
+
+    // [pushString]
+    //
+    // On stack, before: ...
+    // On stack, after: quotedString(string), ...
+    //
+    // Push a quoted version of `string` onto the stack
+    pushString: function(string) {
+      this.pushStackLiteral(this.quotedString(string));
+    },
+
+    // [push]
+    //
+    // On stack, before: ...
+    // On stack, after: expr, ...
+    //
+    // Push an expression onto the stack
+    push: function(expr) {
+      this.inlineStack.push(expr);
+      return expr;
+    },
+
+    // [pushLiteral]
+    //
+    // On stack, before: ...
+    // On stack, after: value, ...
+    //
+    // Pushes a value onto the stack. This operation prevents
+    // the compiler from creating a temporary variable to hold
+    // it.
+    pushLiteral: function(value) {
+      this.pushStackLiteral(value);
+    },
+
+    // [pushProgram]
+    //
+    // On stack, before: ...
+    // On stack, after: program(guid), ...
+    //
+    // Push a program expression onto the stack. This takes
+    // a compile-time guid and converts it into a runtime-accessible
+    // expression.
+    pushProgram: function(guid) {
+      if (guid != null) {
+        this.pushStackLiteral(this.programExpression(guid));
+      } else {
+        this.pushStackLiteral(null);
+      }
+    },
+
+    // [invokeHelper]
+    //
+    // On stack, before: hash, inverse, program, params..., ...
+    // On stack, after: result of helper invocation
+    //
+    // Pops off the helper's parameters, invokes the helper,
+    // and pushes the helper's return value onto the stack.
+    //
+    // If the helper is not found, `helperMissing` is called.
+    invokeHelper: function(paramSize, name) {
+      this.context.aliases.helperMissing = 'helpers.helperMissing';
+
+      var helper = this.lastHelper = this.setupHelper(paramSize, name, true);
+      var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
+
+      this.push(helper.name + ' || ' + nonHelper);
+      this.replaceStack(function(name) {
+        return name + ' ? ' + name + '.call(' +
+            helper.callParams + ") " + ": helperMissing.call(" +
+            helper.helperMissingParams + ")";
+      });
+    },
+
+    // [invokeKnownHelper]
+    //
+    // On stack, before: hash, inverse, program, params..., ...
+    // On stack, after: result of helper invocation
+    //
+    // This operation is used when the helper is known to exist,
+    // so a `helperMissing` fallback is not required.
+    invokeKnownHelper: function(paramSize, name) {
+      var helper = this.setupHelper(paramSize, name);
+      this.push(helper.name + ".call(" + helper.callParams + ")");
+    },
+
+    // [invokeAmbiguous]
+    //
+    // On stack, before: hash, inverse, program, params..., ...
+    // On stack, after: result of disambiguation
+    //
+    // This operation is used when an expression like `{{foo}}`
+    // is provided, but we don't know at compile-time whether it
+    // is a helper or a path.
+    //
+    // This operation emits more code than the other options,
+    // and can be avoided by passing the `knownHelpers` and
+    // `knownHelpersOnly` flags at compile-time.
+    invokeAmbiguous: function(name, helperCall) {
+      this.context.aliases.functionType = '"function"';
+
+      this.pushStackLiteral('{}');    // Hash value
+      var helper = this.setupHelper(0, name, helperCall);
+
+      var helperName = this.lastHelper = this.nameLookup('helpers', name, 'helper');
+
+      var nonHelper = this.nameLookup('depth' + this.lastContext, name, 'context');
+      var nextStack = this.nextStack();
+
+      this.pushSource('if (' + nextStack + ' = ' + helperName + ') { ' + nextStack + ' = ' + nextStack + '.call(' + helper.callParams + '); }');
+      this.pushSource('else { ' + nextStack + ' = ' + nonHelper + '; ' + nextStack + ' = typeof ' + nextStack + ' === functionType ? ' + nextStack + '.call(' + helper.callParams + ') : ' + nextStack + '; }');
+    },
+
+    // [invokePartial]
+    //
+    // On stack, before: context, ...
+    // On stack after: result of partial invocation
+    //
+    // This operation pops off a context, invokes a partial with that context,
+    // and pushes the result of the invocation back.
+    invokePartial: function(name) {
+      var params = [this.nameLookup('partials', name, 'partial'), "'" + name + "'", this.popStack(), "helpers", "partials"];
+
+      if (this.options.data) {
+        params.push("data");
+      }
+
+      this.context.aliases.self = "this";
+      this.push("self.invokePartial(" + params.join(", ") + ")");
+    },
+
+    // [assignToHash]
+    //
+    // On stack, before: value, hash, ...
+    // On stack, after: hash, ...
+    //
+    // Pops a value and hash off the stack, assigns `hash[key] = value`
+    // and pushes the hash back onto the stack.
+    assignToHash: function(key) {
+      var value = this.popStack(),
+          context,
+          type;
+
+      if (this.options.stringParams) {
+        type = this.popStack();
+        context = this.popStack();
+      }
+
+      var hash = this.hash;
+      if (context) {
+        hash.contexts.push("'" + key + "': " + context);
+      }
+      if (type) {
+        hash.types.push("'" + key + "': " + type);
+      }
+      hash.values.push("'" + key + "': (" + value + ")");
+    },
+
+    // HELPERS
+
+    compiler: JavaScriptCompiler,
+
+    compileChildren: function(environment, options) {
+      var children = environment.children, child, compiler;
+
+      for(var i=0, l=children.length; i<l; i++) {
+        child = children[i];
+        compiler = new this.compiler();
+
+        var index = this.matchExistingProgram(child);
+
+        if (index == null) {
+          this.context.programs.push('');     // Placeholder to prevent name conflicts for nested children
+          index = this.context.programs.length;
+          child.index = index;
+          child.name = 'program' + index;
+          this.context.programs[index] = compiler.compile(child, options, this.context);
+          this.context.environments[index] = child;
+        } else {
+          child.index = index;
+          child.name = 'program' + index;
+        }
+      }
+    },
+    matchExistingProgram: function(child) {
+      for (var i = 0, len = this.context.environments.length; i < len; i++) {
+        var environment = this.context.environments[i];
+        if (environment && environment.equals(child)) {
+          return i;
+        }
+      }
+    },
+
+    programExpression: function(guid) {
+      this.context.aliases.self = "this";
+
+      if(guid == null) {
+        return "self.noop";
+      }
+
+      var child = this.environment.children[guid],
+          depths = child.depths.list, depth;
+
+      var programParams = [child.index, child.name, "data"];
+
+      for(var i=0, l = depths.length; i<l; i++) {
+        depth = depths[i];
+
+        if(depth === 1) { programParams.push("depth0"); }
+        else { programParams.push("depth" + (depth - 1)); }
+      }
+
+      return (depths.length === 0 ? "self.program(" : "self.programWithDepth(") + programParams.join(", ") + ")";
+    },
+
+    register: function(name, val) {
+      this.useRegister(name);
+      this.pushSource(name + " = " + val + ";");
+    },
+
+    useRegister: function(name) {
+      if(!this.registers[name]) {
+        this.registers[name] = true;
+        this.registers.list.push(name);
+      }
+    },
+
+    pushStackLiteral: function(item) {
+      return this.push(new Literal(item));
+    },
+
+    pushSource: function(source) {
+      if (this.pendingContent) {
+        this.source.push(this.appendToBuffer(this.quotedString(this.pendingContent)));
+        this.pendingContent = undefined;
+      }
+
+      if (source) {
+        this.source.push(source);
+      }
+    },
+
+    pushStack: function(item) {
+      this.flushInline();
+
+      var stack = this.incrStack();
+      if (item) {
+        this.pushSource(stack + " = " + item + ";");
+      }
+      this.compileStack.push(stack);
+      return stack;
+    },
+
+    replaceStack: function(callback) {
+      var prefix = '',
+          inline = this.isInline(),
+          stack;
+
+      // If we are currently inline then we want to merge the inline statement into the
+      // replacement statement via ','
+      if (inline) {
+        var top = this.popStack(true);
+
+        if (top instanceof Literal) {
+          // Literals do not need to be inlined
+          stack = top.value;
+        } else {
+          // Get or create the current stack name for use by the inline
+          var name = this.stackSlot ? this.topStackName() : this.incrStack();
+
+          prefix = '(' + this.push(name) + ' = ' + top + '),';
+          stack = this.topStack();
+        }
+      } else {
+        stack = this.topStack();
+      }
+
+      var item = callback.call(this, stack);
+
+      if (inline) {
+        if (this.inlineStack.length || this.compileStack.length) {
+          this.popStack();
+        }
+        this.push('(' + prefix + item + ')');
+      } else {
+        // Prevent modification of the context depth variable. Through replaceStack
+        if (!/^stack/.test(stack)) {
+          stack = this.nextStack();
+        }
+
+        this.pushSource(stack + " = (" + prefix + item + ");");
+      }
+      return stack;
+    },
+
+    nextStack: function() {
+      return this.pushStack();
+    },
+
+    incrStack: function() {
+      this.stackSlot++;
+      if(this.stackSlot > this.stackVars.length) { this.stackVars.push("stack" + this.stackSlot); }
+      return this.topStackName();
+    },
+    topStackName: function() {
+      return "stack" + this.stackSlot;
+    },
+    flushInline: function() {
+      var inlineStack = this.inlineStack;
+      if (inlineStack.length) {
+        this.inlineStack = [];
+        for (var i = 0, len = inlineStack.length; i < len; i++) {
+          var entry = inlineStack[i];
+          if (entry instanceof Literal) {
+            this.compileStack.push(entry);
+          } else {
+            this.pushStack(entry);
+          }
+        }
+      }
+    },
+    isInline: function() {
+      return this.inlineStack.length;
+    },
+
+    popStack: function(wrapped) {
+      var inline = this.isInline(),
+          item = (inline ? this.inlineStack : this.compileStack).pop();
+
+      if (!wrapped && (item instanceof Literal)) {
+        return item.value;
+      } else {
+        if (!inline) {
+          this.stackSlot--;
+        }
+        return item;
+      }
+    },
+
+    topStack: function(wrapped) {
+      var stack = (this.isInline() ? this.inlineStack : this.compileStack),
+          item = stack[stack.length - 1];
+
+      if (!wrapped && (item instanceof Literal)) {
+        return item.value;
+      } else {
+        return item;
+      }
+    },
+
+    quotedString: function(str) {
+      return '"' + str
+        .replace(/\\/g, '\\\\')
+        .replace(/"/g, '\\"')
+        .replace(/\n/g, '\\n')
+        .replace(/\r/g, '\\r')
+        .replace(/\u2028/g, '\\u2028')   // Per Ecma-262 7.3 + 7.8.4
+        .replace(/\u2029/g, '\\u2029') + '"';
+    },
+
+    setupHelper: function(paramSize, name, missingParams) {
+      var params = [];
+      this.setupParams(paramSize, params, missingParams);
+      var foundHelper = this.nameLookup('helpers', name, 'helper');
+
+      return {
+        params: params,
+        name: foundHelper,
+        callParams: ["depth0"].concat(params).join(", "),
+        helperMissingParams: missingParams && ["depth0", this.quotedString(name)].concat(params).join(", ")
+      };
+    },
+
+    // the params and contexts arguments are passed in arrays
+    // to fill in
+    setupParams: function(paramSize, params, useRegister) {
+      var options = [], contexts = [], types = [], param, inverse, program;
+
+      options.push("hash:" + this.popStack());
+
+      inverse = this.popStack();
+      program = this.popStack();
+
+      // Avoid setting fn and inverse if neither are set. This allows
+      // helpers to do a check for `if (options.fn)`
+      if (program || inverse) {
+        if (!program) {
+          this.context.aliases.self = "this";
+          program = "self.noop";
+        }
+
+        if (!inverse) {
+         this.context.aliases.self = "this";
+          inverse = "self.noop";
+        }
+
+        options.push("inverse:" + inverse);
+        options.push("fn:" + program);
+      }
+
+      for(var i=0; i<paramSize; i++) {
+        param = this.popStack();
+        params.push(param);
+
+        if(this.options.stringParams) {
+          types.push(this.popStack());
+          contexts.push(this.popStack());
+        }
+      }
+
+      if (this.options.stringParams) {
+        options.push("contexts:[" + contexts.join(",") + "]");
+        options.push("types:[" + types.join(",") + "]");
+        options.push("hashContexts:hashContexts");
+        options.push("hashTypes:hashTypes");
+      }
+
+      if(this.options.data) {
+        options.push("data:data");
+      }
+
+      options = "{" + options.join(",") + "}";
+      if (useRegister) {
+        this.register('options', options);
+        params.push('options');
+      } else {
+        params.push(options);
+      }
+      return params.join(", ");
+    }
+  };
+
+  var reservedWords = (
+    "break else new var" +
+    " case finally return void" +
+    " catch for switch while" +
+    " continue function this with" +
+    " default if throw" +
+    " delete in try" +
+    " do instanceof typeof" +
+    " abstract enum int short" +
+    " boolean export interface static" +
+    " byte extends long super" +
+    " char final native synchronized" +
+    " class float package throws" +
+    " const goto private transient" +
+    " debugger implements protected volatile" +
+    " double import public let yield"
+  ).split(" ");
+
+  var compilerWords = JavaScriptCompiler.RESERVED_WORDS = {};
+
+  for(var i=0, l=reservedWords.length; i<l; i++) {
+    compilerWords[reservedWords[i]] = true;
+  }
+
+  JavaScriptCompiler.isValidJavaScriptVariableName = function(name) {
+    if(!JavaScriptCompiler.RESERVED_WORDS[name] && /^[a-zA-Z_$][0-9a-zA-Z_$]+$/.test(name)) {
+      return true;
+    }
+    return false;
+  };
+
+  __exports__ = JavaScriptCompiler;
+  return __exports__;
+})(__module2__);
+
+// handlebars/compiler/compiler.js
+var __module10__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__) {
+  "use strict";
+  var __exports__ = {};
+  var Exception = __dependency1__;
+  var parse = __dependency2__.parse;
+  var JavaScriptCompiler = __dependency3__;
+  var AST = __dependency4__;
+
+  function Compiler() {}
+
+  __exports__.Compiler = Compiler;// the foundHelper register will disambiguate helper lookup from finding a
+  // function in a context. This is necessary for mustache compatibility, which
+  // requires that context functions in blocks are evaluated by blockHelperMissing,
+  // and then proceed as if the resulting value was provided to blockHelperMissing.
+
+  Compiler.prototype = {
+    compiler: Compiler,
+
+    disassemble: function() {
+      var opcodes = this.opcodes, opcode, out = [], params, param;
+
+      for (var i=0, l=opcodes.length; i<l; i++) {
+        opcode = opcodes[i];
+
+        if (opcode.opcode === 'DECLARE') {
+          out.push("DECLARE " + opcode.name + "=" + opcode.value);
+        } else {
+          params = [];
+          for (var j=0; j<opcode.args.length; j++) {
+            param = opcode.args[j];
+            if (typeof param === "string") {
+              param = "\"" + param.replace("\n", "\\n") + "\"";
+            }
+            params.push(param);
+          }
+          out.push(opcode.opcode + " " + params.join(" "));
+        }
+      }
+
+      return out.join("\n");
+    },
+
+    equals: function(other) {
+      var len = this.opcodes.length;
+      if (other.opcodes.length !== len) {
+        return false;
+      }
+
+      for (var i = 0; i < len; i++) {
+        var opcode = this.opcodes[i],
+            otherOpcode = other.opcodes[i];
+        if (opcode.opcode !== otherOpcode.opcode || opcode.args.length !== otherOpcode.args.length) {
+          return false;
+        }
+        for (var j = 0; j < opcode.args.length; j++) {
+          if (opcode.args[j] !== otherOpcode.args[j]) {
+            return false;
+          }
+        }
+      }
+
+      len = this.children.length;
+      if (other.children.length !== len) {
+        return false;
+      }
+      for (i = 0; i < len; i++) {
+        if (!this.children[i].equals(other.children[i])) {
+          return false;
+        }
+      }
+
+      return true;
+    },
+
+    guid: 0,
+
+    compile: function(program, options) {
+      this.opcodes = [];
+      this.children = [];
+      this.depths = {list: []};
+      this.options = options;
+
+      // These changes will propagate to the other compiler components
+      var knownHelpers = this.options.knownHelpers;
+      this.options.knownHelpers = {
+        'helperMissing': true,
+        'blockHelperMissing': true,
+        'each': true,
+        'if': true,
+        'unless': true,
+        'with': true,
+        'log': true
+      };
+      if (knownHelpers) {
+        for (var name in knownHelpers) {
+          this.options.knownHelpers[name] = knownHelpers[name];
+        }
+      }
+
+      return this.accept(program);
+    },
+
+    accept: function(node) {
+      var strip = node.strip || {},
+          ret;
+      if (strip.left) {
+        this.opcode('strip');
+      }
+
+      ret = this[node.type](node);
+
+      if (strip.right) {
+        this.opcode('strip');
+      }
+
+      return ret;
+    },
+
+    program: function(program) {
+      var statements = program.statements;
+
+      for(var i=0, l=statements.length; i<l; i++) {
+        this.accept(statements[i]);
+      }
+      this.isSimple = l === 1;
+
+      this.depths.list = this.depths.list.sort(function(a, b) {
+        return a - b;
+      });
+
+      return this;
+    },
+
+    compileProgram: function(program) {
+      var result = new this.compiler().compile(program, this.options);
+      var guid = this.guid++, depth;
+
+      this.usePartial = this.usePartial || result.usePartial;
+
+      this.children[guid] = result;
+
+      for(var i=0, l=result.depths.list.length; i<l; i++) {
+        depth = result.depths.list[i];
+
+        if(depth < 2) { continue; }
+        else { this.addDepth(depth - 1); }
+      }
+
+      return guid;
+    },
+
+    block: function(block) {
+      var mustache = block.mustache,
+          program = block.program,
+          inverse = block.inverse;
+
+      if (program) {
+        program = this.compileProgram(program);
+      }
+
+      if (inverse) {
+        inverse = this.compileProgram(inverse);
+      }
+
+      var type = this.classifyMustache(mustache);
+
+      if (type === "helper") {
+        this.helperMustache(mustache, program, inverse);
+      } else if (type === "simple") {
+        this.simpleMustache(mustache);
+
+        // now that the simple mustache is resolved, we need to
+        // evaluate it by executing `blockHelperMissing`
+        this.opcode('pushProgram', program);
+        this.opcode('pushProgram', inverse);
+        this.opcode('emptyHash');
+        this.opcode('blockValue');
+      } else {
+        this.ambiguousMustache(mustache, program, inverse);
+
+        // now that the simple mustache is resolved, we need to
+        // evaluate it by executing `blockHelperMissing`
+        this.opcode('pushProgram', program);
+        this.opcode('pushProgram', inverse);
+        this.opcode('emptyHash');
+        this.opcode('ambiguousBlockValue');
+      }
+
+      this.opcode('append');
+    },
+
+    hash: function(hash) {
+      var pairs = hash.pairs, pair, val;
+
+      this.opcode('pushHash');
+
+      for(var i=0, l=pairs.length; i<l; i++) {
+        pair = pairs[i];
+        val  = pair[1];
+
+        if (this.options.stringParams) {
+          if(val.depth) {
+            this.addDepth(val.depth);
+          }
+          this.opcode('getContext', val.depth || 0);
+          this.opcode('pushStringParam', val.stringModeValue, val.type);
+        } else {
+          this.accept(val);
+        }
+
+        this.opcode('assignToHash', pair[0]);
+      }
+      this.opcode('popHash');
+    },
+
+    partial: function(partial) {
+      var partialName = partial.partialName;
+      this.usePartial = true;
+
+      if(partial.context) {
+        this.ID(partial.context);
+      } else {
+        this.opcode('push', 'depth0');
+      }
+
+      this.opcode('invokePartial', partialName.name);
+      this.opcode('append');
+    },
+
+    content: function(content) {
+      this.opcode('appendContent', content.string);
+    },
+
+    mustache: function(mustache) {
+      var options = this.options;
+      var type = this.classifyMustache(mustache);
+
+      if (type === "simple") {
+        this.simpleMustache(mustache);
+      } else if (type === "helper") {
+        this.helperMustache(mustache);
+      } else {
+        this.ambiguousMustache(mustache);
+      }
+
+      if(mustache.escaped && !options.noEscape) {
+        this.opcode('appendEscaped');
+      } else {
+        this.opcode('append');
+      }
+    },
+
+    ambiguousMustache: function(mustache, program, inverse) {
+      var id = mustache.id,
+          name = id.parts[0],
+          isBlock = program != null || inverse != null;
+
+      this.opcode('getContext', id.depth);
+
+      this.opcode('pushProgram', program);
+      this.opcode('pushProgram', inverse);
+
+      this.opcode('invokeAmbiguous', name, isBlock);
+    },
+
+    simpleMustache: function(mustache) {
+      var id = mustache.id;
+
+      if (id.type === 'DATA') {
+        this.DATA(id);
+      } else if (id.parts.length) {
+        this.ID(id);
+      } else {
+        // Simplified ID for `this`
+        this.addDepth(id.depth);
+        this.opcode('getContext', id.depth);
+        this.opcode('pushContext');
+      }
+
+      this.opcode('resolvePossibleLambda');
+    },
+
+    helperMustache: function(mustache, program, inverse) {
+      var params = this.setupFullMustacheParams(mustache, program, inverse),
+          name = mustache.id.parts[0];
+
+      if (this.options.knownHelpers[name]) {
+        this.opcode('invokeKnownHelper', params.length, name);
+      } else if (this.options.knownHelpersOnly) {
+        throw new Error("You specified knownHelpersOnly, but used the unknown helper " + name);
+      } else {
+        this.opcode('invokeHelper', params.length, name);
+      }
+    },
+
+    ID: function(id) {
+      this.addDepth(id.depth);
+      this.opcode('getContext', id.depth);
+
+      var name = id.parts[0];
+      if (!name) {
+        this.opcode('pushContext');
+      } else {
+        this.opcode('lookupOnContext', id.parts[0]);
+      }
+
+      for(var i=1, l=id.parts.length; i<l; i++) {
+        this.opcode('lookup', id.parts[i]);
+      }
+    },
+
+    DATA: function(data) {
+      this.options.data = true;
+      if (data.id.isScoped || data.id.depth) {
+        throw new Exception('Scoped data references are not supported: ' + data.original);
+      }
+
+      this.opcode('lookupData');
+      var parts = data.id.parts;
+      for(var i=0, l=parts.length; i<l; i++) {
+        this.opcode('lookup', parts[i]);
+      }
+    },
+
+    STRING: function(string) {
+      this.opcode('pushString', string.string);
+    },
+
+    INTEGER: function(integer) {
+      this.opcode('pushLiteral', integer.integer);
+    },
+
+    BOOLEAN: function(bool) {
+      this.opcode('pushLiteral', bool.bool);
+    },
+
+    comment: function() {},
+
+    // HELPERS
+    opcode: function(name) {
+      this.opcodes.push({ opcode: name, args: [].slice.call(arguments, 1) });
+    },
+
+    declare: function(name, value) {
+      this.opcodes.push({ opcode: 'DECLARE', name: name, value: value });
+    },
+
+    addDepth: function(depth) {
+      if(isNaN(depth)) { throw new Error("EWOT"); }
+      if(depth === 0) { return; }
+
+      if(!this.depths[depth]) {
+        this.depths[depth] = true;
+        this.depths.list.push(depth);
+      }
+    },
+
+    classifyMustache: function(mustache) {
+      var isHelper   = mustache.isHelper;
+      var isEligible = mustache.eligibleHelper;
+      var options    = this.options;
+
+      // if ambiguous, we can possibly resolve the ambiguity now
+      if (isEligible && !isHelper) {
+        var name = mustache.id.parts[0];
+
+        if (options.knownHelpers[name]) {
+          isHelper = true;
+        } else if (options.knownHelpersOnly) {
+          isEligible = false;
+        }
+      }
+
+      if (isHelper) { return "helper"; }
+      else if (isEligible) { return "ambiguous"; }
+      else { return "simple"; }
+    },
+
+    pushParams: function(params) {
+      var i = params.length, param;
+
+      while(i--) {
+        param = params[i];
+
+        if(this.options.stringParams) {
+          if(param.depth) {
+            this.addDepth(param.depth);
+          }
+
+          this.opcode('getContext', param.depth || 0);
+          this.opcode('pushStringParam', param.stringModeValue, param.type);
+        } else {
+          this[param.type](param);
+        }
+      }
+    },
+
+    setupMustacheParams: function(mustache) {
+      var params = mustache.params;
+      this.pushParams(params);
+
+      if(mustache.hash) {
+        this.hash(mustache.hash);
+      } else {
+        this.opcode('emptyHash');
+      }
+
+      return params;
+    },
+
+    // this will replace setupMustacheParams when we're done
+    setupFullMustacheParams: function(mustache, program, inverse) {
+      var params = mustache.params;
+      this.pushParams(params);
+
+      this.opcode('pushProgram', program);
+      this.opcode('pushProgram', inverse);
+
+      if(mustache.hash) {
+        this.hash(mustache.hash);
+      } else {
+        this.opcode('emptyHash');
+      }
+
+      return params;
+    }
+  };
+
+  function precompile(input, options) {
+    if (input == null || (typeof input !== 'string' && input.constructor !== AST.ProgramNode)) {
+      throw new Exception("You must pass a string or Handlebars AST to Handlebars.precompile. You passed " + input);
+    }
+
+    options = options || {};
+    if (!('data' in options)) {
+      options.data = true;
+    }
+
+    var ast = parse(input);
+    var environment = new Compiler().compile(ast, options);
+    return new JavaScriptCompiler().compile(environment, options);
+  }
+
+  __exports__.precompile = precompile;function compile(input, options, env) {
+    if (input == null || (typeof input !== 'string' && input.constructor !== AST.ProgramNode)) {
+      throw new Exception("You must pass a string or Handlebars AST to Handlebars.compile. You passed " + input);
+    }
+
+    options = options || {};
+
+    if (!('data' in options)) {
+      options.data = true;
+    }
+
+    var compiled;
+
+    function compileInput() {
+      var ast = parse(input);
+      var environment = new Compiler().compile(ast, options);
+      var templateSpec = new JavaScriptCompiler().compile(environment, options, undefined, true);
+      return env.template(templateSpec);
+    }
+
+    // Template is only compiled on first use and cached after that point.
+    return function(context, options) {
+      if (!compiled) {
+        compiled = compileInput();
+      }
+      return compiled.call(this, context, options);
+    };
+  }
+
+  __exports__.compile = compile;
+  return __exports__;
+})(__module5__, __module8__, __module11__, __module7__);
+
+// handlebars.js
+var __module0__ = (function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__) {
+  "use strict";
+  var __exports__;
+  var Handlebars = __dependency1__;
+
+  // Compiler imports
+  var AST = __dependency2__;
+  var Parser = __dependency3__.parser;
+  var parse = __dependency3__.parse;
+  var Compiler = __dependency4__.Compiler;
+  var compile = __dependency4__.compile;
+  var precompile = __dependency4__.precompile;
+  var JavaScriptCompiler = __dependency5__;
+
+  var _create = Handlebars.create;
+  var create = function() {
+    var hb = _create();
+
+    hb.compile = function(input, options) {
+      return compile(input, options, hb);
+    };
+    hb.precompile = precompile;
+
+    hb.AST = AST;
+    hb.Compiler = Compiler;
+    hb.JavaScriptCompiler = JavaScriptCompiler;
+    hb.Parser = Parser;
+    hb.parse = parse;
+
+    return hb;
+  };
+
+  Handlebars = create();
+  Handlebars.create = create;
+
+  __exports__ = Handlebars;
+  return __exports__;
+})(__module1__, __module7__, __module8__, __module10__, __module11__);
+
+  return __module0__;
+})();
diff --git a/erp_web/js/pages/materials/add_temp.js b/erp_web/js/pages/materials/add_temp.js
new file mode 100644
index 00000000..84db3a3e
--- /dev/null
+++ b/erp_web/js/pages/materials/add_temp.js
@@ -0,0 +1,35 @@
+$.get("../../pages/template/base.html", function(tem) {
+    if(tem) {
+        var template = Handlebars.compile(tem);
+        /**
+         * 加载供应商、客户模块
+         */
+        $("body").append(template({
+            supplierSelect: true
+        }));
+        $('#supplierDlg').dialog({
+            closed: true,
+            modal: true,
+            collapsible: false,
+            closable: true
+        });
+        $("#supplierDlg #supplier").validatebox({
+            required: true,
+            validType: 'length[2,30]'
+        });
+        $("#supplierDlg #email").validatebox({
+            validType: 'email'
+        });
+        $("#BeginNeedGet,#BeginNeedPay,#AllNeedGet,#AllNeedPay").numberbox({
+            min:0,
+            precision:2
+        });
+
+        $("#saveSupplier").linkbutton({
+            iconCls: 'icon-ok'
+        });
+        $("#cancelSupplier").linkbutton({
+            iconCls: 'icon-cancel'
+        });
+    }
+});
\ No newline at end of file
diff --git a/erp_web/js/pages/materials/in_out.js b/erp_web/js/pages/materials/in_out.js
index a8222bf4..6d9686cc 100644
--- a/erp_web/js/pages/materials/in_out.js
+++ b/erp_web/js/pages/materials/in_out.js
@@ -1096,31 +1096,44 @@
 			toolbar:[
 				{
 					id:'append',
-					text:'新增',
+					text:'新增行',
 					iconCls:'icon-add',
-					handler:function()
-					{
-						append(); //新增
+					handler:function() {
+						append(); //新增行
 					}
 				},
 				{
 					id:'delete',
-					text:'删除',
+					text:'删除行',
 					iconCls:'icon-remove',
-					handler:function()
-					{
-						batchDel(); //删除
+					handler:function() {
+						batchDel(); //删除行
 					}
 				},
 				{
 					id:'reject',
 					text:'撤销',
 					iconCls:'icon-undo',
-					handler:function()
-					{
+					handler:function() {
 						reject(); //撤销
 					}
-				}
+				},
+                {
+                    id:'appendDepot',
+                    text:'新增仓库',
+                    iconCls:'icon-add',
+                    handler:function() {
+                        appendDepot(); //新增仓库
+                    }
+                },
+                {
+                    id:'appendMaterial',
+                    text:'新增商品',
+                    iconCls:'icon-add',
+                    handler:function() {
+                        appendMaterial(); //新增商品
+                    }
+                }
 			],
 			onLoadError:function()
 			{
@@ -1586,18 +1599,19 @@
 	    depotHeadID = 0;
 	    initTableData_material("add"); //商品列表
 	    reject(); //撤销下、刷新商品列表
+		function supplierDlgFun(type) {
+            $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加' + type + '信息');
+            $('#supplierFM').form('clear');
+            bindSupplierEvent();
+        }
 		$("#addOrgan").off("click").on("click",function(){
-			$('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加供应商信息');
-            $('#supplierFM').form('clear');
+            supplierDlgFun("供应商");
 		});
-
         $("#addMember").off("click").on("click",function(){
-            $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加会员信息');
-            $('#supplierFM').form('clear');
+            supplierDlgFun("会员");
         });
         $("#addCustomer").off("click").on("click",function(){
-            $('#supplierDlg').dialog('open').dialog('setTitle','<img src="/js/easyui-1.3.5/themes/icons/edit_add.png"/>&nbsp;增加客户信息');
-            $('#supplierFM').form('clear');
+            supplierDlgFun("客户");
         });
 	    url = '/depotHead/addDepotHeadAndDetail';
 
@@ -2585,31 +2599,38 @@
 			$("#otherMoneyTotalDlg").text($("#OtherMoney").val());
 		});
 
-		if(listTitle === "采购入库列表" || listTitle === "其它入库列表" || listTitle === "采购订单列表"|| listTitle === "零售出库列表"|| listTitle === "销售出库列表"|| listTitle === "销售订单列表"){
-			var supplierType = "供应商";
-			if(listTitle === "零售出库列表"){
+	}
+
+    /**
+	 * 绑定供应商、客户事件
+     */
+	function bindSupplierEvent() {
+        if(listTitle === "采购入库列表" || listTitle === "其它入库列表" || listTitle === "采购订单列表"
+            || listTitle === "零售出库列表"|| listTitle === "销售出库列表"|| listTitle === "销售订单列表"){
+            var supplierType = "供应商";
+            if(listTitle === "零售出库列表"){
                 supplierType = "会员";
-			}else if(listTitle === "销售出库列表" || listTitle === "销售订单列表"){
-            supplierType = "客户";
-			}
-			//检查单位名称是否存在 ++ 重名无法提示问题需要跟进
-			function checkSupplierName() {
-				var supplierName = $.trim($("#supplier").val());
-				var orgSupplier = "";
-				//表示是否存在 true == 存在 false = 不存在
-				var flag = false;
-				//开始ajax名称检验，不能重名
-				if(supplierName.length > 0 &&( orgSupplier.length ==0 || supplierName != orgSupplier))
-				{
-					$.ajax({
-						type:"get",
-						url: "/supplier/checkIsNameExist",
-						dataType: "json",
-						async :  false,
-						data: ({
+            }else if(listTitle === "销售出库列表" || listTitle === "销售订单列表"){
+                supplierType = "客户";
+            }
+            //检查单位名称是否存在 ++ 重名无法提示问题需要跟进
+            function checkSupplierName() {
+                var supplierName = $.trim($("#supplier").val());
+                var orgSupplier = "";
+                //表示是否存在 true == 存在 false = 不存在
+                var flag = false;
+                //开始ajax名称检验，不能重名
+                if(supplierName.length > 0 &&( orgSupplier.length ==0 || supplierName != orgSupplier))
+                {
+                    $.ajax({
+                        type:"get",
+                        url: "/supplier/checkIsNameExist",
+                        dataType: "json",
+                        async :  false,
+                        data: ({
                             id : 0,
                             name : supplierName
-						}),
+                        }),
                         success: function (res) {
                             if(res && res.code === 200) {
                                 if(res.data && res.data.status) {
@@ -2621,59 +2642,59 @@
                                 }
                             }
                         },
-						//此处添加错误处理
-						error:function() {
-							$.messager.alert('提示','检查单位名称是否存在异常，请稍后再试！','error');
-							return;
-						}
-					});
-				}
-				return flag;
-			}
+                        //此处添加错误处理
+                        error:function() {
+                            $.messager.alert('提示','检查单位名称是否存在异常，请稍后再试！','error');
+                            return;
+                        }
+                    });
+                }
+                return flag;
+            }
 
-			//保存供应商信息
-			$("#saveSupplier").off("click").on("click",function() {
+            //保存供应商信息
+            $("#saveSupplier").off("click").on("click",function() {
                 if(validateForm("supplierFM")) {
                     return;
                 }
-				if(checkSupplierName()){
-					return;
-				}
-				var reg = /^([0-9])+$/;
-				var phonenum = $.trim($("#phonenum").val());
-				if(phonenum.length>0 && !reg.test(phonenum))
-				{
-					$.messager.alert('提示','电话号码只能是数字','info');
-					$("#phonenum").val("").focus();
-					return;
-				}
-				var beginNeedGet = $.trim($("#BeginNeedGet").val());
-				var beginNeedPay = $.trim($("#BeginNeedPay").val());
-				if(beginNeedGet && beginNeedPay) {
-					$.messager.alert('提示','期初应收和期初应付不能同时输入','info');
-					return;
-				}
-				var url = '/supplier/add';
+                if(checkSupplierName()){
+                    return;
+                }
+                var reg = /^([0-9])+$/;
+                var phonenum = $.trim($("#phonenum").val());
+                if(phonenum.length>0 && !reg.test(phonenum))
+                {
+                    $.messager.alert('提示','电话号码只能是数字','info');
+                    $("#phonenum").val("").focus();
+                    return;
+                }
+                var beginNeedGet = $.trim($("#BeginNeedGet").val());
+                var beginNeedPay = $.trim($("#BeginNeedPay").val());
+                if(beginNeedGet && beginNeedPay) {
+                    $.messager.alert('提示','期初应收和期初应付不能同时输入','info');
+                    return;
+                }
+                var url = '/supplier/add';
                 var supObj = $("#supplierFM").serializeObject();
                 supObj.type = supplierType;
                 supObj.enabled = 1;
-				$.ajax({
-					url: url,
-					type:"post",
-					dataType: "json",
-					data:{
+                $.ajax({
+                    url: url,
+                    type:"post",
+                    dataType: "json",
+                    data:{
                         info: JSON.stringify(supObj)
-					},
-					success: function(res) {
-						if (res) {
-							$('#supplierDlg').dialog('close');
-							initSupplier(); //刷新供应商
-						}
-					}
-				});
-			});
-		}
-	}
+                    },
+                    success: function(res) {
+                        if (res) {
+                            $('#supplierDlg').dialog('close');
+                            initSupplier(); //刷新供应商
+                        }
+                    }
+                });
+            });
+        }
+    }
 
 	function showDepotHeadDetails(pageNo,pageSize){
 		var materialParam = $.trim($("#searchMaterial").val());
@@ -2989,6 +3010,14 @@
 	    $('#materialData').datagrid('rejectChanges');
 	    editIndex = undefined;
 	}
+    //新增仓库
+    function appendDepot() {
+		alert("新增仓库");
+    }
+    //新增商品
+    function appendMaterial() {
+        alert("新增商品");
+	}
 	//判断
 	function CheckData(type) {
 		append();
diff --git a/erp_web/pages/materials/allocation_out_list.html b/erp_web/pages/materials/allocation_out_list.html
index 673f2088..7c3ccb21 100644
--- a/erp_web/pages/materials/allocation_out_list.html
+++ b/erp_web/pages/materials/allocation_out_list.html
@@ -13,8 +13,10 @@
     <script src="/js/jquery-1.8.0.min.js"></script>
     <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
     <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
 <body>
diff --git a/erp_web/pages/materials/assemble_list.html b/erp_web/pages/materials/assemble_list.html
index c410ba1b..50279e15 100644
--- a/erp_web/pages/materials/assemble_list.html
+++ b/erp_web/pages/materials/assemble_list.html
@@ -13,8 +13,10 @@
     <script src="/js/jquery-1.8.0.min.js"></script>
     <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
     <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
 <body>
diff --git a/erp_web/pages/materials/disassemble_list.html b/erp_web/pages/materials/disassemble_list.html
index bdf06062..9698fe2f 100644
--- a/erp_web/pages/materials/disassemble_list.html
+++ b/erp_web/pages/materials/disassemble_list.html
@@ -13,14 +13,11 @@
     <script src="/js/jquery-1.8.0.min.js"></script>
     <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
     <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
-    <script>
-        var kid = ${sessionScope.user.id};
-        var path = "<%=path%>";
-        var clientIp = "<%=clientIp%>";
-    </script>
 </head>
 <body>
 <!-- 查询 -->
diff --git a/erp_web/pages/materials/other_in_list.html b/erp_web/pages/materials/other_in_list.html
index bc39709b..e371bb9d 100644
--- a/erp_web/pages/materials/other_in_list.html
+++ b/erp_web/pages/materials/other_in_list.html
@@ -13,8 +13,10 @@
     <script src="/js/jquery-1.8.0.min.js"></script>
     <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
     <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
 <body>
@@ -146,107 +148,5 @@
     <a href="javascript:void(0)" id="cancelDepotHeadShow" class="easyui-linkbutton" iconCls="icon-cancel"
        onclick="javascript:$('#depotHeadDlgShow').dialog('close')">取消</a>
 </div>
-<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"
-     closed="true" buttons="#supplierDlgBtn" modal="true" collapsible="false" closable="true">
-    <form id="supplierFM">
-        <table>
-            <tr>
-                <td style="width: 80px;height: 20px">名称</td>
-                <td style="width: 180px;padding:1px">
-                    <input name="supplier" id="supplier" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 160px;height: 20px"/>
-                </td>
-                <td style="width: 60px;height: 20px">联系人</td>
-                <td style="width:180px;padding:1px;">
-                    <input name="contacts" id="contacts" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>手机号码</td>
-                <td style="padding:1px;">
-                    <input name="telephone" id="telephone" class="easyui-validatebox"
-                           style="width: 160px;height: 20px"/>
-                </td>
-                <td>电子邮箱</td>
-                <td style="padding:1px">
-                    <input name="email" id="email" class="easyui-validatebox" validType="email"
-                           style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>联系电话</td>
-                <td style="padding:1px;">
-                    <input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>传真</td>
-                <td style="padding:1px">
-                    <input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>期初应收</td>
-                <td style="padding:1px">
-                    <input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
-                </td>
-                <td>期初应付</td>
-                <td style="padding:1px">
-                    <input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
-                </td>
-            </tr>
-            <tr>
-                <td>累计应收</td>
-                <td style="padding:1px">
-                    <input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
-                </td>
-                <td>累计应付</td>
-                <td style="padding:1px">
-                    <input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
-                </td>
-            </tr>
-            <tr>
-                <td>纳税人识别号</td>
-                <td style="padding:1px">
-                    <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>税率</td>
-                <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>开户行</td>
-                <td style="padding:1px">
-                    <input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>账号</td>
-                <td style="padding:1px">
-                    <input name="accountNumber" id="accountNumber" class="easyui-validatebox"
-                           style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>地址</td>
-                <td style="padding:1px" colspan="3">
-                    <input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>备注</td>
-                <td style="padding:1px" colspan="3">
-                    <textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
-                </td>
-            </tr>
-        </table>
-    </form>
-</div>
-<div id="supplierDlgBtn">
-    <a href="javascript:void(0)" id="saveSupplier" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-    <a href="javascript:void(0)" id="cancelSupplier" class="easyui-linkbutton" iconCls="icon-cancel"
-       onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
-</div>
 </body>
 </html>
diff --git a/erp_web/pages/materials/other_out_list.html b/erp_web/pages/materials/other_out_list.html
index 2507ccb2..0ec3bdc0 100644
--- a/erp_web/pages/materials/other_out_list.html
+++ b/erp_web/pages/materials/other_out_list.html
@@ -13,8 +13,10 @@
     <script src="/js/jquery-1.8.0.min.js"></script>
     <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
     <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
 <body>
diff --git a/erp_web/pages/materials/purchase_back_list.html b/erp_web/pages/materials/purchase_back_list.html
index b0d51565..c65719bf 100644
--- a/erp_web/pages/materials/purchase_back_list.html
+++ b/erp_web/pages/materials/purchase_back_list.html
@@ -13,8 +13,10 @@
     <script src="/js/jquery-1.8.0.min.js"></script>
     <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
     <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
 <body>
@@ -63,13 +65,7 @@
             <tr>
                 <td style="width:70px;">供应商：</td>
                 <td style="padding:5px;width:170px;">
-                    <div class="org-list">
-                        <input id="OrganId" name="OrganId" style="width:130px;"/>
-                    </div>
-                    <div class="add-org-btn">
-                        <img id="addOrgan" src="/js/easyui-1.3.5/themes/icons/edit_add.png"
-                             style="cursor: pointer;" alt="增加供应商" title="增加供应商"/>
-                    </div>
+                    <input id="OrganId" name="OrganId" style="width:130px;"/>
                 </td>
                 <td style="width:70px;">单据日期：</td>
                 <td style="padding:5px">
@@ -278,107 +274,5 @@
     <a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
     <a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
 </div>
-<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"
-     closed="true" buttons="#supplierDlgBtn" modal="true" collapsible="false" closable="true">
-    <form id="supplierFM">
-        <table>
-            <tr>
-                <td style="width: 80px;height: 20px">名称</td>
-                <td style="width: 180px;padding:1px">
-                    <input name="supplier" id="supplier" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 160px;height: 20px"/>
-                </td>
-                <td style="width: 60px;height: 20px">联系人</td>
-                <td style="width:180px;padding:1px;">
-                    <input name="contacts" id="contacts" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>联系电话</td>
-                <td style="padding:1px;">
-                    <input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>手机</td>
-                <td style="padding:1px;">
-                    <input name="telephone" id="telephone" class="easyui-validatebox"
-                           style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>电子邮箱</td>
-                <td style="padding:1px">
-                    <input name="email" id="email" class="easyui-validatebox" validType="email"
-                           style="width: 160px;height: 20px"/>
-                </td>
-                <td>传真</td>
-                <td style="padding:1px">
-                    <input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>期初应收</td>
-                <td style="padding:1px">
-                    <input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
-                </td>
-                <td>期初应付</td>
-                <td style="padding:1px">
-                    <input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
-                </td>
-            </tr>
-            <tr>
-                <td>累计应收</td>
-                <td style="padding:1px">
-                    <input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
-                </td>
-                <td>累计应付</td>
-                <td style="padding:1px">
-                    <input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
-                </td>
-            </tr>
-            <tr>
-                <td>纳税人识别号</td>
-                <td style="padding:1px">
-                    <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>税率(%)</td>
-                <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-numberbox" data-options="validType:'length[1,2]'" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>开户行</td>
-                <td style="padding:1px">
-                    <input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>账号</td>
-                <td style="padding:1px">
-                    <input name="accountNumber" id="accountNumber" class="easyui-validatebox"
-                           style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>地址</td>
-                <td style="padding:1px" colspan="3">
-                    <input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>备注</td>
-                <td style="padding:1px" colspan="3">
-                    <textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
-                </td>
-            </tr>
-        </table>
-    </form>
-</div>
-<div id="supplierDlgBtn">
-    <a href="javascript:void(0)" id="saveSupplier" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-    <a href="javascript:void(0)" id="cancelSupplier" class="easyui-linkbutton" iconCls="icon-cancel"
-       onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
-</div>
 </body>
 </html>
diff --git a/erp_web/pages/materials/purchase_in_list.html b/erp_web/pages/materials/purchase_in_list.html
index ad7ad9de..d31e2287 100644
--- a/erp_web/pages/materials/purchase_in_list.html
+++ b/erp_web/pages/materials/purchase_in_list.html
@@ -13,8 +13,10 @@
     <script src="/js/jquery-1.8.0.min.js"></script>
     <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
     <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
 <body>
@@ -280,107 +282,5 @@
     <a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
     <a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
 </div>
-<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"
-     closed="true" buttons="#supplierDlgBtn" modal="true" collapsible="false" closable="true">
-    <form id="supplierFM">
-        <table>
-            <tr>
-                <td style="width: 80px;height: 20px">名称</td>
-                <td style="width: 180px;padding:1px">
-                    <input name="supplier" id="supplier" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 160px;height: 20px"/>
-                </td>
-                <td style="width: 60px;height: 20px">联系人</td>
-                <td style="width:180px;padding:1px;">
-                    <input name="contacts" id="contacts" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>手机号码</td>
-                <td style="padding:1px;">
-                    <input name="telephone" id="telephone" class="easyui-validatebox"
-                           style="width: 160px;height: 20px"/>
-                </td>
-                <td>电子邮箱</td>
-                <td style="padding:1px">
-                    <input name="email" id="email" class="easyui-validatebox" validType="email"
-                           style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>联系电话</td>
-                <td style="padding:1px;">
-                    <input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>传真</td>
-                <td style="padding:1px">
-                    <input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>期初应收</td>
-                <td style="padding:1px">
-                    <input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
-                </td>
-                <td>期初应付</td>
-                <td style="padding:1px">
-                    <input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
-                </td>
-            </tr>
-            <tr>
-                <td>累计应收</td>
-                <td style="padding:1px">
-                    <input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
-                </td>
-                <td>累计应付</td>
-                <td style="padding:1px">
-                    <input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
-                </td>
-            </tr>
-            <tr>
-                <td>纳税人识别号</td>
-                <td style="padding:1px">
-                    <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>税率(%)</td>
-                <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-numberbox" data-options="validType:'length[1,2]'" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>开户行</td>
-                <td style="padding:1px">
-                    <input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>账号</td>
-                <td style="padding:1px">
-                    <input name="accountNumber" id="accountNumber" class="easyui-validatebox"
-                           style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>地址</td>
-                <td style="padding:1px" colspan="3">
-                    <input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>备注</td>
-                <td style="padding:1px" colspan="3">
-                    <textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
-                </td>
-            </tr>
-        </table>
-    </form>
-</div>
-<div id="supplierDlgBtn">
-    <a href="javascript:void(0)" id="saveSupplier" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-    <a href="javascript:void(0)" id="cancelSupplier" class="easyui-linkbutton" iconCls="icon-cancel"
-       onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
-</div>
 </body>
 </html>
diff --git a/erp_web/pages/materials/purchase_orders_list.html b/erp_web/pages/materials/purchase_orders_list.html
index 367c66d3..05b4213b 100644
--- a/erp_web/pages/materials/purchase_orders_list.html
+++ b/erp_web/pages/materials/purchase_orders_list.html
@@ -13,8 +13,10 @@
     <script src="/js/jquery-1.8.0.min.js"></script>
     <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
     <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
 <body>
@@ -199,107 +201,5 @@
     <a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
     <a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
 </div>
-<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"
-     closed="true" buttons="#supplierDlgBtn" modal="true" collapsible="false" closable="true">
-    <form id="supplierFM">
-        <table>
-            <tr>
-                <td style="width: 80px;height: 20px">名称</td>
-                <td style="width: 180px;padding:1px">
-                    <input name="supplier" id="supplier" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 160px;height: 20px"/>
-                </td>
-                <td style="width: 60px;height: 20px">联系人</td>
-                <td style="width:180px;padding:1px;">
-                    <input name="contacts" id="contacts" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>手机号码</td>
-                <td style="padding:1px;">
-                    <input name="telephone" id="telephone" class="easyui-validatebox"
-                           style="width: 160px;height: 20px"/>
-                </td>
-                <td>电子邮箱</td>
-                <td style="padding:1px">
-                    <input name="email" id="email" class="easyui-validatebox" validType="email"
-                           style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>联系电话</td>
-                <td style="padding:1px;">
-                    <input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>传真</td>
-                <td style="padding:1px">
-                    <input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>期初应收</td>
-                <td style="padding:1px">
-                    <input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
-                </td>
-                <td>期初应付</td>
-                <td style="padding:1px">
-                    <input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
-                </td>
-            </tr>
-            <tr>
-                <td>累计应收</td>
-                <td style="padding:1px">
-                    <input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
-                </td>
-                <td>累计应付</td>
-                <td style="padding:1px">
-                    <input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
-                </td>
-            </tr>
-            <tr>
-                <td>纳税人识别号</td>
-                <td style="padding:1px">
-                    <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>税率(%)</td>
-                <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-numberbox" data-options="validType:'length[1,2]'" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>开户行</td>
-                <td style="padding:1px">
-                    <input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>账号</td>
-                <td style="padding:1px">
-                    <input name="accountNumber" id="accountNumber" class="easyui-validatebox"
-                           style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>地址</td>
-                <td style="padding:1px" colspan="3">
-                    <input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>备注</td>
-                <td style="padding:1px" colspan="3">
-                    <textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
-                </td>
-            </tr>
-        </table>
-    </form>
-</div>
-<div id="supplierDlgBtn">
-    <a href="javascript:void(0)" id="saveSupplier" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-    <a href="javascript:void(0)" id="cancelSupplier" class="easyui-linkbutton" iconCls="icon-cancel"
-       onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
-</div>
 </body>
 </html>
diff --git a/erp_web/pages/materials/retail_back_list.html b/erp_web/pages/materials/retail_back_list.html
index 78f6b7d4..eddc1676 100644
--- a/erp_web/pages/materials/retail_back_list.html
+++ b/erp_web/pages/materials/retail_back_list.html
@@ -13,8 +13,10 @@
     <script src="/js/jquery-1.8.0.min.js"></script>
     <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
     <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
 <body>
diff --git a/erp_web/pages/materials/retail_out_list.html b/erp_web/pages/materials/retail_out_list.html
index 47d1ba3b..9f5b5fd1 100644
--- a/erp_web/pages/materials/retail_out_list.html
+++ b/erp_web/pages/materials/retail_out_list.html
@@ -13,8 +13,10 @@
     <script src="/js/jquery-1.8.0.min.js"></script>
     <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
     <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
 <body>
@@ -249,107 +251,5 @@
     <a href="javascript:void(0)" id="saveDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
     <a href="javascript:void(0)" id="cancelDepotHeadAccountDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
 </div>
-<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"
-     closed="true" buttons="#supplierDlgBtn" modal="true" collapsible="false" closable="true">
-    <form id="supplierFM">
-        <table>
-            <tr>
-                <td style="width: 80px;height: 20px">名称</td>
-                <td style="width: 180px;padding:1px">
-                    <input name="supplier" id="supplier" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 160px;height: 20px"/>
-                </td>
-                <td style="width: 60px;height: 20px">联系人</td>
-                <td style="width:180px;padding:1px;">
-                    <input name="contacts" id="contacts" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>联系电话</td>
-                <td style="padding:1px;">
-                    <input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>手机</td>
-                <td style="padding:1px;">
-                    <input name="telephone" id="telephone" class="easyui-validatebox"
-                           style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>电子邮箱</td>
-                <td style="padding:1px">
-                    <input name="email" id="email" class="easyui-validatebox" validType="email"
-                           style="width: 160px;height: 20px"/>
-                </td>
-                <td>传真</td>
-                <td style="padding:1px">
-                    <input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>期初应收</td>
-                <td style="padding:1px">
-                    <input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
-                </td>
-                <td>期初应付</td>
-                <td style="padding:1px">
-                    <input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
-                </td>
-            </tr>
-            <tr>
-                <td>累计应收</td>
-                <td style="padding:1px">
-                    <input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
-                </td>
-                <td>累计应付</td>
-                <td style="padding:1px">
-                    <input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
-                </td>
-            </tr>
-            <tr>
-                <td>纳税人识别号</td>
-                <td style="padding:1px">
-                    <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>税率</td>
-                <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>开户行</td>
-                <td style="padding:1px">
-                    <input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>账号</td>
-                <td style="padding:1px">
-                    <input name="accountNumber" id="accountNumber" class="easyui-validatebox"
-                           style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>地址</td>
-                <td style="padding:1px" colspan="3">
-                    <input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>备注</td>
-                <td style="padding:1px" colspan="3">
-                    <textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
-                </td>
-            </tr>
-        </table>
-    </form>
-</div>
-<div id="supplierDlgBtn">
-    <a href="javascript:void(0)" id="saveSupplier" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-    <a href="javascript:void(0)" id="cancelSupplier" class="easyui-linkbutton" iconCls="icon-cancel"
-       onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
-</div>
 </body>
 </html>
diff --git a/erp_web/pages/materials/sale_back_list.html b/erp_web/pages/materials/sale_back_list.html
index 03daf716..7b9e92c2 100644
--- a/erp_web/pages/materials/sale_back_list.html
+++ b/erp_web/pages/materials/sale_back_list.html
@@ -13,8 +13,10 @@
     <script src="/js/jquery-1.8.0.min.js"></script>
     <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
     <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
 <body>
@@ -63,7 +65,7 @@
             <tr>
                 <td>客户：</td>
                 <td style="padding:5px">
-                    <input id="OrganId" name="OrganId" style="width:110px;"/>
+                    <input id="OrganId" name="OrganId" style="width:130px;"/>
                 </td>
                 <td>单据日期：</td>
                 <td style="padding:5px">
diff --git a/erp_web/pages/materials/sale_orders_list.html b/erp_web/pages/materials/sale_orders_list.html
index 52845374..b2671f91 100644
--- a/erp_web/pages/materials/sale_orders_list.html
+++ b/erp_web/pages/materials/sale_orders_list.html
@@ -13,8 +13,10 @@
     <script src="/js/jquery-1.8.0.min.js"></script>
     <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
     <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
 <body>
@@ -201,107 +203,5 @@
     <a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
     <a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
 </div>
-<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"
-     closed="true" buttons="#supplierDlgBtn" modal="true" collapsible="false" closable="true">
-    <form id="supplierFM">
-        <table>
-            <tr>
-                <td style="width: 80px;height: 20px">名称</td>
-                <td style="width: 180px;padding:1px">
-                    <input name="supplier" id="supplier" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 160px;height: 20px"/>
-                </td>
-                <td style="width: 60px;height: 20px">联系人</td>
-                <td style="width:180px;padding:1px;">
-                    <input name="contacts" id="contacts" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>联系电话</td>
-                <td style="padding:1px;">
-                    <input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>手机</td>
-                <td style="padding:1px;">
-                    <input name="telephone" id="telephone" class="easyui-validatebox"
-                           style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>电子邮箱</td>
-                <td style="padding:1px">
-                    <input name="email" id="email" class="easyui-validatebox" validType="email"
-                           style="width: 160px;height: 20px"/>
-                </td>
-                <td>传真</td>
-                <td style="padding:1px">
-                    <input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>期初应收</td>
-                <td style="padding:1px">
-                    <input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
-                </td>
-                <td>期初应付</td>
-                <td style="padding:1px">
-                    <input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
-                </td>
-            </tr>
-            <tr>
-                <td>累计应收</td>
-                <td style="padding:1px">
-                    <input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
-                </td>
-                <td>累计应付</td>
-                <td style="padding:1px">
-                    <input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
-                </td>
-            </tr>
-            <tr>
-                <td>纳税人识别号</td>
-                <td style="padding:1px">
-                    <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>税率(%)</td>
-                <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-numberbox" data-options="validType:'length[1,2]'" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>开户行</td>
-                <td style="padding:1px">
-                    <input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>账号</td>
-                <td style="padding:1px">
-                    <input name="accountNumber" id="accountNumber" class="easyui-validatebox"
-                           style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>地址</td>
-                <td style="padding:1px" colspan="3">
-                    <input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>备注</td>
-                <td style="padding:1px" colspan="3">
-                    <textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
-                </td>
-            </tr>
-        </table>
-    </form>
-</div>
-<div id="supplierDlgBtn">
-    <a href="javascript:void(0)" id="saveSupplier" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-    <a href="javascript:void(0)" id="cancelSupplier" class="easyui-linkbutton" iconCls="icon-cancel"
-       onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
-</div>
 </body>
 </html>
diff --git a/erp_web/pages/materials/sale_out_list.html b/erp_web/pages/materials/sale_out_list.html
index ef62ea8d..57a1dc5f 100644
--- a/erp_web/pages/materials/sale_out_list.html
+++ b/erp_web/pages/materials/sale_out_list.html
@@ -13,8 +13,10 @@
     <script src="/js/jquery-1.8.0.min.js"></script>
     <script src="/js/easyui-1.3.5/jquery.easyui.min.js"></script>
     <script src="/js/easyui-1.3.5/locale/easyui-lang-zh_CN.js"></script>
+    <script src="/js/handlebars.js"></script>
     <script src="/js/My97DatePicker/WdatePicker.js"></script>
     <script src="/js/common/common.js"></script>
+    <script src="/js/pages/materials/add_temp.js"></script>
     <script src="/js/pages/materials/in_out.js"></script>
 </head>
 <body>
@@ -282,107 +284,5 @@
     <a href="javascript:void(0)" id="saveOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
     <a href="javascript:void(0)" id="cancelOtherMoneyDlg" class="easyui-linkbutton" iconCls="icon-cancel">取消</a>
 </div>
-<div id="supplierDlg" class="easyui-dialog" style="width:580px;padding:10px 20px"
-     closed="true" buttons="#supplierDlgBtn" modal="true" collapsible="false" closable="true">
-    <form id="supplierFM">
-        <table>
-            <tr>
-                <td style="width: 80px;height: 20px">名称</td>
-                <td style="width: 180px;padding:1px">
-                    <input name="supplier" id="supplier" class="easyui-validatebox"
-                           data-options="required:true,validType:'length[2,30]'" style="width: 160px;height: 20px"/>
-                </td>
-                <td style="width: 60px;height: 20px">联系人</td>
-                <td style="width:180px;padding:1px;">
-                    <input name="contacts" id="contacts" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>联系电话</td>
-                <td style="padding:1px;">
-                    <input name="phonenum" id="phonenum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>手机</td>
-                <td style="padding:1px;">
-                    <input name="telephone" id="telephone" class="easyui-validatebox"
-                           style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>电子邮箱</td>
-                <td style="padding:1px">
-                    <input name="email" id="email" class="easyui-validatebox" validType="email"
-                           style="width: 160px;height: 20px"/>
-                </td>
-                <td>传真</td>
-                <td style="padding:1px">
-                    <input name="fax" id="fax" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>期初应收</td>
-                <td style="padding:1px">
-                    <input name="BeginNeedGet" id="BeginNeedGet" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
-                </td>
-                <td>期初应付</td>
-                <td style="padding:1px">
-                    <input name="BeginNeedPay" id="BeginNeedPay" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px"></input>
-                </td>
-            </tr>
-            <tr>
-                <td>累计应收</td>
-                <td style="padding:1px">
-                    <input name="AllNeedGet" id="AllNeedGet" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
-                </td>
-                <td>累计应付</td>
-                <td style="padding:1px">
-                    <input name="AllNeedPay" id="AllNeedPay" type="text" class="easyui-numberbox"
-                           data-options="min:0,precision:2" style="width: 160px;height: 20px" disabled="true"></input>
-                </td>
-            </tr>
-            <tr>
-                <td>纳税人识别号</td>
-                <td style="padding:1px">
-                    <input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>税率(%)</td>
-                <td style="padding:1px">
-                    <input name="taxRate" id="taxRate" class="easyui-numberbox" data-options="validType:'length[1,2]'" style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>开户行</td>
-                <td style="padding:1px">
-                    <input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
-                </td>
-                <td>账号</td>
-                <td style="padding:1px">
-                    <input name="accountNumber" id="accountNumber" class="easyui-validatebox"
-                           style="width: 160px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>地址</td>
-                <td style="padding:1px" colspan="3">
-                    <input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
-                </td>
-            </tr>
-            <tr>
-                <td>备注</td>
-                <td style="padding:1px" colspan="3">
-                    <textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
-                </td>
-            </tr>
-        </table>
-    </form>
-</div>
-<div id="supplierDlgBtn">
-    <a href="javascript:void(0)" id="saveSupplier" class="easyui-linkbutton" iconCls="icon-ok">保存</a>
-    <a href="javascript:void(0)" id="cancelSupplier" class="easyui-linkbutton" iconCls="icon-cancel"
-       onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
-</div>
 </body>
 </html>
diff --git a/erp_web/pages/template/base.html b/erp_web/pages/template/base.html
new file mode 100644
index 00000000..f0c2abe1
--- /dev/null
+++ b/erp_web/pages/template/base.html
@@ -0,0 +1,95 @@
+{{#if supplierSelect}}
+<div id="supplierDlg" style="width:580px;padding:10px 20px" buttons="#supplierDlgBtn">
+	<form id="supplierFM">
+		<table>
+			<tr>
+				<td style="width: 80px;height: 20px">名称</td>
+				<td style="width: 180px;padding:1px">
+					<input name="supplier" id="supplier" style="width: 160px;height: 20px"/>
+				</td>
+				<td style="width: 60px;height: 20px">联系人</td>
+				<td style="width:180px;padding:1px;">
+					<input name="contacts" id="contacts" style="width: 160px;height: 20px"/>
+				</td>
+			</tr>
+			<tr>
+				<td>手机号码</td>
+				<td style="padding:1px;">
+					<input name="telephone" id="telephone" style="width: 160px;height: 20px"/>
+				</td>
+				<td>电子邮箱</td>
+				<td style="padding:1px">
+					<input name="email" id="email" style="width: 160px;height: 20px"/>
+				</td>
+			</tr>
+			<tr>
+				<td>联系电话</td>
+				<td style="padding:1px;">
+					<input name="phonenum" id="phonenum" style="width: 160px;height: 20px"/>
+				</td>
+				<td>传真</td>
+				<td style="padding:1px">
+					<input name="fax" id="fax" style="width: 160px;height: 20px"/>
+				</td>
+			</tr>
+			<tr>
+				<td>期初应收</td>
+				<td style="padding:1px">
+					<input name="BeginNeedGet" id="BeginNeedGet" type="text" style="width: 160px;height: 20px"/>
+				</td>
+				<td>期初应付</td>
+				<td style="padding:1px">
+					<input name="BeginNeedPay" id="BeginNeedPay" type="text" style="width: 160px;height: 20px"/>
+				</td>
+			</tr>
+			<tr>
+				<td>累计应收</td>
+				<td style="padding:1px">
+					<input name="AllNeedGet" id="AllNeedGet" type="text" style="width: 160px;height: 20px" disabled="true"/>
+				</td>
+				<td>累计应付</td>
+				<td style="padding:1px">
+					<input name="AllNeedPay" id="AllNeedPay" type="text" style="width: 160px;height: 20px" disabled="true"/>
+				</td>
+			</tr>
+			<tr>
+				<td>纳税人识别号</td>
+				<td style="padding:1px">
+					<input name="taxNum" id="taxNum" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+				</td>
+				<td>税率(%)</td>
+				<td style="padding:1px">
+					<input name="taxRate" id="taxRate" class="easyui-numberbox" data-options="validType:'length[1,2]'" style="width: 160px;height: 20px"/>
+				</td>
+			</tr>
+			<tr>
+				<td>开户行</td>
+				<td style="padding:1px">
+					<input name="bankName" id="bankName" class="easyui-validatebox" style="width: 160px;height: 20px"/>
+				</td>
+				<td>账号</td>
+				<td style="padding:1px">
+					<input name="accountNumber" id="accountNumber" class="easyui-validatebox"
+						   style="width: 160px;height: 20px"/>
+				</td>
+			</tr>
+			<tr>
+				<td>地址</td>
+				<td style="padding:1px" colspan="3">
+					<input name="address" id="address" class="easyui-validatebox" style="width: 408px;height: 20px"/>
+				</td>
+			</tr>
+			<tr>
+				<td>备注</td>
+				<td style="padding:1px" colspan="3">
+					<textarea name="description" id="description" rows="2" cols="2" style="width: 408px;"></textarea>
+				</td>
+			</tr>
+		</table>
+	</form>
+</div>
+<div id="supplierDlgBtn">
+	<a href="javascript:void(0)" id="saveSupplier">保存</a>
+	<a href="javascript:void(0)" id="cancelSupplier" onclick="javascript:$('#supplierDlg').dialog('close')">取消</a>
+</div>
+{{/if}}
\ No newline at end of file