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

陈婷婷

2026-01-23 b3f83df85d445a69dfb065de5be767499a64c5cf

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

 .env.development

@@ -5,10 +5,10 @@
ENV = 'development'

# 智云迈思L-MOM管理系统/开发环境
VUE_APP_BASE_API = http://localhost:81/API/
# VUE_APP_BASE_API = http://localhost:81/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/LuBaoAPI/'
#锦隆
# # VUE_APP_BASE_API_INNER = 'http://192.168.1.11/API/'
# # VUE_APP_BASE_API = http://61.174.29.234:8880/API/
@@ -18,6 +18,6 @@
#杜贺
# VUE_APP_BASE_API = http://localhost:8082/API/
# 内网地址测试
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

 src/router/index.js

@@ -1823,9 +1823,9 @@
    },
    children: [
      {
        path: "/logistics/WayBillPaymentBill/YFPayMentOtherBillTranList",
        component: () => import("@/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue"),
        name: "yfPayMentOtherBillTranList",
        path: "/logistics/WayBillPaymentBill/payWayBillPaymentBillList",
        component: () => import("@/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillList.vue"),
        name: "payWayBillPaymentBillList",
        meta: { title: "运单费用结算单", activeMenu: "/logistics/WayBillPaymentBill" },
      },
    ],

 src/store/modules/permission.js

@@ -96,10 +96,10 @@
                    title: "运单费用结算单",
                  },
                  component: () =>
                    import("@/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue"),
                    import("@/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillList.vue"),
                  hidden: false,
                  name: "yfPayMentOtherBillTranList",
                  path: "YFPayMentOtherBillTranList",
                  name: "payWayBillPaymentBillList",
                  path: "PayWayBillPaymentBillList",
                }
                ]
              }

 src/views/component/CurrencyDialog/index.vue

@@ -598,6 +598,11 @@
    handleDblclick(row, column, cell, event) {
      this.OperationType = 3
      if (this.openPage) {
        if(this.openPage='Kf_StockOutRequestBill')
      {
        this.$emit('deptEmitDb', row, 10)
      }
      else
        this.$emit('deptEmitDb', row, 2)
      } else {
        this.handleEdit();

 src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue

File was renamed from src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranEdit.vue
@@ -23,11 +23,6 @@
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="辅助字段" prop="HInnerBillNo">
                                <el-input v-model="form.HInnerBillNo" placeholder="请输入辅助字段" />
                            </el-form-item>
                        </el-col>
                        <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"
@@ -38,35 +33,16 @@
                    </el-row>
                    <el-row>
                        <el-col :span="6">
                            <el-form-item label="保管员" prop="HKeeperName">
                                <el-input v-model="form.HKeeperName" placeholder="请输入保管员" disabled>
                            <el-form-item label="币别" prop="HCurName">
                                <el-input v-model="form.HCurName" placeholder="请输入币别" disabled>
                                    <el-button slot="append" icon="el-icon-search"
                                        @click="openDataDialog(4, zhiyuanType = 'baoguanyuan')"></el-button>
                                        @click="openDataDialog(10, zhiyuanType = 'yewuyuan')"></el-button>
                                </el-input>
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="主管" prop="HMangerName">
                                <el-input v-model="form.HMangerName" placeholder="请输入主管" disabled>
                                    <el-button slot="append" icon="el-icon-search"
                                        @click="openDataDialog(4, zhiyuanType = 'zhuguan')"></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"
                                        @click="openDataDialog(4, zhiyuanType = 'yanshou')"></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(2, ckType = 'form')"></el-button>
                                </el-input>
                            <el-form-item label="汇率" prop="HExRate">
                                <el-input v-model="form.HExRate" placeholder="请输入汇率" disabled />
                            </el-form-item>
                        </el-col>
                    </el-row>
@@ -80,8 +56,8 @@
                            </el-form-item>
                        </el-col>
                        <el-col :span="6">
                            <el-form-item label="往来单位" prop="HSupName">
                                <el-input v-model="form.HSupName" placeholder="请输入往来单位" disabled>
                            <el-form-item label="承运商" prop="HSupName">
                                <el-input v-model="form.HSupName" placeholder="请输入承运商" disabled>
                                    <el-button slot="append" icon="el-icon-search"
                                        @click="openDataDialog(6)"></el-button>
                                </el-input>
@@ -176,86 +152,37 @@
                @selection-change="handleTableZbEdit" :row-class-name="rowSysZbIndex" show-summary border>
                <el-table-column type="selection" width="55" align="center" />
                <el-table-column align="center" label="序号" type="index" width="80" />
                <el-table-column align="center" label="物料代码" width="120">
                <el-table-column align="center" label="始发地" width="120">
                    <template slot-scope="scope">
                        <el-input v-model="scope.row.物料代码" placeholder="请输入物料代码"
                            @keyup.native.f7="openDataDialog(3, scope.row)"
                            @dblclick.native="openDataDialog(3, scope.row)" />
                        <el-input v-model="scope.row.HBeginAddrName" placeholder="请输入始发地"
                            @keyup.native.f7="openDataDialog(3, scope.row, areaType = 'b')"
                            @dblclick.native="openDataDialog(3, scope.row, areaType = 'b')" />
                    </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.物料名称 }}</span>
                        <el-input v-model="scope.row.HEndAddrName" placeholder="请输入目的地"
                            @keyup.native.f7="openDataDialog(3, scope.row, areaType = 'e')"
                            @dblclick.native="openDataDialog(3, scope.row, areaType = 'e')" />
                    </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.规格型号 }}</span>
                        <el-select v-model="scope.row.HTransType" placeholder="请选择运输方式">
                                    <el-option label="零单" value="零单"></el-option>
                                    <el-option label="整车" value="整车"></el-option>
                        </el-select>
                    </template>
                </el-table-column>
                <el-table-column align="center" label="计量单位" width="120">
                <el-table-column align="center" label="运输费用" width="120">
                    <template slot-scope="scope">
                        <el-input v-model="scope.row.计量单位" placeholder="请输入计量单位"
                            @keyup.native.f7="openDataDialog('单位页面还没有', scope.row, dwType = 'jldw')"
                            @dblclick.native="openDataDialog('单位页面还没有', scope.row, dwType = 'jldw')" />
                    </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, ckType = 'zb')"
                            @dblclick.native="openDataDialog(2, scope.row, ckType = 'zb')" />
                    </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(9, scope.row)"
                            @dblclick.native="openDataDialog(9, scope.row)" />
                    </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('单位页面还没有', scope.row, dwType = 'kcfdw')"
                            @dblclick.native="openDataDialog('单位页面还没有', scope.row, dwType = 'kcfdw')" />
                    </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('单位页面还没有', scope.row, dwType = 'jbdw')"
                            @dblclick.native="openDataDialog('单位页面还没有', scope.row, dwType = 'jbdw')" />
                    </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('单位页面还没有', scope.row, dwType = 'fdw')"
                            @dblclick.native="openDataDialog('单位页面还没有', scope.row, dwType = 'fdw')" />
                    </template>
                </el-table-column>
                <el-table-column align="center" label="应收数量" width="120">
                    <template slot-scope="scope">
                        <el-input-number v-model="scope.row.HQtyMust" :min="1" style="width: 90px;"
                        <el-input-number v-model="scope.row.HMoney" :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">
                    <template slot-scope="scope">
                        <el-input-number v-model="scope.row.HQty" :min="1" style="width: 90px;"
                            controls-position="right"></el-input-number>
                    </template>
                </el-table-column>
                <el-table-column align="center" label="单价" width="120">
                    <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">
                    <template slot-scope="scope">
                        <span>{{ scope.row.HMoney }}</span>
                        <span>{{ scope.row.HRemark }}</span>
                    </template>
                </el-table-column>
                <el-table-column align="center" label="操作" width="55" fixed="right">
@@ -274,6 +201,8 @@
            <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" v-if="gyStockPlaceShow" />
            <GyCurrcy @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="currcyShow" />
            <AreaDialog @deptEmitDb="dbEmitData" @deptEmit="emitData" :openPage="HModName" v-if="areaShow" />
            <div slot="footer" class="dialog-footer">
                <el-button type="primary" @click="deptClickSub">确 定</el-button>
                <el-button @click="deptClose">取 消</el-button>
@@ -290,15 +219,18 @@
import RowSettings from '@/views/component/rowSettings'
import Dept from '@/views/basic/gy/gyDepartment.vue'
import Warehouse from '@/views/basic/gyWarehouse/gyWarehouse.vue'
import Material from '@/views/gyMaterial/GyMaterial.vue'
// import Material from '@/views/gyMaterial/GyMaterial.vue'
import GyEmployee from '@/views/basic/gyEmployee/gyEmployee.vue'
import GySupplier from '@/views/basic/gy/gySupplier.vue'
import GyStockPlace from '@/views/basic/gyStockPlace/gyStockPlace.vue'
// import GyCurrcy from '@/views/basic/gyCurrency/gyCurrency.vue'
import GyCurrcy from '@/views/component/CurrencyDialog/index.vue'
import AreaDialog from "@/views/component/AreaDialog"
import moment from 'moment';

export default {
    name: 'Kf_StockOutRequestBill',
    components: { Dept, Warehouse, Material, RowSettings, GyEmployee, GySupplier, GyStockPlace },
    components: { Dept, Warehouse, RowSettings, GyEmployee, GySupplier, GyStockPlace ,GyCurrcy, AreaDialog},
    props: {
        OperationType: { type: Number, },
        linterid: { type: Number, },
@@ -329,6 +261,8 @@
            gyEmployeeShow: false,//销售员数据组件
            gySupplierShow: false,
            gyStockPlaceShow: false,
             currcyShow: false,
            areaShow: false,//地区数据组件
            deptform: {},//弹窗选中数据
            openData: false,//数据弹窗
            dialogTitle: '',
@@ -380,7 +314,12 @@
            form: {},
            // 表单校验
            rules: {

                HBeginAddrName: [
                    { required: true, message: "始发地不能为空", trigger: "blur" }
                ],
                HEndAddrName: [
                    { required: true, message: "目的地不能为空", trigger: "blur" }
                ],
                HDate: [
                    { required: true, message: "日期不能为空", trigger: "blur" }
                ],
@@ -455,6 +394,10 @@
        },
        //部门弹窗赋值
        dbEmitData(deptRow, num) {
        // console.log('dbEmitData 被调用');
        // console.log('num:', num, '类型:', typeof num);
        // console.log('当前zbIndex:', this.zbIndex);
        // console.log('选择的是:', num === 3 ? '始发地' : num === 5 ? '目的地' : '其他');
            // num=1部门 num=2出库仓库
            if (deptRow.HItemID) {
                if (num == 1) {
@@ -473,17 +416,26 @@
                    this.warehouseShow = 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.materialShow = false
                    if (this.areaType == 'b') {
                    this.editData[this.zbIndex].HBeginAddrName = deptRow.地区名称
                    this.editData[this.zbIndex].HBeginAddr = deptRow.HItemID
                } else if (this.areaType == 'e') {
                    this.editData[this.zbIndex].HEndAddrName = deptRow.地区名称
                    this.editData[this.zbIndex].HEndAddr = deptRow.HItemID
                }
                    // this.editData[this.zbIndex].HBeginAddr = deptRow.HItemID;
                    // this.editData[this.zbIndex].HBeginAddrName = deptRow.地区名称;
                    this.areaShow = false
                    this.openData = false
                } else if (num == 4) {
                }
                // else if (num == 5) {

                //     this.editData[this.zbIndex].HEndAddr = deptRow.HItemID;
                //     this.editData[this.zbIndex].HEndAddrName = deptRow.地区名称;
                //     this.areaShow = false
                //     this.openData = false
                // }
                else if (num == 4) {
                    if (this.zhiyuanType == 'yewuyuan') {
                        this.form.HEmpName = deptRow.职员名称
                        this.form.HEmpID = deptRow.HItemID
@@ -508,6 +460,13 @@
                    this.editData[this.zbIndex].HSPID = deptRow.HMainID;
                    this.editData[this.zbIndex].仓位 = deptRow.仓位名称;
                    this.gyStockPlaceShow = false
                    this.openData = false
                }
                else if (num == 10) {
                    this.form.HCurName = deptRow.货币名称
                    this.form.HCurID = deptRow.HItemID
                    this.form.HExRate = deptRow.汇率
                    this.currcyShow = false
                    this.openData = false
                }
            } else {
@@ -539,11 +498,12 @@
                HDeptID:0,
                HSupID:0,
                HSupName:'',
                HCarrierID:0,
                HEmpID:0,
                HEmpName:'',
                HCurID:0,
                HCurName:'',
                HExRate:'',
                HExRate:1,
                HManagerName:'',
                HManagerID:0,
                HPSStyleID:0,
@@ -562,7 +522,9 @@
                HCloseDate:'',
                HUpDateDate:'',
                HDeleteDate:'',

                HCurID:0,
                HCurName:'',
                HExRate:1,
            }
            this.editData = []
            this.editBtData = []
@@ -646,78 +608,61 @@
        handleUpdate() {
            this.reset()
            let rowHmainid = this.linterid
            axios.get(this.$baseUrl + "/Kf_StockOutRequestBill/cx", {
            axios.get(this.$baseUrl + "/Pay_WayBillPaymentBillController/Pay_WayBillPaymentBillEditList", {
                params: { 'HInterID': rowHmainid }
            }).then(response => {
                if (response.data.count == 1) {
                    var result = response.data
                    var data = response.data.data[0]
                    this.allVal = data
                    this.form.BillType = data.HSourceBillType
                    //this.form.BillType = data.HSourceBillType
                    if (this.copyType == 1) {
                        this.getHBillNo()
                        let date = new Date()
                        this.form.HDate = moment(date).format('YYYY-MM-DD')
                    } else {
                        this.form.HBillNo = data.单据号
                        // this.form.HInterID = data.HInterID
                        this.form.HDate = data.日期
                        this.form.HMaker = data.制单人
                        this.form.HUpDater = data.修改人
                        this.form.HChecker = data.审核人
                        this.form.HMakeDate = data.制单日期
                        this.form.HUpDateDate = data.修改日期
                        this.form.HCheckDate = data.审核日期
                        this.form.HCloseMan = data.关闭人
                        this.form.HDeleteMan = data.作废人
                        this.form.HCloseDate = data.关闭日期
                        this.form.HDeleteDate = data.作废日期
                        this.form.HBillNo = data[0].单据号
                        this.form.HInterID = data[0].HInterID
                        this.form.HDate = data[0].日期
                        this.form.HMaker = data[0].制单人
                        this.form.HUpDater = data[0].修改人
                        this.form.HChecker = data[0].审核人
                        this.form.HMakeDate = data[0].制单日期
                        this.form.HUpDateDate = data[0].修改日期
                        this.form.HCheckDate = data[0].审核日期
                        this.form.HCloseMan = data[0].关闭人
                        this.form.HDeleteMan = data[0].作废人
                        this.form.HCloseDate = data[0].关闭日期
                        this.form.HDeleteDate = data[0].作废日期
                    }
                    this.form.HAddress = data.交货地点
                    this.form.HDeptName = data.部门
                    this.form.HDeptID = data.HDeptID
                    this.form.HSupID = data.HSupID
                    this.form.HSupName = data.供应商
                    this.form.HEmpID = data.HEmpID
                    this.form.HEmpName = data.业务员
                    this.form.HCurID = data.HCurID
                    this.form.HCurName = data.币别
                    this.form.HExRate = data.汇率
                    this.form.HManagerName = data.主管
                    this.form.HManagerID = data.HManagerID
                    this.form.HPSStyleID = data.HPSStyleID
                    this.form.HPSStyleName = data.采购方式
                    this.form.HSSID = data.HSSID
                    this.form.HSSName = data.结算方式
                    this.form.HLinkMan = data.联系人
                    this.form.HLinkPhone = data.联系电话
                    this.form.HInnerBillNo = data.辅助字段
                    this.form.HRemark = data.表头备注
                    this.form.HWHName = data['仓库']
                    this.form.HWHID = data['HWHID']
                    for (var i = 0; i < result.data.length; i++) {
                    this.form.HCarrierID = data[0].HCarrierID
                    this.form.HDeptName = data[0].部门名称
                    this.form.HDeptID = data[0].HDeptID
                    this.form.HSupID = data[0].HCarrierID
                    this.form.HSupName = data[0].供应商
                    this.form.HEmpID = data[0].HEmpID
                    this.form.HEmpName = data[0].业务员名称
                    this.form.HCurID = data[0].HCurID
                    this.form.HCurName = data[0].币别名称
                    this.form.HExRate = data[0].汇率

                    
                    this.form.HRemark = data[0].表体备注
                    
                    for (var i = 0; i < data.length; i++) {
                        this.editData.push(
                            {
                                "HMaterID": result.data[i].HMaterID,
                                "物料代码": result.data[i].物料代码,
                                "物料名称": result.data[i].物料名称,
                                "规格型号": result.data[i].规格型号,
                                "HUnitID": result.data[i].HUnitID,
                                "计量单位": result.data[i].计量单位,
                                "HQty": result.data[i].数量,
                                "HRemark": result.data[i].表体备注,
                                "HPrice": result.data[i].单价,
                                "HMoney": result.data[i].金额,
                                "HTaxRate": result.data[i].税率,
                                "HTaxMoney": result.data[i].金额 * result.data[i].税率,
                                "HlineTotal": result.data[i].金额 + result.data[i].税额,
                                "HlineTotalBB": (result.data[i].金额 + result.data[i].税额) * result.data[i].汇率, "HTaxPrice": result.data[i].含税单价,
                                "HDiscountRate": result.data[i].折扣率,
                                "HRelTaxPrice": data.实际含税单价,
                                "仓库":  data.仓库,
                                "HDate": moment(result.data[i].交货日期).format('YYYY-MM-DD'),
                                "HQtyMust": data.实收数量,
                                "HQty": data.应收数量
                                "HBeginAddr": data[i].HBeginAddr,
                                "HBeginAddrName": data[i].始发地,
                                 "HEndAddr": data[i].HEndAddr,
                                "HEndAddrName": data[i].目的地,
                                "HRemark": data[i].表体备注,
                                
                                "HMoney": data[i].运输费用,
                                "HTransType": data[i].运输方式,
                               
                                // "HDate": moment(result.data[i].交货日期).format('YYYY-MM-DD'),

                            }
                        );
                    }
@@ -738,10 +683,13 @@
                this.$modal.msgError("请选择一行数据编辑!");
            } else {
                let obj = {
                    "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "HWHID": 0, "仓库": "",
                    "HSPID": 0, "仓位": "", "HSecUnitID": 0, "库存辅单位": "", "HBASEUNITID": 0, "基本单位": "",
                    "HEXTAUXUNITID": 0, "辅单位": "", "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HRemark": ""
                }
            "HBeginAddrName": "",
            "HBeginAddr": 0,
            "HEndAddrName": "",
            "HEndAddr": 0,
            "HMoney": 0,
            "HRemark": ""
        };
                if (index) {
                    this.editData.splice(index, 0, obj);
                    this.$set(this.editData, index, obj)
@@ -812,25 +760,31 @@
        // 编辑提交保存
        submitForm() {
            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) {


                            //this.form.HCarrierID=this.form.HSupID
                            this.form.HCarrierID=this.form.HSupID
                            var sMainStr = JSON.stringify(this.form);
                            var sSubStr = JSON.stringify(this.editData);
                            var sAllStr = JSON.stringify(this.allVal)
                            var sMainSub = sMainStr + ';' + sSubStr + ';' + this.OperationType + ";" + sessionStorage["HUserName"] + ';' + sAllStr;
                            var refs=this.OperationType==1?"Add":"Update"
                            var sMainSub = sMainStr + ';' + sSubStr + ';' + refs + ";" + sessionStorage["HUserName"] + ';' + sAllStr;
                            axios({
                                method: 'post',
                                url: this.$baseUrl + "/Kf_StockOutRequestBill/StockOutRequestBillEdit",
                                url: this.$baseUrl + "/Pay_WayBillPaymentBillController/saveBILL",
                                data: {
                                    'sMainSub': sMainSub
                                    'msg': sMainSub
                                },
                            }).then(response => {
                                if (response.data.count == 1) {
@@ -873,6 +827,8 @@
            this.gyEmployeeShow = false
            this.gySupplierShow = false
            this.gyStockPlaceShow = false
            this.currcyShow = false
            this.areaShow = false
        },
        //  打开数据列表弹窗
        openDataDialog(num, row) {
@@ -890,10 +846,16 @@
                this.warehouseShow = true
                this.openData = true
            } else if (num == 3) {
                this.dialogTitle = '物料列表'
                this.materialShow = true
                this.dialogTitle = '地区列表'
                this.areaShow  = true
                this.openData = true
            } else if (num == 4) {
            } 
            // else if (num == 5) {
            //     this.dialogTitle = '地区列表'
            //     this.areaShow  = true
            //     this.openData = true
            // }
            else if (num == 4) {
                this.dialogTitle = '职员列表'
                this.gyEmployeeShow = true
                this.openData = true
@@ -905,7 +867,11 @@
                this.dialogTitle = '往来单位列表'
                this.gyStockPlaceShow = true
                this.openData = true
            }
            }else if (num == 10) {
                this.dialogTitle = '币别列表'
                this.currcyShow = true
                this.openData = true
            } 

        },
    }

 src/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillList.vue

File was renamed from src/views/logistics/WayBillPaymentBill/YF_PayMentOtherBillTranList.vue
@@ -27,7 +27,7 @@
            <el-collapse v-model="activeSeach">
                <el-collapse-item title="更多" name="1">
                    <el-card class="box-card">
                        <el-form-item label="部门名称" prop="HDepartName">
                       <!---- <el-form-item label="部门名称" prop="HDepartName">
                            <el-input v-model="queryParams.HDepartName" placeholder="请输入部门名称"
                                @keyup.enter.native="HDepartName" />
                        </el-form-item>
@@ -42,7 +42,7 @@
                        <el-form-item label="仓库" prop="HWHID">
                            <el-input v-model="queryParams.HWHID" placeholder="请输入仓库"
                                @keyup.enter.native="handleQuery" />
                        </el-form-item>
                        </el-form-item> -->
                        <div slot="header" class="clearfix"><span>过滤</span></div>
                        <div>
                            <el-row>
@@ -174,7 +174,7 @@
            <!-- 编辑 -->
            <el-dialog title="编辑" :visible.sync="openEdit" width="1480px" append-to-body class="xsckdBox"
                @close="close">
                <edit :OperationType="OperationType" :linterid="this.rowForm.hmainid"
                <edit :OperationType="OperationType" :linterid="this.rowForm.hmainid || this.rowForm.HInterID"
                    :HSouceBillType="this.rowForm.HSourceBillType" :copyType="copyType" @editClose="editClose"
                    v-if="editShow" />
            </el-dialog>
@@ -185,13 +185,13 @@
<script>
import axios from "axios";
import RowSettings from "@/views/component/rowSettings";
import Edit from "@/views/warehouse/shipment/Kf_StockOutRequestBill.vue";
import Edit from "@/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue";
import PrintList from "@/views/component/printList";
import BarCodeDetail from '@/views/component/BarCodeDetail'               //条码明细组件
import moment from "moment";

export default {
    name: "Kf_StockOutRequestBillList",
    name: "YF_PayMentOtherBillTranList",
    components: { RowSettings, Edit, PrintList, BarCodeDetail },
    data() {
        return {
@@ -376,9 +376,10 @@
            if (this.pageSize == 0) {
                this.pageSize = 50;
            }
            console.log(this.$baseUrl);
            // 列表
            axios
                .get(this.$baseUrl + "/YF_PayMentOtherBillTran/YF_PayMentOtherBillMainList", {
                .get(this.$baseUrl + "/Pay_WayBillPaymentBillController/Pay_WayBillPaymentBillList", {
                    params: {
                        sWhere: this.sWhere,
                        user: sessionStorage["HUserName"],

 src/views/logistics/transportGPS/WL_YayBill.vue

@@ -170,6 +170,10 @@
                <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
                    @click="handleVolume(rowForm)">维护零单占用体积</el-button>
            </el-col>
             <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="single"
                    @click="SelectPayWayBill()">下推运单费用</el-button>
            </el-col>
            <el-col :span="1.5">
                <el-button type="primary" icon="el-icon-edit-outline" size="mini" :disabled="single"
                    @click="set_CheckBill(0, form = rowForm)">审核</el-button>
@@ -276,6 +280,13 @@
            <BarCodeDetail :visible.sync="barCodeDetailShow" ref="barcodeDetail" />
            <!-- 包装容器出入库明细 -->
            <PackStockDetail :visible.sync="packStockDetailShow" ref="packStockDetail" />
            <!-- 下推 -->
            <el-dialog title="下推" :visible.sync="selectEdit" width="1480px" append-to-body class="xsckdBox"
                @close="close">
                <edit :OperationType=OperationType :linterid=this.rowForm.HInterID
                    :HEntryID=this.rowForm.HEntryID :copyType="copyType" @editClose="editClose"
                    v-if="TranEditShow" />
            </el-dialog>
        </div>
    </div>
</template>
@@ -288,10 +299,9 @@
import BarCodeDetail from '@/views/component/BarCodeDetail'               //条码明细组件
import PackStockDetail from '@/views/component/PackStockDetail'               //条码明细组件
import Edit from '@/views/logistics/transportGPS/Add_Edit_WL_YayBill'   //编辑页面组件

import PayMentOtherBillTranEdit from "@/views/logistics/WayBillPaymentBill/Pay_WayBillPaymentBillEdit.vue";  //编辑页面组件
export default {
    name: 'WL_YayBill',
    components: { RowSettings, Edit, PrintList, BarCodeDetail, PackStockDetail },
    data() {
        return {
            baseURL: process.env.VUE_APP_BASE_API,                //后端接口前缀(后端服务器ip地址)
@@ -785,6 +795,13 @@
            })
        },
        //#endregion
        //#region 下推运单费用
        SelectPayWayBill() {
            this.editShow = true
            this.openEdit = true
            this.OperationType = 4
        },
        //#endregion
        cancelVolume() {
            this.openVolume = false
            this.resetVolume()