Tang 3 anni fa
parent
commit
78ff44dd51

+ 6 - 6
src/components/tableList.vue

@@ -203,7 +203,7 @@
                   {{ itm.educationName + "-" + itm.projectName }}
                 </li>
               </template>
-              <el-popover placement="right" trigger="click">
+              <el-popover  :key="Math.random()" placement="right" trigger="click">
                 <ul>
                   <li v-for="(itm, inds) in scope.row[item.prop]" :key="inds">
                     {{ inds + 1 }}、
@@ -227,7 +227,7 @@
               >
                 班级({{ scope.row[item.prop].length }})
               </li>
-              <el-popover placement="right" trigger="click">
+              <el-popover :key="Math.random()"  placement="right" trigger="click">
                 <ul>
                   <li v-for="(itm, inds) in scope.row[item.prop]" :key="inds">
                     {{ inds + 1 }}、
@@ -251,7 +251,7 @@
                   </li>
                 </template>
               </ul>
-              <el-popover placement="right" trigger="click">
+              <el-popover :key="Math.random()"  placement="right" trigger="click">
                 <ul>
                   <li v-for="(itm, inds) in scope.row[item.prop]" :key="inds">
                     {{ inds + 1 }}、
@@ -276,7 +276,7 @@
                   </li>
                 </template>
               </ul>
-              <el-popover placement="right" trigger="click">
+              <el-popover :key="Math.random()" placement="right" trigger="click">
                 <ul>
                   <li v-for="(itm, inds) in scope.row[item.prop]" :key="inds">
                     {{ inds + 1 }}、
@@ -307,7 +307,7 @@
                   }}
                 </li>
               </template>
-              <el-popover placement="right" trigger="click">
+              <el-popover :key="Math.random()"  placement="right" trigger="click">
                 <ul>
                   <li v-for="(itm, inds) in scope.row[item.prop]" :key="inds">
                     {{ inds + 1 }}、
@@ -350,7 +350,7 @@
                 : "未知"
             }}</span>
             <span v-else-if="item.scope === 'TimeVoBtn'">
-              <el-popover placement="left" trigger="click">
+              <el-popover :key="Math.random()" placement="left" trigger="click">
                 <div
                   v-for="(items, indexs) in scope.row[item.prop]"
                   :key="indexs"

+ 24 - 7
src/views/Marketing/commodityManageMent/edit/index.vue

@@ -558,8 +558,18 @@
       <el-button type="primary" @click="submit('listData', 1)" size="mini"
         >保存</el-button
       >
-      <el-button type="primary" @click="submit('listData', 2)" size="mini"
-        >上架</el-button
+      <el-button
+        v-if="listData.goodsStatus !== 0 || listData.goodsStatus !== 1"
+        type="primary"
+        @click="submit('listData', 2)"
+        size="mini"
+        >{{
+          listData.goodsStatus === 0
+            ? "上架"
+            : listData.goodsStatus === 1
+            ? "下架"
+            : "未知"
+        }}</el-button
       >
     </div>
     <el-dialog
@@ -1380,9 +1390,10 @@ export default {
     search() {
       this.$api.obtainGoods(this.$route.query.id).then((res) => {
         res.data.standPriceJson = JSON.parse(res.data.standPriceJson);
-        if (res.data.auditionList && res.data.goodsType == 1) {
+        if (res.data.goodsAuditionConfig && res.data.goodsType == 1) {
+          var goodsAuditionConfig = JSON.parse(res.data.goodsAuditionConfig);
           var arrays = [];
-          res.data.auditionList.map((item) => {
+          goodsAuditionConfig.map((item) => {
             arrays.push({
               TypeId: "3-" + item.sectionId,
               menuId: item.sectionId,
@@ -1392,9 +1403,10 @@ export default {
           });
           this.auditionList = arrays;
         }
-        if (res.data.examConfigList && res.data.goodsType == 2) {
+        if (res.data.goodsExamConfig && res.data.goodsType == 2) {
           var arrays = [];
-          res.data.examConfigList.map((item) => {
+          var goodsExamConfig = JSON.parse(res.data.goodsExamConfig);
+          goodsExamConfig.map((item) => {
             var ast = {};
             if (item.moduleExamId && item.chapterExamId && item.examId) {
               ast.TypeId =
@@ -1607,7 +1619,12 @@ export default {
     rulesTableSumbit(int) {
       var datas = JSON.parse(JSON.stringify(this.listData));
       if (int === 2) {
-        datas.goodsStatus = 1;
+        if (this.listData.goodsStatus === 1) {
+          datas.goodsStatus = 0;
+        }
+        if (this.listData.goodsStatus === 0) {
+          datas.goodsStatus = 1;
+        }
       }
       this.courTypeOptions.map((item) => {
         if (item.id === this.listData.businessId) {

+ 1 - 0
src/views/Marketing/commodityManageMent/poppleSet.vue

@@ -62,6 +62,7 @@ export default {
   },
   methods: {
     openExpand() {
+      console.log(this.auditionList,151)
       if (this.auditionList) {
         this.auditionListCope = JSON.parse(JSON.stringify(this.auditionList));
         var arrays = [];

+ 8 - 5
src/views/resource/videoManagement/moduleManagement/index.vue

@@ -129,11 +129,14 @@ export default {
           scope: "mapTypesMores",
           width: "240",
         },
-        // {
-        //   label: "关联课程",
-        //   prop: "educationName",
-        //   hidden: true,
-        // },
+        {
+          label: "关联课程",
+          prop: "courseList",
+          prop1: "courseName",
+          hidden: true,
+          scope: "aboutChapter",
+          width: "150",
+        },
         // {
         //   label: "章总数",
         //   prop: "chapterNum",