This commit is contained in:
linfso 2024-05-26 17:46:38 +08:00
parent b00cd85bcd
commit 5100b44d97

View File

@ -213,7 +213,7 @@
<el-col :span="12">
<el-form-item label="寄件人" prop="sender.name">
<CustomerAddressSimplePicker0 addressType="1" v-model="form.sender.name" @onChange="onChangeSelectSender"></CustomerAddressSimplePicker0>
<CustomerAddressSimplePicker0 addressType="1" :useSiteCode="form.sendSiteCode" v-model="form.sender.name" @onChange="onChangeSelectSender"></CustomerAddressSimplePicker0>
</el-form-item>
</el-col>
<el-col :span="12">
@ -277,7 +277,7 @@
<el-col :span="12">
<el-form-item label="收件人" prop="reciever.name">
<CustomerAddressSimplePicker1 addressType="2" :countryCode="form.reciever.country" v-model="form.reciever.name" @onChange="onChangeSelectReceiver"></CustomerAddressSimplePicker1>
<CustomerAddressSimplePicker1 addressType="2" :useSiteCode="form.sendSiteCode" :countryCode="form.reciever.country" v-model="form.reciever.name" @onChange="onChangeSelectReceiver"></CustomerAddressSimplePicker1>
</el-form-item>
</el-col>
@ -656,8 +656,8 @@
</el-col>
<el-col :span="24">
<el-form-item label="总运费" prop="freight" label-width="70px">
<el-input v-model="form.freight" placeholder="" >
</el-input>
<el-input v-if="form.calcFeeType == 3" v-model="form.freight" placeholder="" > </el-input>
<el-input v-else v-model="form.freight" disabled placeholder="" > </el-input>
</el-form-item>
<el-form-item label="费用备注" prop="feeRemaker" label-width="70px">
<el-input v-model="form.feeRemaker" type="textarea" placeholder="" >
@ -713,7 +713,7 @@
</div>
<el-dialog :title="titleSelectAddress" :visible.sync="openSelectAddress" width="60%" :destroy-on-close="true" v-dialogDrag append-to-body>
<AddressSelectPicker0 :addressType="addressType" @onSelected="onAddressChangeSelect"></AddressSelectPicker0>
<AddressSelectPicker0 :addressType="addressType" :useSiteCode="form.sendSiteCode" @onSelected="onAddressChangeSelect"></AddressSelectPicker0>
</el-dialog>
</div>
@ -954,13 +954,13 @@ data() {
{ required: true, message: "目的地网点代码不能为空", trigger: "blur" }
],
custNo: [
{ required: true, message: "月结卡号不能为空", trigger: "blur" }
{ required: true, message: "月结卡号不能为空", trigger: ["blur",'change'] }
],
payee: [
{ required: true, message: "销售回款人不能为空", trigger: "blur" }
{ required: true, message: "销售回款人不能为空", trigger: ["blur",'change'] }
],
salesmen: [
{ required: true, message: "销售联系人不能为空", trigger: "blur" }
{ required: true, message: "销售联系人不能为空", trigger: ["blur",'change'] }
],
takePieceEmployeeCode: [
{ required: true, message: "取件员代码不能为空", trigger: ["blur",'change'] }
@ -1565,15 +1565,27 @@ methods: {
&& this.form.sendSiteCode
&& this.form.dispatchUnderlingSiteCode
&& this.form.calcFeeType
&& this.form.customsClear
&& this.form.customsEclaration
){
let calcFeeType=this.form.calcFeeType;
if(calcFeeType==3){
calcFeeType=1;
}
let postData={
productType: this.form.productType,
customerCode: this.form.customerCode,
custNo: this.form.custNo,
calcFeeType: this.form.calcFeeType,
calcFeeType:calcFeeType,
settlementWeight: this.form.settlementWeight,
sendSiteCode: this.form.sendSiteCode,
dispatchUnderlingSiteCode: this.form.dispatchUnderlingSiteCode,
customsClear:this.form.customsClear,
customsEclaration:this.form.customsEclaration
}
calcWaybillFee(postData).then(response => {