Merge branch 'master' of http://221.216.211.14:3000/GCLS/GCLS_Page_Book_Component_NPC

src/views/courseList.vue

@@ -239,6 +239,18 @@
         </el-form-item>
         <el-form-item
           class="label-input"
+          label="丛书编号"
+          label-width="90px"
+          prop="series_code"
+        >
+          <el-input
+            autocomplete="off"
+            name="series_code"
+            v-model="formDialog.series_code"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          class="label-input"
           label="价格"
           label-width="90px"
           prop="price"
@@ -366,6 +378,7 @@ export default {
         edition: "",
         publisher: "",
         publish_number: "",
+        series_code: "",
         publish_status: -1,
       },
       dialogFlag: false, // 新建教材弹出层
@@ -381,6 +394,7 @@ export default {
         org_name: "",
         publish_scope: 0,
         publish_number: "",
+        series_code: "",
         picture_id: "",
         id: "",
         publisher: "",
@@ -555,6 +569,7 @@ export default {
         org_name: "",
         publish_scope: 0,
         publish_number: "",
+        series_code: "",
         picture_id: "",
         id: "",
         publisher: "",
@@ -800,6 +815,7 @@ export default {
             picture_id: res.picture_id,
             name_english: res.name_english,
             publish_number: res.publish_number,
+            series_code: res.series_code,
             publisher: res.publisher,
             theme_color: res.theme_color,
             edition: res.edition,

src/views/discountCodeList.vue

@@ -54,7 +54,7 @@
 </template>
 <script>
 import Header from "@/components/Header";
-import { getContent } from "@/api/ajax";
+import { LearnWebSI } from "@/api/ajax";
 import { getToken } from '@/utils/auth'
 export default {
     name: "courselist",
@@ -100,12 +100,13 @@ export default {
         onSubmit () {
             if(this.discountNumber){
                 this.loading = true;
-                let MethodName = 'book-book_manager-BatchCreateDiscountCodeForBook'
+                let MethodName = 'order-discount_manager-BatchCreateDiscountCodeFoGoods'
                 let data = {
-                    book_id:this.bookId,
+                    goods_id:this.bookId,
+                    goods_type:101,
                     count:Number(this.discountNumber)
                 }
-                getContent(MethodName, data)
+                LearnWebSI(MethodName, data)
                 .then((res) => {
                     this.$message.success("操作成功");
                     this.discountNumber = null
@@ -129,14 +130,15 @@ export default {
         },
         // 查询数据列表
         getList () {
-            let MethodName = "page_query-PageQueryBookDiscountCodeList";
+            let MethodName = "page_query-PageQueryGoodsDiscountCodeList";
             let data = {
-                book_id: this.bookId,
+                goods_id: this.bookId,
+                goods_type: 101,
                 page_capacity: this.page_capacity,
                 cur_page: this.currentPage,
                 use_status:-1
             };
-            getContent(MethodName, data).then(
+            LearnWebSI(MethodName, data).then(
                 (res) => {
                     let _this = this;
                     _this.tableData = res.discount_code_list;
@@ -159,11 +161,13 @@ export default {
                 type: "warning",
             })
                 .then(() => {
-                    let MethodName = "book-book_manager-DeleteBookDiscountCode";
+                    let MethodName = "order-discount_manager-DeleteGoodsDiscountCode";
                     let data = {
-                        id: row.id,
+                        goods_id:this.bookId,
+                        goods_type:101,
+                        discount_code_id: row.id,
                     };
-                    getContent(MethodName, data).then(
+                    LearnWebSI(MethodName, data).then(
                         (res) => {
                             this.currentPage = 1;
                             this.getList()
@@ -190,13 +194,14 @@ export default {
                 UserType = user.user_type;
                 SessionID = user.session_id;
             }
-            let MethodName = "data_export-ExportBookDiscountCodeList"
+            let MethodName = "data_export-ExportGoodsDiscountCodeList"
             let data = {
-                book_id: this.bookId,
+                goods_id: this.bookId,
+                goods_type: 101,
                 use_status:this.exportRadio
             }
             window.open(process.env.VUE_APP_BASE_API +
-                    `/GCLSBookWebSI/ServiceInterface?MethodName=${MethodName}&UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}&Parameter=${encodeURIComponent(JSON.stringify(data))}`) 
+                    `/GCLSLearnWebSI/ServiceInterface?MethodName=${MethodName}&UserCode=${UserCode}&UserType=${UserType}&SessionID=${SessionID}&Parameter=${encodeURIComponent(JSON.stringify(data))}`) 
             this.exportLoading = false
         }
     }