From 7b495b35fdc4fb438c85cf6b08e2f75d0ad42fb8 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 2 Sep 2022 16:09:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=BE=E7=A8=8B=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/setting.js                       |  1 +
 src/utils/api.js                     |  1 +
 src/views/course/AddCurriculum.vue   | 19 +++++++------
 src/views/course/contentSettings.vue |  4 +++
 src/views/order/AddOrder.vue         | 42 ++++++++++++++++++----------
 src/views/order/Order.vue            | 33 ++++++++++++++++++----
 6 files changed, 72 insertions(+), 28 deletions(-)

diff --git a/src/setting.js b/src/setting.js
index d7837ac..3f54fc8 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -10,6 +10,7 @@ let host = `${location.origin}/`
 if (isDev) {
   jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统
   host = 'http://121.37.12.51/'
+  // host = 'https://huorantech.cn/'
   // host = 'http://192.168.31.151:9000/'// 榕
   // host = 'http://192.168.31.137:9000/'// 赓
 } else if (isPro) {
diff --git a/src/utils/api.js b/src/utils/api.js
index 715afb7..5add5fe 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -27,6 +27,7 @@ export default {
     ship: `nakadai/nakadai/orderOther/ship`,// 处理时的订单发货管理-post
     bulkShipping: `nakadai/nakadai/orderOther/bulkShipping`,
     getOrderOtherTime: `nakadai/nakadai/orderOther/getOrderOtherTime`,
+    refreshCache: `data/data/myDate/refreshCache`,
 
     // 客户管理
     delCustomers: `nakadai/nakadai/customer/delCustomers`,
diff --git a/src/views/course/AddCurriculum.vue b/src/views/course/AddCurriculum.vue
index 4abe193..a945795 100644
--- a/src/views/course/AddCurriculum.vue
+++ b/src/views/course/AddCurriculum.vue
@@ -187,7 +187,7 @@
                             <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
                             <el-table-column prop="applicationName" label="系统名称" align="center">
                               <template slot-scope="scope">
-                                {{ systemAll.find(e => e.systemId == scope.row.systemId).systemName }}
+                                {{ scope.row.applicationName || systemAll.find(e => e.systemId == scope.row.systemId).systemName }}
                               </template>
                             </el-table-column>
                             <el-table-column label="排序" align="center" width="100">
@@ -317,7 +317,7 @@
                 </el-table-column>
                 <el-table-column prop="projectName" width="80" label="系统类型" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.type }}
+                    {{ scope.row.type ? '流程类' : '编程类' }}
                   </template>
                 </el-table-column>
                 <el-table-column prop="projectName" label="项目名称" align="center"></el-table-column>
@@ -594,11 +594,14 @@ export default {
         },
         // 练习考核弹框
         handleConfig(type) {
-            this.permissions = type;
-            this.configVisible = true;
-            this.pageNo = 1;
-            this.getConfig();
-            this.checkeds = JSON.parse(JSON.stringify(type ? this.assessmentData : this.practiceData))
+          this.systemKeyword = ''
+          this.projectKeyword = ''
+          this.checkedKeyword = ''
+          this.permissions = type;
+          this.configVisible = true;
+          this.pageNo = 1;
+          this.getConfig();
+          this.checkeds = JSON.parse(JSON.stringify(type ? this.assessmentData : this.practiceData))
         },
         // 获取系统
         getConfig() {
@@ -630,7 +633,6 @@ export default {
             this.projectAll = JSON.parse(JSON.stringify(res)) // 全部项目，另外保存
             const result = []
             res.map(e => {
-              e.type = item.type ? '流程类' : '编程类'
               // 如果选择了该项目，则禁用并选中
               const include = checked.some(n => n.projectId == e.projectId && n.systemId == e.systemId)
               e.check = include
@@ -658,7 +660,6 @@ export default {
             if (val) {
               res.map(e => {
                 if (!checkeds.find(n => n.projectId == e.projectId && n.systemId == e.systemId)) {
-                  e.type = item.type ? '流程类' : '编程类'
                   checkeds.push(e)
                 }
               })
diff --git a/src/views/course/contentSettings.vue b/src/views/course/contentSettings.vue
index 4c2d106..f3ea323 100644
--- a/src/views/course/contentSettings.vue
+++ b/src/views/course/contentSettings.vue
@@ -834,6 +834,10 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.page-content {
+  max-height: calc(100vh - 420px);
+  overflow: auto;
+}
 .action-btn{
     color: #9076FF;
     font-size: 14px;
diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue
index b8d1428..b6b25f8 100644
--- a/src/views/order/AddOrder.vue
+++ b/src/views/order/AddOrder.vue
@@ -247,7 +247,7 @@
                                             </el-switch>
                                             <el-switch
                                                 v-else
-                                                :disabled="viewDisabled || scope.row.status === 3"
+                                                :disabled="viewDisabled"
                                                 v-model="scope.row.isEnable"
                                                 :active-value="1"
                                                 :inactive-value="0"
@@ -642,7 +642,7 @@
             </el-dialog>
         </div>
         <!-- 选择客户 -->
-        <select-client @back="backToOrder" v-show="showSelectClient" :refresh="showSelectClient"></select-client>
+        <select-client ref="client" @back="backToOrder" v-show="showSelectClient" :refresh="showSelectClient"></select-client>
     </div>
 </template>
 
@@ -943,25 +943,27 @@ export default {
             let list = orderOther.map(e => {
                 const now = Date.now()
                 const item = renewList.find(n => n.dataOrCourseId === e.dataOrCourseId && n.authority === e.authority) // 匹配renew接口返回的数据
-                if (item) {
+                // if (item) {
                     // 处于续费
+                    const cur = item || e
                     if (this.renewDisabled) {
-                        let end = Date.parse(item.endTime);
+                        let end = Date.parse(cur.endTime);
                         if (now < end) {
-                            let time = new Date(item.endTime.split(" ")[0])
+                            let time = new Date(cur.endTime.split(" ")[0])
                             time = new Date(time.setDate(time.getDate() + 1))
                             e.startTime = `${time.getFullYear()}-${time.getMonth() + 1}-${time.getDate()}`
                         } else {
-                            // 过期
-                            e.startTime = "";
+                          const date = new Date()
+                          // 过期
+                          e.startTime = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()}`
                         }
                         e.endTime = "";
                         e.periodOfUse = "";
                     } else if (!this.viewDisabled) { // 如果不是查看
-                        e.startTime = item.startTime.split(" ")[0];
-                        e.endTime = item.endTime.split(" ")[0];
+                        e.startTime = cur.startTime.split(" ")[0];
+                        e.endTime = cur.endTime.split(" ")[0];
                     }
-                }
+                // }
                 const startTime = new Date(e.startTime)
                 const endTime = new Date(e.endTime)
                 // 1: 未生效，2：生效中，3：已过期
@@ -976,6 +978,13 @@ export default {
             this.coursePermissions = list.filter(i => i.authority === 1);
             this.dataPlatformPermissions = list.filter(i => i.authority === 0);
         },
+        // 刷新缓存
+        refreshCache() {
+          const { customerId } = this.form
+          const clients = this.$refs.client.listData
+          const curClient = clients.find(e => e.customerId == customerId)
+          this.$post(`${this.api.refreshCache}?schoolId=${curClient ? curClient.schoolId : ''}`).then(res => {}).catch(res => {})
+        },
         // 新增订单
         submitOrder() {
             let purchase = 0 // 总采购成本
@@ -1054,6 +1063,7 @@ export default {
                     this.loading = true;
                     if (this.editDisabled) {
                         this.$post(this.api.orderUpdate, param).then(res => {
+                            this.refreshCache()
                             this.$message.success("修改成功");
                             this.loading = false;
                             this.$router.back();
@@ -1062,9 +1072,10 @@ export default {
                         });
                     } else {
                         this.$post(this.api.orderAdd, param).then(res => {
+                            this.refreshCache()
                             this.$message.success("添加订单成功");
                             this.loading = false;
-                            this.$router.back();
+                            this.renewDisabled ? this.$router.push('/order') : this.$router.back();
                         }).catch(err => {
                             this.loading = false;
                         });
@@ -1362,6 +1373,7 @@ export default {
           const list = data ? this.dataPlatformPermissions : this.coursePermissions
           list.map(e => e.ship = ship)
           if (this.editDisabled) {
+            this.refreshCache()
             this.$post(this.api.bulkShipping, {
               orderOthers: list
             }).then(res => {})
@@ -1370,7 +1382,8 @@ export default {
         // 课程/数据平台-发货
         handleDeliver(e, row) {
             if (this.editDisabled) {
-                this.$post(this.api.ship,row).then(res => {});
+              this.refreshCache()
+              this.$post(this.api.ship,row).then(res => {});
             }
         },
         // 如果非数字，则返回0
@@ -1483,14 +1496,15 @@ export default {
             const useUnit = row.periodOfUse // 使用期限
             let price = row.marketPrice // 市场单价
             // 结算单价是元/年，所以如果选择的不是年，要进行换算（日：/365,月：/12)
-            row.marketValue = ((!unit ? 
+            row.marketValue = ((!unit ?
               price / 365 * useUnit :
               unit === 1 ?
                 price / 12 * useUnit :
                 price * useUnit)).toFixed(2)
-            
             this.dealComputers(e, row)
+
             row.authority ? this.calculateDiscountCourse(e, row) : this.calculateDiscount(e, row)
+
             // 只有改变了起止日期才需要调接口查询订单，该接口作用是把开始时间传过去，会返回一个提示或者时间，如果是时间，则把时间+1天，如果是提示，则无法保存
             if (isDate) {
                 const cId = row.dataOrCourseId
diff --git a/src/views/order/Order.vue b/src/views/order/Order.vue
index 6d17483..fb34720 100644
--- a/src/views/order/Order.vue
+++ b/src/views/order/Order.vue
@@ -158,7 +158,8 @@ export default {
             pageNo: +this.$route.query.page || 1,
             pageSize: 10,
             totals: 0,
-            searchTimer: null
+            searchTimer: null,
+            schools: []
         };
     },
     watch: {
@@ -170,7 +171,8 @@ export default {
         }
     },
     created() {
-        this.getData();
+      this.getData()
+      this.getSchool()
     },
     methods: {
         test(val) {
@@ -245,6 +247,23 @@ export default {
             })
             // this.$router.push("/addorder?" + val + "=" + row.orderId+"&orderStatus="+orderStatus);
         },
+        // 获取学校列表
+        getSchool() {
+          this.$post(this.api.queryCustomer, {
+            countries: '中国',
+            provinceId: '',
+            cityId: '',
+            searchContent: '',
+            page: 1,
+            size: 10000
+          }).then(res => {
+            this.schools = res.message.list
+          }).catch(res => {})
+        },
+        // 刷新缓存
+        refreshCache(customerId) {
+          this.$post(`${this.api.refreshCache}?schoolId=${this.schools.find(e => e.customerId == customerId).schoolId}`).then(res => {}).catch(res => {})
+        },
         // 删除订单
         handleDelete(row) {
             this.$confirm("确定要删除吗？", "提示", {
@@ -261,6 +280,7 @@ export default {
                             this.pageNo = this.pageNo-1
                         }
                     }
+                    this.refreshCache(row.customerId)
                     this.getData();
                 }).catch(res => {
                 });
@@ -279,14 +299,17 @@ export default {
             }
         },
         delAllSelection() {
-            if (this.multipleSelection.length != "") {
+            const list = this.multipleSelection
+            if (list.length != "") {
                 // 批量删除
                 this.$confirm("确定要删除吗？", "提示", {
                     type: "warning"
                 }).then(() => {
-                    this.$post(this.api.orderDelete, { ids: this.multipleSelection }).then(res => {
+                    this.$post(this.api.orderDelete, { ids: list }).then(res => {
+                        const { orderData } = this
+                        list.map(e => this.refreshCache(orderData.find(n => n.orderId == e).customerId))
                         this.$message.success("删除成功");
-                        if(this.multipleSelection.length == this.orderData.length){
+                        if(list.length == this.orderData.length){
                             if(this.pageNo > 1){
                                 this.pageNo = this.pageNo-1
                             }