XMLWAN 2 лет назад
Родитель
Сommit
0403b2a000
4 измененных файлов: 1434 добавлений и 400 удалений
  1. 1429 396
      package-lock.json
  2. 1 1
      src/xt_pages/stock/drugs/inventory.vue
  3. 2 1
      src/xt_pages/stock/inventory.vue
  4. 2 2
      src/xt_pages/stock/stockPrint.vue

Разница между файлами не показана из-за своего большого размера
+ 1429 - 396
package-lock.json


+ 1 - 1
src/xt_pages/stock/drugs/inventory.vue Просмотреть файл

884
          arr[i].last_stock_max_number = parseInt(arr[i].last_stock_max_number)
884
          arr[i].last_stock_max_number = parseInt(arr[i].last_stock_max_number)
885
          arr[i].last_stock_min_number = parseInt(arr[i].last_stock_min_number)
885
          arr[i].last_stock_min_number = parseInt(arr[i].last_stock_min_number)
886
 
886
 
887
-         
887
+         arr[i].storehouse_id = this.storehouse_id
888
        }
888
        }
889
 
889
 
890
        var params = {
890
        var params = {

+ 2 - 1
src/xt_pages/stock/inventory.vue Просмотреть файл

571
         }else{
571
         }else{
572
           arr[i].last_stock_count = parseInt(arr[i].last_stock_count)
572
           arr[i].last_stock_count = parseInt(arr[i].last_stock_count)
573
         }
573
         }
574
-        
574
+        arr[i].storehouse_id = this.storehouse_id
575
       }
575
       }
576
        var params = {
576
        var params = {
577
          tableData:arr,
577
          tableData:arr,
578
          storehouse_id:this.storehouse_id,
578
          storehouse_id:this.storehouse_id,
579
        }
579
        }
580
+      console.log("param23323232323232323",params)
580
       saveStockInentoryList(params).then(response=>{
581
       saveStockInentoryList(params).then(response=>{
581
         if(response.data.state == 1){
582
         if(response.data.state == 1){
582
            var inventory = response.data.data.inventory
583
            var inventory = response.data.data.inventory

+ 2 - 2
src/xt_pages/stock/stockPrint.vue Просмотреть файл

47
                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
47
                                       <span v-if="getWareInfo(item.xt_warehouse_info)>0">{{getWareInfo(item.xt_warehouse_info)}}{{item.packing_unit}}</span>
48
                                    </td>
48
                                    </td>
49
                                    <td v-if="end_time == ''">
49
                                    <td v-if="end_time == ''">
50
-                                      <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265">
50
+                                      <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id== 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265 || org_id == 10210">
51
                                         <span>
51
                                         <span>
52
                                           {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info)}}
52
                                           {{getWareInfo(item.xt_warehouse_info) - getOverFlushInfo(item.xt_warehouse_info) + getCancelSotckInfo(item.cancel_stock_info)}}
53
                                         </span>
53
                                         </span>
60
                                    </td>
60
                                    </td>
61
                                   
61
                                   
62
                                    <td v-if="end_time == ''">
62
                                    <td v-if="end_time == ''">
63
-                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265">
63
+                                     <span v-if="org_id == 9671 || org_id == 10138 || org_id == 10028 || org_id == 9675 || org_id == 4 || org_id == 3877 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9779 || org_id == 10290 || org_id == 10265 || org_id == 10210">
64
                                         {{getOverFlushInfo(item.xt_warehouse_info)}}
64
                                         {{getOverFlushInfo(item.xt_warehouse_info)}}
65
                                      </span>
65
                                      </span>
66
                                      <span v-else>
66
                                      <span v-else>