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

Merge pull request 'master-客户管理' (#37) from master-客户管理 into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/37
This commit is contained in:
wuteng 2025-07-25 10:52:00 +08:00
commit 7682de89db
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/static/tpl/imp_month_user.xlsx
View File

Binary file not shown.

13
src/views/emis/emisCustomerUser/monthUserList.vue
View File

@ -341,6 +341,7 @@ import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import EmpNamePicker4 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import EmpNamePicker4 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
import {excelDateToJSDate } from '@/utils/dateUtils'
import XLSX from 'xlsx' import XLSX from 'xlsx'
@ -567,7 +568,7 @@ export default {
const postData= { const postData= {
customerName: element['客户名称'], customerName: element['客户名称'],
customerNameEn: element['英文简称'], customerNameEn: element['客户英文简称'],
contact: element['联系人'], contact: element['联系人'],
phone: element['手机号码'], phone: element['手机号码'],
customerType: '2', customerType: '2',
@ -580,12 +581,15 @@ export default {
city:element['城市'], city:element['城市'],
county: element['区县'], county: element['区县'],
address: element['联系地址'], address: element['联系地址'],
creditPeriod: element['账期(天)'],
settleDay: element['账单日'],
email: element['E-Mail'], email: element['E-Mail'],
status: element['是否启用'], status: element['是否启用'],
payee: element['回款联系人'], payee: element['回款联系人'],
salesmen: element['销售联系人'], salesmen: element['销售联系人'],
salesExecutive: element['销售主管'], salesExecutive: element['销售主管'],
salesSupport: element['销售支持'], salesSupport: element['销售支持'],
bizSiteName: element['业务网点范围'],
dataFrom: "pc", dataFrom: "pc",
firstSigningDay:element['首次签约时间'], firstSigningDay:element['首次签约时间'],
blOpenOms: element['是否开启OMS账号'], blOpenOms: element['是否开启OMS账号'],
@ -598,9 +602,12 @@ export default {
// postData.cosigneeTelephone= element['收件电话'] // postData.cosigneeTelephone= element['收件电话']
// postData.country= element['国家'] // postData.country= element['国家']
// postData.extJsonStr = JSON.stringify(extJsonStr) // postData.extJsonStr = JSON.stringify(extJsonStr)
//转时间格式
if(postData.firstSigningDay){
postData.firstSigningDay=excelDateToJSDate(postData.firstSigningDay).split(' ')[0]
}
const res = await addMonthUser(postData) const res = await addMonthUser(postData)
console.log(res); console.log(res);
if (res.code !== 200) { if (res.code !== 200) {
this.$modal.msgError(JSON.stringify(res.msg)) this.$modal.msgError(JSON.stringify(res.msg))

2
src/views/emis/emisWaybill/batchWaybillRecord.vue
View File

@ -567,7 +567,7 @@ export default {
//拼接remark 和virtualRemark //拼接remark 和virtualRemark
this.orderList.forEach((item,index)=>{ this.orderList.forEach((item,index)=>{
if(item.blVirtual ==='是' && item.transLineType ==='缅甸快递'){ 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=[]; this.tmpDataList=[];

11
src/views/emis/emisWaybillAjustApply/adjustPanel.vue
View File

@ -965,7 +965,7 @@
<span v-else>否</span> <span v-else>否</span>
</el-col> </el-col>
<el-col :span="14" style="text-align: center"> <el-col :span="14" style="text-align: center">
<el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSpecialQuote" :disabled="form.calcFeeType==3" :true-label="1" :false-label="0"> {{ $t('特殊报价') }}</el-checkbox> <el-checkbox @change="handleChange" style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSpecialQuote" :disabled="form.calcFeeType==3" :true-label="1" :false-label="0"> {{ $t('特殊报价') }}</el-checkbox>
</el-col> </el-col>
</el-row> </el-row>
</el-col> </el-col>
@ -1123,7 +1123,7 @@
size="mini" size="mini"
type="text" type="text"
icon="el-icon-plus" icon="el-icon-plus"
:disabled="form.calcFeeType==3" :disabled="form.calcFeeType==3 || form.blSpecialQuote !==1"
@click="handleAddFee" @click="handleAddFee"
>{{ $t('增加自定义费用') }}</el-button> >{{ $t('增加自定义费用') }}</el-button>
</el-popover> </el-popover>
@ -1515,7 +1515,6 @@ export default {
if(this.form.calcFeeType==3){ if(this.form.calcFeeType==3){
this.form.blSpecialQuote='0'; this.form.blSpecialQuote='0';
} }
}, },
deep: true deep: true
}, },
@ -2194,6 +2193,12 @@ export default {
if(this.form.reciever){ if(this.form.reciever){
this.recieverCountryCode = this.form.reciever.country; 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();
} }
} }
}; };