Merge branch 'dev' of http://172.16.90.250:3000/forestProduct/forestProduct-UI into dev

js/config.js

@@ -25,8 +25,8 @@ function loadJS(url) {
 	"use strict";
 	window.hywa = {
 		config: {
-			href: 'http://172.16.90.64:21009/',
-			imgbyapplets: 'http://47.98.47.246:8310',
+			href: 'http://172.16.90.64:8103/',
+			// href: 'http://172.16.90.77:21008/',
 			port: {
 				login: '/web/user/login', //登录
 				loginOut: "/web/user/logout", //退出

pages/enterprise/add_change.html

@@ -256,6 +256,7 @@
 					<option value=""></option>
 					<option value="0">标准模板</option>
 					<option value="1">大米模板</option>
+					<option value="2">林产品模板</option>
 				</select>
 			</div>
 		</div>

pages/region/add_change.html

@@ -502,6 +502,9 @@
 					return false;
 				}
 				this.current.fkPostionId = this.current.countyId;
+				if ("edit_region" === this.save_data) {
+					this.current.guid = _this.guid;
+				}
 				$.ajax({
 					type: 'POST',
 					url: this.save_data,//+'?userId='+this.guid