diff --git a/public/static/tpl/imp_month_user.xlsx b/public/static/tpl/imp_month_user.xlsx
index 397230a5..e3fc6554 100644
Binary files a/public/static/tpl/imp_month_user.xlsx and b/public/static/tpl/imp_month_user.xlsx differ
diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue
index 26731ded..0cc3ee4e 100644
--- a/src/views/emis/emisCustomerUser/monthUserList.vue
+++ b/src/views/emis/emisCustomerUser/monthUserList.vue
@@ -341,6 +341,7 @@ import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker4 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import {excelDateToJSDate } from '@/utils/dateUtils'
import XLSX from 'xlsx'
@@ -567,7 +568,7 @@ export default {
const postData= {
customerName: element['客户名称'],
- customerNameEn: element['英文简称'],
+ customerNameEn: element['客户英文简称'],
contact: element['联系人'],
phone: element['手机号码'],
customerType: '2',
@@ -580,12 +581,15 @@ export default {
city:element['城市'],
county: element['区县'],
address: element['联系地址'],
+ creditPeriod: element['账期(天)'],
+ settleDay: element['账单日'],
email: element['E-Mail'],
status: element['是否启用'],
payee: element['回款联系人'],
salesmen: element['销售联系人'],
salesExecutive: element['销售主管'],
salesSupport: element['销售支持'],
+ bizSiteName: element['业务网点范围'],
dataFrom: "pc",
firstSigningDay:element['首次签约时间'],
blOpenOms: element['是否开启OMS账号'],
@@ -598,9 +602,12 @@ export default {
// postData.cosigneeTelephone= element['收件电话']
// postData.country= element['国家']
// postData.extJsonStr = JSON.stringify(extJsonStr)
-
+ //转时间格式
+ if(postData.firstSigningDay){
+ postData.firstSigningDay=excelDateToJSDate(postData.firstSigningDay).split(' ')[0]
+ }
const res = await addMonthUser(postData)
- console.log(res);
+ console.log(res);
if (res.code !== 200) {
this.$modal.msgError(JSON.stringify(res.msg))
diff --git a/src/views/emis/emisWaybill/batchWaybillRecord.vue b/src/views/emis/emisWaybill/batchWaybillRecord.vue
index 8ec89737..4930e2dd 100644
--- a/src/views/emis/emisWaybill/batchWaybillRecord.vue
+++ b/src/views/emis/emisWaybill/batchWaybillRecord.vue
@@ -567,7 +567,7 @@ export default {
//拼接remark 和virtualRemark
this.orderList.forEach((item,index)=>{
if(item.blVirtual ==='是' && item.transLineType ==='缅甸快递'){
- item.remark = `${item.remark && item.remark.toString().replace(/\s/g, '').length>0?item.remark+',':''}${item.masterBillCode && item.masterBillCode.toString().replace(/\s/g, '').length>0 ?'该单为虚拟单:对应主单为:'+item.masterBillCode:''}`
+ item.remark = `${item.remark && item.remark.toString().replace(/\s/g, '').length>0?item.remark+',':''}${item.masterBillCode && item.masterBillCode.toString().replace(/\s/g, '').length>0 ?'该单为虚拟单:对应主单为'+item.masterBillCode:''}`
}
})
this.tmpDataList=[];
diff --git a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
index 47394c34..8b9115a3 100644
--- a/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
+++ b/src/views/emis/emisWaybillAjustApply/adjustPanel.vue
@@ -965,7 +965,7 @@
否
- {{ $t('特殊报价') }}
+ {{ $t('特殊报价') }}
@@ -1123,7 +1123,7 @@
size="mini"
type="text"
icon="el-icon-plus"
- :disabled="form.calcFeeType==3"
+ :disabled="form.calcFeeType==3 || form.blSpecialQuote !==1"
@click="handleAddFee"
>{{ $t('增加自定义费用') }}
@@ -1515,7 +1515,6 @@ export default {
if(this.form.calcFeeType==3){
this.form.blSpecialQuote='0';
}
-
},
deep: true
},
@@ -2194,6 +2193,12 @@ export default {
if(this.form.reciever){
this.recieverCountryCode = this.form.reciever.country;
}
+ },
+ handleChange(checked) {
+ // console.log('bill.feeItems',this.billDetail.feeItems)
+ // console.log('form.feeItems',this.form.feeItems)
+ this.form.feeItems = deepClone(this.billDetail.feeItems);
+ this.handleCalcFeeItem();
}
}
};