rev:更新

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

@@ -382,18 +382,22 @@ export default {
         this.form2.unassign_qty = current.unassign_qty
         this.form2.assign_qty = current.assign_qty
         this.tabledis = []
-        if (current.bill_status === '10') {
+        if (current.bill_status === '15') {
           this.button1 = false
           this.button2 = true
           this.button3 = false
-        } else if (current.bill_status === '30') {
+        } else if (current.bill_status === '20') {
           this.button1 = false
           this.button2 = false
           this.button3 = false
-        } else if (current.bill_status === '40') {
+        } else if (current.bill_status === '30') {
           this.button1 = true
           this.button2 = false
           this.button3 = true
+        } else {
+          this.button1 = true
+          this.button2 = true
+          this.button3 = true
         }
         this.queryTableDdis(current.iostorinvdtl_id)
       } else {

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

@@ -38,6 +38,13 @@ export function getOutBillDis(params) {
     params
   })
 }
+export function audit(data) {
+  return request({
+    url: '/api/checkoutbill/audit',
+    method: 'post',
+    data
+  })
+}
 export function allDiv(data) {
   return request({
     url: '/api/checkoutbill/allDiv',
@@ -116,4 +123,4 @@ export function outReturn(data) {
   })
 }
 
-export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, autoCancel, getStructIvt, manualDiv, confirm, allDivOne, getOutBillTask, oneCancel, allSetPoint, outReturn }
+export default { add, edit, del, audit, allDiv, allCancel, getOutBillDtl, getOutBillDis, autoCancel, getStructIvt, manualDiv, confirm, allDivOne, getOutBillTask, oneCancel, allSetPoint, outReturn }

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

@@ -118,6 +118,18 @@
       </div>
       <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
       <crudOperation :permission="permission">
+        <el-button
+          slot="right"
+          class="filter-item"
+          type="warning"
+          icon="el-icon-check"
+          size="mini"
+          :loading="loadingAudit"
+          :disabled="audit_flag"
+          @click="audit"
+        >
+          审核
+        </el-button>
         <el-button
           slot="right"
           class="filter-item"
@@ -134,7 +146,7 @@
           v-permission="permission.confirm"
           class="filter-item"
           :loading="loadingConfirm"
-          type="warning"
+          type="danger"
           :disabled="confirm_flag"
           icon="el-icon-check"
           size="mini"
@@ -191,6 +203,8 @@
         <el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="100" />
         <el-table-column show-overflow-tooltip label="制单人" align="center" prop="input_optname" />
         <el-table-column show-overflow-tooltip label="制单时间" align="center" prop="input_time" width="140" />
+        <el-table-column show-overflow-tooltip label="审核人" align="center" prop="audit_optname" />
+        <el-table-column show-overflow-tooltip label="审核时间" align="center" prop="audit_time" width="140" />
         <el-table-column show-overflow-tooltip label="修改人" align="center" prop="update_optname" />
         <el-table-column show-overflow-tooltip label="修改时间" align="center" prop="update_time" width="140" />
         <el-table-column show-overflow-tooltip label="分配人" align="center" prop="dis_optname" />
@@ -249,7 +263,9 @@ export default {
         confirm: ['admin', 'checkoutbill:confirm']
       },
       loadingConfirm: false,
+      loadingAudit: false,
       divShow: false,
+      audit_flag: true,
       dis_flag: true,
       confirm_flag: true,
       business_confirm_flag: true,
@@ -334,12 +350,13 @@ export default {
     buttonChange(current) {
       if (current !== null) {
         this.currentRow = current
-        if (current.bill_status === '10' || current.bill_status === '20' || current.bill_status === '30' || current.bill_status === '40') {
+        this.audit_flag = current.bill_status !== '10'
+        if (current.bill_status === '15' || current.bill_status === '20' || current.bill_status === '30') {
           this.dis_flag = false
         } else {
           this.dis_flag = true
         }
-        if (current.bill_status === '50' || current.bill_status === '40' || current.bill_status === '30') {
+        if (current.bill_status === '30') {
           this.confirm_flag = false
         } else {
           this.confirm_flag = true
@@ -349,7 +366,7 @@ export default {
         } else {
           this.business_confirm_flag = true
         }
-        if (current.bill_status === '40' || current.bill_status === '30') {
+        if (current.bill_status === '30') {
           this.outReturn_flag = false
         } else {
           this.outReturn_flag = true
@@ -370,6 +387,7 @@ export default {
     },
     handleCurrentChange(current) {
       if (current === null) {
+        this.audit_flag = true
         this.dis_flag = true
         this.confirm_flag = true
         this.outReturn_flag = true
@@ -387,6 +405,16 @@ export default {
         this.mstrow = this.currentRow
       })
     },
+    audit() {
+      this.loadingAudit = true
+      checkoutbill.audit({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(() => {
+        this.querytable()
+        this.crud.notify('审核成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.loadingAudit = false
+      }).catch(() => {
+        this.loadingAudit = false
+      })
+    },
     confirm() {
       this.loadingConfirm = true
       checkoutbill.confirm({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {