采购入库修改bug

wangyi

5 天以前 61eec888693c019dac099d4bb6b0470647031473

采购入库修改bug

 src/views/CaiGouGuanLi/CaiGouRuKu/Kf_POStockInBillEdit.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="close">退 出</el-button>
      <!-- <el-button @click="cancel">取 消</el-button> -->
    </div>
@@ -26,7 +26,7 @@
            <el-col :span="6">
              <el-form-item label="业务员" prop="HEmpName">
                <el-input v-model="form.HEmpName" placeholder="请输入业务员" disabled>
                  <el-button slot="append" icon="el-icon-search"></el-button>
                <el-button slot="append" icon="el-icon-search" @click="openDataDialog(5,empType=1)"></el-button>
                </el-input>
              </el-form-item>
            </el-col>
@@ -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"></el-button>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(6)"></el-button>
                </el-input>
              </el-form-item>
            </el-col>
@@ -54,14 +54,14 @@
            <el-col :span="6">
              <el-form-item label="仓库" prop="HWHName">
                <el-input v-model="form.HWHName" placeholder="请输入仓库">
                  <el-button slot="append" icon="el-icon-search"></el-button>
                   <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=1)"></el-button>
                </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="验收员" prop="HSecManagerName">
                <el-input v-model="form.HSecManagerName" placeholder="请输入验收员" disabled>
                  <el-button slot="append" icon="el-icon-search"></el-button>
                 <el-button slot="append" icon="el-icon-search" @click="openDataDialog(5,empType=2)"></el-button>
                </el-input>
              </el-form-item>
            </el-col>
@@ -222,14 +222,14 @@
        </el-table-column>
        <el-table-column align="center" label="收料仓库" width="120">
          <template slot-scope="scope">
            <el-input v-model="scope.row.收料仓库" placeholder="请输入收料仓库" @keyup.native.f7="openDataDialog(2, scope.row)"
              @dblclick.native="openDataDialog(2, scope.row)" />
            <el-input v-model="scope.row.收料仓库" placeholder="请输入收料仓库" @keyup.native.f7="openDataDialog(2,scope.row,eHWHType=2)"
              @dblclick.native="openDataDialog(2, scope.row,eHWHType=2)" />
          </template>
        </el-table-column>
        <el-table-column align="center" label="仓位名称" width="120">
          <template slot-scope="scope">
            <el-input v-model="scope.row.收料仓位" placeholder="请输入仓位名称" @keyup.native.f7="openDataDialog(2, scope.row)"
              @dblclick.native="openDataDialog(2, scope.row)" />
            <el-input v-model="scope.row.仓位名称" placeholder="请输入仓位名称" @keyup.native.f7="openDataDialog(9, scope.row)"
              @dblclick.native="openDataDialog(9, scope.row)" />
          </template>
        </el-table-column>
        <el-table-column align="center" label="备注" width="120">
@@ -258,11 +258,17 @@
    <!-- 数据弹窗 -->
    <el-dialog :title="dialogTitle" :visible.sync="openData" width="1280px" append-to-body>
      <!-- 部门 -->
      <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="deptShow" />
       <Dept @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="deptShow" />
      <!-- 仓库 -->
      <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="warehouseShow" />
      <Warehouse @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="warehouseShow" />
      <!-- 物料 -->
      <Material @deptEmitDb="dbEmitData" @deptEmit="emitData" v-if="materialShow" />
      <Material @deptEmitDb="dbEmitData" @deptEmit="emitData"  :openPage="HModName" v-if="materialShow" />
      <!-- 职员 -->
      <GyEmployee @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyEmployeeShow" />
      <!-- 供应商 -->
      <GySupplier @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gySupplierShow" />
         <!-- 仓位 -->
      <GyStockPlace @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" :openPageData="openPageData" v-if="gyStockPlaceShow" />
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="deptClickSub">确 定</el-button>
        <el-button @click="deptClose">取 消</el-button>
@@ -278,13 +284,16 @@
import axios from 'axios'
import moment from 'moment';
import RowSettings from '@/views/component/rowSettings'
import Dept from '@/views/component/dept'
import Warehouse from '@/views/component/warehouse'
import Material from '@/views/component/material'
import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
import Dept from '@/views/basic/gy/gyDepartment'
import GySupplier from '@/views/basic/gy/gySupplier.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
import Material from '@/views/gyMaterial/GyMaterial'

export default {
  name: 'SellOutBill',
  components: { Dept, Warehouse, Material, RowSettings },
  components: { Dept, Warehouse, Material, RowSettings,GySupplier ,GyStockPlace,GyEmployee},
  props: {
    OperationType: { type: Number, },
    linterid: { type: Number, },
@@ -295,14 +304,14 @@
  data() {
    return {
      baseURL: process.env.VUE_APP_BASE_API,                                     //后端接口前缀(后端服务器IP)

      HModName:"Sc_MouldProdOutBillEdit",
      organizationList: [],                                                      //页面初始化组织列表

      loading: true,                                                             // 遮罩层

      addBtnShow: false,                                                         //新增按钮显示标记
      subDisabled: false,                                                        //保存按钮禁用标记

      openPageData:{},//传入弹窗的数据
      formShow: false,                                                           //表单是否显示标记
      formLoading: true,                                                         //表单加载遮罩
      zzSelDis: false,                                                           //组织下拉列表禁用标记
@@ -315,6 +324,8 @@
      dialogTypeNum: null,                                                       //部门弹窗1，仓库弹窗2
      deptShow: false,                                                           //部门数据组件显示标记
      warehouseShow: false,                                                      //仓库数据组件显示标记
      gyEmployeeShow:false,
      gySupplierShow :false,
      materialShow: false,                                                       //物料数据组件显示标记
      stockPlaceShow: false,                                                     //仓位数据组件显示标记
      deptform: {},                                                              //弹窗选中数据
@@ -509,57 +520,60 @@
    //#region 页面数据初始化
    reset() {
      this.form = {
        HInterID: 0,
        HBillNo: "",
        HDate: new Date(),
        HEmpID: 0,
        HEmpName: "",
        HDeptID: 0,
        HDeptName: "",
        HSupID: 0,
        HSupName: "",
        HInvoiceBillNo: "",
        HWHID: 0,
        HWHName: "",
        HSecManagerID: 0,
        HSecManagerName: "",
        HRemark: "",
        HOrgID: sessionStorage["OrganizationID"] - 0,
        HMaker: sessionStorage["HUserName"],
        HChecker: "",
        HCloseMan: "",
        HUpDater: "",
        HDeleteMan: "",
        HMakeDate: "",//new Date().format("yyyy-MM-dd hh:mm:ss"),
        HCheckDate: "",
        HCloseDate: "",
        HUpDateDate: "",
        HDeleteDate: "",
        BillType: '1402',
        HBillSubType: '1205',
        HSTOCKORGID: sessionStorage["OrganizationID"] - 0,//组织id
        HOWNERID: sessionStorage["OrganizationID"] - 0,
      HInterID: 0,
      HBillNo: " ",
      HDate: new Date(),
      HEmpID: 1,
      HEmpName: " ",
      HDeptID: 1,
      HDeptName: " ",
      HSupID: 1,
      HSupName: " ",
      HInvoiceBillNo: " ",
      HWHID: 1,
      HWHName: " ",
      HSecManagerID: 1,
      HSecManagerName: " ",
      HRemark: " ",
      HOrgID: sessionStorage["OrganizationID"] - 0,
      HMaker: sessionStorage["HUserName"],
      HChecker: " ",
      HCloseMan: " ",
      HUpDater: " ",
      HDeleteMan: " ",
      
      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"),
      HUpDateDate: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),
      HDeleteDate: moment(new Date()).format("YYYY-MM-DD HH:mm:ss"),

        
        HManagerID: 0,
        HManagerName:"",
        HKeeperID: 0,
        HKeeperName: "",
        HProjectID: 0,
        HProjectNumber: "",
        HProjectName: "",
        
        
        HCurID: 0,
        HCurName: '',
        HExRate: 1,
        HSourceBillType: "",
        HMainSourceInterID: 0,
        HMainSourceEntryID: 0,
        HMainSourceBillType: '',
        HMainSourceBillNo: '',
        HExplanation :"",
        HInnerBillNo: "",
      HBillType: "1201",
      BillType: '1402',
      HBillSubType: '1201',
      HSTOCKORGID: sessionStorage["OrganizationID"] - 0,
      HOWNERID: sessionStorage["OrganizationID"] - 0,
      eHWHType: 1,
      empType: 1,

      HManagerID: 1,
      HManagerName: " ",
      HKeeperID: 1,
      HKeeperName: " ",
      HProjectID: 1,
      HProjectNumber: " ",
      HProjectName: " ",

      HCurID: 1,
      HCurName: " ",
      HExRate: 1,
      HSourceBillType: "0",
      HMainSourceInterID: 1,
      HMainSourceEntryID: 1,
      HMainSourceBillType: '0',
      HMainSourceBillNo: ' ',
      HExplanation: " ",
      HInnerBillNo: " "
      }
      this.editData = []
      this.editBtData = []
@@ -730,7 +744,7 @@
        this.deptShow = true
        this.openData = true
      } else if (num == 2) {
        this.dialogTitle = '出库仓库列表'
        this.dialogTitle = '仓库列表'
        this.warehouseShow = true
        this.openData = true
      } else if (num == 3) {
@@ -741,6 +755,28 @@
        this.dialogTitle = '仓位列表'
        this.stockPlaceShow = true
        this.openData = true
      }else if (num == 5) {
        if(this.empType == 1){
          this.dialogTitle = '业务员列表'
        }else{
          this.dialogTitle = '验收员员列表'
        }
        this.gyEmployeeShow = true
        this.openData = true
      }
      else if (num == 6) {
        this.dialogTitle = '供应商列表'
        this.gySupplierShow = true
        this.openData = true
      }else if(num ==9 ){
        if(this.editData[this.zbIndex].收料仓库){
          this.dialogTitle = '仓位列表'
          this.openPageData.HWHName = this.editData[this.zbIndex].收料仓库
          this.gyStockPlaceShow = true
          this.openData = true
        }else{
          this.$modal.msgError("请先选择仓库!");
        }
      }
    },
    //#region 将数据弹窗全部取消加载
@@ -748,6 +784,9 @@
      this.deptShow = false
      this.warehouseShow = false
      this.materialShow = false
      this.gyEmployeeShow =false
      this.gySupplierShow = false
      this.gyStockPlaceShow = false
    },
    //#endregion
    //#endregion
@@ -759,34 +798,78 @@
        this.form.HDeptID = deptRow.HItemID
        this.form.HEmpID = deptRow.HEmpID
        this.form.HManagerName = deptRow.负责人
        this.deptShow = false
        this.openData = false
      } 
      else if (num == 2) {                                                      //收料仓库
        this.editData[this.zbIndex].HWHID = deptRow.HItemID;
        this.editData[this.zbIndex].收料仓库 = deptRow.仓库名称;
        this.openData = false
      }
      else if (num == 4) {                                                      //仓位
        this.editData[this.zbIndex].HSPID = deptRow.HItemID;
        this.editData[this.zbIndex].仓位名称 = deptRow.仓位名称;
        this.openData = false
      else if (num == 2) {
        if(this.eHWHType == 1){
              this.form.HWHName = deptRow.仓库名称
              this.form.HWHID = deptRow.HItemID
              this.form.HWHNumber = deptRow.仓库代码
              this.openData = false
            }else{
              this.editData[this.zbIndex].HWHID = deptRow.HItemID;
              this.editData[this.zbIndex].收料仓库 = deptRow.仓库名称;
              this.openData = false
            }
          this.openData = false
      }
      else if (num == 3) {                                                      //物料
        this.editData[this.zbIndex].HMaterID = deptRow.HItemID;
        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].HTaxPrice = deptRow.含税成本价
        this.editData[this.zbIndex].HTaxRate = deptRow.默认税率
        this.editData[this.zbIndex].规格型号 = deptRow.规格型号;
        this.editData[this.zbIndex].计量单位 = deptRow.计量单位名称;
        this.editData[this.zbIndex].HTaxPrice = deptRow.含税成本价;
        this.editData[this.zbIndex].HTaxRate = deptRow.默认税率;
        this.materialShow = false
        this.openData = false
      }
      else if (num == 4) {                                                      //仓位
          if(this.empType == 1){
              this.form.HEmpName = deptRow.职员名称
              this.form.HEmpID = deptRow.HItemID
            }else if(this.empType == 2){
              this.form.HSecManagerName = deptRow.职员名称
              this.form.HSecManagerID = deptRow.HItemID
            }
            this.gyEmployeeShow =false
            this.openData = false
      }
       else if (num == 5) {                                    //职员
            if(this.empType == 1){
              this.form.HEmpName = deptRow.职员名称
              this.form.HEmpID = deptRow.HItemID
            }else if(this.empType == 2){
              this.form.HMangerName = deptRow.职员名称
              this.form.HMangerID = deptRow.HItemID
            }else if(this.empType == 3){
              this.form.HSecManagerName = deptRow.职员名称
              this.form.HSecManagerID = deptRow.HItemID
            }else if(this.empType == 4){
              this.form.HKeeperName = deptRow.职员名称
              this.form.HKeeperID = deptRow.HItemID
            }
            this.openData = false
        }
        else if (num == 6) {
            this.form.HSupName = deptRow.供应商名称
            this.form.HSupID = deptRow.HItemID
            this.openData = false
        }
        else if (num == 9){
            this.editData[this.zbIndex].HSPID = deptRow.HItemID
            this.editData[this.zbIndex].仓位名称 = deptRow.仓位名称
            this.gyStockPlaceShow = false
            this.openData = false
          }
    },
    //#endregion

    //#region 弹窗数据单击事件
    emitData(deptRow, num) {
      
      this.dialogTypeNum = num
      this.deptform = deptRow
    },
@@ -813,12 +896,12 @@
      this.$refs["form"].validate(valid => {
        if (valid) {
          let fhck = false
          this.editData.map((item, index) => {
            if (!item.发货仓库) {
              fhck = true
              this.$modal.msgError("第" + (index + 1) + "行：发货仓库未选择！");
            }
          })
          // this.editData.map((item, index) => {
          //   if (!item.发货仓库) {
          //     fhck = true
          //     this.$modal.msgError("第" + (index + 1) + "行：发货仓库未选择！");
          //   }
          // })
          this.$nextTick(() => {
            if (!fhck) {
              var sMainStr = JSON.stringify(this.form);
@@ -826,7 +909,7 @@
              var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"] + ';' + this.OperationType;
              axios({
                method: 'post',
                url: this.$baseUrl + "/Kf_SellOutBill/SaveSellOutBillList",
                url: this.$baseUrl + "/Kf_POStockInBill/SaveSellOutBillList",
                data: {
                  'msg': sMainSub
                },
@@ -914,7 +997,7 @@
          HMoney: 0,
          HTaxMoney: 0,
          HWHID: 0,
          发货仓库: '',
          收料仓库: '',
          HRemark: '',
          HQty_Full: 0,
          HQty_Empty: 0,
@@ -924,15 +1007,15 @@
          HSalePrice: 0,
          HSeOrderInterID: 741,
          HSeOrderEntryID: 18,
          HSeOrderBillNo: 'XSFH00000747',
          HSeOrderBillNo: '',
          HSourceInterID: 741,
          HSourceEntryID: 18,
          HSourceBillNo: 'XSFH00000747',
          HSourceBillNo: '',
          HSourceBillType: 1402,
          HRelationQty: 0,
          HRelationMoney: 0,
          HSPID: 0,
          HSPName: '',
          仓位名称: '',
          HSPGroupID: 0,
          HSPGroupName: '',
          HSCWHID: 0,
@@ -1078,7 +1161,10 @@

    //#region 获取最大单据号
    get_MAXNum_Task(Type) {
      var sql = `exec h_p_Xt_GetMaxBillNo_SubType '1201','${this.form.HDate}',0,0,0,'${Type}','${this.form.HDeptID}'`;
      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",