apply-clients 3.0.2 → 3.0.5-2

package/src/components/product/Process/Processes/ReceiveBatch.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="flex" style="height: auto;">
+  <div class="flex col-sm-12" style="height: auto;margin-top: 15px;min-height: 200px">
     <div class="form-inline auto" style="margin-bottom: 5px;"style="height: auto;">
       <form novalidate class="" partial>
         <div class="col-sm-10">
@@ -40,12 +40,12 @@
             </center>
           </div>
           <!--<div class="col-sm-1">-->
-            <!--<center>-->
+          <!--<center>-->
 
-              <!--<div class="col-sm-12  pull-right">-->
-                <!--<button type="button" class="btn btn-warning add-postition" @click="impexcel()" v-show="edit">导入</button>-->
-              <!--</div>-->
-            <!--</center>-->
+          <!--<div class="col-sm-12  pull-right">-->
+          <!--<button type="button" class="btn btn-warning add-postition" @click="impexcel()" v-show="edit">导入</button>-->
+          <!--</div>-->
+          <!--</center>-->
           <!--</div>-->
         </div>
       </form>
@@ -77,15 +77,16 @@
               <td @click="$parent.$parent.$parent.showdetail(row.id,$index,row.f_effective_state)">{{row.f_material_operator}}</td>
               <td @click="$parent.$parent.$parent.showdetail(row.id,$index,row.f_effective_state)">{{row.f_batch_importdate}}</td>
               <td >
-                <button class="btn btn-link" @click="$parent.$parent.$parent.showReceiptSheet(row.id)">打印</button>
+                <!--<button class="btn btn-link" v-if="showprint" @click="$parent.$parent.$parent.showReceiptSheet(row.id)">打印</button>-->
+                <button class="btn btn-link" v-if="$parent.$parent.$parent.showprint" @click="$parent.$parent.$parent.stamp(row.id,$index,row.f_effective_state)">打印</button>
               </td>
               <!--<td>{{row.f_remarks}}</td>-->
               <!--<td v-show="edit"><input type="checkbox" v-model="row.f_pay" @click="$parent.$parent.$parent.paychange(row)"/></td>-->
               <!--<td class="flex-around">-->
-                <!--<button type="button" name="button" class="btn btn-link"-->
-                        <!--@click.stop="$parent.$parent.$parent.tovoid(row)">作废-->
-                <!--</button>-->
-      <!---->
+              <!--<button type="button" name="button" class="btn btn-link"-->
+              <!--@click.stop="$parent.$parent.$parent.tovoid(row)">作废-->
+              <!--</button>-->
+              <!---->
               <!--</td>-->
             </template>
           </data-grid>
@@ -102,14 +103,19 @@
 
 
 
-      <div class="col-sm-12 span recordTable " style="margin-top: 10px;height:auto;" v-if="isShowdetail" >
-        <p>材料清单
-          <button type="button" class="close" @click="isShowdetail=false" aria-hidden="true">&times;</button>
-        </p>
-        <partial-view v-ref:single-load>
-          <data-grid :model="batchmodel"  v-ref:batchgrid>
-            <template partial='head'>
-              <tr>
+      <!--<div class="col-sm-12 span recordTable " style="margin-top: 10px;height:auto;" v-if="isShowdetail" >-->
+        <!--<p>材料清单-->
+          <!--<button type="button" class="close" @click="isShowdetail=false" aria-hidden="true">&times;</button>-->
+        <!--</p>-->
+        <!--<partial-view v-ref:single-load>-->
+          <!--<data-grid :model="batchmodel"  v-ref:batchgrid>-->
+            <!--<template partial='head'>-->
+
+      <div class="col-sm-12"  v-if="isShowdetail">
+        <h5  style="text-align: center;color: darkcyan;">
+          材料清单</h5>
+        <table  class="table table-bordered table-striped table-hover">
+          <tr style="background-color:#88C78E">
                 <th>序号</th>
                 <th>材料名称</th>
                 <th>材料类型</th>
@@ -119,53 +125,30 @@
                 <th>累计领取数量</th>
                 <th>剩余数量</th>
                 <th>材料单位</th>
-                <th >领取</th>
+                <!--<th ><button type="button" @click="$parent.$parent.$parent.lowerhair()"  class="btn btn-warning add-postition" style="width:80px; margin-left:40px;">-->
+                  <!--领取材料-->
+                <!--</button> </th>-->
                 <!--<th >操作</th>-->
               </tr>
-            </template>
-            <template partial='body'style="min-height: 100px;max-height:200px;">
-              <td>{{$index+1}}</td>
-              <td>{{row.f_batch_name}}</td>
-              <td>{{row.f_batch_type}}</td>
-              <td>{{row.f_batch_code}}</td>
-              <td>{{row.f_batch_norms}}</td>
-              <td>{{row.f_budget_num}}</td>
-              <td>{{row.f_add_receive}}</td>
-              <td>{{row.f_surplus_num}}</td>
-              <td>{{row.f_batch_company}}</td>
-              <!--<td>{{row.f_remarks}}</td>-->
-              <!--<td v-show="edit"><input type="checkbox" v-model="row.f_pay" @click="$parent.$parent.$parent.paychange(row)"/></td>-->
-              <td><input type="text"  class="form-control" v-model="row.f_receive_num"/></td>
-              <!--<td class="flex-around">-->
-                <!--<button type="button" name="button" class="btn btn-link"-->
-                        <!--@click.stop="$parent.$parent.$parent.receiveBatch(row)">领取-->
-                <!--</button>-->
-         <!---->
-              <!--</td>-->
-            </template>
-          </data-grid>
-
-        </partial-view>
+              <tr v-for="(j,row) in batchmodel.rows">
+                <td>{{$index+1}}</td>
+                <td>{{row.f_batch_name}}</td>
+                <td>{{row.f_batch_type}}</td>
+                <td>{{row.f_batch_code}}</td>
+                <td>{{row.f_batch_norms}}</td>
+                <td>{{row.f_budget_num}}</td>
+                <td>{{row.f_add_receive}}</td>
+                <td>{{row.f_surplus_num}}</td>
+                <td>{{row.f_batch_company}}</td>
+                <!--<td>{{row.f_remarks}}</td>-->
+                <!--<td v-show="edit"><input type="checkbox" v-model="row.f_pay" @click="$parent.$parent.$parent.paychange(row)"/></td>-->
+                <td><input  type="hidden"  class="form-control" v-model="row.f_receive_num" :readonly="!showprint"/></td>
+              </tr>
+        </table>
       </div>
 
 
 
-      <div class="from-group col-sm-11"  v-show="edit">
-        <center>
-          <!-- <button type="button" @click="confirm()" class="btn btn-primary" style="width:80px; margin-left:40px;"  >
-             保存
-           </button>-->
-          <button type="button" @click="commit()" class="btn btn-primary" style="width:80px; margin-left:40px;">
-            提交
-          </button>
-          <button type="button" @click="lowerhair()" class="btn btn-primary" style="width:80px; margin-left:40px;">
-            下发
-          </button>
-          <button type="button" @click="reset()" class="btn btn-warning" style="width:80px; margin-left:40px;">
-            取消
-          </button>
-        </center>
-      </div>
     </div>
 
     <modal :show.sync="show" v-ref:modal backdrop="false">
@@ -265,12 +248,12 @@
           <data-grid :model="receiptSheetData" v-ref:grid1  partial='list'>
             <template partial='head'>
               <tr>
-                <th><nobr>序号</nobr></th>
-                <th><nobr>流程编号</nobr></th>
-                <th><nobr>操作部门</nobr></th>
-                <th><nobr>领料批次操作人</nobr></th>
-                <th><nobr>领料时间</nobr></th>
-                <th><nobr>操作</nobr></th>
+                <th><font color="white"><nobr>序号</nobr></font></th>
+                <th><font color="white"><nobr>流程编号</nobr></font></th>
+                <th><font color="white"><nobr>操作部门</nobr></font></th>
+                <th><font color="white"><nobr>领料批次操作人</nobr></font></th>
+                <th><font color="white"><nobr>领料时间</nobr></font></th>
+                <th><font color="white"><nobr>操作</nobr></font></th>
               </tr>
             </template>
             <template partial='body'>
@@ -289,62 +272,12 @@
       <footer slot="modal-footer" class="modal-footer">
       </footer>
     </modal>
-    <!--打印html-->
+    <!--打印报表html-->
     <div v-show="false">
-      <div>
-        <style id="style1">
-          table {
-            font-size: 15px;
-            border-width: 2px;
-            border-collapse: collapse;
-            border: solid 2px;
-            border-color: black;
-          }
-          table th {
-            border-width: 1px;
-            padding: 2px;
-            border-style: solid;
-          }
-          table td {
-            border-width: 1px;
-            padding: 2px;
-            border-style: solid;
-            text-align: center;
-          }
-        </style>
-        <div id="print1">
-          <table class="table">
-            <caption style="text-align: center">领料明细记录表</caption>
-            <tr>
-              <td>报建编号</td>
-              <td>{{f_apply_num}}</td>
-              <td>材料单号</td>
-              <td>{{f_material_num}}</td>
-              <td>领料操作人</td>
-              <td>{{f_sheet_operator}}</td>
-            </tr>
-            <tr>
-              <td>材料类型</td>
-              <td>材料编码</td>
-              <td>材料名称</td>
-              <td>材料规格</td>
-              <td>材料单位</td>
-              <td>领取数量</td>
-            </tr>
-            <tr v-for="row in receiptDetailData">
-              <td>{{row.f_batch_type}}</td>
-              <td>{{row.f_batch_code}}</td>
-              <td>{{row.f_batch_name}}</td>
-              <td>{{row.f_batch_norms}}</td>
-              <td>{{row.f_batch_company}}</td>
-              <td>{{row.f_receipt_num}}</td>
-            </tr>
-          </table>
-        </div>
+      <div class="row" style="display: flex;justify-content: center;" id='bill-fee'>
+        {{{bill}}}
       </div>
-      <print-element id='print1' styleid='style1' v-ref:printreceipt
-                     top='40' left='60' width='100%' height='100%'>
-      </print-element>
+      <report-print id='bill-fee' top='15mm' left='5mm' width='90%'  height='70%' :showbtn="false" preview="true" v-ref:reportprint></report-print>
     </div>
   </div>
 </template>
@@ -388,8 +321,8 @@
             }else{
               self.$showMessage('作废后不可恢复，确认删除吗？', ['confirm', 'cancel']).then((res) => {
                 if (res === 'confirm') {
-                  self.$resetpost('rs/logic/tovoidbatch',{id: row.id}).then((res) => {
-                    getInfo(self,0,0)
+                  self.$resetpost('rs/logic/tovoidbatch',{id: row.id}).then(async (res) => {
+                    await getInfo(self,0,0)
                   })
                 }
               })
@@ -451,7 +384,21 @@
   }
   export default {
     title: '材料信息',
-    props: ['selectdata','edit'],
+    props: {
+      selectdata: {
+        type: Object
+      },
+      edit: {
+        type: Boolean
+      },
+      state: {
+        type: Number
+      },
+      showprint: {
+        type: Boolean,
+        default: true
+      }
+    },
     data() {
       return {
         fmaterialtype: [],
@@ -495,10 +442,12 @@
         f_apply_num: '', // 打印显示的报建编号
         f_material_num: '', // 打印显示的材料编号
         f_sheet_operator: '' ,// 打印显示的领料人
-        pgd:''
-     }
+        pgd:'',
+        bill: ''  // 票数据
+      }
     },
     async ready() {
+      this.isShowdetail = false
       this.load()
       getInfo(this,0,0)
     },
@@ -507,7 +456,9 @@
         this.$dispatch('get-pgd', this.pgd)
       },
       'selectdata.f_process_id'() {
+        this.isShowdetail=false
         this.headers.blodid = this.selectdata.f_process_id
+        this.load()
         getInfo(this,0,0)
       },
       deep:true
@@ -583,6 +534,171 @@
       }
     },
     methods: {
+      async stamp(id,index,f_effective_state){
+        console.log("id",id)
+        // 点击后显示详情
+        // await this.showdetail(id,index,f_effective_state)
+        let val = id
+        if (f_effective_state === '无效'){
+          this.pgd =''
+          this.isShowdetail=false
+        }else {
+          this.pgd = this.selectdata.f_contract_number+'-C'+val
+          console.log(val)
+          this.isShowdetail=true
+          await  getInfo(this,1,val)
+          this.batchindex=index
+        }
+        // 点击领料按钮
+        // await  this.lowerhair()
+        console.log('领取了')
+        let greater=true//判断领取数量不能大于剩余数量
+        let isPicking=true
+        if (this.batchmodel.rows.length<=0){
+          this.$showMessage('请选择具体批次进行领料！')
+        }else{
+          for (var i = 0; i < this.batchmodel.rows.length; i++) {
+            // console.log('第'+i+'条的值为：'+this.batchmodel.rows[i].f_receive_num)
+            if(!this.batchmodel.rows[i].f_receive_num||this.batchmodel.rows[i].f_receive_num<=0){
+              this.batchmodel.rows[i].f_receive_num=this.batchmodel.rows[i].f_surplus_num
+            }
+
+            if (this.batchmodel.rows[i].f_surplus_num<this.batchmodel.rows[i].f_receive_num) {
+              greater=false
+              this.$showMessage('领取数量不能大于剩余数量')
+              break
+            }
+            if(this.batchmodel.rows[i].f_surplus_num == 0 && this.batchmodel.rows[i].f_add_receive !=0) {
+              greater=false
+              this.$showAlert(this.batchmodel.rows[i].f_batch_type+' 已全部领取。', 'info', 2000)
+            }
+            this.batchmodel.rows[i].f_receipt_num=Number(this.batchmodel.rows[i].f_receive_num)
+            this.batchmodel.rows[i].f_detail_operator=this.$login.f.name
+            this.batchmodel.rows[i].f_add_receive=this.accAdd(Number(this.batchmodel.rows[i].f_add_receive),Number(this.batchmodel.rows[i].f_receive_num))
+            if (this.batchmodel.rows[i].f_budget_num<this.batchmodel.rows[i].f_add_receive) {
+              this.batchmodel.rows[i].f_surplus_num=0
+            }else{
+              this.batchmodel.rows[i].f_surplus_num=this.accSub(Number(this.batchmodel.rows[i].f_budget_num),Number(this.batchmodel.rows[i].f_add_receive))
+            }
+            this.batchmodel.rows[i].f_receive_num= this.batchmodel.rows[i].f_surplus_num
+
+            if ( this.batchmodel.rows[i].f_surplus_num !=0){
+              isPicking=false
+            }
+
+          }
+          if (isPicking) {
+            this.model.rows[this.batchindex].f_picking_state='已领完'
+          }
+
+          let http3 = new HttpResetClass()
+          let data3 = {
+            tablename: 't_receipt_sheet',
+            condition: `f_apply_num = '${this.selectdata.f_apply_num}'`
+          }
+          let res3 = await  http3.load('POST','rs/sql/singleTable', {data:data3},{resolveMsg: '查询成功', rejectMsg: '查询失败'})
+          if(res3.data.length==0){
+            let data = {
+              f_batch_id:this.model.rows[this.batchindex].id,
+              f_apply_num:this.model.rows[this.batchindex].f_apply_num,
+              processid:this.model.rows[this.batchindex].processid,
+              f_filiale:this.model.rows[this.batchindex].f_filiale,
+              f_parentname:this.model.rows[this.batchindex].f_parentname,
+              f_sheet_operator:this.$login.f.name,
+              f_picking_state:this.model.rows[this.batchindex].f_picking_state,
+              batchmodel:this.batchmodel.rows
+            }
+            await this.$resetpost('rs/logic/receipt_batch', data,{resolveMsg: '领取成功', rejectMsg: '领取失败'}).then((res) => {
+              if (!this.state){
+                this.printReceiptSheet(data.f_batch_id)
+              }
+              getInfo(this,0,0)
+
+            })
+          }else if (greater){
+            let data = {
+              f_batch_id:this.model.rows[this.batchindex].id,
+              f_apply_num:this.model.rows[this.batchindex].f_apply_num,
+              processid:this.model.rows[this.batchindex].processid,
+              f_filiale:this.model.rows[this.batchindex].f_filiale,
+              f_parentname:this.model.rows[this.batchindex].f_parentname,
+              f_sheet_operator:this.$login.f.name,
+              f_picking_state:this.model.rows[this.batchindex].f_picking_state,
+              batchmodel:this.batchmodel.rows
+            }
+            await  this.$resetpost('rs/logic/receipt_batch', data,{resolveMsg: '领取成功', rejectMsg: '领取失败'}).then((res) => {
+              if (!this.state){
+                this.printReceiptSheet(data.f_batch_id)
+              }
+               getInfo(this,0,0)
+
+            })
+
+          }
+
+        }
+
+        // 点击原打印按钮
+        // this.showReceiptSheet(id)
+
+
+
+        // 显示该材料批次下的领料批次
+        let data = {
+          tablename: 't_receipt_sheet',
+          condition: `f_batch_id = ${id}`
+        }
+        let res = await this.$resetpost('rs/sql/singleTable',{data: data}, {resolveMsg: null, rejectMsg: "获取领料记录失败!"})
+        if (!res.data.length) {
+          this.$showMessage('该材料批次下无领料明细')
+          return
+        }
+        this.receiptSheetData.rows = res.data
+        this.receiptSheetShow = true
+        // 打印第一个
+        // this.printReceiptDetail(this.receiptSheetData[0])
+        let row = this.receiptSheetData[0]
+        let printdata ={}
+        printdata = this.$parent.getmodel()
+        // this.$parent.$refs.service_show.getmodel()
+        printdata = Object.assign(this.selectdata,printdata)
+        for (var k in printdata) {
+          if (printdata[k] == null){
+            printdata[k] = ''
+          }
+        }
+        printdata.tablename = 't_receipt_detail'
+        printdata.condition = `f_sheet_id = ${row.id}`
+        if((printdata.f_work_startdate)||(printdata.f_finished_time)||(printdata.f_application_time)){
+          if(printdata.f_work_startdate.length>10){
+            printdata.f_work_startdate=printdata.f_work_startdate.substring(0,11)
+          }
+          if(printdata.f_application_time.length>10){
+            printdata.f_application_time = printdata.f_application_time.substring(0,11)
+          }
+          if(printdata.f_finished_time.length>10){
+            printdata.f_finished_time=printdata.f_finished_time.substring(0,11)
+          }
+        }
+        res = await this.$resetpost('rs/report/paigongdan',{data: printdata}, {resolveMsg: null, rejectMsg: "提取数据出错，请重试!"})
+        this.bill = res.data
+        this.$nextTick(()=>{
+          this.$refs.reportprint.print()
+        })
+      },
+      async printReceiptSheet(id) {
+        let data = {
+          tablename: 't_receipt_sheet',
+          condition: `id=(select max(id) from t_receipt_sheet where f_batch_id = ${id})`
+        }
+        await this.$resetpost('rs/sql/singleTable',{data: data}, {resolveMsg: null, rejectMsg: "获取领料记录失败!"}).then((res)=>{
+          if (res.data.length < 1) {
+            this.$showMessage('该材料批次下无领料明细')
+            return
+          }
+          this.printReceiptDetail(res.data[0])
+        })
+      },
       async showReceiptSheet (id) {
         // 显示该材料批次下的领料批次
         let data = {
@@ -603,21 +719,41 @@
       },
       // 打印领料批次下的领料明细
       async printReceiptDetail (row) {
-        let data = {
-          tablename: 't_receipt_detail',
-          condition: `f_sheet_id = ${row.id}`
+        console.log("row:",row)
+        let printdata = {}
+        if(this.$parent.model){
+          printdata = this.$parent.getmodel()
         }
-        let res = await this.$resetpost('rs/sql/singleTable',{data: data}, {resolveMsg: null, rejectMsg: "获取领料明细失败!"})
-        if (!res.data.length) {
-          this.$showMessage('该领料批次下无领料明细')
-          return
+
+        // this.$parent.$refs.service_show.getmodel()
+        printdata = Object.assign(this.selectdata,printdata)
+        for (var k in printdata) {
+          if (printdata[k] == null){
+            printdata[k] = ''
+          }
         }
-        this.f_apply_num = row.f_apply_num
-        this.f_material_num = `${row.f_apply_num}-C${row.f_batch_id}`
-        this.f_sheet_operator = row.f_sheet_operator
-        this.receiptDetailData = res.data
+        // 派工单号的处理：
+        // 如果t_apply中没有则由生成
+        if((!printdata.f_dispatched_number)&&row.f_batch_id){
+          printdata.f_dispatched_number = this.selectdata.f_contract_number+'-C'+row.f_batch_id
+        }
+        printdata.tablename = 't_receipt_detail'
+        printdata.condition = `f_sheet_id = ${row.id}`
+        if((printdata.f_work_startdate)||(printdata.f_finished_time)||(printdata.f_application_time)){
+          if(printdata.f_work_startdate.length>10){
+            printdata.f_work_startdate=printdata.f_work_startdate.substring(0,11)
+          }
+          if(printdata.f_application_time.length>10){
+            printdata.f_application_time = printdata.f_application_time.substring(0,11)
+          }
+          if(printdata.f_finished_time.length>10){
+            printdata.f_finished_time=printdata.f_finished_time.substring(0,11)
+          }
+        }
+        let res = await this.$resetpost('rs/report/paigongdan',{data: printdata}, {resolveMsg: null, rejectMsg: "提取数据出错，请重试!"})
+        this.bill = res.data
         this.$nextTick(()=>{
-          this.$refs.printreceipt.PrintTable()
+          this.$refs.reportprint.print()
         })
       },
       // 父组件更新子组件属性
@@ -625,16 +761,16 @@
         this.headers.blodid = val.f_process_id
         this.selectdata = val
       },
-      showdetail(val,index,f_effective_state) {
+      async showdetail(val,index,f_effective_state) {
 
         if (f_effective_state === '无效'){
           this.pgd =''
-            this.isShowdetail=false
+          this.isShowdetail=false
         }else {
-          this.pgd = this.selectdata.f_contract_number+'C-'+val
+          this.pgd = this.selectdata.f_contract_number+'-C'+val
           console.log(val)
           this.isShowdetail=true
-          getInfo(this,1,val)
+          await  getInfo(this,1,val)
           this.batchindex=index
         }
 
@@ -701,6 +837,7 @@
       },
 
       lowerhair() {
+        console.log('领取了')
         let greater=true//判断领取数量不能大于剩余数量
         let isPicking=true
         if (this.batchmodel.rows.length<=0){
@@ -708,12 +845,19 @@
         }else{
           for (var i = 0; i < this.batchmodel.rows.length; i++) {
             // console.log('第'+i+'条的值为：'+this.batchmodel.rows[i].f_receive_num)
+            if(!this.batchmodel.rows[i].f_receive_num||this.batchmodel.rows[i].f_receive_num<=0){
+              this.batchmodel.rows[i].f_receive_num=this.batchmodel.rows[i].f_surplus_num
+            }
 
             if (this.batchmodel.rows[i].f_surplus_num<this.batchmodel.rows[i].f_receive_num) {
               greater=false
               this.$showMessage('领取数量不能大于剩余数量')
               break
             }
+            if(this.batchmodel.rows[i].f_surplus_num == 0 && this.batchmodel.rows[i].f_add_receive !=0) {
+              greater=false
+              this.$showAlert(this.batchmodel.rows[i].f_batch_type+' 已全部领取。', 'info', 2000)
+            }
             this.batchmodel.rows[i].f_receipt_num=Number(this.batchmodel.rows[i].f_receive_num)
             this.batchmodel.rows[i].f_detail_operator=this.$login.f.name
             this.batchmodel.rows[i].f_add_receive=this.accAdd(Number(this.batchmodel.rows[i].f_add_receive),Number(this.batchmodel.rows[i].f_receive_num))
@@ -734,40 +878,42 @@
           }
 
 
-         if (greater){
-           let data = {
-             f_batch_id:this.model.rows[this.batchindex].id,
-             f_apply_num:this.model.rows[this.batchindex].f_apply_num,
-             processid:this.model.rows[this.batchindex].processid,
-             f_filiale:this.model.rows[this.batchindex].f_filiale,
-             f_parentname:this.model.rows[this.batchindex].f_parentname,
-             f_sheet_operator:this.$login.f.name,
-             f_picking_state:this.model.rows[this.batchindex].f_picking_state,
-             batchmodel:this.batchmodel.rows
-
-           }
-           this.$resetpost('rs/logic/receipt_batch', data,{resolveMsg: '下发成功', rejectMsg: '下发失败'}).then((res) => {
-             getInfo(this,0,0)
+          if (greater){
+            let data = {
+              f_batch_id:this.model.rows[this.batchindex].id,
+              f_apply_num:this.model.rows[this.batchindex].f_apply_num,
+              processid:this.model.rows[this.batchindex].processid,
+              f_filiale:this.model.rows[this.batchindex].f_filiale,
+              f_parentname:this.model.rows[this.batchindex].f_parentname,
+              f_sheet_operator:this.$login.f.name,
+              f_picking_state:this.model.rows[this.batchindex].f_picking_state,
+              batchmodel:this.batchmodel.rows
+            }
+            this.$resetpost('rs/logic/receipt_batch', data,{resolveMsg: '领取成功', rejectMsg: '领取失败'}).then((res) => {
+              if (!this.state){
+                this.printReceiptSheet(data.f_batch_id)
+              }
+              getInfo(this,0,0)
 
-           })
+            })
 
-         }
+          }
 
         }
 
 
       },
-       accSub(arg1, arg2) {
-       var r1, r2, m, n;
-       try { r1 = arg1.toString().split(".")[1].length } catch (e) { r1 = 0 }
+      accSub(arg1, arg2) {
+        var r1, r2, m, n;
+        try { r1 = arg1.toString().split(".")[1].length } catch (e) { r1 = 0 }
         try { r2 = arg2.toString().split(".")[1].length } catch (e) { r2 = 0 }
-       m = Math.pow(10, Math.max(r1, r2));
-       //last modify by deeka
-       //动态控制精度长度
-       n = (r1 >= r2) ? r1 : r2;
+        m = Math.pow(10, Math.max(r1, r2));
+        //last modify by deeka
+        //动态控制精度长度
+        n = (r1 >= r2) ? r1 : r2;
         return ((arg1 * m - arg2 * m) / m).toFixed(n);
-         },
-        reset() {
+      },
+      reset() {
         this.$dispatch('close')
         this.$dispatch('selfsearch')
       },
@@ -824,6 +970,7 @@
 
       },
       filterParams(f_material_operator,f_effective_stated,f_picking_stated) {
+        this.isShowdetail = false
         if ((f_material_operator && f_material_operator !== "")||
           (f_picking_stated && f_picking_stated !== "")&&(f_effective_stated && f_effective_stated !== "")) {
           let temp = []
@@ -868,7 +1015,7 @@
 
       },
       receiveBatch(row) {
-       console.log(row.f_receive_num)
+        console.log(row.f_receive_num)
       },
       // 缴费情况修改
       paychange(row) {
@@ -986,7 +1133,6 @@
   .recordTable table tr:hover {
     background-color: rgb(230, 230, 230);
   }
-
   td {
     text-align: center !important
   }