From d75055662b1d1835d489651128ea12ae357c5c8a Mon Sep 17 00:00:00 2001 From: wangchenguang <728837162@qq.com> Date: Thu, 13 Apr 2023 19:14:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=8Cbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1.html | 19 +++++++ src/views/customer/AddCustomer.vue | 9 ++- src/views/order/AddOrder.vue | 80 ++++++++++++++++++--------- src/views/parnerOperation/learnMg.vue | 1 + 4 files changed, 83 insertions(+), 26 deletions(-) create mode 100644 1.html diff --git a/1.html b/1.html new file mode 100644 index 0000000..190ab61 --- /dev/null +++ b/1.html @@ -0,0 +1,19 @@ + + + + + + + Document + + + + + \ No newline at end of file diff --git a/src/views/customer/AddCustomer.vue b/src/views/customer/AddCustomer.vue index 836331c..4a3da1c 100644 --- a/src/views/customer/AddCustomer.vue +++ b/src/views/customer/AddCustomer.vue @@ -557,6 +557,7 @@ export default { const { productTypeList } = this data.map(e => { const list = e.startAndEndTimeList + console.log('list=>', list) if (list) { let connect = true // 每个订单的开始结束日期是否连续 list.map((n, i) => { @@ -626,13 +627,18 @@ export default { date.setSeconds(0) e.remain = e.status === '已过期' ? 0 : this.getRemain(date.getTime(), e.endTime) // 获取剩余期限 e.startAndEndTime = e.status === '已过期' ? '' : e.startTime + ' ~ ' + e.endTime - e.productTypeName = productTypeList.find(n => n.id === e.productType).name + const isHave = productTypeList.find(n => n.id === e.productType) + console.log('ishave=>',isHave) + if (isHave) { + e.productTypeName = isHave.name + } // 1开启 0禁用（已过期的订单，或者当前生效的订单为禁用，则显示为禁用，否则是启用） e.isEnable = (e.status === '未生效' || e.status === '已过期' || !e.orderEnable) ? 0 : 1 } }) + console.log('this.productAll=>',data) this.productAll = data this.totalProduct = data.length this.handlePage() @@ -654,6 +660,7 @@ export default { // 已订阅产品筛选 filterForm2() { const list = this.productAll + console.log('this.productAll=>', this.productAll) const { productType, status, keyword } = this.form2 this.products = list.filter(e => (productType === '' || productType === e.productType) && (e.status === status || status === '全部') && e.productName.includes(keyword)) }, diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue index 4f9c562..0b5f637 100644 --- a/src/views/order/AddOrder.vue +++ b/src/views/order/AddOrder.vue @@ -118,9 +118,8 @@
添加
@@ -247,7 +246,7 @@ :inactive-value="0" :active-text="scope.row.ship ? '已发货' : '未发货'" :disabled="viewDisabled" - @change="handleDeliver($event,scope.row)"> + @change="handleDeliver($event,scope.row,1)"> + @change="handleEnable($event,scope.row,1)"> @@ -276,8 +275,8 @@
添加
@@ -418,14 +417,14 @@ style="margin-right:10px;" >删除 + @change="handleDeliver($event,scope.row,2)"> + @change="handleEnable($event,scope.row,2)"> @@ -454,8 +453,8 @@
添加
@@ -568,14 +567,14 @@ style="margin-right:10px;" >删除 + @change="handleDeliver($event,scope.row,3)"> + @change="handleEnable($event,scope.row,3)"> @@ -822,6 +821,8 @@ export default { data() { return { pageTypes: false, + dataPageTypes: false, + modelPageTypes:false, loading: false,// 页面加载 isAdd: false, // 是否添加 viewDisabled: false,// 查看禁用 @@ -1652,18 +1653,35 @@ export default { }); }, // 课程/数据平台-启用 - handleEnable(e, row) { - console.log('1111=>',e) - console.log('row=>',row) + handleEnable(e, row,type) { if (row.isEnable === 0 ) { - this.pageTypes = false + if(type === 1) { + this.pageTypes = false + }else if(type === 2) { + this.dataPageTypes = false + }else { + this.modelPageTypes = false + } }else { - this.pageTypes = false + if(type === 1) { + this.pageTypes = false + }else if(type === 2) { + this.dataPageTypes = false + }else { + this.modelPageTypes = false + } } }, // 一键发货 - batchDeliver(ship, data) { - this.pageTypes = !this.pageTypes + batchDeliver(ship, data,type) { + if (type === 1) { + this.pageTypes = !this.pageTypes + }else if (type ==2) { + this.dataPageTypes = !this.dataPageTypes + }else { + this.modelPageTypes = !this.modelPageTypes + } + const list = data == 1 ? this.dataPlatformPermissions : data == 2 ? @@ -1683,12 +1701,24 @@ export default { } }, // 课程/数据平台-发货 - handleDeliver(e, row) { + handleDeliver(e, row,type) { if(row.ship === 1) { row.isEnable = 1 - this.pageType = true + if(type === 1) { + this.pageTypes = true + }else if(type === 2) { + this.dataPageTypes = true + }else { + this.modelPageTypes = true + } }else { - this.pageType = false + if(type === 1) { + this.pageTypes = true + }else if(type === 2) { + this.dataPageTypes = true + }else { + this.modelPageTypes = true + } } }, // 如果非数字，则返回0 diff --git a/src/views/parnerOperation/learnMg.vue b/src/views/parnerOperation/learnMg.vue index 311879d..e34bca8 100644 --- a/src/views/parnerOperation/learnMg.vue +++ b/src/views/parnerOperation/learnMg.vue @@ -656,6 +656,7 @@ export default { submit(isRelease, next) { if (this.submiting) return false const form = JSON.parse(JSON.stringify(this.form)) + console.log('form=>',form) if (!form.title) return Util.errorMsg('请填写标题') if (this.nameRepeat) return Util.errorMsg('该标题已重复!') // 如果是发布