diff --git a/public/static/tpl/imp_month_user.xlsx b/public/static/tpl/imp_month_user.xlsx
index 5e091501..397230a5 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/EmisBaseTools/EmisMonthpayAccountPicker.vue b/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue
index 0a966085..413b79c3 100644
--- a/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue
@@ -101,6 +101,7 @@
this.bakOptionItems=[];
this.optionItems=[];
listSimpleEmisMonthpayAccount(queryParams).then(response => {
+ console.log('response',response.rows);
this.loading = false;
this.bakOptionItems = response.rows;
this.optionItems =this.bakOptionItems;
diff --git a/src/views/emis/emisCustomerUser/batchUpdateForm.vue b/src/views/emis/emisCustomerUser/batchUpdateForm.vue
index 9cd24649..7115f61e 100644
--- a/src/views/emis/emisCustomerUser/batchUpdateForm.vue
+++ b/src/views/emis/emisCustomerUser/batchUpdateForm.vue
@@ -32,6 +32,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -104,6 +114,8 @@ import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
import EmisSiteSelectTreePicker from '@/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue';
import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker4 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
export default {
@@ -119,7 +131,9 @@ export default {
CountryPicker,
EmisSiteSimplePicker,ProvincePicker,CityPicker,DistrictPicker,
EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2,
- EmisSiteSelectTreePicker
+ EmisSiteSelectTreePicker,
+ EmpNamePicker3,
+ EmpNamePicker4,
},
dicts: ['emis_cus_settled_type'],
data() {
diff --git a/src/views/emis/emisCustomerUser/monthUserForm.vue b/src/views/emis/emisCustomerUser/monthUserForm.vue
index 74320dc5..24a64050 100644
--- a/src/views/emis/emisCustomerUser/monthUserForm.vue
+++ b/src/views/emis/emisCustomerUser/monthUserForm.vue
@@ -148,6 +148,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -234,7 +244,8 @@ import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
import EmisSiteSelectTreePicker from '@/views/emis/EmisBaseTools/EmisSiteSelectTreePicker.vue';
import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
-
+import EmpNamePicker3 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
+import EmpNamePicker4 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue';
export default {
@@ -250,6 +261,7 @@ export default {
},
components: {
PayeePicker,SalemanPicker,
+ EmpNamePicker3,EmpNamePicker4,
CountryPicker,
EmisSiteSimplePicker,ProvincePicker,CityPicker,DistrictPicker,
EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2,
@@ -308,6 +320,9 @@ export default {
salesmen: [
{ required: true, message: "销售联系人不能为空", trigger: ["blur",'change'] }
],
+ salesExecutive:[
+ { required: true, message: "销售主管不能为空", trigger: ["blur",'change'] }
+ ],
blOpenOms: [
{ required: true, message: "是否开通oms不能为空", trigger: ["blur",'change'] }
],
diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue
index 58364f6c..26731ded 100644
--- a/src/views/emis/emisCustomerUser/monthUserList.vue
+++ b/src/views/emis/emisCustomerUser/monthUserList.vue
@@ -22,7 +22,24 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -196,10 +200,8 @@
-
-
-
-
+
+
@@ -237,9 +239,10 @@
-
+
+
@@ -336,6 +339,8 @@ import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePick
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 XLSX from 'xlsx'
@@ -343,7 +348,9 @@ export default {
name: "MonthUserList",
components: {
EmpNamePicker1,EmpNamePicker2,
- elDateSimplePicker,monthUserForm,batchUpdateForm,CountryPicker,
+ EmpNamePicker3,
+ EmpNamePicker4,
+ elDateSimplePicker,monthUserForm,batchUpdateForm,CountryPicker,
EmisSiteSimplePicker,ProvincePicker,CityPicker,
EmisUserSimplePicker0,EmisUserSimplePicker1,EmisUserSimplePicker2
},
@@ -488,7 +495,7 @@ export default {
handleFormChanged(){
this.openForm = false;
this.openBatchUpdateForm = false;
- this.getList();
+ this.getList();
},
cancelForm(){
this.openBatchUpdateForm = false;
@@ -556,7 +563,8 @@ export default {
})
for (let index = 0; index < results.length; index++) {
const element = results[index]
- // 客户名称 英文简称 月结编号 联系人 手机号码 主归属网点 回款联系人 销售联系人 结算类型 国家 省份 城市 区县 联系地址 E-Mail 是否启用 是否开启OMS账号 首次签约时间 备注
+ // 客户名称 英文简称 月结编号 联系人 手机号码 主归属网点 回款联系人 销售联系人 销售主管 销售支持 结算类型 国家 省份 城市 区县 联系地址 E-Mail 是否启用 是否开启OMS账号 首次签约时间 备注
+
const postData= {
customerName: element['客户名称'],
customerNameEn: element['英文简称'],
@@ -576,27 +584,31 @@ export default {
status: element['是否启用'],
payee: element['回款联系人'],
salesmen: element['销售联系人'],
+ salesExecutive: element['销售主管'],
+ salesSupport: element['销售支持'],
dataFrom: "pc",
firstSigningDay:element['首次签约时间'],
blOpenOms: element['是否开启OMS账号'],
- remark: element['备注']
+ blSms: element['是否短信'],
+ remark: element['备注'],
+ blImport: 1,
};
// postData.cosignee= element['']
// postData.cosigneeAddress= element['收件地址']
// postData.cosigneeTelephone= element['收件电话']
// postData.country= element['国家']
// postData.extJsonStr = JSON.stringify(extJsonStr)
-
- const res = await addMonthUser(postData)
+
+ const res = await addMonthUser(postData)
console.log(res);
- if (res.code !== 200) {
- this.$modal.msgError(JSON.stringify(res.msg))
+ if (res.code !== 200) {
+ this.$modal.msgError(JSON.stringify(res.msg))
+ loadingInstance.close()
+ return
+ }
loadingInstance.close()
- return
- }
- loadingInstance.close()
- loadingInstance = this.$loading({
+ loadingInstance = this.$loading({
text: '正在导入 ' + _index + ' 数据...'
})
}
diff --git a/src/views/emis/emisSettlePayRecord/index.vue b/src/views/emis/emisSettlePayRecord/index.vue
index bcff5f37..b90b903f 100644
--- a/src/views/emis/emisSettlePayRecord/index.vue
+++ b/src/views/emis/emisSettlePayRecord/index.vue
@@ -638,8 +638,8 @@ export default {
return v['waybillDetail']['sendCompany'];
}
- if (j === 'waybillDetail.paymentType') {
- let paymentType=v['waybillDetail']['paymentType'];
+ if (j === 'paymentType') {
+ let paymentType=v['paymentType'];
return this.selectDictLabel(this.dict.type.emis_payment_type,paymentType);
}
@@ -698,8 +698,8 @@ export default {
return v['settlePayRecordDetail']['payId'];
}
- if (j === 'settlePayRecordDetail.recType') {
- let recType=v['settlePayRecordDetail']['recType'];
+ if (j === 'recType') {
+ let recType=v['recType'];
if(recType == 1){
return '收款';
}
@@ -735,10 +735,8 @@ export default {
}
}
-
-
- if (j === 'settlePayRecordDetail.payType') {
- let payType=v['settlePayRecordDetail']['payType'];
+ if (j === 'payType') {
+ let payType=v['payType'];
return this.selectDictLabel(this.dict.type.emis_settlebill_pay_type,payType);
}
if (j === 'settleType') {
@@ -782,7 +780,18 @@ export default {
let paymentStatus=v['settleSubBill']['paymentStatus'];
return this.selectDictLabel(this.dict.type.emis_payment_status,paymentStatus);
}
-
+
+ if(j == 'payStatus'){
+ let payStatus = v['payStatus']
+ if (payStatus == 0) {
+ return '待支付';
+ }
+ else if (payStatus == 1) {
+ return '支付成功';
+ } else if (payStatus == 2) {
+ return '支付失败';
+ }
+ }
return v[j]
}))
},
diff --git a/src/views/emis/emisWaybill/waybillModify.vue b/src/views/emis/emisWaybill/waybillModify.vue
index 64092780..d441116c 100644
--- a/src/views/emis/emisWaybill/waybillModify.vue
+++ b/src/views/emis/emisWaybill/waybillModify.vue
@@ -1219,7 +1219,7 @@ methods: {
this.initData();
},
onBillCodeChange(){
- if(this.form.billCode){
+ if(this.form.billCode){
this.form.billCode=this.form.billCode.replace(/\s+/g, '');
checkWaybillIsExists(this.form.billCode).then(response => {
const result = response.data;
@@ -1665,7 +1665,8 @@ methods: {
this.startTimer();
}
-
+ this.senderCountryCode = this.form.sender.country;
+ this.recieverCountryCode = this.form.reciever.country;
});
}
else{