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

wangyi

5 天以前 939636dd7cc056f66cf7880fd2d032a138b56133

 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>
@@ -42,7 +42,7 @@
            <el-col :span="6">
              <el-form-item label="往来单位" prop="HSupName">
                <el-input v-model="form.HSupName" placeholder="请输入往来单位" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(7)"></el-button>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(6)"></el-button>
                </el-input>
              </el-form-item>
            </el-col>
@@ -73,7 +73,7 @@
            <el-col :span="6">
              <el-form-item label="选单号" prop="HMainSourceBillNo">
                <el-input v-model="form.HMainSourceBillNo" placeholder="请选择源单" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(null)"></el-button>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(11)"></el-button>
                </el-input>
              </el-form-item>
            </el-col>
@@ -224,6 +224,8 @@
        <el-table-column align="center" label="序号" type="index" width="80" />
        <el-table-column align="center" label="源单单号" width="120">
          <template slot-scope="scope">
            <!-- <el-input v-model="scope.row.HSourceBillNo" placeholder="请选择源单单号" @keyup.native.f7="openDataDialog(6, scope.row)"
              @dblclick.native="openDataDialog(6, scope.row)" /> -->
            <span>{{ scope.row.HSourceBillNo }}</span>
          </template>
        </el-table-column>
@@ -263,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>
@@ -305,9 +307,9 @@
              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="140">
          <template slot-scope="scope">
            <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 90px;"
            <el-input-number v-model="scope.row.HPrice" :min="0" style="width: 120px;"
              controls-position="right"></el-input-number>
          </template>
        </el-table-column>
@@ -326,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>
@@ -376,7 +378,7 @@
            <el-input v-model="scope.row.HBatchNo" placeholder="请输入批次" />
          </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.HPOOrderBillNo }}</span>
          </template>
@@ -405,7 +407,7 @@
          <template slot-scope="scope">
            <span>{{ scope.row.HSeOrderEntryID }}</span>
          </template>
        </el-table-column>
        </el-table-column> -->
        <el-table-column align="center" label="备注" width="120">
          <template slot-scope="scope">
            <el-input v-model="scope.row.HRemark" placeholder="请输入备注" />
@@ -430,11 +432,11 @@
      <!--业务员-->
      <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
      <!--客户-->
      <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
      <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
      <!--仓位-->、
      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :openPageData="openPageData" v-if="gyStockPlaceShow" />
      <!--选择源单-->
      <HSourceReportHtml @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID='this.form.HOrgID' :HSouceBillType="HSouceBillType" v-if="ScICMOBillShow" />
      <Kf_MoveStockRequestBillList @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :HOrgID='this.form.HOrgID' v-if="Kf_MoveStockRequestBillShow" />
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="deptClickSub">确 定</el-button>
        <el-button @click="deptClose">取 消</el-button>
@@ -458,10 +460,11 @@
import Material from '@/views/gyMaterial/GyMaterial'
import GyCustomer from '@/views/GyCustomer/index'
import HSourceReportHtml from '@/views/component/HSourceReportHtml'
import Kf_MoveStockRequestBillList from '@/views/warehouse/transfer/Kf_MoveStockRequestBillList.vue'

export default {
  name: 'MoveStockBillEdit',
  components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GyCustomer, HSourceReportHtml, GyStockPlace },
  components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySupplier, HSourceReportHtml, GyStockPlace, Kf_MoveStockRequestBillList },
  props: {
    OperationType: { type: Number, },
    linterid: { type: Number, },
@@ -491,7 +494,7 @@
      formHideDataShow: false,                                                   //表单隐藏内容标记
      formLoading: true,                                                         //表单加载遮罩
      zzSelDis: false,                                                           //组织下拉列表禁用标记

      
      rowHideShow: false,                                                        //列设置组件容器显示标记
      openRowHide: false,                                                        //列设置组件显示标记

@@ -504,7 +507,8 @@
      stockPlaceShow: false,                                                     //仓位数据组件显示标记
      gyEmployeeShow: false,                                                     //业务员数据组件显示标记
      ScICMOBillShow: false,                                                     //源单数据组件显示标记
      GyCustomerShow: false,                                                     //往来单位数据组件显示标记
      gySupplierShow: false,                                                     //往来单位数据组件显示标记
      Kf_MoveStockRequestBillShow: false,                                        //选择源单数据组件显示标记
      deptform: {},                                                              //弹窗选中数据
      
      temp: undefined,                                                           //临时变量
@@ -567,17 +571,21 @@
        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: "",
        HManagerName:"",
        HOrgID: sessionStorage["OrganizationID"] - 0,
        HSourceBillNo: "",
        HSourceBillType: "调拨申请单",
        HSourceInterID: 0,
        HSourceEntryID: 0,

        HMaker: sessionStorage["HUserName"],
        HMakeDate: new Date(),
@@ -607,7 +615,6 @@
      //新增获取单据号
      this.getHBillNo()
      if (this.OperationType == 1) {
        this.handleAddSysZb()
      }
      this.$nextTick(() => {
        this.formShow = true
@@ -683,7 +690,6 @@
          this.form.HSCWHID= data.HSCWHID
          this.form.HSCWHName= data.调出仓库
          this.form.HRemark= data.表头备注

          this.form.HSecManagerID= data.HSecManagerID
          this.form.HSecManagerName= data.验收员
          this.form.HKeeperID= data.HKeeperID
@@ -694,7 +700,10 @@
          this.form.HInnerBillNo= data.内部单据号
          this.form.HExplanation= data.HExplanation
          this.form.HInvoiceBillNo= data.发票编号
          
          this.form.HSourceBillNo= data.HSourceBillNo
          this.form.HSourceBillType= data.HSourceBillType
          this.form.HSourceInterID= data.HSourceInterID
          this.form.HSourceEntryID= data.HSourceEntryID
          //子表  赋值
          var result = response.data.data[1]
          for (var i = 0; i < result.length; i++) {
@@ -783,7 +792,12 @@
    //#region 数据弹窗
    //#region 打开数据列表弹窗
    openDataDialog(num, row) {
      if (row) {
      if (num == 11) {
        this.handleAddSysZb(); 
        this.$nextTick(() => {
          this.zbIndex = this.editData.length - 1;
        });
      }else if (row) {
        this.zbIndex = row.index - 1
      }
      this.showReset()
@@ -811,11 +825,17 @@
        }
        this.gyEmployeeShow = true
        this.openData = true
      }else if (num == 7){
        this.dialogTitle = '客户列表'
        this.gyCustomerShow = true
      }else if (num == 11){
        this.dialogTitle = '调拨申请单列表'
        this.Kf_MoveStockRequestBillShow = true
        this.openData = true
      }else if (num == 6){
        this.dialogTitle = '供应商列表'
        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 = '仓位列表'
@@ -851,7 +871,9 @@
      this.warehouseShow = false
      this.materialShow = false
      this.gyEmployeeShow = false
      this.GyCustomerShow = false
      this.gySupplierShow = false
      this.Kf_MoveStockRequestBillShow = false
      this.gyStockPlaceShow = false
    },
    //#endregion
    //#endregion
@@ -868,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
@@ -920,10 +954,59 @@
        this.editData[this.zbIndex].HTaxRate = deptRow.默认税率
        this.materialShow = false
        this.openData = false
      } else if(num == 7){
          this.form.HSupName = deptRow.客户名称
      }else if (num == 11){
        this.form.HSourceBillNo = deptRow.单据号
        this.form.HSourceBillType = deptRow.HBillSubType
        this.form.HSourceInterID = deptRow.hmainid
        this.form.HSourceEntryID = deptRow.hsubid
        this.form.HSupName = deptRow.往来单位
        this.form.HSupID = deptRow.HSupID
        this.form.HEmpName = deptRow.业务员
        this.form.HEmpID = deptRow.HEmpID
        this.form.HDeptName = deptRow.部门
        this.form.HDeptID = deptRow.HDeptID
        this.form.HWHName = deptRow.主调入仓库
        this.form.HWHID = deptRow.主调入仓库ID
        this.form.HSCWHName = deptRow.主调出仓库
        this.form.HSCWHID = deptRow.主调出仓库ID

        this.Kf_MoveStockRequestBillShow = false
        this.openData = false
        if (this.zbIndex !== null && this.editData[this.zbIndex]) {
          this.editData[this.zbIndex].HSourceBillNo = deptRow.单据号
          this.editData[this.zbIndex].HSourceBillType = deptRow.HBillSubType
          this.editData[this.zbIndex].HSourceInterID = deptRow.hmainid
          this.editData[this.zbIndex].HSourceEntryID = deptRow.hsubid
          this.editData[this.zbIndex].HMaterID = deptRow.HMaterID;
          this.editData[this.zbIndex].物料代码 = deptRow.物料代码;
          this.editData[this.zbIndex].物料名称 = deptRow.物料名称;
          this.editData[this.zbIndex].HUnitID = deptRow.HUnitID;
          this.editData[this.zbIndex].规格型号 = deptRow.规格型号
          this.editData[this.zbIndex].计量单位 = deptRow.计量单位
          this.editData[this.zbIndex].HPropertyID = deptRow.HPropertyID
          this.editData[this.zbIndex].HSecUnitRate = deptRow.换算率
          this.editData[this.zbIndex].HQtyMust = deptRow.应收数量
          this.editData[this.zbIndex].HQty = deptRow.实收数量
          this.editData[this.zbIndex].HPrice = deptRow.单价
          this.editData[this.zbIndex].HMoney = deptRow.金额
          this.editData[this.zbIndex].HOutPrice = deptRow.调出单价
          this.editData[this.zbIndex].HOutMoney = deptRow.调出金额
          this.editData[this.zbIndex].HWHID = deptRow.HWHID
          this.editData[this.zbIndex].HWHName = deptRow.调入仓库
          this.editData[this.zbIndex].HSPID = deptRow.HSPID
          this.editData[this.zbIndex].HWHNumber = deptRow.调入仓库代码
          this.editData[this.zbIndex].HSPName = deptRow.仓位名称
          this.editData[this.zbIndex].HSCWHID = deptRow.HSCWHID
          this.editData[this.zbIndex].HSCWHName = deptRow.调出仓库
          this.editData[this.zbIndex].HSCWHNumber = deptRow.调出仓库代码
          this.editData[this.zbIndex].HSCSPID = deptRow.HSCSPID
          this.editData[this.zbIndex].HSCSPName = deptRow.调出仓位名称

      }
      } else if(num == 6){
          this.form.HSupName = deptRow.供应商名称
          this.form.HSupID = deptRow.HItemID
          this.gyCustomerShow = false
          this.gySupplierShow = false
          this.openData = false
      }else if (num == 9){
            if(this.HSPType == 1){
@@ -990,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); //审核
@@ -1061,8 +1144,8 @@
          规格型号: '',
          HUnitID: 0,
          计量单位: '',
          HQtyMust: 1,
          HQty: 1,
          HQtyMust: 0,
          HQty: 0,
          HPieceQty: 0,
          HPrice: 0,
          HTaxPrice: 0,
@@ -1072,18 +1155,18 @@
          HWHID: 0,
          发货仓库: '',
          HRemark: '',
          HQty_Full: 0,
          HQty_Full:0,
          HQty_Empty: 0,
          HQty_Back: 0,
          HCostPrice: 0,
          HCostMoney: 0,
          HSalePrice: 0,
          HSeOrderInterID: 741,
          HSeOrderInterID: 0,
          HSeOrderEntryID: 18,
          HSeOrderBillNo: 'XSFH00000747',
          HSourceInterID: 741,
          HSourceEntryID: 18,
          HSourceBillNo: 'XSFH00000747',
          HSeOrderBillNo: '',
          HSourceInterID: 0,
          HSourceEntryID: 0,
          HSourceBillNo: '',
          HSourceBillType: 1402,
          HRelationQty: 0,
          HRelationMoney: 0,