Merge remote-tracking branch 'origin/dev' into dev

sgzb-ui/src/api/claimAndRefund/receive.js

@@ -264,7 +264,14 @@ export function submitOut(params){
   })
 }
 
-
+// 领料出库  数量出库 保存
+export function submitNumOut(params){
+  return request({
+    url: '/base/leaseOutDetails/submitOut',
+    method: 'post',
+    data: params
+  })
+}
 
 
 

sgzb-ui/src/views/claimAndRefund/receive/receiveOut.vue

@@ -62,16 +62,16 @@
         <el-table-column label="领料单号" align="center" prop="code" :show-overflow-tooltip="true" />
         <el-table-column label="领料申请单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
         <el-table-column label="领料申请工程" align="center" prop="proName" :show-overflow-tooltip="true" />
-        <el-table-column label="申请数量" align="center" prop="" :show-overflow-tooltip="true">
+        <el-table-column label="申请数量" align="center" prop="preCountNum" :show-overflow-tooltip="true">
         
         </el-table-column>
         <el-table-column label="申请时间" align="center" prop="createTimes" :show-overflow-tooltip="true">
           
         </el-table-column>
-        <el-table-column label="已出库数量" align="center" prop="" :show-overflow-tooltip="true">
+        <el-table-column label="已出库数量" align="center" prop="alNum" :show-overflow-tooltip="true">
          
         </el-table-column>
-        <el-table-column label="出库状态" align="center" prop="" :show-overflow-tooltip="true">
+        <el-table-column label="出库状态" align="center" prop="taskName" :show-overflow-tooltip="true">
  
         </el-table-column>
        
@@ -226,7 +226,7 @@
             <el-button
               type="primary"
               size="mini"
-              @click="saveCodeOut"
+              @click="saveNumOut"
             >出库</el-button>
           </el-col>
         </el-row>
@@ -255,7 +255,7 @@
   </template>
   
   <script>
-  import { getUnitData,getProData,getLeaseAuditList,getLeaseAuditListDetail,getDetailsByTypeId,submitOut } from "@/api/claimAndRefund/receive.js"
+  import { getUnitData,getProData,getLeaseAuditList,getLeaseAuditListDetail,getDetailsByTypeId,submitOut,submitNumOut } from "@/api/claimAndRefund/receive.js"
   import { getTypeList } from "@/api/store/warehousing";
   import { equipmentTypeTree } from "@/api/store/tools";
   import Treeselect from "@riophae/vue-treeselect";
@@ -455,6 +455,8 @@
         // console.log(row)
         let obj = {}
         this.$set(obj,'taskId',row.taskId)
+        this.$set(id,'taskId',row.id)
+        this.$set(manageType,'taskId',1)
         this.$set(obj,'parentId',row.parentId)
         this.$set(obj,'typeName',row.typeName)
         this.$set(obj,'typeModelName',row.typeModelName)
@@ -487,7 +489,7 @@
       }, 
       //编码出库保存
       saveCodeOut(){
-        console.log(this.outObj)
+        // console.log(this.outObj)
 
         let params = this.maCodeList.map(item=>{
           let obj = {
@@ -502,23 +504,23 @@
           return obj
         })
         console.log(params)
-
-
-        // let params = {
-        //   id:this.outObj.id,
-        //   // maId:this.outQuery.maId,
-        //   typeId:this.outObj.typeId,
-        //   parentId:this.outObj.parentId,
-        //   outNum:this.outObj.outNum,
-        //   taskId:this.outObj.taskId,
-        // }
         submitOut(params).then(response => {
-            // this.outCodeList = response.rows;
+              this.$modal.msgSuccess("出库成功");
-            // this.outTotal = response.total;
+              this.openCode = false;
+              this.handleQuery();
+          }
+        );
+      },
+      saveNumOut(){
+        let param = this.outNumList[0]
+        console.log(params)
+        submitNumOut(params).then(response => {
+              this.$modal.msgSuccess("出库成功");
+              this.openNum = false;
+              this.handleQuery();
           }
         );
       },
-      
       
       //输入出库数量
       checkNum(row){
@@ -527,12 +529,6 @@
         }
       },
     
-     
-      /** 提交按钮 */
-      submitForm: function(type) {
-      
-      },
-    
       /** 导出按钮操作 */
       handleExport() {
         // this.downloadJson('material/secondaryWarehouse/exportList',JSON.stringify(this.queryParams), `二级库_${new Date().getTime()}.xlsx`)