aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-01-10 09:06:13 +08:00
parent fa34812770
commit 151bf79074
2 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/views/emis/emisTmsCostFee/emisTmsCostFeeForm.vue
View File

@ -235,8 +235,8 @@
</el-row> </el-row>
</el-form> </el-form>
<div style="text-align: center;margin-bottom: 10px;"> <div style="text-align: center;margin-bottom: 10px;">
<el-button type="primary" @click="submitForm">确 定</el-button> <el-button type="primary" :loading="isDoing" @click="submitForm">确 定</el-button>
<el-button type="primary" @click="submitFormAndContinue" >保存并继续录入</el-button> <el-button type="primary" :loading="isDoing" @click="submitFormAndContinue" >保存并继续录入</el-button>
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
</div> </div>
@ -263,6 +263,7 @@ export default {
emisTmsCostFeeOptions: [], emisTmsCostFeeOptions: [],
// 遮罩层 // 遮罩层
loading: true, loading: true,
isDoing:false,
// 表单参数 // 表单参数
form: {}, form: {},
// 表单校验 // 表单校验
@ -438,15 +439,31 @@ export default {
submitForm(isContinue) { submitForm(isContinue) {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
addEmisTmsCostFee(this.form).then(response => { if (this.form.id != null) {
this.$modal.msgSuccess("新增成功"); this.isDoing=true;
if(isContinue==true){ updateEmisTmsCostFee(this.form).then(response => {
this.form.feeType=null; this.isDoing=false;
this.form.costFee=null; this.$modal.msgSuccess("保存成功");
}else{ if(isContinue==true){
this.$emit("on-changed"); this.form.feeType=null;
} this.form.costFee=null;
}); }else{
this.$emit("on-changed");
}
});
}else{
this.isDoing=true;
addEmisTmsCostFee(this.form).then(response => {
this.isDoing=false;
this.$modal.msgSuccess("新增成功");
if(isContinue==true){
this.form.feeType=null;
this.form.costFee=null;
}else{
this.$emit("on-changed");
}
});
}
} }
}); });
}, },

14
src/views/emis/emisWaybill/OrderDetailReadOnly.vue
View File

@ -38,11 +38,11 @@
color: white;"> {{ $t('收') }} - {{ form.reciever.countryName }} {{ form.reciever.provinceName }} - {{ form.dispatchUnderlingSiteName }}</span> color: white;"> {{ $t('收') }} - {{ form.reciever.countryName }} {{ form.reciever.provinceName }} - {{ form.dispatchUnderlingSiteName }}</span>
</div> </div>
<div style=" font-size: 12px; <div style="font-size: 12px;
font-weight: bold; font-weight: bold;
color: black; color: black;
border: 1px solid #e6ebf5; border: 1px solid #e6ebf5;
margin-top: 10px; min-height: 90px;"> margin-top: 10px; min-height: 90px;">
<div>{{ form.reciever.name }} {{ form.reciever.phone }}</div> <div>{{ form.reciever.name }} {{ form.reciever.phone }}</div>
<div>{{ form.reciever.countryName }} {{ form.reciever.provinceName }} {{ form.reciever.cityName }} {{ form.reciever.countyName }} {{ form.reciever.address }}</div> <div>{{ form.reciever.countryName }} {{ form.reciever.provinceName }} {{ form.reciever.cityName }} {{ form.reciever.countyName }} {{ form.reciever.address }}</div>
<div>{{ form.reciever.company }}</div> <div>{{ form.reciever.company }}</div>
@ -76,7 +76,7 @@
<!-- <el-descriptions-item label="合同号" :span="4">{{ form.custOrderId }}</el-descriptions-item> --> <!-- <el-descriptions-item label="合同号" :span="4">{{ form.custOrderId }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="专属取件员">{{ form.takePieceEmployeeName }}/{{ form.operateEmployeeName }}</el-descriptions-item> --> <!-- <el-descriptions-item label="专属取件员">{{ form.takePieceEmployeeName }}/{{ form.operateEmployeeName }}</el-descriptions-item> -->
<!-- <el-descriptions-item label="录单员">{{ form.registerManName }}</el-descriptions-item> --> <!-- <el-descriptions-item label="录单员">{{ form.registerManName }}</el-descriptions-item> -->
<el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" label="月结客户" >{{ form.customerName }}</el-descriptions-item> <el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" label="月结客户" >{{ form.custName }}</el-descriptions-item>
<!-- <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item> --> <!-- <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item> -->
<el-descriptions-item label="销售联系人">{{ form.salesmen }}</el-descriptions-item> <el-descriptions-item label="销售联系人">{{ form.salesmen }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
@ -261,7 +261,7 @@
<dict-tag :options="dict.type.emis_payment_type" :value="form.paymentType"/> <dict-tag :options="dict.type.emis_payment_type" :value="form.paymentType"/>
</el-descriptions-item> </el-descriptions-item>
<!-- <el-descriptions-item label="费用币种">{{ form.currency }}</el-descriptions-item> --> <!-- <el-descriptions-item label="费用币种">{{ form.currency }}</el-descriptions-item> -->
<el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" label="月结客户" :span="4">{{ form.customerName }}</el-descriptions-item> <el-descriptions-item v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" label="月结客户" :span="4">{{ form.custName }}</el-descriptions-item>
<!-- <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item> <!-- <el-descriptions-item label="回款联系人">{{ form.payee }}</el-descriptions-item>
<el-descriptions-item label="销售联系人" :span="3">{{ form.salesmen }}</el-descriptions-item> --> <el-descriptions-item label="销售联系人" :span="3">{{ form.salesmen }}</el-descriptions-item> -->
<el-descriptions-item label="费用明细" :span="4"> <el-descriptions-item label="费用明细" :span="4">