From 9b3c41dbfb5079fbc54e4107b7c0614d9e3fa5c6 Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Fri, 27 Dec 2019 09:47:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=B9=B3=E5=8F=B0=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=20=E5=88=9B=E5=BB=BA=E7=AB=A0=E8=8A=82=20?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AE=9E=E8=AE=AD=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lessoncategory/edit/chapter/index.vue     |  4 +--
 .../lessoncategory/edit/chapter/list.vue      | 27 +++++++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/views/lesson/lessoncategory/edit/chapter/index.vue b/src/views/lesson/lessoncategory/edit/chapter/index.vue
index 0f3c5d53a..2e00a96f7 100644
--- a/src/views/lesson/lessoncategory/edit/chapter/index.vue
+++ b/src/views/lesson/lessoncategory/edit/chapter/index.vue
@@ -98,7 +98,7 @@ export default {
             },
             detail: {
                 mapId: '',
-                prdId: ''
+                prdType: ''
             },
             loading: false
         };
@@ -176,7 +176,7 @@ export default {
         loadTrainingList(data) {
             getLessonDetail({ id: data.lessonId }).then(resp => {
                 this.detail.mapId = resp.data.mapId;
-                this.detail.prdId = resp.data.prdId;
+                this.detail.prdType = resp.data.prdType;
                 this.chapterModel.lessonId = resp.data.id;
                 this.chapterModel.lessonName = resp.data.name;
                 if (data.type === 'Chapter') {
diff --git a/src/views/lesson/lessoncategory/edit/chapter/list.vue b/src/views/lesson/lessoncategory/edit/chapter/list.vue
index af0dc3398..7a87e1e28 100644
--- a/src/views/lesson/lessoncategory/edit/chapter/list.vue
+++ b/src/views/lesson/lessoncategory/edit/chapter/list.vue
@@ -13,7 +13,8 @@
 </template>
 
 <script>
-import { getProductList } from '@/api/management/mapprd';
+import ConstConfig from '@/scripts/ConstConfig';
+import Cookies from 'js-cookie';
 import { pageQueryTraining } from '@/api/jmap/training';
 import { getPublishMapListOnline } from '@/api/jmap/map';
 import localStore from 'storejs';
@@ -43,7 +44,6 @@ export default {
                 pageSize: 'pageSize',
                 pageIndex: 'pageNum'
             },
-            prdTypeList: [],
             trainingTypeList: [],
             trainingOperateTypeMap: {},
             queryForm: {
@@ -92,9 +92,9 @@ export default {
                     },
                     {
                         title: this.$t('lesson.product'),
-                        prop: 'prdId',
+                        prop: 'prdType',
                         type: 'tag',
-                        columnValue: (row) => { return this.$convertField(row.prdId, this.prdTypeList, ['code', 'name']); },
+                        columnValue: (row) => { return this.$convertField(row.prdId, this.prdTypeList, ['label', 'name']); },
                         tagType: (row) => { return 'success'; }
                     },
                     {
@@ -134,6 +134,14 @@ export default {
             }
         };
     },
+    computed:{
+        prdTypeList() {
+            const productTypeList = ConstConfig.ConstSelect.prdType;
+            return Cookies.get('user_lang') == 'en'
+                ? productTypeList.map(elem => { return { value: elem.value, label: elem.enlabel }; })
+                : productTypeList.map(elem => { return { value: elem.value, label: elem.label }; });
+        }
+    },
     created() {
         this.loadInitData();
     },
@@ -147,7 +155,7 @@ export default {
         },
         async queryFunction(params) {
             params['mapId'] = this.detail.mapId;
-            params['prdId'] = this.detail.prdId;
+            params['prdType'] = this.detail.prdType;
             const res = await pageQueryTraining(params);
             this.trainings.forEach(ele => {
                 res.data.list.forEach(item => {
@@ -172,15 +180,6 @@ export default {
                 this.mapIdList = response.data;
             });
 
-            getProductList({ pageSize: 500, pageNum: 1 }).then(res => {
-                const list = res.data.list;
-                if (list && list.length > 0) {
-                    list.forEach(elem => {
-                        this.prdTypeList.push({ code: elem.code, name: elem.name });
-                    });
-                }
-            });
-
             this.trainingOperateTypeMap = {};
             const list01 = await this.$Dictionary.stationControl();
             this.trainingOperateTypeMap['01'] = list01; // 控制权实训