产品导入新增、详情修改文字命名及详情加入标准信息。

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

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

@@ -80,9 +80,12 @@
     line-height: 34px;
 }
 .pro-list-tab .col-md-2{
-    width: 120px;
+    width: 160px;
     margin-left: 5px;
 }
+.pro-list-tab .col-md-4{
+    width: 30%;
+}
 .pro-list-tab .col-md-4 input{
     border: #bfbfbf 1px solid !important;
     padding-left: 10px;
@@ -100,23 +103,23 @@
 		<div class="com_head"><span>产品导入</span><span class="fr"><em>录入人：{{user.userName}}</em><time>日期：{{time}}</time></span></div>
 		<!--产品资料新增-->
         <form class="pro-add-tab pro-add-data clearfix" name="productInfo">
-            <div class="com_title01 sty01" style="margin-bottom: 15px;"><span>基本信息<em>*</em></span></div>
+            <div class="com_title01 sty01" style="margin-bottom: 15px;"><span>导入信息<em>*</em></span></div>
             <div class="pro-list-tab row">
-                <div class="col-md-2">产品编号：</div>
+                <div class="col-md-2">导入产品编号：</div>
                 <div class="col-md-4"><input type="text" ng-model="prodInfo.code" style="cursor: pointer;" required="true"></div>
-                <div class="col-md-2">产品名称：</div>
+                <div class="col-md-2">导入产品名称：</div>
                 <div class="col-md-4"><input type="text"  ng-model="prodInfo.title" style="cursor: pointer;" required="true"></div>
             </div>
             <div class="pro-list-tab row">
-                <div class="col-md-2">产品型号：</div>
+                <div class="col-md-2">导入产品型号：</div>
                 <div class="col-md-4">
                     <input type="text"  ng-model="prodInfo.cmpCode" style="cursor: pointer;" required="true" ng-click="selectKind()">
                 </div>
-                <div class="col-md-2">品牌：</div>
+                <div class="col-md-2">导入品牌：</div>
                 <div class="col-md-4"><input type="text" ng-model="prodInfo.brand" placeholder="品牌" style="cursor: pointer;" readonly="readonly"></div>
             </div>
             <div class="pro-list-tab row">
-                <div class="col-md-2">单位：</div>
+                <div class="col-md-2">导入单位：</div>
                 <div class="col-md-4">
                     <input type="text"  ng-model="prodInfo.unit" placeholder="单位" style="cursor: pointer;" list="unit">
                     <datalist id="unit">
@@ -126,17 +129,17 @@
                         <option value="M">
                     </datalist>
                 </div>
-                <div class="col-md-2">最小包装量：</div>
+                <div class="col-md-2">导入最小包装量：</div>
                 <div class="col-md-4">
                     <input type="text" ng-model="prodInfo.minPack" placeholder="最小包装量" style="cursor: pointer;" ng-pattern="/^\+?[1-9]\d*$/">
                 </div>
             </div>
             <div class="pro-list-tab row">
-                <div class="col-md-2">最小订货量：</div>
+                <div class="col-md-2">导入最小订货量：</div>
                 <div class="col-md-4">
                     <input type="text" ng-model="prodInfo.minOrder" placeholder="最小订货量" style="cursor: pointer;" ng-pattern="/^\+?[1-9]\d*$/">
                 </div>
-                <div class="col-md-2">交货周期：</div>
+                <div class="col-md-2">导入交货周期：</div>
                 <div class="col-md-4">
                     <input type="text" ng-model="prodInfo.leadtime" placeholder="交货周期" style="cursor: pointer;" ng-pattern="/^\+?[1-9]\d*$/">
                 </div>
@@ -145,54 +148,13 @@
                 <div class="col-md-2">状态：</div>
                 <div class="col-md-4">有效</div>
             </div>
-           <!-- <dl>
-                <dd>
-                    <div class="fl">产品编号：</div>
-                    <div class="fr"><input type="text" ng-model="prodInfo.code" style="cursor: pointer;" required="true"><span>（建议与您系统的产品编号保持一致，便于追溯）</span></div>
-                </dd>
-                <dd>
-                    <div class="fl">产品名称：</div>
-                    <div class="fr"><input type="text"  ng-model="prodInfo.title" style="cursor: pointer;" required="true"></div>
-                </dd>
-                <dd>
-                    <div class="fl">产品型号：</div>
-                    <div class="fr"><input type="text"  ng-model="prodInfo.cmpCode" style="cursor: pointer;" required="true" ng-click="selectKind()"><span>（请填写详细）</span></div>
-                </dd>
-                &lt;!&ndash;  <dd>
-                    <div class="fl">原厂型号：</div>
-                    <div class="fr"><input type="text" readonly="readonly" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode"  ng-click="selectKind()"><span>（关联器件原厂型号，不可编辑）</span></div>
-                </dd> &ndash;&gt;
-                <dd>
-                    <div class="fl">品牌：</div>
-                    <div class="fr"><input type="text" ng-model="prodInfo.brand" placeholder="品牌" style="cursor: pointer;" readonly="readonly"><span>（关联器件物料品牌，不可编辑）</span></div>
-                </dd>
-                <dd>
-                    <div class="fl">单位：</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>
-                    <div class="fr"><input type="text" ng-model="prodInfo.minPack" placeholder="最小包装量" style="cursor: pointer;" ng-pattern="/^\+?[1-9]\d*$/"></div>
-                </dd>
-                <dd>
-                    <div class="fl">最小订货量：</div>
-                    <div class="fr"><input type="text" ng-model="prodInfo.minOrder" placeholder="最小订货量" style="cursor: pointer;" ng-pattern="/^\+?[1-9]\d*$/"></div>
-                </dd>
-                <dd>
-                    <div class="fl">交货周期：</div>
-                    <div class="fr"><input type="text" ng-model="prodInfo.leadtime" placeholder="交货周期" style="cursor: pointer;" ng-pattern="/^\+?[1-9]\d*$/"></div>
-                </dd>
-                <dd>
-                    <div class="fl">状态：</div>
-                    <div class="fr">有效</div>
-                </dd>
-            </dl>-->
+           <!-- <div class="com_title01 sty01" style="margin-bottom: 15px;"><span>标准信息</span></div>
+            <div class="pro-list-tab row" style="padding-bottom: 5px;">
+                <div class="col-md-2" style="padding-right: 0;">标准产品名称（类目）:</div>
+                <div class="col-md-4"><input type="text" ng-model="" ></div>
+                <div class="col-md-2">标准品牌：</div>
+                <div class="col-md-4"><input type="text"  ng-model=""></div>
+            </div>-->
             <div class="com_title01"><span>图片和详细说明</span></div>
             <dl>
                 <dd class="upload-pro">

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

@@ -83,10 +83,13 @@
         margin:10px 0;
         line-height: 34px;
     }
-    .pro-list-tab .col-md-2{
-        width: 120px;
-        margin-left: 5px;
-    }
+.pro-list-tab .col-md-2{
+    width: 160px;
+    margin-left: 5px;
+}
+.pro-list-tab .col-md-4{
+    width: 30%;
+}
 .pro-list-tab .col-md-4 input{
     border: #bfbfbf 1px solid !important;
     padding-left: 10px;
@@ -110,41 +113,44 @@
 #order-detail-list .table-default td{
     border-bottom: #ddd 1px solid;
 }
+.table>tbody+tbody{
+    border-top: 0;
+}
 </style>
 <div class="wrap">
 	<div class="content">
 		<div class="com_head"><span>产品导入</span><span class="fr"><em>录入人：{{user.userName}}</em><time>日期：{{time}}</time></span></div>
 		<!--产品资料新增-->
         <div class="pro-add-tab pro-add-data clearfix">
-            <div class="com_title01 sty01" style="margin-bottom: 15px;"><span>基本信息<em>*</em></span></div>
+            <div class="com_title01 sty01" style="margin-bottom: 15px;"><span>导入信息<em>*</em></span></div>
             <div class="pro-list-tab row">
-                <div class="col-md-2">产品编号：</div>
+                <div class="col-md-2">导入产品编号：</div>
                 <div class="col-md-4">
                     <input type="text" ng-model="prodInfo.code" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" ng-readonly="!prodInfo.$editing">
                 </div>
-                <div class="col-md-2">产品名称：</div>
+                <div class="col-md-2">导入产品名称：</div>
                 <div class="col-md-4">
                     <input type="text"  ng-model="prodInfo.title" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" ng-readonly="!prodInfo.$editing" ng-if="prodInfo.kind == null">
                     <input type="text"  ng-model="prodInfo.kind" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" readonly="readonly" ng-if="prodInfo.kind != null">
                 </div>
             </div>
             <div class="pro-list-tab row">
-                <div class="col-md-2">产品型号：</div>
+                <div class="col-md-2">导入产品型号：</div>
                 <div class="col-md-4">
                     <input type="text"  ng-model="prodInfo.cmpCode" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" ng-readonly="!prodInfo.$editing"  ng-click="selectKind()" ng-disabled="!prodInfo.$editing" ng-if="prodInfo.pcmpcode == null">
                     <input type="text"  ng-model="prodInfo.pcmpcode" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-disabled="!prodInfo.$editing" ng-if="prodInfo.pcmpcode != null" readonly>
                 </div>
-                <div class="col-md-2" ng-if="prodInfo.pbranden == null">品牌：</div>
+                <div class="col-md-2" ng-if="prodInfo.pbranden == null">导入品牌：</div>
                 <div class="col-md-4" ng-if="prodInfo.pbranden == null">
                     <input type="text" ng-model="prodInfo.brand" type="text" placeholder="品牌" style="cursor: pointer;" ng-readonly="prodInfo.cmpUuId != null">
                 </div>
-                <div class="col-md-2" ng-if="prodInfo.pbranden != null">品牌：</div>
+                <div class="col-md-2" ng-if="prodInfo.pbranden != null">导入品牌：</div>
                 <div class="col-md-4" ng-if="prodInfo.pbranden != null">
                     <input type="text" ng-model="prodInfo.pbranden" type="text" placeholder="品牌" style="cursor: pointer;" readonly>
                 </div>
             </div>
             <div class="pro-list-tab row">
-                <div class="col-md-2">单位：</div>
+                <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">
                     <datalist id="unit">
@@ -154,17 +160,17 @@
                         <option value="M">
                     </datalist>
                 </div>
-                <div class="col-md-2">最小包装量： </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*$/">
                 </div>
             </div>
             <div class="pro-list-tab row">
-                <div class="col-md-2">最小订货量：</div>
+                <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*$/">
                 </div>
-                <div class="col-md-2">交货周期：</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*$/">
                 </div>
@@ -173,64 +179,13 @@
                 <div class="col-md-2">状态：</div>
                 <div class="col-md-4">有效</div>
             </div>
-           <!-- <dl>
-                <dd>
-                    <div class="fl">产品编号：</div>
-                    <div class="fr"><input type="text" ng-model="prodInfo.code" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" ng-readonly="!prodInfo.$editing"><span>（建议与您系统的产品编号保持一致，便于追溯）</span></div>
-                </dd>
-                <dd>
-                    <div class="fl">产品名称：</div>
-                    <div class="fr">
-                        <input type="text"  ng-model="prodInfo.title" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" ng-readonly="!prodInfo.$editing" ng-if="prodInfo.kind == null">
-                        <input type="text"  ng-model="prodInfo.kind" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" readonly="readonly" ng-if="prodInfo.kind != null">
-                    </div>
-                </dd>
-                <dd>
-                    <div class="fl">产品型号：</div>
-                    <div class="fr">
-                        <input type="text"  ng-model="prodInfo.cmpCode" ng-class="{'readonly-pointer': !prodInfo.$editing}" required="true" ng-readonly="!prodInfo.$editing"  ng-click="selectKind()" ng-disabled="!prodInfo.$editing" ng-if="prodInfo.pcmpcode == null">
-                        <input type="text"  ng-model="prodInfo.pcmpcode" ng-class="{'readonly-pointer': !prodInfo.$editing}"  ng-disabled="!prodInfo.$editing" ng-if="prodInfo.pcmpcode != null" readonly>
-                        <span>（请填写详细）</span></div>
-                </dd>
-                &lt;!&ndash;  <dd>
-                     <div class="fl">原厂型号：</div>
-                     <div class="fr"><input type="text" readonly="prodInfo.cmpUuId != null" ng-disabled="!prodInfo.$editing" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode" ng-click="selectKind(prodInfo.cmpCode)"><span></span></div>
-                 </dd> &ndash;&gt;
-                <dd ng-if="prodInfo.pbranden == null">
-                    <div class="fl">品牌：</div>
-                    <div class="fr"><input type="text" ng-model="prodInfo.brand" type="text" placeholder="品牌" style="cursor: pointer;" ng-readonly="prodInfo.cmpUuId != null"><span></span></div>
-                </dd>
-                <dd ng-if="prodInfo.pbranden != null">
-                    <div class="fl">品牌：</div>
-                    <div class="fr"><input type="text" ng-model="prodInfo.pbranden" type="text" placeholder="品牌" style="cursor: pointer;" readonly><span></span></div>
-                </dd>
-                <dd>
-                    <div class="fl">单位：</div>
-                    <div class="fr"><input type="text"  ng-model="prodInfo.unit" placeholder="单位" ng-class="{'readonly-pointer': !prodInfo.$editing}" 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>
-                    <div class="fr"><input type="text" ng-model="prodInfo.minPack" placeholder="最小包装量" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/"></div>
-                </dd>
-                <dd>
-                    <div class="fl">最小订货量：</div>
-                    <div class="fr"><input type="text" ng-model="prodInfo.minOrder" placeholder="最小订货量" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/"></div>
-                </dd>
-                <dd>
-                    <div class="fl">交货周期：</div>
-                    <div class="fr"><input type="text" ng-model="prodInfo.leadtime" placeholder="交货周期" ng-class="{'readonly-pointer': !prodInfo.$editing}" ng-readonly="!prodInfo.$editing" ng-pattern="/^\+?[1-9]\d*$/"></div>
-                </dd>
-                <dd>
-                    <div class="fl">状态：</div>
-                    <div class="fr">有效</div>
-                </dd>
-            </dl>-->
+            <div class="com_title01 sty01" style="margin-bottom: 15px;" ng-if="matchresults.length > 0"><span>标准信息</span></div>
+            <div class="pro-list-tab row" style="padding-bottom: 5px;" ng-repeat = "result in matchresults ">
+                <div class="col-md-2" style="padding-right: 0;">标准产品名称（类目）:</div>
+                <div class="col-md-4"><input type="text" ng-model="result.kindcn"></div>
+                <div class="col-md-2">标准品牌：</div>
+                <div class="col-md-4"><input type="text"  ng-model="result.branden"></div>
+            </div>
             <div class="com_title01"><span>图片和详细说明</span></div>
             <dl>
                 <dd class="upload-pro">