ERP_override.git

			@@ -71,6 +71,9 @@
			deliveryDate:'',
			salesmanId:'',
			salesman:'',
			freight:'',
			freightPrice:'',
			freightQuantity:'',
			creatorId:userStore.user.userid,
			creator:userStore.user.userName
			})
			@@ -100,7 +103,10 @@
			remarks:'',
			createTime:'',
			deliveryDate:'',
			creator:''
			creator:'',
			freight:'',
			freightPrice:'',
			freightQuantity:'',
			},
			finishedGoodsInventory:{
			quantityAvailable:'',
			@@ -266,7 +272,7 @@
			options: [
			[
			{ code: 'copyChecked', name: t('basicData.selectSame'), prefixIcon: 'vxe-icon-copy', visible: true, disabled: false },
			{ code: 'otherMoney', name: t('basicData.otherAmounts'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false }
			//{ code: 'otherMoney', name: t('basicData.otherAmounts'), prefixIcon: 'vxe-icon-chart-bar-x', visible: true, disabled: false }
			]
			]
			}
			@@ -385,8 +391,14 @@
			ElMessage.error(t('delivery.pleaseEnterThePaymentMethod'))
			return
			}


			const freightPrice = titleUploadData.value.freightPrice
			if(freightPrice=== null \|\| freightPrice === undefined \|\| freightPrice === ''){
			titleUploadData.value.freightPrice=0
			}
			const freightQuantity = titleUploadData.value.freightQuantity
			if(freightQuantity=== null \|\| freightQuantity === undefined \|\| freightQuantity === ''){
			titleUploadData.value.freightQuantity=0
			}


			let flowData = ref({
			@@ -622,6 +634,12 @@
			<el-col :span="3"><el-input v-model="titleUploadData.salesman" :readonly="true"/></el-col>
			<el-col :span="2"><el-text>{{$t('delivery.shipper')}}:</el-text></el-col>
			<el-col :span="5"><el-input v-model="titleUploadData.creator" :readonly="true"/></el-col>
			<el-col :span="1"><el-text>运费单价:</el-text></el-col>
			<el-col :span="1"><el-input v-model="titleUploadData.freightPrice" /></el-col>
			<el-col :span="1"><el-text>运费数量:</el-text></el-col>
			<el-col :span="1"><el-input v-model="titleUploadData.freightQuantity" /></el-col>
			<el-col :span="1"><el-text>运费金额:</el-text></el-col>
			<el-col :span="2"><el-input v-model="titleUploadData.freight" :readonly="true"/></el-col>
			</el-row>
			</div>
			<div class="order-detail">