Zhouzhendong 4 лет назад
Родитель
Сommit
4e59608afd
2 измененных файлов с 4 добавлено и 10 удалено
  1. 1 1
      app/Services/StorageService.php
  2. 3 9
      resources/views/customer/project/index.blade.php

+ 1 - 1
app/Services/StorageService.php

@@ -447,7 +447,7 @@ sql;
         if (!$inv)return false;//余量与入库不符
         DB::connection("oracle")->transaction(function ()use($inv,$amount,$ide,$task,&$who){
             $db = DB::connection("oracle");
-            $db->delete(DB::raw("DELETE FROM inv_lot_loc_id WHERE lotnum = ? AND traceid = ? AND traceid != '*'  AND qty = 0"),[
+            $db->delete(DB::raw("DELETE FROM inv_lot_loc_id WHERE lotnum = ? AND traceid = ? AND traceid != '*'"),[
                 $inv->lotnum,$inv->traceid
             ]);
             $invHistory = $db->selectOne(DB::raw("SELECT * FROM inv_lot_loc_id WHERE lotnum = ? AND locationid = ? AND customerid = ? AND sku = ? AND traceid = '*' FOR UPDATE"),[

+ 3 - 9
resources/views/customer/project/index.blade.php

@@ -56,7 +56,7 @@
         @endif
         <div>
             <table class="table table-sm text-nowrap table-striped table-hover td-min-width-80" id="table">
-                <tr v-for="(owner,i) in owners" :class="owner.id==id ? 'focusing' : ''"  @click="(selectTableRow(owner.id,$event)) && (id=owner.id)">
+                <tr v-for="(owner,i) in owners" :class="owner.id===id ? 'focusing' : ''"  @click="selectTableRow(owner.id)">
                     <td>
                         <label><input type="checkbox" :value="owner.id"></label>
                     </td>
@@ -177,14 +177,8 @@
                 }).init();
             },
             methods:{
-                selectTableRow(id,e){
-                    $('#headerParent tr[class=focusing]').removeClass('focusing')
-                    if (id === this.selectTr) {
-                        this.selectTr = '';
-                        return;
-                    }
-                    this.selectTr = id;
-                    $(e.target).parent('tr').addClass('focusing')
+                selectTableRow(id){
+                    this.id = id;
                 },
                 executeExport(isAll){
                     let url = '{{url('customer/project/index/export')}}';