Просмотр исходного кода

修改新增采购询价页面的异常

hejq 8 лет назад
Родитель
Сommit
f68b43606a

+ 3 - 1
src/main/webapp/resources/js/index/app.js

@@ -4533,7 +4533,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         var loadShipAddress = function () {
             ShipAddress.shipAddList({}, function (data) {
                 $scope.ships = data;
-                $scope.inquiry.ship = $scope.ships[0].address + $scope.ships[0].addressdet + $scope.ships[0].receiver + $scope.ships[0].usertel;
+                if (angular.isDefined($scope.ships)) {
+                    $scope.inquiry.ship = $scope.ships[0].address + $scope.ships[0].addressdet + $scope.ships[0].receiver + $scope.ships[0].usertel;
+                }
             });
         };
         loadShipAddress();

+ 3 - 20
src/main/webapp/resources/tpl/index/purc/inquiry_new.html

@@ -1094,8 +1094,7 @@ select.disabled {
                                         <span class="text-center"><input type="text" ng-model="prod.unit" placeholder="点击填入单位" required style="width: 93%;"/></span>
                                         <span class="left-dropdown-menu"><input ng-model="prod.toDate" type="text" class="editable"  required
 													placeholder="选择时间" datepicker-popup="yyyy-MM-dd" is-open="prod.$toDateOpen"
-													min-date="getMinDate()"
-													current-text="今天" clear-text="清除" close-text="关闭"
+													min-date="getMinDate()" current-text="今天" clear-text="清除" close-text="关闭"
 													datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
 													ng-focus="openDatePicker($event, prod.$toDateOpen)" readonly="readonly"
 													ng-click="openDatePicker($event, prod.$toDateOpen, $index)"></span>
@@ -1110,30 +1109,15 @@ select.disabled {
                  <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>
-                    <input  class="tender-input" name="ifOpen" value="0" ng-model="inquiry.isOpen = 0" style="display: none"/>
+                    <input  class="tender-input" name="ifOpen" value="0" ng-model="inquiry.isOpen" style="display: none"/>
                   	 <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" id="isOpenChoice">
-                    <div class="tender-desc">是否开放报名:</div>
-                    <div class="input-select col-xs-4">
-                        <input class="tender-input" name="ifOpen" type="radio" value="1" ng-click="removeChecked()" ng-model="inquiry.isOpen"/>
-                        <span>允许优软平台的供应商参与</span>
-                    </div>
-                    <div class="input-select col-xs-4">
-                        <input  class="tender-input" name="ifOpen" type="radio" value="0" ng-model="inquiry.isOpen"/>
-                        <span>只允许我邀请的供应商参与</span>
-                    </div>
-                </div>-->
                 <div class="row vend-info">
                     <div class="col-xs-12" style="" ng-repeat="vendor in vendors">
                         <div class="col-xs-1 control-label" style="width: 60px;">{{$index + 1}}</div>
                         <div class="info-line col-xs-4"><span>供应商</span><span><input class="tender-input01" ng-model="vendor.enName" type="text" readonly></span></div>
-                        <!-- <div class="col-xs-1" style="width: 60px; margin-left: 20px;">UU</div>
-                        <div class="col-xs-3">
-                            <input ng-model="vendor.enuu" type="text" style="width: 200px;" class="tender-input01" readonly>
-                        </div> -->
                         <div class="info-line col-xs-3">
                             <span>币别</span>
                             <span>
@@ -1196,7 +1180,7 @@ select.disabled {
 					</td>
 					<td class="text-center" colspan="7" ng-if="tip == null">
 						<br>
-						<div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 暂无物料信息,<a ui-sref="sale.newProdInfo" target="_blank">立即添加</a></div>
+						<div class="text-muted" style="font-size: 14px;"><i class="fa fa-spinner"></i> 暂无物料信息,<a ui-sref="purc.uploadProduct" target="_blank">立即添加</a></div>
 					</td>
 				</tr>
 			</tbody>
@@ -1269,7 +1253,6 @@ select.disabled {
             </li>
             <li class="line02 margin-top40">
                 <div class="fl">所在地址<em>*</em>:</div>
-                <!--<div class="select fr"><input type="text" placeholder="请选择" ng-model="ship.address" required="true"/><i class="fa fa-angle-down"></i></div>-->
                 <div class="select fr">
                     <select required="" class="area-select" ng-model="ship.province" ng-options="key as key for (key,value) in provinces"
                             ng-change="ship.city='';ship.district='';" required="true">