运单，承运合同选择赋值修改

陈婷婷

7 天以前 50e0ec470aa41649849c248342545e4daa67e421

运单，承运合同选择赋值修改

 .env.development

@@ -6,7 +6,7 @@

# 智云迈思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/'
@@ -14,8 +14,8 @@
# VUE_APP_BASE_API_INNER = http://192.168.1.11/API/
# VUE_APP_BASE_API = http://61.174.29.234:8880/API/
# 宁波 四维尔
# VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
# VUE_APP_BASE_API = http://220.189.218.155:9010/API/
VUE_APP_BASE_API_INNER = http://192.168.0.236:9010/API/
VUE_APP_BASE_API = http://220.189.218.155:9010/API/
#杜贺
# VUE_APP_BASE_API = http://localhost:8082/API/
# 内网地址测试

 src/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue

@@ -379,16 +379,16 @@
        this.sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + this.sTime + "'"
        this.sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + this.eTime + "'"
      }
      if (this.propHBeginAddrName) {
        this.sWhere += " and 始发地 = '" + this.propHBeginAddrName + "'"
      }
      if (this.propHBeginHEndAddrName) {
        this.sWhere += " and 目的地 = '" + this.propHBeginHEndAddrName + "'"
      }
      if (this.propHCarTypeName) {
        this.sWhere += " and 运输方式 = '" + this.propHCarTypeName + "'"
      }
      console.log(this.sWhere)
      // if (this.propHBeginAddrName) {
      //   this.sWhere += " and 始发地 = '" + this.propHBeginAddrName + "'"
      // }
      // if (this.propHBeginHEndAddrName) {
      //   this.sWhere += " and 目的地 = '" + this.propHBeginHEndAddrName + "'"
      // }
      // if (this.propHCarTypeName) {
      //   this.sWhere += " and 运输方式 = '" + this.propHCarTypeName + "'"
      // }
      // console.log(this.sWhere)
      if (this.pageSize == 0) {
        this.pageSize = 50
      }

 src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue

@@ -105,12 +105,30 @@
                                    </el-form-item>
                                </el-col>
                                <el-col :span="12">
                                    <el-form-item label="运输线路" prop="HTransLine">
                                        <el-select v-model="form.HTransLine" placeholder="请选择运输线路"
                                    <el-form-item label="运输线路" prop="HTransportLineName">
                                        <el-select v-model="form.HTransportLineName" placeholder="请选择运输线路" filterable
                                            @change="checkAndCallGetTransCost" @focus="checkTransportList">
                                            <el-option v-for="(item, index) in transportList" :key="index" :label="item"
                                                :value="item"></el-option>
                                        </el-select>
                                    </el-form-item>
                                </el-col>
                            </el-row>
                             <el-row>
                                <el-col :span="6">
                                    <el-form-item label="始发地" prop="HBeginAddrName">
                                        <el-input v-model="form.HBeginAddrName" placeholder="请输入始发地">
                                            <el-button slot="append" icon="el-icon-search"
                                                @click="openDataDialog(3, areaType = 'b')"></el-button>
                                        </el-input>
                                    </el-form-item>
                                </el-col>
                                <el-col :span="6">
                                    <el-form-item label="目的地" prop="HEndAddrName">
                                        <el-input v-model="form.HEndAddrName" placeholder="请输入目的地">
                                            <el-button slot="append" icon="el-icon-search"
                                                @click="openDataDialog(3, areaType = 'e')"></el-button>
                                        </el-input>
                                    </el-form-item>
                                </el-col>
                            </el-row>
@@ -243,7 +261,7 @@
                                </el-col>
                                <el-col :span="6">
                                    <el-form-item label="运费" prop="HMoney">
                                        <el-input v-model="form.HMoney" placeholder="请输入运费" />
                                        <el-input v-model="form.HMoney" placeholder="请输入运费" disabled />
                                    </el-form-item>
                                </el-col>
                                <el-col :span="6">
@@ -613,7 +631,7 @@
import ContractTransport from "@/views/basic/gytransport/cgContractTransportBillList/Cg_ContractTransportBillList.vue"
import GyMaterialPackingRelation from '@/views/scMould/basicModeling/Gy_MaterialPackingRelationList.vue'
import AreaDialog from "@/views/component/AreaDialog"
import { watch } from 'vue';

export default {
    name: 'Add_Edit_WL_YayBill.vue',
    components: { Dept, Warehouse, Material, RowSettings, XsSeOutStockBill, GyCustomer, GySupplier, GyCartype, GyCar, GyDriver, ContractTransport, GyMaterialPackingRelation, AreaDialog },
@@ -664,7 +682,7 @@

            temp: undefined,                                                           //临时变量
            btResList: [],                                                             // 列设置
            transportList: [],                                                         //运输线路选择列表
            transportList: [],                                                     //运输线路选择列表
            form: {},                                                                  // 表单参数
            rules: {                                                                   // 表单校验
                HCarrierName: [
@@ -691,7 +709,7 @@
                HTransType: [
                    { required: true, message: "运输方式不能为空", trigger: "blur" }
                ],
                HTransLine: [
                HTransportLineName: [
                    { required: true, message: "运输线路不能为空", trigger: "blur" }
                ]
            },
@@ -796,7 +814,7 @@
                HPickAddr: "",
                HArriverAddr: "",
                HTransType: "",
                HTransLine: "",
                HTransportLineName: "",
                HCarTypeID: 0,
                HCarTypeName: "",
                HCarTypeMaxVolume: 0,
@@ -934,7 +952,7 @@
                    this.form.HCarName = data.车辆名称
                    this.form.HDriverID = data.司机ID
                    this.form.HDriverName = data.司机名称

                    this.form.HTransportLineName = data.运输路线名称
                    //子表  赋值
                    for (var i = 0; i < result.data.length; i++) {
                        var qty = parseFloat(result.data[i].HQty) || 0;
@@ -1149,44 +1167,31 @@
                console.log(deptRow)
                this.form.HContractTransportBillNo = deptRow.单据号
                this.form.HContractTransportInterID = deptRow.HInterID
                this.form.HContractTransportEntryID = deptRow.HInterID
                this.transportList = []
                // axios.get(this.$baseUrl + '/WLYayBillController/page', {
                //     params: {
                //         "HInterID": deptRow.HInterID,
                //         "user": sessionStorage["HUserName"],
                //     },
                // }).then(response => {
                //     if (response.data.count == 1) {
                //         this.form.HCarrierID = response.data.HSupID
                //         this.form.HCarrierName = response.data.供应商名称
                //         this.form.HCurID = response.data.币别
                //         this.form.HCurName = response.data.货币名称
                //         this.form.HExRate = response.data.汇率 == null ? 0 : response.data.汇率
                //         this.form.HSSID = response.data.结算方式
                //         this.form.HSSName = response.data.结算方式名称
                //         this.transportList=[]
                //     } else {
                //         this.$modal.msgError("错误:" + response.data.code + response.data.Message);
                //     }
                // }).catch(error => {
                //     this.$modal.msgError("接口请求失败!");
                // });
                // this.form.HContractTransportBillNo = deptRow.单据号
                // this.form.HContractTransportInterID = deptRow.HInterID
                // this.form.HContractTransportEntryID = deptRow.HInterID
                // this.form.HDistance = deptRow.距离
                // this.form.HTransportTimes = deptRow.运输时效
                // this.form.HTransportTyep = deptRow.运输类型
                // this.form.HTransType = deptRow.运输类型
                // this.form.HSSID = deptRow.结算方式
                // this.form.HSSName = deptRow.结算方式名称
                // this.form.HCurID = deptRow.币别
                // this.form.HCurName = deptRow.货币名称
                // this.form.HMoney = deptRow.运输费用
                // this.form.HExRate = deptRow.汇率 == null ? 0 : deptRow.汇率
                // this.form.HCarrierID = deptRow.HSupID
                // this.form.HCarrierName = deptRow.供应商名称
                axios.get(this.$baseUrl + '/WLYayBillController/initDataForSelectContractTransportBill', {
                    params: {
                        "hmainid": deptRow.HInterID,
                    },
                }).then(res => {
                    let response = res.data
                    if (response.code == 1) {
                        this.form.HContractTransportEntryID = response.data[0].HEntryID
                        this.form.HCarrierID = response.data[0].HSupID
                        this.form.HCarrierName = response.data[0].供应商名称
                        this.form.HCurID = response.data[0].币别
                        this.form.HCurName = response.data[0].货币名称
                        this.form.HExRate = response.data[0].汇率 == null ? 0 : response.data.汇率
                        this.form.HSSID = response.data[0].结算方式
                        this.form.HSSName = response.data[0].结算方式名称
                        response.data.map(item => {
                            this.transportList.push(item.运输路线名称)
                        })
                    } else {
                        this.$modal.msgError("错误:" + response.data.code + response.data.Message);
                    }
                }).catch(error => {
                    this.$modal.msgError("接口请求失败!");
                });
                this.ContractTransportShow = false
                this.openData = false
            } else if (num == 17) {
@@ -2111,28 +2116,55 @@
            }
        },
        checkAndCallGetTransCost() {
            const { HContractTransportBillNo, HCarTypeName, HTransType, HTransLine } = this.form
            const { HContractTransportBillNo, HCarTypeName, HTransType, HTransportLineName } = this.form

            if (!HContractTransportBillNo) {
                this.$message.warning('请先选择承运合同')
                return
            }
            if (!HCarTypeName) {
                this.$message.warning('请先选择车型')
                return
            }
            if (!HTransType) {
                this.$message.warning('请先选择运输方式')
                return
            }
            if (!HTransLine) {
            if (HTransType !== '零单' && !HCarTypeName) {
                this.$message.warning('请先选择车型')
                return
            }
            if (!HTransportLineName) {
                this.$message.warning('请先选择运输线路')
                return
            }

            this.getTransCost()
        },
        getTransCost() { },
        getTransCost() {
            axios.get(this.$baseUrl + '/WLYayBillController/getSelectContractTransportBillEntryData', {
                params: {
                    HSupID: this.form.HSupID,
                    HTransportLineName: this.form.HTransportLineName,
                    HCarTypeID: this.form.HCarTypeID,
                    HTransportType: this.form.HTransType,
                },
            }).then(res => {
                let response = res.data
                if (response.code == 1) {
                    if (response.data.length == 0) {
                        this.$modal.msgError("未获取到指定承运合同数据，请检查【" + this.form.HCarrierName + this.form.运输路线名称 + this.form.车型名称 + this.form.HTransType + "】对应的承运合同是否维护！！！");
                        this.form.HMoney = 0
                        return
                    }
                    this.form.HDistance = response.data[0].距离
                    this.form.HTransportTimes = response.data[0].运输时效
                    this.form.HTransportTyep = response.data[0].运输类型
                    this.form.HMoney = response.data[0].运输费用
                } else {
                    this.$modal.msgError("错误:" + response.code + response.Message);
                }
            }).catch(error => {
                this.$modal.msgError("接口请求失败!");
            });

        },
    }
};
</script>