物料编辑更新

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@9848 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

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

@@ -3177,6 +3177,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 					attach.type = attach.name.substr(attach.name.lastIndexOf('.')+1);
 				});
 				$scope.inquiry = inquiry;
+				console.log($scope.inquiry);
 			});
 		};
 		loadData();
@@ -10642,12 +10643,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 						toaster.pop('error', '提示', response.data);
 					});
 				}
-				if ($rootScope.isProductEdit) { // 是否点击编辑
-                    $scope.prodInfo.$editing = true;
-                } else {
-                    $scope.prodInfo.$editing = false;
-                }
-                $rootScope.isProductEdit = false; // 第一次进入判断，后续不用
 				$scope.loading = false;
 			});
 		};
@@ -10977,7 +10972,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 				},
 			}).success(function(data) {
 				if(data.success) {
-					toaster.pop('success', '提示', data.success);
+					toaster.pop('success', '提示', '产品添加成功');
 					$timeout(function() {
 						//提交后跳转到详情页面，防止重复提交
 //						window.location.href="#/sale/prodList/"+data.id;
@@ -17862,7 +17857,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 					$timeout(function() {
 						//提交后跳转到详情页面，防止重复提交
 //						window.location.href="#/sale/prodList/"+data.id;
-						window.location.href="#/sale/prodList";
+						window.location.href="#/purc/product";
 					}, 500);
 				}
 				if(data.error) {
@@ -17870,7 +17865,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 					$timeout(function() {
 						//提交后跳转到详情页面，防止重复提交
 //						window.location.href="#/sale/prodList/"+data.id;
-						window.location.href="#/sale/prodList";
+						window.location.href="#/purc/product";
 					}, 500);
 				}
 				
@@ -17968,7 +17963,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 						toaster.pop('error', '提示', response.data);
 					});
 				}
-				$scope.prodInfo.$editing = false;
 				$scope.loading = false;
 			});
 		};
@@ -18113,7 +18107,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 					toaster.pop("error", "提示", data.error);
 				} else {
 					toaster.pop("success", "提示", "删除成功");
-					window.location.href = "#/purc/prodList";
+					window.location.href = "#/purc/product";
 				}
 			}), function(response) {
 				toaster.pop("error", "删除失败", response.data);

src/main/webapp/resources/tpl/index/baseInfo/productDetail.html

@@ -134,7 +134,7 @@
                 		ng-change="getSimilarKinds(prodInfo.title)" name="title" ng-focus="onFocus('title')"
                 		typeahead="kind.kindName for kind in getSimilarKinds($viewValue)"
 						autocomplete="off" typeahead-on-select="onAssociateTitleClick($item, prodInfo)"
-						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-readonly="!prodInfo.$editing || !editstatus">
+						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-readonly="!editstatus">
                 </div>
             </div>
             <div class="pro-list-tab row">
@@ -144,7 +144,7 @@
                 		ng-change="getSimilarComponents(prodInfo.cmpCode)" name="cmpCode" ng-focus="onFocus('cmpCode')"
                 		typeahead="cmp.code for cmp in getSimilarComponents($viewValue)"
 						autocomplete="off" typeahead-on-select="onAssociateCmpClick($item, prodInfo)"
-						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-readonly="!prodInfo.$editing || !editstatus">
+						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-readonly="!editstatus">
                 </div>
                 <div class="col-md-2">导入品牌：</div>
                 <div class="col-md-4">
@@ -152,13 +152,13 @@
                 		ng-change="getSimilarBrands(prodInfo.brand)" name="brand" ng-focus="onFocus('brand')"
                 		typeahead="brand.brandName for brand in getSimilarBrands($viewValue)"
 						autocomplete="off" typeahead-on-select="onAssociateBrandClick($item, prodInfo)"
-						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-readonly="!prodInfo.$editing || !editstatus">
+						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-readonly="!editstatus">
                 </div>
             </div>
             <div class="pro-list-tab row">
                 <div class="col-md-2">导入单位：</div>
                 <div class="col-md-4">
-                    <input type="text"  ng-model="prodInfo.unit" placeholder="单位" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing" list="unit">
+                    <input type="text"  ng-model="prodInfo.unit" placeholder="单位" ng-class="{'readonly-pointer': !prodInfo.$editing}" list="unit">
                     <datalist id="unit">
                         <option value="PCS">
                         <option value="KG">
@@ -168,17 +168,17 @@
                 </div>
                 <div class="col-md-2">导入最小包装量： </div>
                 <div class="col-md-4">
-                    <input type="text" ng-model="prodInfo.minPack" placeholder="最小包装量" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/">
+                    <input type="text" ng-model="prodInfo.minPack" placeholder="最小包装量" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-pattern="/^\+?[1-9]\d*$/">
                 </div>
             </div>
             <div class="pro-list-tab row">
                 <div class="col-md-2">导入最小订货量：</div>
                 <div class="col-md-4">
-                    <input type="text" ng-model="prodInfo.minOrder" placeholder="最小订货量" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/">
+                    <input type="text" ng-model="prodInfo.minOrder" placeholder="最小订货量" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-pattern="/^\+?[1-9]\d*$/">
                 </div>
                 <div class="col-md-2">导入交货周期：</div>
                 <div class="col-md-4">
-                    <input type="text" ng-model="prodInfo.leadtime" placeholder="交货周期" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/">
+                    <input type="text" ng-model="prodInfo.leadtime" placeholder="交货周期" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-pattern="/^\+?[1-9]\d*$/">
                 </div>
             </div>
             <div class="pro-list-tab row">
@@ -193,7 +193,7 @@
                 		ng-change="getSimilarKinds(prodInfo.kind)" name="kind" ng-focus="onFocus('kind')"
                 		typeahead="kind.kindName for kind in getSimilarKinds($viewValue)"
 						autocomplete="off" typeahead-on-select="onAssociateKindClick($item, prodInfo)"
-						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-readonly="!prodInfo.$editing">
+						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}">
                 </div>
                 <div class="col-md-2">标准品牌：</div>
                 <div class="col-md-4">
@@ -201,7 +201,7 @@
                 		ng-change="getSimilarBrands(prodInfo.pbranden)" name="pbranden" ng-focus="onFocus('pbranden')"
                 		typeahead="brand.brandName for brand in getSimilarBrands($viewValue)"
 						autocomplete="off" typeahead-on-select="onAssociatePBrandClick($item, prodInfo)"
-						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-readonly="!prodInfo.$editing">
+						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}" >
                 </div>
             </div>
             <div class="pro-list-tab row"  style="padding-bottom: 5px;" ng-show="false">
@@ -211,7 +211,7 @@
                 		ng-change="getSimilarComponents(prodInfo.pcmpcode)" name="pcmpcode" ng-focus="onFocus('pcmpcode')"
                 		typeahead="cmp.code for cmp in getSimilarComponents($viewValue)"
 						autocomplete="off" typeahead-on-select="onAssociateComponentClick($item, prodInfo)"
-						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing">
+						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}">
                 </div>
              </div>
             <div class="com_title01"><span>图片和详细说明</span></div>
@@ -219,7 +219,7 @@
                 <dd class="upload-pro">
                     <div class="fl">产品图片：</div>
                     <div class="fr">
-                        <span><input ng-file-select  ng-model="myFiles" type="file" ng-multiple="false" id="enImage" name="enImage" placeholder="图片或PDF文件" ng-disabled="!prodInfo.$editing"></span>
+                        <span><input ng-file-select  ng-model="myFiles" type="file" ng-multiple="false" id="enImage" name="enImage" placeholder="图片或PDF文件"></span>
                         <a ng-click="showImg()" ng-if="prodInfo.attach">{{prodInfo.attach.name}}</a>
                         <i>提示：图片尺寸在750*750像素以上，图片请避免全文字</i>
                     </div>
@@ -300,11 +300,11 @@
             	</dd>
             </dl>-->
             <div class="many-file-btn">
-                <button class="btn01" ng-if="!prodInfo.$editing" ng-click="update()">修改</button>
-                <button class="btn01" ng-if="prodInfo.$editing" ng-click="cancel()">取消</button>
-                <a class="btn02" ng-if="!prodInfo.$editing" ng-click="deleteById(prodInfo.id)">删除</a>
+               <!--  <button class="btn01" ng-if="!prodInfo.$editing" ng-click="update()">修改</button>
+                <button class="btn01" ng-if="prodInfo.$editing" ng-click="cancel()">取消</button> -->
+                <button class="btn01" ng-click="deleteById(prodInfo.id)">删除</button>
                 <!-- <a ui-sref="sale.uploadByBatch"  class="btn02" ng-if="!prodInfo.$editing">批量导入</a> -->
-                <a class="btn02" ng-click="submit(prodInfo)" ng-if="prodInfo.$editing" ng-disabled="productInfo.$invalid">提交</a>
+                <a class="btn02" ng-click="submit(prodInfo)" ng-disabled="productInfo.$invalid">提交</a>
             </div>
             <div id="image-box" style="display: none">
 				<div class="x-close-wrap" title="关闭">

src/main/webapp/resources/tpl/index/purc/productDetail.html

@@ -134,7 +134,7 @@
                 		ng-change="getSimilarKinds(prodInfo.title)" name="title" ng-focus="onFocus('title')"
                 		typeahead="kind.kindName for kind in getSimilarKinds($viewValue)"
 						autocomplete="off" typeahead-on-select="onAssociateTitleClick($item, prodInfo)"
-						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-readonly="!prodInfo.$editing || !editstatus">
+						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-readonly="!editstatus">
                 </div>
             </div>
             <div class="pro-list-tab row">
@@ -144,7 +144,7 @@
                 		ng-change="getSimilarComponents(prodInfo.cmpCode)" name="cmpCode" ng-focus="onFocus('cmpCode')"
                 		typeahead="cmp.code for cmp in getSimilarComponents($viewValue)"
 						autocomplete="off" typeahead-on-select="onAssociateCmpClick($item, prodInfo)"
-						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-readonly="!prodInfo.$editing || !editstatus">
+						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-readonly="!editstatus">
                 </div>
                 <div class="col-md-2">导入物料品牌：</div>
                 <div class="col-md-4">
@@ -152,13 +152,13 @@
                 		ng-change="getSimilarBrands(prodInfo.brand)" name="brand" ng-focus="onFocus('brand')"
                 		typeahead="brand.brandName for brand in getSimilarBrands($viewValue)"
 						autocomplete="off" typeahead-on-select="onAssociateBrandClick($item, prodInfo)"
-						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-readonly="!prodInfo.$editing || !editstatus">
+						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-readonly="!editstatus">
                 </div>
             </div>
             <div class="pro-list-tab row">
                 <div class="col-md-2">导入单位：</div>
                 <div class="col-md-4">
-                    <input type="text"  ng-model="prodInfo.unit" placeholder="单位" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing" list="unit">
+                    <input type="text"  ng-model="prodInfo.unit" placeholder="单位" ng-class="{'readonly-pointer': !prodInfo.$editing}" list="unit">
                     <datalist id="unit">
                         <option value="PCS">
                         <option value="KG">
@@ -168,17 +168,17 @@
                 </div>
                 <div class="col-md-2">导入最小包装量： </div>
                 <div class="col-md-4">
-                    <input type="text" ng-model="prodInfo.minPack" placeholder="最小包装量" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/">
+                    <input type="text" ng-model="prodInfo.minPack" placeholder="最小包装量" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-pattern="/^\+?[1-9]\d*$/">
                 </div>
             </div>
             <div class="pro-list-tab row">
                 <div class="col-md-2">导入最小订货量：</div>
                 <div class="col-md-4">
-                    <input type="text" ng-model="prodInfo.minOrder" placeholder="最小订货量" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/">
+                    <input type="text" ng-model="prodInfo.minOrder" placeholder="最小订货量" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-pattern="/^\+?[1-9]\d*$/">
                 </div>
                 <div class="col-md-2">导入交货周期：</div>
                 <div class="col-md-4">
-                    <input type="text" ng-model="prodInfo.leadtime" placeholder="交货周期" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/">
+                    <input type="text" ng-model="prodInfo.leadtime" placeholder="交货周期" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-pattern="/^\+?[1-9]\d*$/">
                 </div>
             </div>
             <div class="pro-list-tab row">
@@ -193,7 +193,7 @@
                 		ng-change="getSimilarKinds(prodInfo.kind)" name="kind" ng-focus="onFocus('kind')"
                 		typeahead="kind.kindName for kind in getSimilarKinds($viewValue)"
 						autocomplete="off" typeahead-on-select="onAssociateKindClick($item, prodInfo)"
-						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-readonly="!prodInfo.$editing">
+						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}" >
                 </div>
                 <div class="col-md-2">标准品牌：</div>
                 <div class="col-md-4">
@@ -201,7 +201,7 @@
                 		ng-change="getSimilarBrands(prodInfo.pbranden)" name="pbranden" ng-focus="onFocus('pbranden')"
                 		typeahead="brand.brandName for brand in getSimilarBrands($viewValue)"
 						autocomplete="off" typeahead-on-select="onAssociateBrandClick($item, prodInfo)"
-						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-readonly="!prodInfo.$editing">
+						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}" >
                 </div>
             </div>
             <div class="pro-list-tab row"  style="padding-bottom: 5px;" ng-show="false">
@@ -211,7 +211,7 @@
                 		ng-change="getSimilarComponents(prodInfo.pcmpcode)" name="pcmpcode" ng-focus="onFocus('pcmpcode')"
                 		typeahead="cmp.code for cmp in getSimilarComponents($viewValue)"
 						autocomplete="off" typeahead-on-select="onAssociateComponentClick($item, prodInfo)"
-						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing">
+						spellcheck="false" ng-class="{'readonly-pointer': !prodInfo.$editing}">
                 </div>
              </div>
             <div class="com_title01"><span>图片和详细说明</span></div>
@@ -300,11 +300,11 @@
             	</dd>
             </dl>-->
             <div class="many-file-btn">
-                <button class="btn01" ng-if="!prodInfo.$editing" ng-click="update()">修改</button>
-                <button class="btn01" ng-if="prodInfo.$editing" ng-click="cancel()">取消</button>
-                <a class="btn02" ng-if="!prodInfo.$editing" ng-click="deleteById(prodInfo.id)">删除</a>
+              <!--   <button class="btn01" ng-if="!prodInfo.$editing" ng-click="update()">修改</button>
+                <button class="btn01" ng-if="prodInfo.$editing" ng-click="cancel()">取消</button> -->
+                <button class="btn01" ng-click="deleteById(prodInfo.id)">删除</button>
                 <!-- <a ui-sref="sale.uploadByBatch"  class="btn02" ng-if="!prodInfo.$editing">批量导入</a> -->
-                <a class="btn02" ng-click="submit(prodInfo)" ng-if="prodInfo.$editing" ng-disabled="productInfo.$invalid">提交</a>
+                <a class="btn02" ng-click="submit(prodInfo)" ng-disabled="productInfo.$invalid">提交</a>
             </div>
             <div id="image-box" style="display: none">
 				<div class="x-close-wrap" title="关闭">