陈婷婷
2026-04-02 9e06ca6dc649be48ac292c3447673f2425833828
运单未完成
3个文件已修改
165 ■■■■ 已修改文件
.env.development 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue 152 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/sell/XsSeOutStockBill.vue 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.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/logistics/transportGPS/Add_Edit_WL_YayBill.vue
@@ -52,7 +52,7 @@
                        <!-- 第二块:承运合同、始发地、目的地、车型、车型最大容积、距离、运输时效、运输类型、结算方式、币别、汇率、运费、总体积、装载率、运输方式 -->
                        <div class="form-group">
                            <el-row>
                                <el-col :span="6">
                                <!-- <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"
@@ -67,20 +67,11 @@
                                                @click="openDataDialog(3, areaType = 'e')"></el-button>
                                        </el-input>
                                    </el-form-item>
                                </el-col>
                                <el-col :span="6">
                                    <el-form-item label="车型" prop="HCarTypeName">
                                        <el-input v-model="form.HCarTypeName" placeholder="请输入车型">
                                            <el-button slot="append" icon="el-icon-search"
                                                @click="openDataDialog(13)"></el-button>
                                        </el-input>
                                    </el-form-item>
                                </el-col>
                            </el-row>
                            <el-row>
                                </el-col> -->
                                <el-col :span="6">
                                    <el-form-item label="承运合同" prop="HContractTransportBillNo">
                                        <el-input v-model="form.HContractTransportBillNo" placeholder="请输入承运合同">
                                        <el-input v-model="form.HContractTransportBillNo" placeholder="请输入承运合同"
                                            @change="transChange">
                                            <el-button slot="append" icon="el-icon-search"
                                                @click="openDataDialog(16)"></el-button>
                                        </el-input>
@@ -94,11 +85,31 @@
                                    </el-form-item>
                                </el-col>
                                <el-col :span="6">
                                    <el-form-item label="车型" prop="HCarTypeName">
                                        <el-input v-model="form.HCarTypeName" placeholder="请输入车型">
                                            <el-button slot="append" icon="el-icon-search"
                                                @click="openDataDialog(13)"></el-button>
                                        </el-input>
                                    </el-form-item>
                                </el-col>
                            </el-row>
                            <el-row>
                                <el-col :span="6">
                                    <el-form-item label="运输方式" prop="HTransType">
                                        <el-select v-model="form.HTransType" placeholder="请选择运输方式">
                                        <el-select v-model="form.HTransType" placeholder="请选择运输方式"
                                            @change="checkAndCallGetTransCost">
                                            <el-option label="零单" value="零单"></el-option>
                                            <el-option label="单程" value="单程"></el-option>
                                            <el-option label="往返" value="往返"></el-option>
                                        </el-select>
                                    </el-form-item>
                                </el-col>
                                <el-col :span="12">
                                    <el-form-item label="运输线路" prop="HTransLine">
                                        <el-select v-model="form.HTransLine" placeholder="请选择运输线路"
                                            @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>
@@ -235,7 +246,7 @@
                                        <el-input v-model="form.HMoney" placeholder="请输入运费" />
                                    </el-form-item>
                                </el-col>
                                  <el-col :span="6">
                                <el-col :span="6">
                                    <el-form-item label="币别" prop="HCurName">
                                        <el-input v-model="form.HCurName" placeholder="请输入币别" />
                                    </el-form-item>
@@ -459,7 +470,7 @@
                            <el-table-column align="center" label="物料规格" width="120">
                                <template slot-scope="scope">{{ scope.row.HModel }} </template>
                            </el-table-column>
                            <el-table-column v-if="false"  align="center" label="容器代码" width="120">
                            <el-table-column v-if="false" align="center" label="容器代码" width="120">
                                <template slot-scope="scope">
                                    <el-input v-model="scope.row.HMouldNumber" placeholder="请输入器具代码"
                                        @keyup.native.f7="openDataDialog(17, scope.row)"
@@ -491,7 +502,7 @@
                                        @change="changeHMouldQty(scope.row)"></el-input-number>
                                </template>
                            </el-table-column>
                             <el-table-column v-if="false" align="center" label="容器数量/托" width="120">
                            <el-table-column v-if="false" align="center" label="容器数量/托" width="120">
                                <template slot-scope="scope">
                                    <span>{{ scope.row.HStandardQtyForMouldInPack }}</span>
                                </template>
@@ -519,7 +530,7 @@
                                        controls-position="right"></el-input-number> -->
                                </template>
                            </el-table-column>
                            <el-table-column  v-if="false" align="center" label="容器长度" width="120">
                            <el-table-column v-if="false" align="center" label="容器长度" width="120">
                                <template slot-scope="scope">
                                    <span>{{ scope.row.HMouldLength }}</span>
                                </template>
@@ -529,7 +540,7 @@
                                    <span>{{ scope.row.HMouldWidth }}</span>
                                </template>
                            </el-table-column>
                            <el-table-column  v-if="false" align="center" label="容器高度" width="120">
                            <el-table-column v-if="false" align="center" label="容器高度" width="120">
                                <template slot-scope="scope">
                                    <span>{{ scope.row.HMouldHeight }}</span>
                                </template>
@@ -653,6 +664,7 @@
            temp: undefined,                                                           //临时变量
            btResList: [],                                                             // 列设置
            transportList: [],                                                         //运输线路选择列表
            form: {},                                                                  // 表单参数
            rules: {                                                                   // 表单校验
                HCarrierName: [
@@ -661,7 +673,7 @@
                HCusName: [
                    { required: true, message: "客户不能为空", trigger: "blur" }
                ],
                HCarTypeName:[
                HCarTypeName: [
                    { required: true, message: "车型不能为空", trigger: "blur" }
                ],
                HDate: [
@@ -672,6 +684,15 @@
                ],
                HCarrierName: [
                    { required: true, message: "承运合同不能为空", trigger: "blur" }
                ],
                HContractTransportBillNo: [
                    { required: true, message: "承运合同不能为空", trigger: "blur" }
                ],
                HTransType: [
                    { required: true, message: "运输方式不能为空", trigger: "blur" }
                ],
                HTransLine: [
                    { required: true, message: "运输线路不能为空", trigger: "blur" }
                ]
            },
@@ -775,6 +796,7 @@
                HPickAddr: "",
                HArriverAddr: "",
                HTransType: "",
                HTransLine: "",
                HCarTypeID: 0,
                HCarTypeName: "",
                HCarTypeMaxVolume: 0,
@@ -950,9 +972,9 @@
                                "HQty_origin": result.data[i].HQty,
                                "HVolume": rowVolume,
                                "HScatteredVolume": result.data[i].零单占用体积,
                                "HStandardQtyForMouldInPack":result.data[i].HStandardQtyForMouldInPack,
                                "HPackV":result.data[i].HPackV,
                                "HPackQTY":result.data[i].HPackQTY,
                                "HStandardQtyForMouldInPack": result.data[i].HStandardQtyForMouldInPack,
                                "HPackV": result.data[i].HPackV,
                                "HPackQTY": result.data[i].HPackQTY,
                            }
                        )
                    }
@@ -1112,6 +1134,7 @@
                this.calculateLoadingRate(parseFloat(this.form.HTotalVolume || 0));
                this.gyCartypeShow = false
                this.openData = false
                this.checkAndCallGetTransCost()
            } else if (num == 14) {
                this.form.HCarName = deptRow.车辆名称
                this.form.HCarID = deptRow.HItemID
@@ -1127,18 +1150,43 @@
                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.供应商名称
                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.供应商名称
                this.ContractTransportShow = false
                this.openData = false
            } else if (num == 17) {
@@ -1377,7 +1425,7 @@
                            "HMouldWidth": res[j].宽度,
                            "HMouldHeight": res[j].高度,
                            "HMouldFoldHeight": res[j].折叠高度,
                            "HModel":res[j].物料规格,
                            "HModel": res[j].物料规格,
                            "HQty": res[j].物料数量,
                            "HQty_origin": orginHQTY,
                            "HMouldQty": mouldQty,
@@ -2053,6 +2101,38 @@
        },
        //#endregion
        //#endregion 
        transChange(val) {
            console.log(val)
            this.checkAndCallGetTransCost()
        },
        checkTransportList() {
            if (this.transportList.length === 0) {
                this.$message.warning('请先选择承运合同')
            }
        },
        checkAndCallGetTransCost() {
            const { HContractTransportBillNo, HCarTypeName, HTransType, HTransLine } = this.form
            if (!HContractTransportBillNo) {
                this.$message.warning('请先选择承运合同')
                return
            }
            if (!HCarTypeName) {
                this.$message.warning('请先选择车型')
                return
            }
            if (!HTransType) {
                this.$message.warning('请先选择运输方式')
                return
            }
            if (!HTransLine) {
                this.$message.warning('请先选择运输线路')
                return
            }
            this.getTransCost()
        },
        getTransCost() { },
    }
};
</script>
src/views/sell/XsSeOutStockBill.vue
@@ -103,7 +103,7 @@
                  <el-col :span="7">
                    <el-select v-model="queryParams.ColName" placeholder="请选择" @change="riqiChange"
                      class="ForFilteringSchemes">
                       <span v-for="(item, index) in btList" :key="index">
                      <span v-for="(item, index) in btList" :key="index">
                        <el-option :label="item.field" :value="item.field" v-if="!item.hide"></el-option>
                      </span>
                    </el-select>
@@ -696,7 +696,7 @@
      if (this.pageSize == 0) {
        this.pageSize = 50;
      }
      if (this.openPage && this.propsHOrgID && this.queryParams.HOrgID == "" ) {
      if (this.openPage && this.propsHOrgID && this.queryParams.HOrgID == "") {
        this.queryParams.HOrgID = this.propsHOrgID
      }
      // this.queryParams.HOrgID = 100038
@@ -993,6 +993,9 @@
        this.rowForm = selection[0];
      }
      this.selRowList = selection
      if (this.openPage) {
        this.$emit('deptEmit', this.selRowList, 12)
      }
    },
    //打开侧边搜索弹窗
    handleSearch() {