更新公共询价列表显示数据默认为公司商机

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

@@ -5430,23 +5430,34 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                    $scope.currentEn = data;
                     publicInquiry.getUrl({}, function(data) {
                         $scope.url = data.url;
-                        if (!$scope.remind) {// 非推荐信息
-                            $http({
-                                method: 'get',
-                                dataType: 'json',
-                                url: $scope.url + '/inquiry/public',
-                                params: {pageNumber: pageParams.page, pageSize: pageParams.count, enUU: $scope.currentEn.uu, keyword: $scope.keyword,
-                                    fromDate: getDateTime($scope.condition.dateFrom), endDate: getDateTime($scope.condition.dateTo), distribute: $scope.distribute, remind: $scope.remind}
-                            }).success(function (response) {
-                                $scope.loading = false;
-                                if (response) {
-                                    params.total(response.totalElements);
-                                    $defer.resolve(response.content);
-                                    $scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的关键词
-                                }
-                            }).error(function (err) {
+                        if (!$scope.remind) {// 企业商机
+                            AuthenticationService.getAuthentication().success(function (data) {
                                 $scope.loading = false;
-                                toaster.pop('error', '数据加载失败', err);
+                                $scope.thisUser = data;
+                                $http({
+                                    method: 'get',
+                                    dataType: 'json',
+                                    url: $scope.url + '/inquiry/sale/enremind',
+                                    params: {
+                                        pageNumber: pageParams.page,
+                                        pageSize: pageParams.count,
+                                        useruu: $scope.thisUser.userUU,
+                                        enuu: $scope.currentEn.uu,
+                                        keyword: $scope.keyword,
+                                        fromDate: getDateTime($scope.condition.dateFrom),
+                                        endDate: getDateTime($scope.condition.dateTo)
+                                    }
+                                }).success(function (response) {
+                                    $scope.loading = false;
+                                    if (response) {
+                                        params.total(response.totalElements);
+                                        $defer.resolve(response.content);
+                                        $scope.searchFilterXls = angular.copy(pageParams.searchFilter);//保存当前取值的关键词
+                                    }
+                                }).error(function (err) {
+                                    $scope.loading = false;
+                                    toaster.pop('error', '数据加载失败', err);
+                                });
                             });
                         } else {// 推荐报价信息
                             AuthenticationService.getAuthentication().success(function (data) {

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

@@ -368,7 +368,7 @@
                                    <th width="70" class="line"><em></em>报价</th>
                                </tr>
                                </thead>
-                               <tbody ng-if="active != 'remind'">
+                               <!--<tbody ng-if="active != 'remind'">
                                     <tr ng-repeat="inquiryItem in $data">
                                         <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.inquiry.date| date: 'yyyy-MM-dd'"></td>
                                         <td ng-click="toDetail(inquiryItem)" title="查看详情" ng-bind="inquiryItem.inbrand || inquiryItem.product.brand || '无'"></td>
@@ -388,15 +388,15 @@
                                             <a class="offer" ng-if="inquiryItem.remainingTime <= 0 || inquiryItem.overdue == 1 || !isOverDue(inquiryItem.inquiry.endDate)" ng-click="">已结束</a>
                                         </td>
                                     </tr>
-                               </tbody>
-                               <tbody ng-if="active == 'remind'">
+                               </tbody>-->
+                               <tbody >
                                    <tr ng-repeat="remind in $data">
                                        <td ng-click="remindDetail(remind)" title="查看详情" ng-bind="remind.reDate| date: 'yyyy-MM-dd'"></td>
-                                       <td ng-click="remindDetail(remind)" title="查看详情" ng-bind="remind.brand"></td>
-                                       <td ng-click="remindDetail(remind)" title="查看详情" ng-bind="remind.prodTitle"></td>
-                                       <td ng-click="remindDetail(remind)" title="查看详情" ng-bind="remind.cmpCode"></td>
-                                       <td ng-click="remindDetail(remind)" title="查看详情" ng-bind="remind.spec"></td>
-                                       <td ng-click="remindDetail(remind)" title="查看详情" ng-bind="remind.needQty"></td>
+                                       <td ng-click="remindDetail(remind)" title="查看详情" ng-bind="remind.brand || '无'"></td>
+                                       <td ng-click="remindDetail(remind)" title="查看详情" ng-bind="remind.prodTitle || '无'"></td>
+                                       <td ng-click="remindDetail(remind)" title="查看详情" ng-bind="remind.cmpCode || '无'"></td>
+                                       <td ng-click="remindDetail(remind)" title="查看详情" ng-bind="remind.spec || '无'"></td>
+                                       <td ng-click="remindDetail(remind)" title="查看详情" ng-bind="remind.needQty || '-'"></td>
                                        <td ng-click="remindDetail(remind)" title="查看详情" ng-bind="remind.enName"><a></a></td>
                                        <td ng-click="remindDetail(remind)" title="查看详情" ng-bind-html="remind.endDate| datespan"></td>
                                        <td>

src/main/webapp/resources/tpl/index/baseInfo/modal/quotation_modal.html

@@ -138,7 +138,7 @@
             <div class="form-group">
                 <label for="inputEmail3" class="col-xs-4 control-label">最小订购</label>
                 <div class="col-xs-8">
-                    <input type="text" class="form-control" id="inputEmail3" placeholder="1000" ng-model="inquiryItem.minOrderQty" ng-pattern="/^[0-9]*[1-9][0-9]*$/">
+                    <input type="text" class="form-control" id="inputEmail3" placeholder="最小订购（数字）" ng-model="inquiryItem.minOrderQty" ng-pattern="/^[0-9]*[1-9][0-9]*$/">
                 </div>
             </div>
         </div>
@@ -146,7 +146,7 @@
             <div class="form-group">
                 <label for="inputEmail1" class="col-xs-4 control-label">最小包装</label>
                 <div class="col-xs-8">
-                    <input type="text" class="form-control" id="inputEmail1" placeholder="1000" ng-model="inquiryItem.minPackQty" ng-pattern="/^[0-9]*[1-9][0-9]*$/">
+                    <input type="text" class="form-control" id="inputEmail1" placeholder="最小包装（数字）" ng-model="inquiryItem.minPackQty" ng-pattern="/^[0-9]*[1-9][0-9]*$/">
                 </div>
             </div>
         </div>
@@ -154,7 +154,7 @@
             <div class="form-group">
                 <label for="inputEmail2" class="col-xs-4 control-label text-inverse">交货周期（天）</label>
                 <div class="col-xs-8">
-                    <input type="text" class="form-control" id="inputEmail2" placeholder="20" ng-model="inquiryItem.leadtime" ng-pattern="/^[0-9]*[1-9][0-9]*$/" ng-required="true">
+                    <input type="text" class="form-control" id="inputEmail2" placeholder="交货周期（数字）" ng-model="inquiryItem.leadtime" ng-pattern="/^[0-9]*[1-9][0-9]*$/" ng-required="true">
                 </div>
             </div>
         </div>
@@ -172,7 +172,7 @@
             <div class="form-group">
                 <label for="inputEmail4" class="col-xs-4 control-label">税率（%）</label>
                 <div class="col-xs-8">
-                    <input type="text" class="form-control" id="inputEmail4" placeholder="10" ng-model="inquiryItem.taxrate" ng-pattern="/^((\d|[123456789]\d)(\.\d+)?)$/">
+                    <input type="text" class="form-control" id="inputEmail4" placeholder="税率（数字）" ng-model="inquiryItem.taxrate" ng-pattern="/^((\d|[123456789]\d)(\.\d+)?)$/">
                 </div>
             </div>
         </div>
@@ -180,7 +180,7 @@
             <div class="form-group">
                 <label for="inputEmail5" class="col-xs-4 control-label">供应商型号</label>
                 <div class="col-xs-8">
-                    <input type="text" class="form-control" id="inputEmail5" placeholder="1000" ng-model="inquiryItem.vendorprodcode">
+                    <input type="text" class="form-control" id="inputEmail5" placeholder="供应商型号" ng-model="inquiryItem.vendorprodcode">
                 </div>
             </div>
         </div>