企业信息点修改和取消时还原编辑时的数据

src/main/webapp/resources/js/index/app.js

@@ -9674,6 +9674,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // 更新企业信息
         $scope.updateDetailInfo = function () {
             $scope.loading = true;
+            $scope.enterprise = $scope.copyEnterprise;
             $scope.enterprise.tags = $scope.tags.join(','); // 将标签数组转换成逗号分隔的字符串，便于储存
             AccountEnterprise.save($scope.enterprise, function () {
                 $scope.loading = false;
@@ -9896,24 +9897,36 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             });
         }
 
+        // 行业子菜单点击
         $scope.onItemClick = function (key, index, value) {
-            if (angular.isString(value)){
-                $scope.enterprise.profession = value;
+            if (angular.isString(value)){ // 值为字符串说明点击的是最后一级
+                $scope.copyEnterprise.profession = value;
                 $scope.showProfession = false;
                 return;
             }
             $scope.professionArray = [];
             $scope.profession.splice(index+1);
-            if (angular.isArray(value)){
+            if (angular.isArray(value)){ // 值为数组说明下一级是最后一级
                 $scope.professionArray = value;
             } else if (angular.isObject(value)) {
                 $scope.profession[index+1] = value;
             }
         }
 
+        // 判断值是否为字符串
         $scope.isString = function (value) {
             return angular.isString(value);
         }
+
+        // 拷贝企业数据，在编辑企业数据是使用拷贝数据
+        $scope.copyData = function () {
+            $scope.copyEnterprise = angular.copy($scope.enterprise);
+            if ($scope.enterprise.tags) {
+                $scope.tags = $scope.enterprise.tags.split(',');  // 将逗号分隔的标签字符串转换成数组，便于操作
+            } else {
+                $scope.tags = [];
+            }
+        }
     }]);
 
     // 编辑收货地址

src/main/webapp/resources/tpl/index/approvalFlow/enterprise.html

@@ -437,9 +437,9 @@
 		</div>
 	</div>
 	<div class="com_title01"><span>详细信息</span>
-		<a ng-show="!connectionEditing" ng-click="connectionEditing = true" class="pull-right text-simple"><i
+		<a ng-show="!connectionEditing" ng-click="connectionEditing = true;copyData()" class="pull-right text-simple"><i
 				class="fa fa-pencil fa-fw fa-lg"></i>编辑</a>
-		<a ng-show="connectionEditing" ng-click="connectionEditing = false" class="pull-right text-simple color01"><i
+		<a ng-show="connectionEditing" ng-click="connectionEditing = false;copyData()" class="pull-right text-simple color01"><i
 				class="fa fa-reply-all fa-fw"></i>取消</a>
 		<a ng-show="connectionEditing" ng-click="updateDetailInfo()" class="pull-right text-simple  color02"><i
 				class="fa fa-save fa-fw"></i>保存</a>
@@ -453,14 +453,14 @@
 						<span class="title">联系人：</span>
 						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.contactMan"></div>
 						<div class="content" ng-show="connectionEditing">
-							<input  ng-model="enterprise.contactMan" type="text" class="form-control input-xs" placeholder="联系人" />
+							<input  ng-model="copyEnterprise.contactMan" type="text" class="form-control input-xs" placeholder="联系人" />
 						</div>
 					</div>
 					<div class="com-text col-xs-6">
 						<span class="title">联系电话：</span>
 						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.contactTel"></div>
 						<div class="content" ng-show="connectionEditing">
-							<input required="required" ng-model="enterprise.contactTel" type="text" class="form-control input-xs" placeholder="企业电话" />
+							<input required="required" ng-model="copyEnterprise.contactTel" type="text" class="form-control input-xs" placeholder="企业电话" />
 						</div>
 					</div>
 				</div>
@@ -469,7 +469,7 @@
 						<span class="title">邮箱：</span>
 						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.contactEmail"></div>
 						<div class="content" ng-show="connectionEditing">
-							<input required="required" ng-model="enterprise.contactEmail" type="text" class="form-control input-xs" placeholder="邮箱" />
+							<input required="required" ng-model="copyEnterprise.contactEmail" type="text" class="form-control input-xs" placeholder="邮箱" />
 						</div>
 					</div>
 					<div class="com-text col-xs-6">
@@ -477,7 +477,7 @@
 						<div ng-show="!connectionEditing" class="content" ng-bind="::enterprise.enFax"></div>
 						<div class="content" ng-show="connectionEditing">
 							<div class="input-group input-group-xs" style="width: 320px;">
-								<input required="required" ng-model="enterprise.enFax" type="text" class="form-control input-xs" placeholder="企业传真信息">
+								<input required="required" ng-model="copyEnterprise.enFax" type="text" class="form-control input-xs" placeholder="企业传真信息">
 							</div>
 						</div>
 					</div>
@@ -492,7 +492,7 @@
 						<div class="content" ng-show="connectionEditing">
 							<div class="input-group input-group-xs" style="width: 320px;">
 								<span class="input-group-addon">http://</span>
-								<input required="required" ng-model="enterprise.enUrl" type="text" class="form-control input-xs"  style="width: 270px;" placeholder="企业官方网站网址">
+								<input required="required" ng-model="copyEnterprise.enUrl" type="text" class="form-control input-xs"  style="width: 270px;" placeholder="企业官方网站网址">
 							</div>
 						</div>
 					</div>
@@ -537,7 +537,7 @@
 							<!--{{enterprise.enIndustry=='make'?'制造型':'贸易型'}}-->
 						</div>
 						<div class="content" ng-show="connectionEditing">
-							<input ng-model="enterprise.profession" placeholder="所属行业"
+							<input ng-model="copyEnterprise.profession" placeholder="所属行业"
 									class="form-control input-xs" type="text" style="width: 320px;"
 									ng-click="selectProfession()">
 								<!--<option value="make">制造型</option>-->