From 95c329fb0ba13cbea1723fe1b4a753d75b9ca9a2 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 21 Oct 2021 20:04:00 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E5=90=AC=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E5=AE=9E=E6=97=B6=E8=8E=B7=E5=8F=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/order/AddOrder.vue | 75 ++++++++++++++++++++++--------------
 1 file changed, 47 insertions(+), 28 deletions(-)

diff --git a/src/views/order/AddOrder.vue b/src/views/order/AddOrder.vue
index c24a460..e634321 100644
--- a/src/views/order/AddOrder.vue
+++ b/src/views/order/AddOrder.vue
@@ -181,9 +181,12 @@
                                 <el-table-column label="操作" align="center" width="230px">
                                     <template slot-scope="scope">
                                         <div class="flex-c-c">
-                                            <el-button v-if="!editDisabled&&!disabled" style="margin-right:10px;"
-                                                       @click="delCourseForm(scope.$index)">删除
-                                            </el-button>
+                                            <el-button
+                                                v-if="!editDisabled&&!disabled"
+                                                type="text"
+                                                @click="delCourseForm(scope.$index)"
+                                                style="margin-right:10px;"
+                                            >删除</el-button>
                                             <el-switch
                                                 style="margin-right:10px"
                                                 v-show="scope.row.ship"
@@ -191,8 +194,7 @@
                                                 v-model="scope.row.isEnable"
                                                 :active-value="1"
                                                 :inactive-value="0"
-                                                active-text="启用"
-                                                inactive-text="禁用"
+                                                :active-text="scope.row.isEnable ? '禁用' : '启用'"
                                                 @change="handleEnable($event,scope.row)">
                                             </el-switch>
                                             <el-switch
@@ -201,8 +203,7 @@
                                                 v-model="scope.row.ship"
                                                 :active-value="1"
                                                 :inactive-value="0"
-                                                active-text="发货"
-                                                inactive-text="未发货"
+                                                :active-text="scope.row.ship ? '发货' : '未发货'"
                                                 @change="handleDeliver($event,scope.row)">
                                             </el-switch>
                                         </div>
@@ -317,10 +318,12 @@
                                 <el-table-column label="操作" align="center" width="230px">
                                     <template slot-scope="scope">
                                         <div class="flex-c-c">
-                                            <el-button v-if="!editDisabled&&!disabled" style="margin-right:10px;"
-                                                       @click="delDataForm(scope.$index)">删除
-                                            </el-button>
-                                            <!-- <el-button :disabled="disabled" v-show="scope.row.ship===true" style="margin-right:10px;" @click="configure(scope.row)">启动</el-button> -->
+                                            <el-button
+                                                v-if="!editDisabled&&!disabled"
+                                                type="text"
+                                                @click="delDataForm(scope.$index)"
+                                                style="margin-right:10px;"
+                                            >删除</el-button>
                                             <el-switch
                                                 style="margin-right:10px"
                                                 v-show="scope.row.ship"
@@ -328,8 +331,7 @@
                                                 v-model="scope.row.isEnable"
                                                 :active-value="1"
                                                 :inactive-value="0"
-                                                active-text="启用"
-                                                inactive-text="禁用"
+                                                :active-text="scope.row.isEnable ? '禁用' : '启用'"
                                                 @change="handleEnable($event,scope.row)">
                                             </el-switch>
                                             <el-switch
@@ -338,8 +340,7 @@
                                                 v-model="scope.row.ship"
                                                 :active-value="1"
                                                 :inactive-value="0"
-                                                active-text="发货"
-                                                inactive-text="未发货"
+                                                :active-text="scope.row.ship ? '发货' : '未发货'"
                                                 @change="handleDeliver($event,scope.row)">
                                             </el-switch>
                                         </div>
@@ -421,15 +422,14 @@
             </el-row>
 
             <!-- 添加课程权限弹框-->
-            <el-dialog :visible.sync="courseVisible" width="50%" center>
+            <el-dialog :visible.sync="courseVisible" width="50%" center :close-on-click-modal="false" @close="closeJCourse">
                 <div class="flex-between mgb20">
                     <div class="flex-center">
                         <p class="addhr_tag"></p>
                         <span>课程列表</span>
                     </div>
                     <div>
-                        <el-input placeholder="请输入课程名称" prefix-icon="el-icon-search" v-model.trim="curriculumName"
-                                  @keyup.enter.native="getCourseJurisdiction()" clearable></el-input>
+                        <el-input placeholder="请输入课程名称" prefix-icon="el-icon-search" v-model.trim="curriculumName" clearable></el-input>
                     </div>
                 </div>
                 <el-table v-loading="dataLoading" :data="courseList" stripe header-align="center"
@@ -459,8 +459,8 @@
                     </el-pagination>
                 </div>
                 <span slot="footer" class="dialog-footer">
-                    <el-button @click="courseVisible = false">取 消</el-button>
-                    <el-button type="primary" v-preventReClick @click="addCourse()">确 定</el-button>
+                    <el-button @click="closeJCourse">取 消</el-button>
+                    <el-button type="primary" v-preventReClick @click="addCourse">确 定</el-button>
                 </span>
             </el-dialog>
 
@@ -472,8 +472,7 @@
                         <span>数据产品列表</span>
                     </div>
                     <div>
-                        <el-input placeholder="请输入产品名称" prefix-icon="el-icon-search" v-model="productName"
-                                  @keyup.enter.native="getDataJurisdiction('search')" clearable></el-input>
+                        <el-input placeholder="请输入产品名称" prefix-icon="el-icon-search" v-model="productName" clearable></el-input>
                     </div>
                 </div>
                 <el-table v-loading="dataLoading" :data="platformList" stripe header-align="center"
@@ -717,11 +716,25 @@ export default {
             platfromPage: 1,// 页码
             platformList: [],// 数据平台列表
             platformSelect: [],// 数据平台弹框选中
-            productName: ""// 搜索产品名称
-
+            productName: "",// 搜索产品名称
+            searchTimer: null,
 
         };
     },
+    watch: {
+        curriculumName(n) {
+            clearTimeout(this.searchTimer);
+            this.searchTimer = setTimeout(() => {
+                this.getCourseJurisdiction();
+            }, 500);
+        },
+        productName(n) {
+            clearTimeout(this.searchTimer);
+            this.searchTimer = setTimeout(() => {
+                this.getDataJurisdiction();
+            }, 500);
+        }
+    },
     async created() {
         this.token = sessionStorage.getItem("token");
         // 处于查看状态
@@ -950,6 +963,10 @@ export default {
             this.coursePage = val;
             this.getCourseJurisdiction();
         },
+        closeJCourse() { // 关闭课程选择对话框
+            this.curriculumName = "";
+            this.courseVisible = false;
+        },
         async addCourse() {
             if (this.courseSelection.length > 0) {
                 let that = this;
@@ -966,7 +983,7 @@ export default {
                         discountRate: "",// 折扣率
                         accountNum: "",// 账号数
                         totalAmount: "",// 总价
-                        ship: 0,// 发货否
+                        ship: 0,// 发货否（0未发货，1已发货，默认不发货）
                         authority: 1 // 区分权限 0为数据平台权限，1为课程权限
                     };
                     that.coursePermissions.push(obj);
@@ -984,7 +1001,8 @@ export default {
                         fn(e);
                     }
                 });
-                this.courseVisible = !this.courseVisible;
+                this.courseVisible = false;
+                this.curriculumName = "";
                 this.platformSelect = [];
 
                 /* 调接口，判断是否为客户已有的课程 */
@@ -1067,7 +1085,7 @@ export default {
                         discountRate: "",// 折扣率
                         accountNum: "",// 账号数
                         totalAmount: "",// 总价
-                        ship: 0,// 发货否
+                        ship: 0,// 发货否（0未发货，1已发货，默认不发货）
                         authority: 0// 数据平台权限
                     };
                     that.dataPlatformPermissions.push(obj);
@@ -1085,7 +1103,8 @@ export default {
                         fn(e);
                     }
                 });
-                this.showPlatform = !this.showPlatform;
+                this.showPlatform = false;
+                this.productName = "";
                 this.platformSelect = [];
 
                 /* 调接口，判断是否为客户已有的产品功能 */