修改直接调拨单

dytyqx

4 天以前 235ef3a58a45a886c2bcdcfd1c69bf3039dcacfa

修改直接调拨单

 .env.development

@@ -6,10 +6,10 @@

# 智云迈思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/API/'
#锦隆
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
@@ -22,4 +22,4 @@
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
VUE_CLI_BABEL_TRANSPILE_MODULES = true 

 src/views/KCGL/MoveStockBill/Kf_MoveStockBillEdit.vue

@@ -19,14 +19,14 @@
            </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>
            <el-col :span="6">
              <el-form-item label="业务员" prop="HEmpName">
                <el-input v-model="form.HKeeperName" placeholder="请输入业务员" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
                <el-input v-model="form.HEmpName" placeholder="请输入业务员" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(4,empType=1)"></el-button>
                </el-input>
              </el-form-item>
            </el-col>
@@ -41,22 +41,22 @@
          <el-row>
            <el-col :span="6">
              <el-form-item label="往来单位" prop="HSupName">
                <el-input v-model="form.HDeptName" placeholder="请输入往来单位" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
                <el-input v-model="form.HSupName" placeholder="请输入往来单位" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(7)"></el-button>
                </el-input>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="调入仓库" prop="HWHName">
                <el-input v-model="form.HWHName" placeholder="请输入仓库" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></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="HSCWHName">
                <el-input v-model="form.HSCWHName" placeholder="请调出仓库" disabled>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(1)"></el-button>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(2,eHWHType=2)"></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(1)"></el-button>
                  <el-button slot="append" icon="el-icon-search" @click="openDataDialog(null)"></el-button>
                </el-input>
              </el-form-item>
            </el-col>
@@ -334,8 +334,8 @@
        </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.HWHName" placeholder="请输入调入仓库" @keyup.native.f7="openDataDialog(2, scope.row,eHWHType=3)"
              @dblclick.native="openDataDialog(2, scope.row,eHWHType=3)" />
          </template>
        </el-table-column>
        <el-table-column align="center" label="HSPID" width="120">
@@ -345,8 +345,8 @@
        </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.HSPName" placeholder="调入仓位" @keyup.native.f7="openDataDialog(9, scope.row,HSPType=1)"
              @dblclick.native="openDataDialog(9, scope.row,HSPType=1)" />
          </template>
        </el-table-column>
        <el-table-column align="center" label="HSCWHID" width="120">
@@ -356,8 +356,8 @@
        </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.HSCWHName" placeholder="请输入调出仓库" @keyup.native.f7="openDataDialog(2, scope.row,eHWHType=4)"
              @dblclick.native="openDataDialog(2, scope.row,eHWHType=4)" />
          </template>
        </el-table-column>
        <el-table-column align="center" label="HSCSPID" width="120">
@@ -367,8 +367,8 @@
        </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.HSCSPName" placeholder="调出仓位" @keyup.native.f7="openDataDialog(9, scope.row,HSPType=2)"
              @dblclick.native="openDataDialog(9, scope.row,HSPType=2)" />
          </template>
        </el-table-column>
        <el-table-column align="center" label="批次" width="120">
@@ -422,11 +422,19 @@
    <!-- 数据弹窗 -->
    <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" />
      <!--客户-->
      <GyCustomer @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="gyCustomerShow" />
      <!--仓位-->、
      <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" />
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="deptClickSub">确 定</el-button>
        <el-button @click="deptClose">取 消</el-button>
@@ -442,13 +450,18 @@
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'
import GyCustomer from '@/views/GyCustomer/index'
import HSourceReportHtml from '@/views/component/HSourceReportHtml'

export default {
  name: 'MoveStockBillEdit',
  components: { Dept, Warehouse, Material, RowSettings },
  components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GyCustomer, HSourceReportHtml, GyStockPlace },
  props: {
    OperationType: { type: Number, },
    linterid: { type: Number, },
@@ -462,11 +475,17 @@

      organizationList: [],                                                      //页面初始化组织列表
      sourceBillTypeList: [],                                                   //页面初始化源单类型列表

      eHWHType: 0,
      loading: true,                                                             // 遮罩层

      HModName: "Kf_MoveStockBill",
      addBtnShow: false,                                                         //新增按钮显示标记
      subDisabled: false,                                                        //保存按钮禁用标记
      empType:0,
      HSPType:0,
      HOutMoney:0,
      rsv:"",
      openPageData:{},                                                           //传入弹窗的数据
      HSouceBillType:"",

      formShow: false,                                                           //表单是否显示标记
      formHideDataShow: false,                                                   //表单隐藏内容标记
@@ -483,6 +502,9 @@
      warehouseShow: false,                                                      //仓库数据组件显示标记
      materialShow: false,                                                       //物料数据组件显示标记
      stockPlaceShow: false,                                                     //仓位数据组件显示标记
      gyEmployeeShow: false,                                                     //业务员数据组件显示标记
      ScICMOBillShow: false,                                                     //源单数据组件显示标记
      GyCustomerShow: false,                                                     //往来单位数据组件显示标记
      deptform: {},                                                              //弹窗选中数据
      
      temp: undefined,                                                           //临时变量
@@ -516,9 +538,11 @@

      if ((this.OperationType == 1 && this.copyType != 1) || (!this.OperationType && !this.copyType)) {
        this.handleAdd()
        this.rsv = "Add"
      } 
      else if (this.OperationType == 3 || this.copyType == 1) { 
        this.handleUpdate()
        this.rsv = "Update"
      }
    },
    //#endregion
@@ -528,12 +552,17 @@
      this.form = {
        HInterID: 0,
        HBillNo: "",
        HDate: new Date(),
        HDate: moment().format('YYYY-MM-DD'),
        HInnerBillNo: "",
        HSupID: 0,
        HSupName: "",
        HWHID: 0,
        HWHName: "",
        HSCWHName: "",
        HLinkMan: "",
        HLinkPhone:"",
        HAddress:"",
        HSCWHID: "",
        HSecManagerID: 0,
        HSecManagerName: "",
        HKeeperID: 0,
@@ -547,6 +576,7 @@
        HSourceBillType: "",
        HExplanation :"",
        HRemark: "",
        HManagerName:"",
        HOrgID: sessionStorage["OrganizationID"] - 0,

        HMaker: sessionStorage["HUserName"],
@@ -586,6 +616,35 @@
    },
    //#endregion

        getSupType() {
            var type = this.form.HSourceBillType
            switch (type) {
                case '1402':
                    return "发货通知单";
                    break;
                case '1243':
                    return "调拨申请单";
                    break;
                case '3720':
                    return "生产用料清单";
                    break;
                case '1604':
                    return "委外用料清单";
                    break;
                case '1214':
                    return "生产发料通知单";
                    break;
                case '3721':
                    return "生产备料单";
                    break;
                case '1242':
                    return "出库申请单";
                    break;
            }
        },
      isAllEqual(array) {
            return array.every(item => item === array[0])
      },
    //#region 编辑页面初始化
    handleUpdate() {
      this.reset()
@@ -663,13 +722,13 @@
                , HOutPrice: data.HOutPrice
                , HOutMoney: data.HOutMoney
                , HWHID: data.HWHID
                , 调入仓库: data.调入仓库
                , HWHName: data.调入仓库
                , HSPID: data.HSPID
                , 仓位名称: data.仓位名称
                , HSPName: data.仓位名称
                , HSCWHID: data.HSCWHID
                , 调出仓库: data.调出仓库
                , HSCWHName: data.调出仓库
                , HSCSPID: data.HSCSPID
                , 调出仓位名称: data.调出仓位名称
                , HSCSPName: data.调出仓位名称
                , HBatchNo:data.HBatchNo
                , HPOOrderInterID: data.HPOOrderInterID
                , HPOOrderEntryID: data.HPOOrderEntryID
@@ -740,17 +799,59 @@
        this.dialogTitle = '物料列表'
        this.materialShow = true
        this.openData = true
      }else if (num == 4) {
        this.dialogTitle = '仓位列表'
        this.stockPlaceShow = true
      } else if (num == 4) {
        if(this.empType == 1){
          this.dialogTitle = '业务员列表'
        }else if(this.empType == 2){
          this.dialogTitle = '主管列表'
        }else if(this.empType == 3){
          this.dialogTitle = '验收员列表'
        }else if(this.empType == 4){
          this.dialogTitle = '保管员列表'
        }
        this.gyEmployeeShow = true
        this.openData = true
      }
      }else if (num == 7){
        this.dialogTitle = '客户列表'
        this.gyCustomerShow = true
        this.openData = true
      } else if (num == 9) {
        if(this.HSPType==1){
          if(this.editData[this.zbIndex].HWHName){
            this.dialogTitle = '仓位列表'
            this.openPageData.HWHName = this.editData[this.zbIndex].HWHName
            this.gyStockPlaceShow = true
            this.openData = true
          }else{
            this.$modal.msgError("请先选择调入仓库!");
          }
        }
        if(this.HSPType==2){
          if(this.editData[this.zbIndex].HSCWHName){
            this.dialogTitle = '仓位列表'
            this.openPageData.HWHName = this.editData[this.zbIndex].HSCWHName
            this.gyStockPlaceShow = true
            this.openData = true
          }else{
            this.$modal.msgError("请先选择调出仓库!");
          }
        }
      }else {
                this.showReset()
                this.HSouceBillType = this.getSupType()
                this.dialogTitle = this.getSupType() + '列表'
                this.ScICMOBillShow = true
                this.openData = true
            }

    },
    //#region 将数据弹窗全部取消加载
    showReset() {
      this.deptShow = false
      this.warehouseShow = false
      this.materialShow = false
      this.gyEmployeeShow = false
      this.GyCustomerShow = false
    },
    //#endregion
    //#endregion
@@ -760,21 +861,55 @@
      if (num == 1) {
        this.form.HDeptName = deptRow.部门名称                                  //部门
        this.form.HDeptID = deptRow.HItemID
        this.form.HEmpID = deptRow.HEmpID
        this.form.HManagerName = deptRow.负责人
        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 == 3) {                                                      //物料
      else if (num == 2) {
          if(this.eHWHType == 1){
            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.仓库名称
            }
          }else if(this.eHWHType == 2){
            this.form.HSCWHName = deptRow.仓库名称
            this.form.HSCWHID = deptRow.HItemID
            this.form.HSCWHNumber = deptRow.仓库代码
            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.仓库名称
            }
          }else if(this.eHWHType == 3){
            this.editData[this.zbIndex].HWHID = deptRow.HItemID
            this.editData[this.zbIndex].HWHNumber = deptRow.仓库代码
            this.editData[this.zbIndex].HWHName = deptRow.仓库名称
          }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.warehouseShow = 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.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
          }else
          this.gyEmployeeShow = 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.物料名称;
@@ -783,8 +918,26 @@
        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 == 7){
          this.form.HSupName = deptRow.客户名称
          this.form.HSupID = deptRow.HItemID
          this.gyCustomerShow = false
          this.openData = false
      }else if (num == 9){
            if(this.HSPType == 1){
              this.editData[this.zbIndex].HSPID = deptRow.HItemID
              this.editData[this.zbIndex].HSPNumber = deptRow.仓位代码
              this.editData[this.zbIndex].HSPName = deptRow.仓位名称
            }else{
              this.editData[this.zbIndex].HSCSPID = deptRow.HItemID
              this.editData[this.zbIndex].HSCSPNumber = deptRow.仓位代码
              this.editData[this.zbIndex].HSCSPName = deptRow.仓位名称
            }
            this.gyStockPlaceShow = false
            this.openData = false
          }
    },
    //#endregion

@@ -817,19 +970,19 @@
        if (valid) {
          let fhck = false
          this.editData.map((item, index) => {
            if (!item.发货仓库) {
              fhck = true
              this.$modal.msgError("第" + (index + 1) + "行：发货仓库未选择！");
            }
            // if (!item.发货仓库) {
            //   fhck = true
            //   this.$modal.msgError("第" + (index + 1) + "行：发货仓库未选择！");
            // }
          })
          this.$nextTick(() => {
            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.rsv + ';' + sessionStorage["HUserName"];
              axios({
                method: 'post',
                url: this.$baseUrl + "/Kf_SellOutBill/SaveSellOutBillList",
                url: this.$baseUrl + "Kf_MoveStockBill/SaveKf_MoveStockBillMain",
                data: {
                  'msg': sMainSub
                },

 src/views/KCGL/MoveStockBill/Kf_MoveStockBillList.vue

@@ -174,7 +174,7 @@
        </template>
      </el-table>
      <!-- 记录数、页数、当前页 -->
      <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" @pagination="handleQuery" />
      <pagination v-show="total > 0" :total="total" :page.sync="page" :limit.sync="pageSize" :pageSizes="pageSizes" @pagination="getList" />
      <!-- 列设置 -->
      <el-dialog title="隐藏列设置" :visible.sync="openRowHide" width="816px" append-to-body>
        <RowSettings :colName="btResList" HModName="Kf_MoveStockBillList" @rowEditClose="rowSetClose"
@@ -285,9 +285,17 @@
        ColContent: '',
      },
      
      page: 1,                                                      //page页索引
      pageSize: 0,                                                  //page页面记录数
      total: 0,                                                     //记录合计数
      loading: true,
      tyResList: [],//列表（接口数据）
      btList: [],//表头列表显示
      btResList: [],
      tableData: [],//列表(分页显示)
      dataList: [],
      titleData: [],//不需要显示的字段 可扩展
      pageSizes: [ 50,100, 500, 5000, 50000],
      page: 1,
      pageSize: 0,
      total: 0,    
      tableShow: true,                                              // table显示标记
      totalNameList: [],                                            // 需要设置合计行的列数组
      tableData: [],                                                // 列表数据。用于table监听事件
@@ -497,7 +505,6 @@

    //#region 查询
    getList() {
      this.pageSize = 50
      if (this.pageSize == 0) {
        this.pageSize = 50
      }
@@ -505,16 +512,19 @@
      this.loading = true
      
      // 列表查询
      axios.get(this.$baseUrl + '/Kf_MoveStockBill/GetMoveStockBillList', {
      axios.get(this.$baseUrl + '/Kf_MoveStockBill/page', {
        params: {
          "sWhere": this.sWhere,
          "user": sessionStorage["HUserName"]
          "user": sessionStorage["HUserName"],
          "page": this.page,
          "size": this.pageSize,
          "Type":'1207',
        },
      }).then(response => {
        this.tyResList = response.data.data//总数据
        let data1 = response.data
        let option = []
        if (data1.count == 1) {
        if (data1.list && data1.list.length > 0) {
          this.btResList = data1.list             //列表表头数据
          this.total = data1.count;
          var data = [];//列字段数据
@@ -808,11 +818,11 @@
              this.totalNameList.push(item)
            }
          })
          if (data1.data[0].HPageSize == 0) {
            this.pageSize = 50
          } else {
            this.pageSize = data1.data[0].HPageSize
          }
          // if (data1.data[0].HPageSize == 0) {
          //   this.pageSize = 50
          // } else {
          //   this.pageSize = data1.data[0].HPageSize
          // }
          this.tableData = option.data
          this.tableShow = true
          this.loading = false
@@ -918,7 +928,7 @@
      var result = false;
      axios.get(this.$baseUrl + '/Xt_getInfo/getCompanyName').then(response => {
        var data1 = response.data
        if (data1.count == 1) {
        if (data1.list && data1.list.length > 0) {
          if (data1.data == "水务") {
            result = true;
          }