新增物料或修改物料时单位能选择或输入

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

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

@@ -8543,7 +8543,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 			$scope.user = data;
 		});
 		$scope.time = $filter('date')(new Date, 'yyyy-MM-dd HH:mm');
-		$scope.prodInfo = {unit: 'PCS'};
+		$scope.prodInfo = {};
 		// 选择类目
 	    $scope.selectKind = function(uuids) {
 			$modal.open({

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

@@ -109,13 +109,13 @@
                 </dd>
                 <dd>
                     <div class="fl">单位：</div>
-                    <div class="fr"><input type="text"  ng-model="prodInfo.unit" placeholder="单位" style="cursor: pointer;"><span>（请填写详细）</span></div>
-                    <!-- <div class="fr">
-                        <select name="" id="">
-                            <option value="1">kg</option>
-                            <option value="2">g</option>
-                        </select>
-                    </div> -->
+                    <div class="fr"><input type="text"  ng-model="prodInfo.unit" placeholder="单位" style="cursor: pointer;" list="unit"><span>（请填写详细）</span></div>
+              		<datalist id="unit">
+			            <option value="PCS">
+			            <option value="KG">
+			            <option value="L">
+			            <option value="M">
+			        </datalist>
                 </dd>
                 <dd>
                     <div class="fl">最小包装量： </div>

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

@@ -109,13 +109,13 @@
                 </dd>
                 <dd>
                     <div class="fl">单位：</div>
-                    <div class="fr"><input type="text"  ng-model="prodInfo.unit" placeholder="单位" style="cursor: pointer;" ng-readonly="!prodInfo.$editing"><span>（请填写详细）</span></div>
-                    <!-- <div class="fr">
-                        <select name="" id="">
-                            <option value="1">kg</option>
-                            <option value="2">g</option>
-                        </select>
-                    </div> -->
+                    <div class="fr"><input type="text"  ng-model="prodInfo.unit" placeholder="单位" style="cursor: pointer;" ng-readonly="!prodInfo.$editing" list="unit"><span>（请填写详细）</span></div>
+                    <datalist id="unit">
+			            <option value="PCS">
+			            <option value="KG">
+			            <option value="L">
+			            <option value="M">
+			        </datalist>
                 </dd>
                 <dd>
                     <div class="fl">最小包装量： </div>