From 51468f93275c2bcfcc7ad25bf05f3d6a079ff764 Mon Sep 17 00:00:00 2001
From: zjf <zhangjf@probim.com.cn>
Date: Wed, 08 Mar 2023 11:40:01 +0800
Subject: [PATCH] 订阅 最终决定
---
src/api/common.js | 12 ++---
src/views/PWS/Subscriptions.vue | 53 +++++++++++---------------
2 files changed, 27 insertions(+), 38 deletions(-)
diff --git a/src/api/common.js b/src/api/common.js
index 68e4f4c..55a04fb 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -295,13 +295,11 @@
// }
// console.log(params)
return request({
- url: '/AutoDesk/subscriptions/ExportExcel?AutoRenewingSubscriptionText=' + (data.AutoRenewingSubscriptionText === 'AutoRenewing Subscription' ? data.AutoRenewingSubscriptionText : '') +
+ url: '/AutoDesk/subscriptions/ExportExcel?AutoRenewingContractText=' + (data.AutoRenewingContractText === 'Auto-RenewingContract' ? data.AutoRenewingContractText : '') +
(data.ContractNumber
? '&ContractNumber=' + encodeURIComponent(data.ContractNumber) : '') +
(data.EndCustomerAccountName
? '&EndCustomerAccountName=' + encodeURIComponent(data.EndCustomerAccountName) : '') +
- (data.EndCustomerStateProvince
- ? '&EndCustomerStateProvince=' + encodeURIComponent(data.EndCustomerStateProvince) : '') +
(data.ProductLine
? '&ProductLine=' + encodeURIComponent(data.ProductLine) : '') +
(data.Term
@@ -310,10 +308,10 @@
? '&StartEndDate=' + data.StartEndDate : '') +
(data.EndEndDate
? '&EndEndDate=' + data.EndEndDate : '') +
- (data.StartLastPurchaseDate
- ? '&StartLastPurchaseDate=' + data.StartLastPurchaseDate : '') +
- (data.EndLastPurchaseDate
- ? '&EndLastPurchaseDate=' + data.EndLastPurchaseDate : ''),
+ (data.StartContractEndDate
+ ? '&StartContractEndDate=' + data.StartContractEndDate : '') +
+ (data.EndContractEndDate
+ ? '&EndContractEndDate=' + data.EndContractEndDate : ''),
method: 'get',
responseType: 'blob'
})
diff --git a/src/views/PWS/Subscriptions.vue b/src/views/PWS/Subscriptions.vue
index bb34e00..fa2cc5f 100644
--- a/src/views/PWS/Subscriptions.vue
+++ b/src/views/PWS/Subscriptions.vue
@@ -14,26 +14,26 @@
</el-form-item>
<el-form-item>
<div style='display: flex;'>
- <span style="margin-right: 12px">筛选方式:</span>
- <el-select v-model="headObj.AutoRenewingSubscriptionText" placeholder="请选择" @change="renewalMethodChange">
- <el-option key="1" label="自动续约" value="AutoRenewing Subscription"></el-option>
- <el-option key="2" label="到期日期" value="NoAutoRenewing Subscription"></el-option>
+ <span style="margin-right: 12px">合约筛选方式:</span>
+ <el-select v-model="headObj.AutoRenewingContractText" placeholder="请选择" @change="renewalMethodChange">
+ <el-option key="1" label="自动续约" value="Auto-RenewingContract"></el-option>
+ <el-option key="2" label="合约到期日期" value="NoAuto-RenewingContract"></el-option>
</el-select>
</div>
</el-form-item>
- <el-form-item v-if="headObj.AutoRenewingSubscriptionText == 'NoAutoRenewing Subscription'">
- <span>到期开始日期:</span>
+ <el-form-item v-if="headObj.AutoRenewingContractText == 'NoAuto-RenewingContract'">
+ <span>合约到期开始日期:</span>
<el-date-picker
- v-model="headObj.StartEndDate"
+ v-model="headObj.StartContractEndDate"
type="date"
placeholder="选择开始日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
- <el-form-item v-if="headObj.AutoRenewingSubscriptionText == 'NoAutoRenewing Subscription'">
- <span>到期结束日期:</span>
+ <el-form-item v-if="headObj.AutoRenewingContractText == 'NoAuto-RenewingContract'">
+ <span>合约到期结束日期:</span>
<el-date-picker
- v-model="headObj.EndEndDate"
+ v-model="headObj.EndContractEndDate"
type="date"
placeholder="选择结束日期"
value-format="yyyy-MM-dd">
@@ -42,7 +42,7 @@
<el-form-item>
<span>许可开始日期:</span>
<el-date-picker
- v-model="headObj.StartLastPurchaseDate"
+ v-model="headObj.StartEndDate"
type="date"
placeholder="选择开始日期"
value-format="yyyy-MM-dd">
@@ -51,7 +51,7 @@
<el-form-item>
<span>许可结束日期:</span>
<el-date-picker
- v-model="headObj.EndLastPurchaseDate"
+ v-model="headObj.EndEndDate"
type="date"
placeholder="选择结束日期"
value-format="yyyy-MM-dd">
@@ -70,13 +70,6 @@
style="width: 200px"
v-model="headObj.EndCustomerAccountName"
placeholder="请输入最终客户名称"/>
- </el-form-item>
- <el-form-item>
- <span>最终客户帐户所在地:</span>
- <el-input
- style="width: 200px"
- v-model="headObj.EndCustomerStateProvince"
- placeholder="请输入最终客户帐户所在地"/>
</el-form-item>
<el-form-item>
<div style='display: flex;'>
@@ -131,13 +124,12 @@
crmType: 'subscriptions',
headObj: {
ContractNumber: '', // 合约编号
- AutoRenewingSubscriptionText: '', // 自动续约合同
- StartEndDate: '', // 到期日期开始时间
- EndEndDate: '', // 到期日期结束时间
- StartLastPurchaseDate: '', // 许可开始时间
- EndLastPurchaseDate: '', // 许可结束时间
+ AutoRenewingContractText: '', // 自动续约合同
+ StartContractEndDate: '', // 合约到期日期开始时间
+ EndContractEndDate: '', // 合约到期日期结束时间
+ StartEndDate: '', // 许可开始时间
+ EndEndDate: '', // 许可结束时间
ProductLine: '', // 产品线
- EndCustomerStateProvince: '', // 最终客户帐户所在地
Term: '', // 许可年限
EndCustomerAccountName: '' // 最终客户名称
},
@@ -166,13 +158,12 @@
onSubmit (val) {
this.headObj = {
ContractNumber: '', // 合约编号
- AutoRenewingSubscriptionText: '', // 自动续约合同
- StartEndDate: '', // 到期日期开始时间
- EndEndDate: '', // 到期日期结束时间
- StartLastPurchaseDate: '', // 许可开始时间
- EndLastPurchaseDate: '', // 许可结束时间
+ AutoRenewingContractText: '', // 自动续约合同
+ StartContractEndDate: '', // 合约到期日期开始时间
+ EndContractEndDate: '', // 合约到期日期结束时间
+ StartEndDate: '', // 许可开始时间
+ EndEndDate: '', // 许可结束时间
ProductLine: '', // 产品线
- EndCustomerStateProvince: '', // 最终客户帐户所在地
Term: '', // 许可年限
EndCustomerAccountName: '' // 最终客户名称
}
--
Gitblit v1.9.3