合并

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

@@ -20,7 +20,7 @@
     </span>
     <div class="crud-opts2">
       <span class="role-span">出库明细</span>
-      <div class="crud-opts-form">
+      <!--    <div class="crud-opts-form">
         <el-form ref="form" :inline="true" :model="form" size="mini">
           <el-form-item label="库区" prop="gender2">
             <el-cascader
@@ -32,7 +32,7 @@
             />
           </el-form-item>
         </el-form>
-      </div>
+      </div>-->
       <span class="crud-opts-right2">
         <!--左侧插槽-->
         <slot name="left" />
@@ -442,7 +442,7 @@ export default {
     oneDiv() {
       if (this.currentRow.iostorinvdtl_id !== null) {
         this.mstrow.iostorinvdtl_id = this.currentRow.iostorinvdtl_id
-        checkoutbill.allDiv(this.mstrow).then(res => {
+        checkoutbill.allDivOne(this.mstrow).then(res => {
           this.queryTableDtl()
         })
       }

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

@@ -72,6 +72,13 @@ export function allDiv(data) {
     data
   })
 }
+export function allDivOne(data) {
+  return request({
+    url: '/api/checkoutbill/allDivOne',
+    method: 'post',
+    data
+  })
+}
 export function allCancel(data) {
   return request({
     url: '/api/checkoutbill/allCancel',
@@ -155,4 +162,4 @@ export function getType() {
     method: 'get'
   })
 }
-export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType }
+export default { add, edit, del, allDiv, allCancel, getOutBillDtl, getOutBillDis, setPoint, getOutBillTask, getStructIvt, manualDiv, confirm, issueTask, finishTask, cancleTaskfinish, getInvTypes, paramByCodeType, schAreaType, backConfirm, getOutBillDisDtl, getType, allDivOne }