wms / wms4_hh · Commits

Commit 2a5e1411c4022977ab336d6f324d43e1ff9444c8

Authored by 谭毅彬
1 parent 0e1ce614
develop

入库单页面，出库单页面单据审核BUG修复 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 3 changed files with 78 additions and 79 deletions
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
  View file @2a5e141
... ... @@ -390,39 +390,38 @@ export default {
390 390 if (this.selectedRowKeys.length <= 0) {
391 391 this.$message.warning('请选择一条记录！');
392 392 return;
393   - } else {
394   - var ids = "";
395   - for (var a = 0; a < this.selectedRowKeys.length; a++) {
396   - if (this.selectionRows[a].status == 0) {
397   - ids += this.selectedRowKeys[a] + ",";
398   - }
399   - }
400   - if(ids == "") {
401   - this.$message.warning("没有符合取消条件的组盘");
402   - return;
  393 + }
  394 + var ids = "";
  395 + for (var a = 0; a < this.selectedRowKeys.length; a++) {
  396 + if (this.selectionRows[a] != null && this.selectionRows[a].status == 0) {
  397 + ids += this.selectedRowKeys[a] + ",";
403 398 }
404   - var that = this;
405   - this.$confirm({
406   - title: "确认删除",
407   - content: "是否删除选中数据?",
408   - onOk: function () {
409   - that.loading = true;
410   - deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
411   - if (res.success) {
412   - //重新计算分页问题
413   - that.reCalculatePage(that.selectedRowKeys.length)
414   - that.$message.success(res.message);
415   - that.loadData();
416   - that.onClearSelected();
417   - } else {
418   - that.$message.warning(res.message);
419   - }
420   - }).finally(() => {
421   - that.loading = false;
422   - });
423   - }
424   - });
425 399 }
  400 + if(ids == "") {
  401 + this.$message.warning("没有符合取消条件的记录！");
  402 + return;
  403 + }
  404 + var that = this;
  405 + this.$confirm({
  406 + title: "确认删除",
  407 + content: "是否删除选中数据?",
  408 + onOk: function () {
  409 + that.loading = true;
  410 + deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
  411 + if (res.success) {
  412 + //重新计算分页问题
  413 + that.reCalculatePage(that.selectedRowKeys.length)
  414 + that.$message.success(res.message);
  415 + that.loadData();
  416 + that.onClearSelected();
  417 + } else {
  418 + that.$message.warning(res.message);
  419 + }
  420 + }).finally(() => {
  421 + that.loading = false;
  422 + });
  423 + }
  424 + });
426 425 },
427 426 loadData(arg) {
428 427 if (!this.url.list) {
... ...
ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
  View file @2a5e141
... ... @@ -300,68 +300,68 @@ export default {
300 300 if (this.selectedRowKeys.length <= 1) {
301 301 this.$message.warning('至少选择两条记录！')
302 302 return
303   - } else {
304   - var shipmentContainerHeaderList = []
305   - var shipmentContainerHeader = null
306   - for (var a = 0; a < this.selectedRowKeys.length; a++) {
307   - if (this.selectionRows[a] != null && this.selectionRows[a].status == 0) {
308   - if (shipmentContainerHeader == null) {
309   - shipmentContainerHeader = this.selectionRows[a]
310   - }
311   - if (shipmentContainerHeader.taskType == this.selectionRows[a].taskType) {
312   - shipmentContainerHeaderList.push(this.selectionRows[a])
313   - }
  303 + }
  304 + var shipmentContainerHeaderList = []
  305 + var shipmentContainerHeader = null
  306 + for (var a = 0; a < this.selectedRowKeys.length; a++) {
  307 + if (this.selectionRows[a] != null && this.selectionRows[a].status == 0) {
  308 + if (shipmentContainerHeader == null) {
  309 + shipmentContainerHeader = this.selectionRows[a]
  310 + }
  311 + if (shipmentContainerHeader.taskType == this.selectionRows[a].taskType) {
  312 + shipmentContainerHeaderList.push(this.selectionRows[a])
314 313 }
315   - }
316   - if (shipmentContainerHeaderList.length > 0) {
317   - this.$refs.modalForm2.batchEdit(shipmentContainerHeaderList)
318   - this.$refs.modalForm2.title = '选择出库口'
319   - } else {
320   - this.$message.error("至少选择两条符合条件的记录！")
321 314 }
322 315 }
  316 + if (shipmentContainerHeaderList.length > 0) {
  317 + this.$refs.modalForm2.batchEdit(shipmentContainerHeaderList)
  318 + this.$refs.modalForm2.title = '选择出库口'
  319 + } else {
  320 + this.$message.error("至少选择两条符合条件的记录！")
  321 + }
323 322 },
324 323 cancelBatchTask() {
325 324 if (!this.url.deleteBatch) {
326   - this.$message.error("请设置url.deleteBatch属性!")
  325 + this.$message.error('请设置url.deleteBatch属性!')
327 326 return
328 327 }
329 328 if (this.selectedRowKeys.length <= 0) {
330   - this.$message.warning('请选择一条记录！');
331   - return;
332   - } else {
333   - var ids = "";
334   - for (var a = 0; a < this.selectedRowKeys.length; a++) {
335   - if (this.selectionRows[a].status == 0) {
336   - ids += this.selectedRowKeys[a] + ",";
337   - }
338   - }
339   - if(ids == "") {
340   - this.$message.warning("没有符合取消条件的组盘");
341   - return;
  329 + this.$message.warning('请选择一条记录！')
  330 + return
  331 + }
  332 + var ids = ''
  333 + for (var a = 0; a < this.selectedRowKeys.length; a++) {
  334 + if (this.selectionRows[a] != null && this.selectionRows[a].status == 0) {
  335 + ids += this.selectedRowKeys[a] + ','
342 336 }
343   - var that = this;
344   - this.$confirm({
345   - title: "确认删除",
346   - content: "是否删除选中数据?",
347   - onOk: function () {
348   - that.loading = true;
349   - deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
  337 + }
  338 + if (ids == '') {
  339 + this.$message.warning('没有符合取消条件的记录！')
  340 + return
  341 + }
  342 + var that = this
  343 + this.$confirm({
  344 + title: '确认删除',
  345 + content: '是否删除选中数据?',
  346 + onOk: function() {
  347 + that.loading = true
  348 + deleteAction(that.url.deleteBatch, { ids: ids })
  349 + .then(res => {
350 350 if (res.success) {
351 351 //重新计算分页问题
352 352 that.reCalculatePage(that.selectedRowKeys.length)
353   - that.$message.success(res.message);
354   - that.loadData();
355   - that.onClearSelected();
  353 + that.$message.success(res.message)
  354 + that.loadData()
  355 + that.onClearSelected()
356 356 } else {
357   - that.$message.warning(res.message);
  357 + that.$message.warning(res.message)
358 358 }
359   - }).finally(() => {
360   - that.loading = false;
361   - });
362   - }
363   - });
364   - }
  359 + })
  360 + .finally(() => {
  361 + that.loading = false
  362 + })
  363 + }
  364 + })
365 365 },
366 366 loadData(arg) {
367 367 if (!this.url.list) {
... ...
ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
  View file @2a5e141
... ... @@ -85,7 +85,7 @@
85 85 <div class="table-operator">
86 86 <a-button @click="createEmptyIn()" v-has="'taskHeader:emptyIn'" type="primary">空托入库</a-button>
87 87 <a-button @click="createManyEmptyIn()" v-has="'taskHeader:manyEmptyIn'" type="primary">空托组入库</a-button>
88   - <a-button @click="openDemo()" type="primary">弹出demo</a-button>
  88 + <!-- <a-button @click="openDemo()" type="primary">弹出demo</a-button> -->
89 89 </div>
90 90  
91 91 <!-- table区域-begin -->
... ...