Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

llj

2 天以前 25f52486200f94b4dbc99cd2823684e9380b22c3

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

 .env.development

@@ -6,16 +6,16 @@

# 智云迈思L-MOM管理系统/开发环境
# VUE_APP_BASE_API = http://localhost:81/API/
VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://47.96.97.237/API/'
# VUE_APP_BASE_API = 'http://220.189.218.155:9010/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
# VUE_APP_BASE_API = 'http://localhost:8082/API/'
# VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
VUE_APP_BASE_API = 'http://localhost:8082/LuBaoAPI/'
#锦隆
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 宁波 四维尔
# VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
#杜贺
# VUE_APP_BASE_API = http://localhost:8082/API/

 RuoYi-Vue

New file
@@ -0,0 +1 @@
Subproject commit 8a1cf9ed55747229ce4149ddacf8596fa0995814

 src/main.js

@@ -68,6 +68,9 @@
import {hiPrintPlugin} from './hiprintVue/index'
Vue.use(hiPrintPlugin)

// 是否开启 socket.io 以启动客户端静默打印功能
hiPrintPlugin.disAutoConnect()

import Storage from 'vue-ls'
let options = {
  namespace: 'hiPrint-',

 src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.vue

@@ -19,7 +19,7 @@
            </el-col>
            <el-col :span="6">
              <el-form-item label="日期" prop="HDate">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-ddT">
                <el-date-picker v-model="form.HDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd">
                </el-date-picker>
              </el-form-item>
            </el-col>
@@ -188,34 +188,34 @@
              controls-position="right"></el-input-number>
          </template>
        </el-table-column>
        <el-table-column align="center" label="税率" width="120">
          <template slot-scope="scope">
        <el-table-column align="center" label="税率" width="120" v-if="false">
          <template slot-scope="scope" v-if="false">
            <el-input-number v-model="scope.row.HTaxRate" :min="0" style="width: 90px;"
              controls-position="right"></el-input-number>
          </template>
        </el-table-column>
        <el-table-column align="center" label="单价" width="120">
        <el-table-column align="center" label="单价" width="120" v-if="false">
          <template slot-scope="scope">
            <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;"
              controls-position="right"></el-input-number>
          </template>
        </el-table-column>
        <el-table-column align="center" label="含税单价" width="120">
        <el-table-column align="center" label="含税单价" width="120" v-if="false">
          <template slot-scope="scope">
            <span>{{ scope.row.HPrice * (1 + scope.row.HTaxRate*0.01) }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="金额" width="120">
        <el-table-column align="center" label="金额" width="120"  v-if="false">
          <template slot-scope="scope">
            <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="含税金额" width="120">
        <el-table-column align="center" label="含税金额" width="120" v-if="false">
          <template slot-scope="scope">
            <span>{{ (scope.row.HPrice * (1 + scope.row.HTaxRate*0.01)) * scope.row.HQty }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="采购金额" width="120">
        <el-table-column align="center" label="采购金额" width="120"v-if="false">
          <template slot-scope="scope">
            <span>{{ scope.row.HPrice * scope.row.HQty }}</span>
          </template>
@@ -314,7 +314,7 @@
      openPageData:{},//传入弹窗的数据
      formShow: false,                                                           //表单是否显示标记
      formLoading: true,                                                         //表单加载遮罩
      zzSelDis: false,                                                           //组织下拉列表禁用标记
      zzSelDis: false,

      rowHideShow: false,                                                        //列设置组件容器显示标记
      openRowHide: false,                                                        //列设置组件显示标记
@@ -334,15 +334,13 @@
      btResList: [],                                                             // 列设置
      form: {},                                                                  // 表单参数
      rules: {                                                                   // 表单校验
        HSupName: [
          { required: true, message: "客户不能为空", trigger: "blur" }
        ],
        HDate: [
          { required: true, message: "日期不能为空", trigger: "blur" }
        ],
        HExRate: [
          { required: true, message: "汇率不能为空", trigger: "blur" }
        ]
        物料名称: [
          { required: true, message: "物料名称不能为空", trigger: "blur" }
        ],
        
      },
      
      checkedSysZb: [],
@@ -486,6 +484,7 @@
                    , 'HSCWHName': ""
                    , 'HSCSPID': "0"
                    , 'HSCSPName': ""
                    , 'HBillStatus':"0"
                    , 'HBatchNo': ""
                    , 'HPOOrderInterID': "0"
                    , 'HPOOrderEntryID': "0"
@@ -496,6 +495,7 @@
                    , 'HSecUnitName': ""
                    , 'HSecUnitRate': "0"
                    , 'HEngineNum': ""
                    ,  'HPRDORGID' :"0"
                    , 'HUnderPanNum': ""
                    , 'HLeaveFactCard': ""
                    , 'HReqBuyQty': "0"
@@ -514,6 +514,91 @@
          });
        }
      }
       else if (this.OperationType == 5) {
          this.zzSelDis = true
          this.handleAdd()
          let pushData = this.getUrlVars_JSON();
          let sourceList = pushData.data || [];
          for (let item of sourceList) {
            let hmainid = item.hmainid;
            let hsubid = item.hsubid;

            axios.get(this.$baseUrl + '/Cg_POInStockBill/cx1', {
              params: {
                HInterID: hmainid,
                HSubID: hsubid   
              }
            }).then(res => {
              let rows = res.data.data || [];
              if (!rows.length) return;
              let first = rows[0];
              if (this.editData.length === 0) {
                this.form.HSupID = first.HSupID;
                this.form.HSupName = first.供应商;
                this.form.HBillType = first.HBillType;
              }
              this.editData.push({
                HMaterID: first.HMaterID,
                "物料代码": first.物料代码,
                "物料名称": first.物料名称,
                "规格型号": first.规格型号,
                "计量单位": first.计量单位,
                 HQtyMust: first.数量,
                 HQty: first.数量,
                 HPrice: first.单价,
                HTaxRate: first.税率,
                HRemark: first.表体备注,
                HSourceInterID: hmainid,
                HSourceEntryID: hsubid,
                HSourceBillNo: first.单据号,
                HSourceBillType: first.源单类型,
                HWHID: first.HWHID,
                "收料仓库": first.收料仓库,
                HUnitID:first.HUnitID,
                HInvoiceBillNo:first.发票编码,
                HDeptID : first.HDeptID,
                HDeptName : first.部门,
                HEmpID : first.HEmpID,
                HEmpName : first.业务员,
                HManagerID : first.HManagerID,
                HManagerName : first.主管,
                HMainSourceBillType : first.HBillType,
                HSupID : first.HCusID,
                HSupName : first.客户,
                HLinkMan : first.联系人,
                HLinkPhone : first.联系电话,
                HSellSID : first.HSellSID,
                HSellSName : first.销售方式,
                HCurID : first.HCurID,
                HCurName :first.币别,
                HExRate : first.汇率,
                HWHID: first.主表仓库ID,
                HWHName: first.主表仓库,
                HSecManagerID: first.HSecManagerID,
                HSecManagerName: first.验收员,
                HRemark: first.表头备注,
                HOrgID : first.HOrgID,
                HSTOCKORGID : first.HOrgID,
                HOWNERID : first.HOrgID,
                HPieceQty: 0, HTaxPrice: 0, HMoney: 0, HTaxMoney: 0,
                HQty_Full: 0, HQty_Empty: 0, HQty_Back: 0, HCostPrice: 0, HCostMoney: 0,
                HSalePrice: 0, HSeOrderInterID: 0, HSeOrderEntryID: 0, HSeOrderBillNo: "",
                HRelationQty: 0, HRelationMoney: 0, HSPID: first.HSPID, "仓位名称": first.仓位名称,
                HSPGroupID: 0, HSPGroupName: "", HSCWHID: 0, HSCWHName: "", HSCSPID: 0, HSCSPName: "",
                HBatchNo: "", HPOOrderInterID: 0, HPOOrderEntryID: 0, HPOOrderBillNo: "",
                HPropertyID: 0, HPropertyName: "", HSecUnitID: 0, HSecUnitName: "", HSecUnitRate: 0,
                HEngineNum: "", HUnderPanNum: "", HLeaveFactCard: "", HReqBuyQty: 0, HReqOutQty: 0, HCurrentInventory: 0
              });

              this.formShow = true;
              this.formLoading = false;
            }).catch(() => {
              this.$modal.msgError("接口请求失败");
              this.formShow = true;
              this.formLoading = false;
            });
          }
        }
    },
    //#endregion

@@ -523,10 +608,6 @@
      HInterID: 0,
      HBillNo: " ",
      HDate: new Date(),
      HEmpID: 1,
      HEmpName: " ",
      HDeptID: 1,
      HDeptName: " ",
      HSupID: 1,
      HSupName: " ",
      HInvoiceBillNo: " ",
@@ -541,7 +622,9 @@
      HCloseMan: " ",
      HUpDater: " ",
      HDeleteMan: " ",
      
      HEmpName:sessionStorage["HSellMan"],
      HEmpID:sessionStorage["HSellManID"] ,                                             
                //组织下拉列表禁用标记
      HMakeDate: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
      HCheckDate: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
      HCloseDate: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
@@ -591,6 +674,12 @@
      this.reset()
      //新增获取单据号
      this.getHBillNo()
      this.form.HEmpName = sessionStorage.getItem("HSellMan") || ""
      this.form.HEmpID = sessionStorage.getItem("HSellManID") || ""
      this.form.HDeptID = sessionStorage.getItem("HDeptID") || ""
      this.form.HDeptName = sessionStorage.getItem("HDept") || ""
    
      
      if (this.OperationType == 1) {
        this.handleAddSysZb()
      }
@@ -806,6 +895,12 @@
              this.form.HWHName = deptRow.仓库名称
              this.form.HWHID = deptRow.HItemID
              this.form.HWHNumber = deptRow.仓库代码
              for (let i = 0; i < this.editData.length; i++) {
              this.editData[i].HWHID = deptRow.HItemID
              this.editData[i].HWHNumber = deptRow.仓库代码;
              this.editData[i].HWHName = deptRow.仓库名称;
              this.editData[i].收料仓库 = deptRow.仓库名称; 
            }
              this.openData = false
            }else{
              this.editData[this.zbIndex].HWHID = deptRow.HItemID;
@@ -906,18 +1001,18 @@
            if (!fhck) {
              var sMainStr = JSON.stringify(this.form);
              var sSubStr = JSON.stringify(this.editData);
              var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
              var sMainSub = sMainStr + ';' + sSubStr + ';' + this.OperationType + ';' + sessionStorage["HUserName"]+';'+this.OperationType;
              axios({
                method: 'post',
                url: this.$baseUrl + "/Kf_POStockInBill/SaveSellOutBillList",
                url: this.$baseUrl + "/Kf_POStockInBill/POStockInBillEdit",
                data: {
                  'msg': sMainSub
                  'sMainSub': sMainSub
                },
              }).then(response => {
                if (response.data.count == 1) {
                  this.subDisabled = true//设置保存按钮不可用
                  this.$modal.msgSuccess(response.data.Message);
                  // this.get_MAXNum_Task(1);//设置流水号增加
                  this.get_MAXNum_Task(1);//设置流水号增加
                  if (response.data.Verify == "Y") //自动审核
                  {
                    this.set_CheckBill(0, this.form); //审核
@@ -988,7 +1083,7 @@
          规格型号: '',
          HUnitID: 0,
          计量单位: '',
          HQtyMust: 1,
          HQtyMust: 0,
          HQty: 1,
          HPieceQty: 0,
          HPrice: 0,
@@ -1159,26 +1254,26 @@
    },
    //#endregion

    // //#region 获取最大单据号
    // get_MAXNum_Task(Type) {
    //   const formatDate = this.form.HDate
    //  ? new Date(this.form.HDate).toISOString().split('T')[0]
    // : new Date().toISOString().split('T')[0];
    //  var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1201','${formatDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
    //   axios({
    //     method: 'get',
    //     url: this.$baseUrl + "/CommonModel/searchMethod",
    //     params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
    //   }).then(response => {
    //     if (response.data.count == 1) {
    //       this.form.HBillNo = response.data.data[0].HBillNo;
    //     } else {
    //       this.$modal.msgError(response.data.code + response.data.Message);
    //     }
    //   }).catch(error => {
    //     this.$modal.msgError("接口请求失败!");
    //   });
    // },
   // #region 获取最大单据号
    get_MAXNum_Task(Type) {
      const formatDate = this.form.HDate
     ? new Date(this.form.HDate).toISOString().split('T')[0]
    : new Date().toISOString().split('T')[0];
     var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1201','${formatDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
      axios({
        method: 'get',
        url: this.$baseUrl + "/CommonModel/searchMethod",
        params: { "sql": sql, "user": sessionStorage["HUserName"], "ModRightNameCheck": "" },
      }).then(response => {
        if (response.data.count == 1) {
          this.form.HBillNo = response.data.data[0].HBillNo;
        } else {
          this.$modal.msgError(response.data.code + response.data.Message);
        }
      }).catch(error => {
        this.$modal.msgError("接口请求失败!");
      });
    },
    //#endregion

    //#region 根据用户获取对应职员、部门、销售主管

 src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillList.vue

@@ -128,7 +128,7 @@
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-document-copy" size="mini" :disabled="single"
          @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)">复制</el-button>
          @click="handleEdit(row = rowForm, OperationType = 1, copyType = 1)" v-if="false">复制</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-delete" size="mini" :disabled="single" @click="handleDelete">删除

 src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue

@@ -3,7 +3,7 @@
    <div style=" margin-bottom: 10px; border-bottom: 1px solid #f6f6f6;">
      <el-button type="primary" @click="handleAdd(OperationType = 1)" v-if="addBtnShow">新增</el-button>
      <el-button type="primary" @click="submitForm" :disabled="subDisabled">保 存</el-button>
      <el-button type="primary" @click="set_CheckBill(0, form)">审 核</el-button>
      <!-- <el-button type="primary" @click="set_CheckBill(0, form)">审 核</el-button> -->
      <el-button type="primary" @click="close">退 出</el-button>
      <!-- <el-button @click="cancel">取 消</el-button> -->
    </div>
@@ -265,31 +265,31 @@
            <span>{{ scope.row.规格型号 }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="HUnitID" width="120">
        <!-- <el-table-column align="center" label="HUnitID" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HUnitID }}</span>
          </template>
        </el-table-column>
        </el-table-column> -->
        <el-table-column align="center" label="计量单位" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.计量单位 }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="HPropertyID" width="120">
        <!-- <el-table-column align="center" label="HPropertyID" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HPropertyID }}</span>
          </template>
        </el-table-column>
        </el-table-column> -->
        <el-table-column align="center" label="辅助属性" width="120">
          <template slot-scope="scope">
              <span>{{ scope.row.辅助属性 }}</span>
          </template>
        </el-table-column>
        <el-table-column align="center" label="换算率" width="120">
        <!-- <el-table-column align="center" label="换算率" width="120">
          <template slot-scope="scope">
              <span>{{ scope.row.HSecUnitRate }}</span>
          </template>
        </el-table-column>
        </el-table-column> -->
        <el-table-column align="center" label="应发数量" width="120">
          <template slot-scope="scope">
            <span>{{ scope.row.HQtyMust }}</span>
@@ -307,7 +307,7 @@
              controls-position="right"></el-input-number>
          </template>
        </el-table-column>
        <el-table-column align="center" label="单价" width="140">
        <!-- <el-table-column align="center" label="单价" width="140">
          <template slot-scope="scope">
            <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 120px;"
              controls-position="right"></el-input-number>
@@ -328,7 +328,7 @@
          <template slot-scope="scope">
            <span>{{scope.row.HOutMoney = scope.row.HOutPrice * scope.row.HQty }}</span>
          </template>
        </el-table-column>
        </el-table-column>-->
        <el-table-column align="center" label="HWHID" width="120">
          <template slot-scope="scope">
            <span>{{scope.row.HWHID}}</span>
@@ -571,12 +571,12 @@
        HSecManagerName: "",
        HKeeperID: 0,
        HKeeperName: "",
        HDeptID: 0,
        HDeptName: "",
        HDeptID: sessionStorage["HDeptID"],
        HDeptName: sessionStorage["HDept"],
        HManagerID: 0,
        HMangerName: "",
        HEmpID: 0,
        HEmpName: "",
        HEmpID: sessionStorage["HEmpID"],
        HEmpName: sessionStorage["HEmpName"],
        HSourceBillType: "",
        HExplanation :"",
        HRemark: "",
@@ -834,6 +834,8 @@
        this.gySupplierShow = true
        this.openData = true
      } else if (num == 9) {
        this.openPageData.HWHName = ''
        this.$nextTick()
        if(this.HSPType==1){
          if(this.editData[this.zbIndex].HWHName){
            this.dialogTitle = '仓位列表'
@@ -871,6 +873,7 @@
      this.gyEmployeeShow = false
      this.gySupplierShow = false
      this.Kf_MoveStockRequestBillShow = false
      this.gyStockPlaceShow = false
    },
    //#endregion
    //#endregion
@@ -887,28 +890,40 @@
            this.form.HWHName = deptRow.仓库名称
            this.form.HWHID = deptRow.HItemID
            this.form.HWHNumber = deptRow.仓库代码
            this.form.HSPID = 1
            this.form.HSPName = ''
            for (let i = 0; i < this.editData.length; i++) {
              this.editData[i].HWHID = deptRow.HItemID
              this.editData[i].HWHNumber = deptRow.仓库代码
              this.editData[i].HWHName = deptRow.仓库名称
              this.editData[i].HSPID = 1
              this.editData[i].HSPName = ''
            }
          }else if(this.eHWHType == 2){
            this.form.HSCWHName = deptRow.仓库名称
            this.form.HSCWHID = deptRow.HItemID
            this.form.HSCWHNumber = deptRow.仓库代码
            this.form.HSCSPID = 1
            this.form.HSCSPName = ''
            for (let i = 0; i < this.editData.length; i++) {
              this.editData[i].HSCWHID = deptRow.HItemID
              this.editData[i].HSCWHNumber = deptRow.仓库代码
              this.editData[i].HSCWHName = deptRow.仓库名称
              this.editData[i].HSCSPID = 1
              this.editData[i].HSCSPName = ''
            }
          }else if(this.eHWHType == 3){
            this.editData[this.zbIndex].HWHID = deptRow.HItemID
            this.editData[this.zbIndex].HWHNumber = deptRow.仓库代码
            this.editData[this.zbIndex].HWHName = deptRow.仓库名称
            this.editData[this.zbIndex].HSPID = 1
            this.editData[this.zbIndex].HSPName = ''
          }else if(this.eHWHType == 4){
            this.editData[this.zbIndex].HSCWHID = deptRow.HItemID
            this.editData[this.zbIndex].HSCWHNumber = deptRow.仓库代码
            this.editData[this.zbIndex].HSCWHName = deptRow.仓库名称
            this.editData[this.zbIndex].HSCSPID = 1
            this.editData[this.zbIndex].HSCSPName = ''
          }
          this.warehouseShow = false
          this.openData = false
@@ -1058,7 +1073,7 @@
                if (response.data.count == 1) {
                  this.subDisabled = true//设置保存按钮不可用
                  this.$modal.msgSuccess(response.data.Message);
                  this.get_MAXNum_Task(1);//设置流水号增加
                  // this.get_MAXNum_Task(1);//设置流水号增加
                  if (response.data.Verify == "Y") //自动审核
                  {
                    this.set_CheckBill(0, this.form); //审核
@@ -1129,8 +1144,8 @@
          规格型号: '',
          HUnitID: 0,
          计量单位: '',
          HQtyMust: 1,
          HQty: 1,
          HQtyMust: 0,
          HQty: 0,
          HPieceQty: 0,
          HPrice: 0,
          HTaxPrice: 0,

 src/views/purchase/cgPoInStockBill/cgPoInStockBill.vue

@@ -288,6 +288,8 @@
          >删除
        </el-button>
      </el-col>
      
      
      <el-col :span="1.5">
        <el-button
          type="primary"
@@ -401,6 +403,10 @@
        >
      </el-col>
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-tickets" size="mini"
          @click="handlePush(row = rowForm, OperationType = 4)">下推（采购入库单）</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="primary"
          icon="el-icon-download"
@@ -409,6 +415,7 @@
          >隐藏列设置</el-button
        >
      </el-col>
      
      <el-col :span="1.5">
        <el-button type="primary" icon="el-icon-help" size="mini" @click="handleSearch"
          >搜 索</el-button
@@ -499,6 +506,10 @@
        <div style="height: 70vh" v-if="openFlag_pushBarCode">
          <iframe :src="iframeUrl" frameborder="0" width="100%" height="100%"></iframe>
        </div>
      </el-dialog>
       <el-dialog title="下推容采购入库单" :visible.sync="openPush" width="1480px" append-to-body class="xsckdBox" @close="close">
        <push :OperationType='5' :propsData='pushData' :HSouceBillType=BillType
         @editClose="pushClose" v-if="pushShow" />
      </el-dialog>
      <!-- 编辑 -->
      <el-dialog
@@ -616,12 +627,13 @@
<script>
import axios from "axios";
import RowSettings from "@/views/component/rowSettings";
import Push from '@/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit'
import gySource from "@/views/basic/gySource";
import dayjs from "dayjs";

export default {
  name: "cgPoInStockBill",
  components: { RowSettings, gySource },
  components: { RowSettings, gySource ,Push},
  props: {
    openPage: { type: String },
  },
@@ -629,6 +641,7 @@
    return {
      iframeUrl: "",
      activeSeach: "",
      pushShow: false,
      dateRange: [],
      HModName: "cgPoInStockBill",
      editShow: false,
@@ -1198,6 +1211,37 @@
        return { background: "#ecf5ff" };
      }
    },

     //打开下推组件弹窗
    handlePush() {
      if (this.rowList && this.rowList.length > 0) {
        var dataArray = [];
        for (var i = 0; i < this.rowList.length; i++) {
            if (this.rowList[i].状态 != "已审核") {
                this.$modal.msgError("下推失败！所选单据【" + this.rowList[i].单据号 + "】不为已审核状态,不允许下推！")
                return;
            }
            if (this.rowList[i].HQtyMust <= 0) {
                this.$modal.msgError("下推失败！所选单据【" + this.rowList[i].单据号 + "】对应可下推数量必须大于 0 ！")
                return;
            }
            var temp = {
                "hmainid": this.rowList[i].hmainid
                , "hsubid": this.rowList[i].hsubid
                , "HBillType": this.rowList[i].HBillType
            }
            dataArray.push(temp);
        }
        var datajson = {
            "data": dataArray
        };
        this.pushData = JSON.stringify(datajson)
        this.pushShow = true
        this.openPush = true
      } else {
          this.$modal.msgError("请选择数据下推！")
      }
    },
    //双击行
    handleDblclick(row, column, cell, event) {
      this.OperationType = 3;
@@ -1206,6 +1250,7 @@
    // 多选框选中数据
    handleSelectionChange(selection) {
      // this.rowForm = {}
      this.rowList = selection;
      this.ids = selection.map((item) => item.hmainid);
      this.single = selection.length != 1;
      this.multiple = !selection.length;
@@ -1369,11 +1414,28 @@
      this.resetForm("queryForm");
      this.getList();
    },
     //关闭下推页面
    pushClose(val) {
      this.open = val
      this.pushShow = false
      this.openPush = val
      this.clearData()
      this.getList()
    },
    //清除选中数据的缓存
    clearData(){
      this.ids = []
      this.multiple = true
      this.single = true
      this.OperationType = 0
      this.copyType = 0
    },

    //退出
    close() {
      this.tableShow = true;
      this.openEdit = false;
      this.pushShow = false;
      this.openFlag_pushBarCode = false;
      this.disabledFlag_pushBarCode = true;
      this.getList();