From bafa9dff4d9880c562f4d3a7b83bd4c1129240c5 Mon Sep 17 00:00:00 2001
From: zjf <zhangjf@probim.com.cn>
Date: Fri, 03 Mar 2023 15:20:22 +0800
Subject: [PATCH] Subscriptions 导出条件修改
---
src/api/common.js | 14 ++++--
src/views/clients/components/CRMExport.vue | 13 ++++++
src/views/PWS/Subscriptions.vue | 54 ++++++++++++++++++---------
3 files changed, 58 insertions(+), 23 deletions(-)
diff --git a/src/api/common.js b/src/api/common.js
index 9a073e3..0e4d52c 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -295,17 +295,21 @@
// }
// console.log(params)
return request({
- url: '/AutoDesk/subscriptions/ExportExcel?AutoRenewingContractText=' + (data.AutoRenewingContractText === 'Auto-RenewingContract' ? data.AutoRenewingContractText : '') +
+ url: '/AutoDesk/subscriptions/ExportExcel?AutoRenewingSubscriptionText=' + (data.AutoRenewingSubscriptionText === 'AutoRenewing Subscription' ? data.AutoRenewingSubscriptionText : '') +
+ (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
? '&Term=' + data.Term : '') +
- (data.StartContractEndDate
- ? '&StartContractEndDate=' + data.StartContractEndDate : '') +
- (data.EndContractEndDate
- ? '&EndContractEndDate=' + data.EndContractEndDate : ''),
+ (data.StartLastPurchaseDate
+ ? '&StartLastPurchaseDate=' + data.StartLastPurchaseDate : '') +
+ (data.EndLastPurchaseDate
+ ? '&EndLastPurchaseDate=' + data.EndLastPurchaseDate : ''),
method: 'get',
responseType: 'blob'
})
diff --git a/src/views/PWS/Subscriptions.vue b/src/views/PWS/Subscriptions.vue
index 92f7307..ee8bbd2 100644
--- a/src/views/PWS/Subscriptions.vue
+++ b/src/views/PWS/Subscriptions.vue
@@ -6,29 +6,36 @@
main-title="Autodesk PWS" />
<el-form :inline="true" :model="headObj" class="selectInline">
<el-form-item>
+ <span>合约编号:</span>
+ <el-input
+ style="width: 200px"
+ v-model="headObj.ContractNumber"
+ placeholder="请输入合约编号"/>
+ </el-form-item>
+ <el-form-item>
<div style='display: flex;'>
<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 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>
</el-select>
</div>
</el-form-item>
- <el-form-item v-if="headObj.AutoRenewingContractText == 'NoAuto-RenewingContract'">
- <span>合约到期开始日期:</span>
+ <el-form-item v-if="headObj.AutoRenewingSubscriptionText == 'NoAutoRenewing Subscription'">
+ <span>到期日期开始日期:</span>
<el-date-picker
- v-model="headObj.StartContractEndDate"
+ v-model="headObj.StartLastPurchaseDate"
type="date"
placeholder="选择开始日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
- <el-form-item v-if="headObj.AutoRenewingContractText == 'NoAuto-RenewingContract'">
- <span>合约到期结束日期:</span>
+ <el-form-item v-if="headObj.AutoRenewingSubscriptionText == 'NoAutoRenewing Subscription'">
+ <span>到期日期结束日期:</span>
<el-date-picker
- v-model="headObj.EndContractEndDate"
+ v-model="headObj.EndLastPurchaseDate"
type="date"
- placeholder="选择开始日期"
+ placeholder="选择结束日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
@@ -38,6 +45,13 @@
style="width: 200px"
v-model="headObj.ProductLine"
placeholder="请输入产品线"/>
+ </el-form-item>
+ <el-form-item>
+ <span>最终客户名称:</span>
+ <el-input
+ style="width: 200px"
+ v-model="headObj.EndCustomerAccountName"
+ placeholder="请输入最终客户名称"/>
</el-form-item>
<el-form-item>
<span>最终客户帐户所在地:</span>
@@ -98,12 +112,14 @@
showCRMExport: false,
crmType: 'subscriptions',
headObj: {
- AutoRenewingContractText: '', // 自动续约合同
- StartContractEndDate: '', // 开始时间
- EndContractEndDate: '', // 结束时间
+ ContractNumber: '', // 合约编号
+ AutoRenewingSubscriptionText: '', // 自动续约合同
+ StartLastPurchaseDate: '', // 到期日期开始时间
+ EndLastPurchaseDate: '', // 到期日期结束时间
ProductLine: '', // 产品线
EndCustomerStateProvince: '', // 最终客户帐户所在地
- Term: '' // 许可年限
+ Term: '', // 许可年限
+ EndCustomerAccountName: '' // 最终客户名称
},
exportHeadObj: {},
pickerOptions: {
@@ -129,12 +145,14 @@
},
onSubmit (val) {
this.headObj = {
- AutoRenewingContractText: '', // 自动续约合同
- StartContractEndDate: '', // 开始时间
- EndContractEndDate: '', // 结束时间
+ ContractNumber: '', // 合约编号
+ AutoRenewingSubscriptionText: '', // 自动续约合同
+ StartLastPurchaseDate: '', // 到期日期开始时间
+ EndLastPurchaseDate: '', // 到期日期结束时间
ProductLine: '', // 产品线
EndCustomerStateProvince: '', // 最终客户帐户所在地
- Term: '' // 许可年限
+ Term: '', // 许可年限
+ EndCustomerAccountName: '' // 最终客户名称
}
},
exportFile () {
diff --git a/src/views/clients/components/CRMExport.vue b/src/views/clients/components/CRMExport.vue
index 161a76f..ecdbcf5 100644
--- a/src/views/clients/components/CRMExport.vue
+++ b/src/views/clients/components/CRMExport.vue
@@ -250,6 +250,19 @@
console.log(request)
request(params)
.then(res => {
+ if (this.crmType === 'subscriptions') {
+ if (res.data.type === 'application/json') {
+ // this.show = false
+ this.closeView()
+ let reader = new FileReader()
+ reader.readAsText(res.data, 'utf-8')
+ reader.onload = (e) => {
+ let resData = JSON.parse(reader.result)
+ this.$message.error(resData.Message)
+ }
+ return
+ }
+ }
this.exportQueueIndex = ''
this.done = true
var blob
--
Gitblit v1.9.3