H5/americanContainer.git

			@@ -283,7 +283,8 @@
			</div>
			<div class="box_text2">Weight</div>
			</div>
			<el-input :disabled="type == 'detail'" v-model="form.weight" @input="onInput" placeholder="请输入">
			<el-input type="number" :disabled="type == 'detail'" v-model="form.weight" @input="onInput"
			placeholder="请输入">
			<div style="line-height: 50px;" slot="prefix-icon">KG</div>
			</el-input>
			</div>
			@@ -312,7 +313,7 @@
			</div>
			<div class="box_text2">Voume</div>
			</div>
			<el-input :disabled="type == 'detail'" v-model="form.volume" placeholder="请输入">
			<el-input type="number" :disabled="type == 'detail'" v-model="form.volume" placeholder="请输入">
			<div style="line-height: 50px;" slot="suffix">CMB</div>
			</el-input>
			</div>
			@@ -397,7 +398,8 @@
			</div>
			<div class="box_text2">Tel</div>
			</div>
			<el-input :disabled="type == 'detail'" v-model="form.tel" placeholder="请输入"></el-input>
			<el-input type="number" :disabled="type == 'detail'" v-model="form.tel"
			placeholder="请输入"></el-input>

			</div>
			</el-form-item>
			@@ -511,7 +513,7 @@

			<div class="btn">
			<div class="btn_close" @click="$router.go(-1)">关闭</div>
			<div v-if="activeTab == 1" class="btn_comfirm" @click="submitForm('form')">确认</div>
			<div v-if="type != 'detail'" class="btn_comfirm" @click="submitForm('form')">确认</div>
			</div>
			</el-form>
			<AddedInformation v-if="show" :show="show" @close="show = false" @submit="submit"></AddedInformation>
			@@ -541,7 +543,7 @@
			type: 'add',
			activeTab: 1,
			show: false,
			detailInfo:{},
			detailInfo: {},
			form: {
			container: "", //集装箱号
			bol: "", //提单号
			@@ -698,6 +700,7 @@
			],
			optionsPL: [],
			rules: {
			email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
			container: [{ required: true, message: "请输入", trigger: "blur" }],
			bol: [{ required: true, message: "请输入", trigger: "blur" }],
			cargoType: [{ required: true, message: "请选择", trigger: "blur" }],
			@@ -736,7 +739,7 @@
			orderId: this.orderId
			}).then(resp => {
			this.form = resp.data
			this.detailInfo=resp.data
			this.detailInfo = resp.data
			this.form.DOFileUrl = resp.data.DOFileUrl ? resp.data.DOFileUrl : ''
			this.form.PUFileUrl = resp.data.PUFileUrl ? resp.data.PUFileUrl : ''
			this.form.PODFileUrl = resp.data.PODFileUrl ? resp.data.PODFileUrl : ''
			@@ -1096,6 +1099,13 @@
			</script>

			<style lang="less" scoped>
			::v-deep .el-upload-list__item-name {
			max-width: 150px !important;
			overflow: hidden;
			text-overflow: ellipsis;
			white-space: nowrap;
			}

			.tab {
			padding-bottom: 35px;
			}

	src/component/detailInfo.vue	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/view/addOrder.vue	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -40,7 +40,7 @@
			<div class="box33">
			<div class="box_text1">备注：</div>
			</div>
			<el-input type="textarea" disabled v-model="info.remark" placeholder="请输入不超过200字备注">
			<el-input type="textarea" disabled v-model="info.cosRemark" placeholder="请输入不超过200字备注">
			</el-input>
			</div>
			</div>