opt: 1.出库分配

wms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue

@@ -240,7 +240,7 @@ import StructIvt from '@/views/wms/st/outbill/StructIvt'
 import PointDialog from '@/views/wms/sch/point/PointDialog'
 import crudPoint from '@/views/wms/sch/point/schBasePoint'
 import crudSectattr from '@/views/wms/basedata/sectattr/sectattr'
-import { getOutBillDis } from './checkoutbill'
+import { autoCancel, getOutBillDis } from './checkoutbill'
 
 export default {
   name: 'DivDialog',
@@ -297,7 +297,6 @@ export default {
       pointList: [],
       rules: {
       },
-      overdue_qyt: 0
     }
   },
   watch: {
@@ -378,7 +377,6 @@ export default {
     deleteRow(row) {
       checkoutbill.oneCancel(row).then(res => {
         this.queryTableDtl()
-        this.updataIsOverdue()
       })
     },
     handleDtlCurrentChange(current) {
@@ -423,7 +421,6 @@ export default {
       checkoutbill.allDiv(this.mstrow).then(res => {
         this.crud.notify('分配成功！', CRUD.NOTIFICATION_TYPE.INFO)
         this.queryTableDtl()
-        this.updataIsOverdue()
         this.loadingAlldiv = false
       }).catch(() => {
         this.loadingAlldiv = false
@@ -435,7 +432,6 @@ export default {
         this.mstrow.iostorinvdtl_id = this.currentRow.iostorinvdtl_id
         checkoutbill.allDivOne(this.mstrow).then(res => {
           this.queryTableDtl()
-          this.updataIsOverdue()
           this.loadingAutodiv = false
         }).catch(() => {
           this.loadingAutodiv = false
@@ -446,7 +442,6 @@ export default {
       this.loadingAlldiv = true
       checkoutbill.allCancel(this.mstrow).then(res => {
         this.queryTableDtl()
-        this.updataIsOverdue()
         this.loadingAlldiv = false
       }).catch(() => {
         this.loadingAlldiv = false
@@ -455,10 +450,9 @@ export default {
     oneCancel() {
       this.loadingAlldiv = true
       if (this.currentRow.iostorinvdtl_id !== null) {
-        checkoutbill.allCancel(this.currentRow).then(res => {
+        checkoutbill.autoCancel(this.currentRow).then(res => {
           this.queryTableDtl()
           this.loadingAlldiv = false
-          this.updataIsOverdue()
         }).catch(() => {
           this.loadingAlldiv = false
         })
@@ -491,7 +485,6 @@ export default {
     },
     queryTableDtl2() {
       this.queryTableDtl()
-      this.updataIsOverdue()
     },
     queryTableDdis(iostorinvdtl_id) {
       checkoutbill.getOutBillDis({ 'iostorinvdtl_id': iostorinvdtl_id, 'bill_status': '01' }).then(res => {
@@ -519,13 +512,6 @@ export default {
           return stylejson
         }
       }
-    },
-    updataIsOverdue() {
-      this.rowmst.iostorinvdtl_id = this.currentRow.iostorinvdtl_id
-      checkoutbill.updataIsOverdue(this.rowmst).then(res => {
-        this.overdue_qyt = res.overdue_qyt
-        this.rowmst = res.mst
-      })
     }
   }
 }

wms/nladmin-ui/src/views/wms/st/outbill/checkoutbill.js

@@ -74,7 +74,7 @@ export function allDiv(data) {
 }
 export function allDivOne(data) {
   return request({
-    url: '/api/checkoutbill/allDivOne',
+    url: '/api/checkoutbill/autoDiv',
     method: 'post',
     data
   })
@@ -86,6 +86,13 @@ export function allCancel(data) {
     data
   })
 }
+export function autoCancel(data) {
+  return request({
+    url: '/api/checkoutbill/autoCancel',
+    method: 'post',
+    data
+  })
+}
 export function oneCancel(data) {
   return request({
     url: '/api/checkoutbill/oneCancel',
@@ -232,13 +239,6 @@ export function outReturn(data) {
     data
   })
 }
-export function updataIsOverdue(data) {
-  return request({
-    url: '/api/checkoutbill/updataIsOverdue',
-    method: 'post',
-    data
-  })
-}
 export function excelImport(data) {
   return request({
     url: '/api/checkoutbill/importExcel',
@@ -253,4 +253,4 @@ export function saveUpdate(data) {
     data
   })
 }
-export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2, outReturn, updataIsOverdue, excelImport, saveUpdate }
+export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, autoCancel, setPoint, oneSetPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne, moneySubmit, getDisNum, queryBox, getOutBillTask2, oneCancel, cancelTask, allSetPoint, oneSetPoint2, outReturn, excelImport, saveUpdate }

wms/nladmin-ui/src/views/wms/st/outbill/index.vue

@@ -334,7 +334,7 @@ export default {
     buttonChange(current) {
       if (current !== null) {
         this.currentRow = current
-        if (current.bill_status === '10' || current.bill_status === '30' || current.bill_status === '40') {
+        if (current.bill_status === '10' || current.bill_status === '20' || current.bill_status === '30' || current.bill_status === '40') {
           this.dis_flag = false
         } else {
           this.dis_flag = true