Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/yxproject/start/mapper/ReceiptMapper.java

@@ -19,7 +19,7 @@ public interface ReceiptMapper {
             "left join SPECIAL_CARD on SPECIAL_CARD.ACCEPT_NO = prod_card_t.accept_no\n" +
             "left join task on task.task_id =SPECIAL_CARD.task_id \n" +
             "left join GAJG_DM on subStr(prod_card_t.UPLOAD_NO,0,9)= GAJG_DM.GAJG_DM \n" +
-            "where prod_card_t.id_no='110105201209259835' \n" +
+            "where prod_card_t.id_no=#{id} \n" +
             "group by prod_group_t.group_no, prod_card_t.accept_no, subStr(prod_card_t.UPLOAD_NO,0,9), GAJG_DM.GAJG_MC, task.CARD_TYPE, \n" +
             "task.OLD_CARD_TYPE ")
     public Map<String,Object> selectReceiptListDate(String id);
@@ -90,7 +90,6 @@ public interface ReceiptMapper {
 
 
 
-
     //生成交接单详单
     @Insert("INSERT INTO DETAIL_RECEIPT_LIST (UPLOAD_NO,accept_no,name,card_id,POLICE_CODE,RECEIPT_ID)" +
             "VALUES(#{UPLOAD_NO},#{ACCEPT_NO},#{NAME},#{CARD_ID},#{GAJG_DM},#{RECEIPT_ID})")

src/main/resources/static/views/tagPrint/tagPrint.html

@@ -116,12 +116,9 @@
                 </table>
                 <div class="box-footer clearfix" style="border: 0;">
                     <button class="btn btn-success  pull-right" style="margin-right: 20px;" ng-click="checkSame(json.id)">复核一致</button>
-                    <button class="btn btn-info  pull-right" style="margin-right: 20px;" ng-click="PreviewMytableRotate()">打印标签</button>
+                    <button class="btn btn-info  pull-right" style="margin-right: 20px;" ng-click="PreviewMytableRotate()">打印封条</button>
                 </div>
             </div>
-            <h4 class="col-md-7" ng-if="json.policeCardsList.length==0">
-                暂无数据
-            </h4>
         </div>
     </div>
 </div>

src/main/resources/static/views/tagPrint/tagPrint.js

@@ -54,6 +54,7 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
             HttpService.selectTagPrintData($scope.idCard,function(data){
                 console.log(data)
                 if(data){
+                    $scope.json.policeCardsList=[];
                     getPoliceListDataNotChecked();
                 }else{
                     MessageService.showAlert("生成交接单失败")
@@ -67,7 +68,6 @@ angular.module('AvatarCheck.tagPrint', ['ngRoute', 'AvatarCheck.http', 'tm.pagin
             HttpService.updateReceiptList(id,function(data) {
                 if(data){
                     getPoliceListDataNotChecked();
-                    json.policeCardsList=[];
                 }else {
                     MessageService.showAlert("复核失败")
                 }