Commit 9ca9c6d99681f4ab4ab911f0dbbf2b3976b066e2

Authored by tongzhonghao
1 parent 6147bc37

调整组盘页面

src/main/resources/templates/receipt/receiving/receiving.html
@@ -79,6 +79,7 @@ @@ -79,6 +79,7 @@
79 <li> 79 <li>
80 <select id="batteryTypes" name="batteryTypes" class="form-control" type="text" placeholder="电池类必填"> 80 <select id="batteryTypes" name="batteryTypes" class="form-control" type="text" placeholder="电池类必填">
81 <option value="">请选择电池类型</option> 81 <option value="">请选择电池类型</option>
  82 + <option value="1">电池包</option>
82 <option value="2">电池模块</option> 83 <option value="2">电池模块</option>
83 <option value="3">电池单体</option> 84 <option value="3">电池单体</option>
84 </select> 85 </select>
@@ -298,6 +299,10 @@ @@ -298,6 +299,10 @@
298 contentType: "application/x-www-form-urlencoded", 299 contentType: "application/x-www-form-urlencoded",
299 clickToSelect: true, 300 clickToSelect: true,
300 modalName: "收货", 301 modalName: "收货",
  302 + pagination: true, // 是否显示分页(*)
  303 + pageNumber: 1, // 初始化加载第一页,默认第一页
  304 + pageSize: 10, // 每页的记录行数(*)
  305 + pageList: [10, 25, 50, 100],
301 onRefresh: function(){ 306 onRefresh: function(){
302 307
303 }, 308 },
@@ -315,7 +320,14 @@ @@ -315,7 +320,14 @@
315 }, 320 },
316 success:res=>{ 321 success:res=>{
317 // $("#bootstrap-table1").bootstrapTable('load',res.data.list); 322 // $("#bootstrap-table1").bootstrapTable('load',res.data.list);
318 - $("#bootstrap-table2").bootstrapTable('load',res.data.inventoryList); 323 + $("#bootstrap-table2").bootstrapTable('load',res.data.inventoryList);
  324 + // console.log(res.data.inventoryList)
  325 + $("#batteryPackType").val("P1")
  326 + $("#completeness").val(res.data.currBill.completeness)
  327 + $("#batteryTypes").val(res.data.currBill.batteryTypes)
  328 + $("#electricQuantity").val(res.data.currBill.electricQuantity)
  329 + //
  330 + //请选择电池类型
319 // $("#bootstrap-table3").bootstrapTable('load',res.data.containerList); 331 // $("#bootstrap-table3").bootstrapTable('load',res.data.containerList);
320 } 332 }
321 }) 333 })