MES-WEB-VUEUI.git

			@@ -12,198 +12,217 @@
			<el-form ref="form" :model="form" :rules="rules" label-width="130px">
			<el-tabs v-model="activeName" type="card">
			<el-tab-pane label="基本信息" name="first">
			<el-row>
			<el-col :span="6">
			<el-form-item label="单据号" prop="HBillNo">
			<el-input v-model="form.HBillNo" placeholder="请输入单据号" disabled />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="日期" prop="HDate">
			<el-date-picker v-model="form.HDate" type="date" placeholder="选择日期"
			format="yyyy-MM-dd" disabled> </el-date-picker>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="源单号" prop="HMainSourceBillNo">
			<el-input v-model="form.HMainSourceBillNo" placeholder="请输入源单号">
			<el-button slot="append" icon="el-icon-search"
			@click="openDataDialog(12)"></el-button>
			</el-input>
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="承运商" prop="HCarrierName">
			<el-input v-model="form.HCarrierName" placeholder="请输入承运商">
			<el-button slot="append" icon="el-icon-search"
			@click="openDataDialog(6)"></el-button>
			</el-input>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="客户" prop="HCusName">
			<el-input v-model="form.HCusName" placeholder="请输入客户">
			<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="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>
			<el-row>
			<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-col :span="6">
			<el-form-item label="车型最大容积" prop="HCarTypeMaxVolume">
			<el-input v-model="form.HCarTypeMaxVolume" placeholder="请输入车型最大容积" readonly />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="承运合同" prop="HContractTransportBillNo">
			<el-input v-model="form.HContractTransportBillNo" placeholder="请输入承运合同">
			<el-button slot="append" icon="el-icon-search"
			@click="openDataDialog(16)"></el-button>
			</el-input>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="距离（公里）" prop="HDistance">
			<el-input v-model="form.HDistance" placeholder="请输入距离" readonly />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="运输时效" prop="HTransportTimes">
			<el-input v-model="form.HTransportTimes" placeholder="请输入运输时效" readonly />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="运输类型" prop="HTransportTyep">
			<el-input v-model="form.HTransportTyep" placeholder="请输入运输类型" readonly />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="结算方式" prop="HSSName">
			<el-input v-model="form.HSSName" placeholder="请输入结算方式">
			<el-button slot="append" icon="el-icon-search"
			@click="openDataDialog('暂无')"></el-button>
			</el-input>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="币别" prop="HCurName">
			<el-input v-model="form.HCurName" placeholder="请输入币别" />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="汇率" prop="HExRate">
			<el-input v-model="form.HExRate" placeholder="请输入汇率" readonly />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="运费" prop="HMoney">
			<el-input v-model="form.HMoney" placeholder="请输入运费" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="总体积（立方米）" prop="HTotalVolume">
			<el-input v-model="form.HTotalVolume" placeholder="请输入总体积" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="装载率" prop="HLoadingRate">
			<el-input v-model="form.HLoadingRate" placeholder="请输入装载率" />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="提货地址" prop="HPickAddr">
			<el-input v-model="form.HPickAddr" placeholder="请输入提货地址" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="到货地址" prop="HArriverAddr">
			<el-input v-model="form.HArriverAddr" placeholder="请输入到货地址" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="运输方式" prop="HTransType">
			<el-select v-model="form.HTransType" placeholder="请选择运输方式">
			<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="6">
			<el-form-item label="组织" prop="HOrgID">
			<el-select v-model="form.HOrgID" placeholder="请选择组织" @change="organizationChange"
			disabled>
			<el-option v-for="(item, index) in organizationList" :key="index"
			:label="item.Name" :value="item.ID">
			</el-option>
			</el-select>
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="要求提货日期" prop="HDateForRequestedPick">
			<el-date-picker v-model="form.HDateForRequestedPick" type="date"
			placeholder="选择要求提货日期" format="yyyy-MM-dd hh:mm:ss">
			</el-date-picker>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="承运商确认日期" prop="HDate_CarrierSure">
			<el-date-picker v-model="form.HDate_CarrierSure" type="date" placeholder="选择承运商确认日期"
			format="yyyy-MM-dd hh:mm:ss" disabled>
			</el-date-picker>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="物流状态" prop="HCarryStatus">
			<el-select v-model="form.HCarryStatus" placeholder="请选择物流状态" disabled>
			<el-option label="申请中" value="1"></el-option>
			<el-option label="已审核" value="2"></el-option>
			<el-option label="承运商确认" value="3"></el-option>
			<el-option label="待提货" value="4"></el-option>
			<el-option label="已到厂" value="5"></el-option>
			<el-option label="已提货" value="6"></el-option>
			<el-option label="运输中" value="7"></el-option>
			<el-option label="已签收" value="8"></el-option>
			<el-option label="已核算" value="9"></el-option>
			</el-select>
			</el-form-item>
			</el-col>
			</el-row>
			<!-- 第一块：单据号、日期、源单号、承运商、客户 -->
			<div class="form-group">
			<el-row>
			<el-col :span="6">
			<el-form-item label="单据号" prop="HBillNo">
			<el-input v-model="form.HBillNo" placeholder="请输入单据号" disabled />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="日期" prop="HDate">
			<el-date-picker v-model="form.HDate" type="date" placeholder="选择日期"
			format="yyyy-MM-dd" disabled> </el-date-picker>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="源单号" prop="HMainSourceBillNo">
			<el-input v-model="form.HMainSourceBillNo" placeholder="请输入源单号">
			<el-button slot="append" icon="el-icon-search" @click="openDataDialog(12)"></el-button>
			</el-input>
			</el-form-item>
			</el-col>
			<!-- 第一行剩余位置留空，保持布局整齐（可选） -->
			<el-col :span="6"></el-col>
			</el-row>
			<el-row>

			<el-col :span="6">
			<el-form-item label="客户" prop="HCusName">
			<el-input v-model="form.HCusName" placeholder="请输入客户">
			<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="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>
			</div>

			<!-- 第二块：承运合同、始发地、目的地、车型、车型最大容积、距离、运输时效、运输类型、结算方式、币别、汇率、运费、总体积、装载率、运输方式 -->
			<div class="form-group">
			<el-row>
			<el-col :span="6">
			<el-form-item label="承运合同" prop="HContractTransportBillNo">
			<el-input v-model="form.HContractTransportBillNo" placeholder="请输入承运合同">
			<el-button slot="append" icon="el-icon-search" @click="openDataDialog(16)"></el-button>
			</el-input>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="承运商" prop="HCarrierName">
			<el-input v-model="form.HCarrierName" placeholder="请输入承运商">
			<el-button slot="append" icon="el-icon-search" @click="openDataDialog(6)"></el-button>
			</el-input>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="距离（公里）" prop="HDistance">
			<el-input v-model="form.HDistance" placeholder="请输入距离" readonly />
			</el-form-item>
			</el-col>

			</el-row>
			<el-row>


			<el-col :span="6">
			<el-form-item label="运输时效" prop="HTransportTimes">
			<el-input v-model="form.HTransportTimes" placeholder="请输入运输时效" readonly />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="运输类型" prop="HTransportTyep">
			<el-input v-model="form.HTransportTyep" placeholder="请输入运输类型" readonly />
			</el-form-item>
			</el-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="结算方式" prop="HSSName">
			<el-input v-model="form.HSSName" placeholder="请输入结算方式">
			<el-button slot="append" icon="el-icon-search" @click="openDataDialog('暂无')"></el-button>
			</el-input>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="币别" prop="HCurName">
			<el-input v-model="form.HCurName" placeholder="请输入币别" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="汇率" prop="HExRate">
			<el-input v-model="form.HExRate" placeholder="请输入汇率" readonly />
			</el-form-item>
			</el-col>

			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="运费" prop="HMoney">
			<el-input v-model="form.HMoney" placeholder="请输入运费" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="运输方式" prop="HTransType">
			<el-select v-model="form.HTransType" placeholder="请选择运输方式">
			<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="6"></el-col> -->
			</el-row>
			</div>
			<div class="form-group">
			<el-row>
			<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-col :span="6">
			<el-form-item label="车型最大容积" prop="HCarTypeMaxVolume">
			<el-input v-model="form.HCarTypeMaxVolume" placeholder="请输入车型最大容积" readonly />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="总体积（立方米）" prop="HTotalVolume">
			<el-input v-model="form.HTotalVolume" placeholder="请输入总体积" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="装载率" prop="HLoadingRate">
			<el-input v-model="form.HLoadingRate" placeholder="请输入装载率" />
			</el-form-item>
			</el-col>
			</el-row>
			</div>
			<!-- 第三块：提货地址、到货地址、组织、要求提货日期、承运商确认日期、物流状态 -->
			<div class="form-group">
			<el-row>
			<el-col :span="6">
			<el-form-item label="提货地址" prop="HPickAddr">
			<el-input v-model="form.HPickAddr" placeholder="请输入提货地址" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="到货地址" prop="HArriverAddr">
			<el-input v-model="form.HArriverAddr" placeholder="请输入到货地址" />
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="组织" prop="HOrgID">
			<el-select v-model="form.HOrgID" placeholder="请选择组织" @change="organizationChange" disabled>
			<el-option v-for="(item, index) in organizationList" :key="index"
			:label="item.Name" :value="item.ID">
			</el-option>
			</el-select>
			</el-form-item>
			</el-col>
			<el-col :span="6"></el-col>
			</el-row>
			<el-row>
			<el-col :span="6">
			<el-form-item label="要求提货日期" prop="HDateForRequestedPick">
			<el-date-picker v-model="form.HDateForRequestedPick" type="date"
			placeholder="选择要求提货日期" format="yyyy-MM-dd hh:mm:ss">
			</el-date-picker>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="承运商确认日期" prop="HDate_CarrierSure">
			<el-date-picker v-model="form.HDate_CarrierSure" type="date" placeholder="选择承运商确认日期"
			format="yyyy-MM-dd hh:mm:ss" disabled>
			</el-date-picker>
			</el-form-item>
			</el-col>
			<el-col :span="6">
			<el-form-item label="物流状态" prop="HCarryStatus">
			<el-select v-model="form.HCarryStatus" placeholder="请选择物流状态" disabled>
			<el-option label="申请中" value="1"></el-option>
			<el-option label="已审核" value="2"></el-option>
			<el-option label="承运商确认" value="3"></el-option>
			<el-option label="待提货" value="4"></el-option>
			<el-option label="已到厂" value="5"></el-option>
			<el-option label="已提货" value="6"></el-option>
			<el-option label="运输中" value="7"></el-option>
			<el-option label="已签收" value="8"></el-option>
			<el-option label="已核算" value="9"></el-option>
			</el-select>
			</el-form-item>
			</el-col>
			<el-col :span="6"></el-col>
			</el-row>
			</div>
			</el-tab-pane>
			<el-tab-pane label="承运商信息" name="second">
			<el-row>
			@@ -1871,4 +1890,10 @@
			.xsckdBox .el-date-editor.el-input {
			width: 100%;
			}
			.form-group {
			border: 1px solid #ddd; /* 灰色边框 */
			padding: 15px; /* 内边距，让内容与边框有间距 */
			border-radius: 4px; /* 可选圆角 */
			margin-bottom: 20px; /* 保持原有的下边距 */
			}
			</style>

	.env.development	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/logistics/transportGPS/Add_Edit_WL_YayBill.vue	409 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/views/logistics/transportGPS/WL_YayBill.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -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/
			@@ -19,6 +19,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_APP_BASE_API_INNER = http://192.168.1.11/API/
			# 路由懒加载
			VUE_CLI_BABEL_TRANSPILE_MODULES = true

			@@ -1250,7 +1250,7 @@
			this.$modal.msgSuccess(response.data.msg \|\| "司机添加成功");
			}
			} else {
			this.$modal.msgError(response.data.msg \|\| "获取源单数据失败");
			this.$modal.msgError(response.data.msg \|\| "请先供应商确认");
			}
			} catch (error) {
			this.$modal.msgError("获取源单数据时发生错误，请稍后重试!");