新增招标单页面之前更新被覆盖了，重新提交。

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

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

@@ -3,20 +3,24 @@
 
     /* 标题 */
     .tender-label {
-        height: 30px;
-        margin-left: 10px;
-        margin-right: 10px;
-        background: linear-gradient(to top, #e7e7e7 0%,#ffffff 100%);
+        /*height: 30px;*/
+        /*margin-left: 10px;*/
+        /*margin-right: 10px;*/
+        /*background-color: #e8e8e8;*/
+        /*box-shadow: 0 0 5px #6f6f6f;*/
+        /*border-top-right-radius: 20px;*/
+        width: 100%;
         height: 40px;
-        line-height: 40px;
-        box-shadow: 0 0 5px #6f6f6f;
-        border-top-right-radius: 20px;
+        line-height: 42px;
+        background: url(static/img/comm_bg01.png) no-repeat center;
+        background-size: 100%;
+
     }
     /* 主体 */
     .purc-tender {
         line-height: 2;
+        font-family: "Microsoft Yahei Regular";
         font-size: 14px;
-        font-family: "Microsoft YaHei", "微软雅黑";
     }
     .purc-tender .row {
         margin-left: 0px;
@@ -34,6 +38,7 @@
     }
     /* 二级标题栏 */
     .title-div {
+        font-family: "Microsoft Yahei Regular";
         font-size: 14px;
         font-weight: 600;
         padding-left: 30px;
@@ -87,6 +92,7 @@
         margin: 4px;
         width: 100px;
         padding: 0 5%;
+        height: 30px;
     }
 
     select {
@@ -146,24 +152,50 @@
     }
 
     /* 附件上传 */
+    .purc-tender .base-info .attach-upload {
+        display: inline;
+    }
     .purc-tender .base-info .attach-upload input {
-        /*height: 100px;*/
-        /*width: 60%;*/
-        height: 50px;
-        margin: 6px 0 0px 100px;
+        height: 100px;
+        width: 100px;
+        margin: 6px 0 0 100px;
+        opacity: 0;
+        z-index: 1;
+        position: relative;
     }
     .purc-tender .base-info .attach-upload input:hover {
         cursor: pointer;
     }
-    /* 原来的图片点击上传，但是这样无法展示已选附件 */
-   /* .upload-bg {
-        width: 100px;
-        height: 100px;
+    .fileInputContainer{
+        height:100px;
         background-image: url('resources/img/tender/upload.png');
-        margin-top: 10px;
+        position:relative;
+        width: 100px;
         margin-left: 100px;
-        border: 1px solid #e8e8e8;
-    }*/
+        margin-top: 20px;
+    }
+    .fileInput{
+        height:100px;
+        font-size: 100px;
+        position:absolute;
+        margin-left: 100px;
+        margin-top: 20px;
+        right:0;
+        top:0;
+        opacity: 0;
+        filter:alpha(opacity=0);
+        cursor:pointer;
+    }
+    /* 图片点击上传 */
+    /*.upload-bg {*/
+        /*width: 100px;*/
+        /*height: 100px;*/
+        /*background-image: url('resources/img/tender/upload.png');*/
+        /*margin-top: 10px;*/
+        /*margin-left: 100px;*/
+        /*border: 1px solid #e8e8e8;*/
+        /*z-index: 2;*/
+    /*}*/
     /* 供应商信息 添加供应商 */
     .vend-info  a.add-vendor {
          color: #5078cb;
@@ -204,12 +236,10 @@
         width: 94px;
         height: 36px;
         font-size: 14px;
+        font-family: "Microsoft Yahei Regular";
         color: #fff;
         border-radius: 0;
     }
-    .tender-content>div>div>button:hover{
-        background: #5078cb;
-    }
     .tender-content>div>div.btn-publish>button {
         background-color: #327EBE;
     }
@@ -227,16 +257,65 @@
         border: none;
     }
 
+    .attach-file {
+        margin-left: 100px;
+        width: 400px;
+    }
+
+
+    .com_head{width:100%;height:40px;line-height:42px;background:url(static/img/comm_bg01.png) no-repeat center;background-size: 100%;}
+    .com_head span{margin-left:30px;color:#000;font-size:14px;}
+    .com_head a{color:#327ebe;float:right;margin-right:40px;font-size: 14px;}
+    .com_head a i{margin-left: 5px;line-height: 40px;}
+    .com_head a:hover{color: #d2272d;}
+
+    .com_title{width:100%;margin:0px auto;height:40px;line-height:40px;font-size:14px;color:#323232;background:#f5f5f5;}
+    .com_title font{color:#327ebe;}
+
+
+    .com_title01{height: 50px;line-height:50px;width:100%;border-bottom:#3578ba 1px dotted;border-top:#e8e8e8 1px solid;margin-top: -4px;} /*  这里修改过 margin-top*/
+    .com_title01 span{margin-left:20px;font-size: 14px;line-height: 50px;color: #555;font-weight: bold;}
+
+    .com_title01  a {
+        color: #5078cb;
+    }
+    .com_title01  a:hover {
+        cursor: pointer;
+        color: #55b6ff;
+    }
+
+    /*招标单*/
+    .tender-list02 dl{width: 100%;margin:0 auto;}
+    .tender-list02 dl dt{width: 100%;margin:0 auto;height: 40px;}
+    .tender-list02 dl dt span{height: 50px;line-height: 50px;display: inline-block;color: #999;}
+    .tender-list02 dl dd{width: 100%;margin:0 auto;height: 50px;border-bottom: #ccc 1px dotted;overflow: hidden; position: relative;}
+    .tender-list02 dl dd:hover{border: #d32526 1px solid;}
+    .tender-list02 dl dd:hover span a{ display: inline-block;}
+    .tender-list02 dl dd span{height: 50px;line-height: 50px;display: inline-block;}
+    .tender-list02 dl span{width:11%;font-size: 14px;float: left;text-align: center;}
+    .tender-list02 dl span.wid01{ width:22%;}
+    .tender-list02 dl span.wid02{ width:18%;}
+    .tender-list02 dl span.wid03{ width:5%;}
+    .tender-list02 .editable{ text-align: center; width: 100%;}
+    .tender-list02  .scroll-y dd input{width: 100%; height: 34px; border: none; font-size: 14px; padding-left: 4px; text-align: center; vertical-align: middle; line-height: 34px;}
+    .tender-list02 dl span.wid03 a{ display: none;}
+    .tender-list02 dl span.wid03 a.active{ display: inline-block;}
+    .tender-list02 dl span.wid03 a i{width: 20px;height: 20px;display: inline-block;line-height: 20px;background: #d2272d;text-align: center;border-radius: 100%;color: #fff;}
+    .tender-list02 .com_title01 a{float: right;margin-right: 45px;font-size: 14px;line-height: 50px;}
+    .scroll-y{width: 100%;margin: 0 auto;max-height: 500px;}
+    .scroll-y.active{overflow-y: scroll;  overflow-x: hidden;  }
+
 </style>
 
 <div class="ng-scope">
     <form name="tenderForm">
         <div class="purc-tender">
+            <div class="com_title">服务>招标<font>>招标单</font></div>
             <!--<div class="loading in" ng-class="{'in': loading}">
             <i></i>
             </div>-->
             <div class="tender-label list-unstyled">
-                <strong style="padding: 0 10px 0 10px;">|</strong><label>招标单</label>
+                <div class="com_head"><span>招标单</span></div>
             </div>
             <div class="tender-content ng-scope" ng-controller="PurcNewTenderCtrl">
                 <div class="title-div" style="border-bottom: 1px dashed #327ebe;">
@@ -246,51 +325,30 @@
                 <div class="row base-info">
                     <div class = "col-xs-4">
                         <div class="tender-desc">招标标题：</div>
-                        <input class="tender-input" type="text" name="title" ng-model="tenderItem.tender.title" required/>
+                        <input class="tender-input" type="text" name="title" ng-model="tender.title" required/>
                     </div>
                     <div class = "col-xs-4">
                         <div class="tender-desc">联系人：</div>
-                        <input class="tender-input" type="text" name="user" ng-model="tenderItem.tender.user" required/>
+                        <input class="tender-input" type="text" name="user" ng-model="tender.user" required/>
                     </div>
                     <div class = "col-xs-4">
                         <div class="tender-desc">联系电话：</div>
-                        <input class="tender-input" type="text" name="userTel" ng-model="tenderItem.tender.userTel" required/>
-                    </div>
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">产品名称：</div>
-                        <input class="tender-input" type="text" name="prodTitle" ng-model="tenderItem.tender.prodTitle" required/>
-                    </div>
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">产品型号：</div>
-                        <input class="tender-input" type="text" name="prodCode" ng-model="tenderItem.tender.prodCode" required/>
-                    </div>
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">单位：</div>
-                        <!--<select class="select-menu" ng-show="tenderItem.$editing && !input-self">
-                            <option name="unit" value ="pcs">PCS</option>
-                            <option value ="kpcs">KPCS</option>
-                            <option value = "" ng-checked="input-self">填写单位</option>
-                        </select>-->
-                        <input class="tender-input" type="text" name="unit" ng-model="tenderItem.tender.unit" required/>
-                    </div>
-                    <div class = "col-xs-4">
-                        <div class="tender-desc">采购数量：</div>
-                        <input class="tender-input" name="qty" ng-model="tenderItem.tender.qty" type="number" required/>
+                        <input class="tender-input" type="text" name="userTel" ng-model="tender.userTel" required/>
                     </div>
                     <div class = "col-xs-4">
                         <div class="tender-desc">交易币别：</div>
                         <select class="select-menu" data-style="btn-primary">
-                            <option name="currency" ng-model="tenderItem.tender.currency" value ="RMB">RMB</option>
-                            <option name="currency" ng-model="tenderItem.tender.currency" value ="USD">USD</option>
-                            <option name="currency" ng-model="tenderItem.tender.currency" value ="HKD">HKD</option>
-                            <option name="currency" ng-model="tenderItem.tender.currency" value = "EUR">EUR</option>
+                            <option name="currency" ng-model="tender.currency" value ="RMB">RMB</option>
+                            <option name="currency" ng-model="tender.currency" value ="USD">USD</option>
+                            <option name="currency" ng-model="tender.currency" value ="HKD">HKD</option>
+                            <option name="currency" ng-model="ttender.currency" value = "EUR">EUR</option>
                         </select>
                     </div>
                     <div class = "col-xs-4">
                         <div class="tender-desc">是否含税：</div>
                         <select class="select-menu">
-                            <option ng-model="tenderItem.tender.ifTax" value ="yes">是</option>
-                            <option ng-model="tenderItem.tender.ifTax" value ="no">否</option>
+                            <option ng-model="tender.ifTax" value ="yes">是</option>
+                            <option ng-model="tender.ifTax" value ="no">否</option>
                         </select>
                     </div>
                     <div class="col-xs-12">
@@ -298,17 +356,17 @@
                         <span style="border-bottom: 1px solid #323232;"></span>
                         <div class="input-group address-group">
                             <span class="address-addon input-group-addon glyphicon glyphicon-map-marker" style="color: #5078cb;"></span>
-                            <input type="text" name="shipAddress" style="width: 100%; border: none;" ng-model="tenderItem.tender.shipAddress" placeholder="填写总部所在详细地址" required/>
+                            <input type="text" name="shipAddress" style="width: 100%; border: none;" ng-model="tender.shipAddress" placeholder="填写总部所在详细地址" required/>
                         </div>
                     </span>
                     </div>
                     <div class="col-xs-4">
                         <span class="tender-desc" style="padding-top: 15px;">投标截止时间:</span>
                         <div class="input-group input-trigger date-picker">
-                            <input type="text" ng-model="tenderItem.tender.endDate" required
+                            <input type="text" ng-model="tender.endDate" required
                                    class="form-control" placeholder="点击选择截止日期" readonly="readonly"
                                    datepicker-popup="yyyy-MM-dd" is-open="condition.$fromOpened"
-                                   ng-required="true" max-date="tenderItem.tender.publishDate" current-text="今天" min-date = "getMinDate()"
+                                   ng-required="true" max-date="tender.publishDate" current-text="今天" min-date = "currentDay()"
                                    clear-text="清除" close-text="关闭"
                                    datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
                                    ng-click="openDatePicker($event, condition, '$fromOpened')"
@@ -324,7 +382,7 @@
                     <div class="col-xs-4">
                         <span class="tender-desc" style="padding-top: 15px;">公布结果时间:</span>
                         <div class="input-group input-trigger date-picker">
-                            <input type="text" ng-model="tenderItem.tender.publishDate" required
+                            <input type="text" ng-model="tender.publishDate" required
                                    class="form-control" placeholder="点击选择公布日期" readonly="readonly"
                                    datepicker-popup="yyyy-MM-dd" is-open="condition.$toOpened"
                                    ng-required="true" min-date="getMinDate()"
@@ -344,11 +402,11 @@
                     </div>
                     <div class="col-xs-12">
                         <div class="tender-desc">上传招标文件：</div>
-                        <div class="attach-upload">
-                            <!-- accept="image/*,application/pdf,*.pdf" -->
-                            <input type="file" ng-file-select name="file" ng-model="MyFiles">
+                        <div class="fileInputContainer">
+                            <input class="fileInput" type="file" ng-file-select name="file" ng-model="myFile" ng-change="upload(myFile)" />
+                            <!-- href="file/{{attach.id}}" -->
+                            <div class="attach-file" ng-repeat="attach in attaches">{{attach.name}}&nbsp;&nbsp;<a ng-click="removeAttach(attach.id, $index)" title="删除"><i class="fa fa-trash-o"></i></a></div>
                         </div>
-                        <div class="upload-bg"></div>
                         <div style="margin-left: 100px; color: #969595; font-size: 12px; font-family: 'Microsoft Yahei Regular';">
                             提示：选择附件大小不超过5MB，可上传JPG,PNG,EXCEL,WORD,PDF
                         </div>
@@ -357,42 +415,72 @@
                         </div>-->
                     </div>
                 </div>
+
+                <div class="wrap">
+                    <div class="content">
+                        <div class="tender-list02">
+                            <!--产品信息-->
+                            <div class="com_title01"><span>产品明细</span><a href="#">批量导入</a></div>
+                            <dl>
+                                <dt>
+                                    <span>序号</span>
+                                    <span class="wid01">产品名称</span>
+                                    <span class="wid01">型号</span>
+                                    <span class="wid02">品牌</span>
+                                    <span>单位</span>
+                                    <span>采购数量</span>
+                                    <span class="wid03">&nbsp;</span>
+                                </dt>
+                                <div class="scroll-y">
+                                    <dd ng-repeat="prod in tenderProd">
+                                        <span>{{$index + 1}}</span>
+                                        <span class="wid01"><input type="text" ng-model="prod.prodTitle" placeholder="点击填入产品名称" required/></span>
+                                        <span class="wid01"><input type="text"  ng-model="prod.prodCode" placeholder="点击填入型号" required/></span>
+                                        <span class="wid02"><input type="text" ng-model="prod.brand" placeholder="点击填入品牌" required/></span>
+                                        <span><input type="text" ng-model="prod.unit" placeholder="点击填入单位" required/></span>
+                                        <span><input type="text" ng-model="prod.qty" placeholder="点击填入数量" required/></span>
+                                        <span class="wid03"><a ng-click="del($index)"><i class="fa fa-close"></i></a></span>
+                                    </dd>
+                                </div>
+                            </dl>
+                        </div>
+                    </div>
+                </div>
+                <div class="com_title01" style="border-bottom: 1px solid #969595;"><a ng-click="add()" style="margin-left: 20px;"><i class="fa fa-plus"></i>新增产品明细</a></div>
+
                 <div  class="title-div" style="border-bottom: 1px dashed #327ebe;">
                     <span>供应商信息</span>
                 </div>
                 <div class="row vend-info">
-                    <!--<div class="col-xs-10">
-                        <div class="tender-desc" style="font-size: 12px;font-family: 'Microsoft Yahei Regular'; margin-left: -60px; color: #969595;">（非必选）</div>
-                    </div>-->
                     <div class="col-xs-12">
                         <div class="tender-desc">是否开放报名：</div>
                         <div class="input-select col-xs-4">
-                            <input  class="tender-input" name="ifOpen" type="radio" value="0" ng-model="tenderItem.tender.ifOpen"/>
+                            <input  class="tender-input" name="ifOpen" type="radio" value="0" ng-model="tender.ifOpen"/>
                             <span>只允许我邀请的供应商参与</span>
                         </div>
                         <div class="input-select col-xs-4">
-                            <input class="tender-input" name="ifOpen" type="radio" value="1" ng-model="tenderItem.tender.ifOpen"/>
+                            <input class="tender-input" name="ifOpen" type="radio" value="1" ng-model="tender.ifOpen"/>
                             <span>允许优软平台的供应商参与</span>
                         </div>
                     </div>
-                    <div class="col-xs-12" ng-show="tenderItem.tender.ifOpen == 0 && tenderItem.$editing">
+                    <div class="col-xs-12" ng-show="tender.ifOpen == 0">
                         <a class="add-vendor tender-desc" ng-click="dbfindVendor()" href="javascript:void(0)">
                             <i class="fa fa-plus-square"></i>添加供应商&nbsp;
                         </a>
                     </div>
-                    <div class="col-xs-12" style="" ng-repeat="en in tenderItem.enterpriseBaseInfo" ng-show="tenderItem.tender.ifOpen == 0 && tenderItem.$editing">
+                    <div class="col-xs-12" style="" ng-repeat="en in tenderProd.enterpriseBaseInfo" ng-show="tender.ifOpen == 0">
                         <div class="col-xs-2 control-label" style="width: 100px;">供应商{{$index + 1}}</div>
                         <div for="uu{{$index + 1}}" class="col-xs-1" style="width: 20px;">UU</div>
                         <div class="col-xs-2">
-                            <input class="tender-input" ng-model="en.uu" type="number" id="uu{{$index + 1}}" readonly ng-required="tenderItem.tender.ifOpen == 0">
+                            <input class="tender-input" ng-model="en.uu" type="number" id="uu{{$index + 1}}" readonly ng-required="tender.ifOpen == 0">
                         </div>
                         <div for="enName{{$index + 1}}" class="col-xs-1" style="width: 60px; margin-left: 20px; margin-right: -20px;">名称</div>
                         <div class="col-xs-3">
                             <input ng-model="en.enName" type="text" style="width: 100%;" class="tender-input" readonly id="enName{{$index + 1}}"
-                                   ng-required="tenderItem.tender.ifOpen == 0">
+                                   ng-required="tender.ifOpen == 0">
                         </div>
                         <div class="col-xs-1">
-                            <a class="remove-vendor" ng-if="tenderItem.$editing" href="javascript:void(0)" ng-click="removeVendor($index)"><i class="fa fa-trash-o"></i>删除</a>
+                            <a class="remove-vendor" href="javascript:void(0)" ng-click="removeVendor($index)" title="删除"><i class="fa fa-trash-o"></i></a>
                         </div>
                     </div>
                     <div class="col-xs-12" style="border-bottom: 1px dashed #327ebe;">
@@ -400,21 +488,21 @@
                     </div>
                     <div class="col-xs-12">
                         <div class="tender-desc">交易方式：</div>
-                        <input class="tender-input" style="width: 80%; text-align: left;" required name="payment" type="text" ng-model="tenderItem.tender.payment" placeholder="必填，填写付款方式，如现金、月结30天等"/>
+                        <input class="tender-input" style="width: 80%; text-align: left;" required name="payment" type="text" ng-model="tender.payment" placeholder="必填，填写付款方式，如现金、月结30天等"/>
                     </div>
                     <div class="col-xs-2"></div>
                     <div class="col-xs-12">
                         <div class="tender-desc">发票要求：</div>
                         <div class="input-select col-xs-3">
-                            <input class="tender-input"  name="invoiceType" type="radio" value="2" ng-model="tenderItem.tender.invoiceType"/>
+                            <input class="tender-input"  name="invoiceType" type="radio" value="2" ng-model="tender.invoiceType"/>
                             <span>增值税专用发票</span>
                         </div>
                         <div class="input-select col-xs-3">
-                            <input class="tender-input" name="invoiceType" type="radio" value="1" ng-model="tenderItem.tender.invoiceType" />
+                            <input class="tender-input" name="invoiceType" type="radio" value="1" ng-model="tender.invoiceType" />
                             <span>增值税普通发票</span>
                         </div>
                         <div class="input-select col-xs-3">
-                            <input class="tender-input"  name="invoiceType" type="radio" value="0" ng-model="tenderItem.tender.invoiceType" />
+                            <input class="tender-input"  name="invoiceType" type="radio" value="0" ng-model="tender.invoiceType" />
                             <span>不需要发票</span>
                         </div>
                     </div>
@@ -424,34 +512,7 @@
                             <input type="checkbox" name="certificate" ng-model="certificate.checked" value="certificate">
                             <span ng-bind="certificate.name"></span>
                         </div>
-                        <!--<div class="input-select col-xs-3">
-                            <input class="tender-input"  name="certificate" type="checkbox" value="三/五证合一" />
-                            <span>三/五证合一</span>
-                        </div>
-                        <div class="input-select col-xs-3">
-                            <input class="tender-input" name="certificate" type="checkbox" value="营业执照" />
-                            <span>营业执照</span>
-                        </div>
-                        <div class="input-select col-xs-3">
-                            <input class="tender-input"  name="certificate" type="checkbox" value="组织机构代码证" />
-                            <span>组织机构代码证</span>
-                        </div>-->
                     </div>
-                   <!-- <div class="col-xs-12">
-                        <span class="tender-desc" style="font-size: 12px; font-family: 'Microsoft Yahei'; color: #969595;margin-top:-15px;">（多选）</span>
-                        <div class="input-select col-xs-3">
-                            <input class="tender-input" name="certificate" type="checkbox" value="一般纳税人证明材料" />
-                            <span>一般纳税人证明材料</span>
-                        </div>
-                        <div class="input-select col-xs-3">
-                            <input class="tender-input" name="certificate" type="checkbox" value="统计登记证" />
-                            <span>统计登记证</span>
-                        </div>
-                        <div class="input-select col-xs-3">
-                            <input class="tender-input" name="certificate" type="checkbox" value="社会保险登记证" />
-                            <span>社会保险登记证</span>
-                        </div>
-                    </div>-->
                 </div>
                 <div class="col-xs-12" style="padding: 30px;">
                     <div class="col-xs-2 pull-right btn-publish">
@@ -464,4 +525,15 @@
             </div>
         </div>
     </form>
-</div>
+</div>
+<script src="static/lib/jquery/jquery.min.js"></script>
+<script>
+    $(function(){
+        var size10= $(".tender-list02 dl dd").size();
+        if(size10 > 10){
+            $(".scroll-y").addClass("active");
+        }else{
+            $(".scroll-y").removeClass("active");
+        }
+    })
+</script>