代码更新

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

@@ -225,4 +225,11 @@ export function oneSetPoint2(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 }
+export function outReturn(data) {
+  return request({
+    url: '/api/checkoutbill/outReturn',
+    method: 'post',
+    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 }

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

@@ -204,6 +204,18 @@
         >
           强制确认
         </el-button>
+        <el-button
+          slot="right"
+          class="filter-item"
+          :loading="loadingConfirm"
+          type="warning"
+          :disabled="outReturn_flag"
+          icon="el-icon-check"
+          size="mini"
+          @click="outReturn"
+        >
+          质量报告回传
+        </el-button>
       </crudOperation>
       <!--表格渲染-->
       <el-table
@@ -334,6 +346,7 @@ export default {
       dis_flag: true,
       work_flag: true,
       confirm_flag: true,
+      outReturn_flag: true,
       openParam: [],
       openParamMoney: null,
       mstrow: {},
@@ -400,6 +413,11 @@ export default {
         } else {
           this.confirm_flag = true
         }
+        if (current.bill_status === '40') {
+          this.outReturn_flag = false
+        } else {
+          this.outReturn_flag = true
+        }
       }
     },
     stateFormat(row) {
@@ -416,6 +434,7 @@ export default {
         this.dis_flag = true
         this.confirm_flag = true
         this.work_flag = true
+        this.outReturn_flag = true
         this.currentRow = {}
       }
     },
@@ -448,6 +467,12 @@ export default {
         this.loadingConfirm = false
       })
     },
+    outReturn() {
+      checkoutbill.outReturn({ 'iostorinv_id': this.currentRow.iostorinv_id }).then(res => {
+        this.crud.notify('回传成功！', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.querytable()
+      })
+    },
     querytable() {
       this.onSelectAll()
       this.crud.toQuery()