init

src/views/Marketing/commodityManageMent/add/index.vue

@@ -247,6 +247,7 @@
           <el-table
             :data="listData.standPriceJson"
             show-summary
+            :summary-method="zhText"
             border
             :header-cell-style="{
               'background-color': '#eee',
@@ -1969,6 +1970,32 @@ export default {
     // this.getJyData();
   },
   methods: {
+    zhText(param){
+        const { columns, data } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '总价';
+            return;
+          }
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+            sums[index] = '￥' + sums[index];
+          } else {
+            sums[index] = '';
+          }
+        });
+
+        return sums;
+    },
     changeDataTime(arr) {
       if (arr && arr[0] === arr[1]) {
         this.$message.warning("开始时间与结束时间不允许相同");
@@ -2576,13 +2603,11 @@ export default {
         });
         var auditionListArray = [];
         this.auditionList.map((item) => {
-          if (item.type == 3) {
             auditionListArray.push({
               auditionMinute: item.auditionMinute,
               courseId: item.courseId,
               sectionId: item.menuId,
             });
-          }
         });
         datas.auditionList = auditionListArray;
         datas.courseList = courseIdList;

src/views/Marketing/commodityManageMent/edit/index.vue

@@ -250,6 +250,7 @@
           </h5>
           <el-table
             :data="listData.standPriceJson"
+            :summary-method="zhText"
             show-summary
             border
             :header-cell-style="{
@@ -1915,6 +1916,32 @@ export default {
     this.getJyData();
   },
   methods: {
+    zhText(param){
+        const { columns, data } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '总价';
+            return;
+          }
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+            sums[index] = '￥' + sums[index];
+          } else {
+            sums[index] = '';
+          }
+        });
+
+        return sums;
+    },
     changeDataTime(arr) {
       if (arr && arr[0] === arr[1]) {
         this.$message.warning("开始时间与结束时间不允许相同");
@@ -2300,10 +2327,11 @@ export default {
           var arrays = [];
           goodsAuditionConfig.map((item) => {
             arrays.push({
-              TypeId: "3-" + item.sectionId,
+              TypeId:'3-' + item.sectionId,
               menuId: item.sectionId,
               courseId: item.courseId,
               auditionMinute: item.auditionMinute,
+              type:3
             });
           });
           this.auditionList = arrays;

src/views/Marketing/commodityManageMent/poppleSet copy.vue

@@ -0,0 +1,288 @@
+<template>
+  <div id="poppleSet">
+    <el-dialog
+      :visible.sync="dialogVisible"
+      width="60%"
+      @open="openExpand"
+      :show-close="false"
+      :close-on-click-modal="false"
+    >
+      <div slot="title" class="hearders">
+        <div class="leftTitle">试听设置</div>
+        <div class="rightBoxs">
+          <img
+            src="@/assets/images/Close@2x.png"
+            alt=""
+            @click="dialogVisible = false"
+          />
+        </div>
+      </div>
+      <div style="text-align: end">
+        <el-button type="text" @click="inits">重置</el-button>
+      </div>
+      <el-tree
+        ref="trees"
+        :data="datas"
+        :props="layoutTreeProps"
+        :load="loadNode"
+        lazy
+        :default-checked-keys="audition"
+        :show-checkbox="true"
+        :check-strictly="true"
+        @check-change="getCheckedKeys"
+        node-key="onlyId"
+      >
+        <span class="custom-tree-node" slot-scope="{ node }">
+          <span>{{ node.label }}</span>
+          <span v-if="node.checked"
+            >试听前
+            <el-input-number
+              v-model="node.data.auditionMinute"
+              controls-position="right"
+              :min="0"
+              :precision="2"
+              :controls="false"
+              size="mini"
+              style="width: 80px"
+              :max="node.data.durationTime"
+              @blur="changeNum(node)"
+            ></el-input-number
+            >分钟</span
+          >
+        </span>
+      </el-tree>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitTable">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  props: ["tableData", "auditionList"],
+  data() {
+    return {
+      copyData: [],
+      datas: [],
+      audition: [],
+      auditionListCope: [],
+      dialogVisible: false,
+      layoutTreeProps: {
+        label(data, node) {
+          return (
+            data.courseName || data.categoryName || data.name || data.menuName
+          );
+        },
+        isLeaf(data, node) {
+          return !data.hasChildren;
+        },
+      },
+      getAllSeNum: [], //当前tree所有节ID
+    };
+  },
+  methods: {
+    changeNum(v) {
+      console.log(v)
+      if (v.data.auditionMinute === 0) {
+        this.$message.warning("时长禁止为0，请重新设置");
+      }
+    },
+    inits() {
+      this.datas = JSON.parse(JSON.stringify(this.copyData));
+    },
+    openExpand() {
+      console.log('get',this.auditionList)
+      if (this.auditionList) {
+        this.auditionListCope = JSON.parse(JSON.stringify(this.auditionList));
+        var arrays = [];
+        this.auditionList.map((item) => {
+          arrays.push(item.typeId);
+        });
+        this.$nextTick(() => {
+          this.audition = arrays;
+        });
+      }
+      this.$nextTick(() => {
+        this.inits();
+      });
+    },
+    getCheckedKeys(item, node) {
+      if (item.TypeId.split("-")[0] != "3") {
+        return;
+      }
+      console.log(this.audition,321)
+      if (node && this.audition.indexOf(item.onlyId) == -1) {
+        this.audition.push(item.onlyId);
+      }
+      if (!node && this.audition.indexOf(item.onlyId) !== -1) {
+        this.audition.splice(this.audition.indexOf(item.onlyId), 1);
+      }
+      if (node) {
+        var sta = this.auditionListCope.some((items) => {
+          return items.typeId == item.onlyId;
+        });
+        if (!sta) {
+          this.auditionListCope.push({
+            typeId: item.onlyId,
+            auditionMinute: item.auditionMinute,
+            courseId: item.courseId,
+            menuId: item.menuId,
+          });
+        }
+      } else {
+        this.auditionListCope.map((items, indexs) => {
+          if (items.typeId == item.onlyId) {
+            this.auditionListCope.splice(indexs, 1);
+          }
+        });
+      }
+      var a = item.TypeId.split("-").map(Number)[1]
+      this.getAllSeNum.forEach(items => {
+        var ast = items.split("-").map(Number)[3]
+        if(a == ast){
+          this.$refs.trees.setChecked(items, node);
+        }
+      })
+    },
+    submitTable() {
+      if (!this.auditionListCope.length) {
+        this.$message.warning("请勾选至少一节的试听时间");
+        return;
+      }
+      var arrays = this.$refs.trees.getCheckedNodes();
+      for (let i = 0; i < arrays.length; i++) {
+        for (let j = 0; j < this.auditionListCope.length; j++) {
+          if (arrays[i].onlyId === this.auditionListCope[j].typeId) {
+            this.auditionListCope[j].auditionMinute = arrays[i].auditionMinute;
+          }
+          if (this.auditionListCope[j].auditionMinute === 0) {
+            this.$message.warning("不允许填写时长为0，请重新输入");
+            return;
+          }
+        }
+      }
+      // console.log(this.auditionListCope,321)
+      // this.auditionListCope.map((item) => {
+      //   if (!item.auditionMinute) {
+      //     arrays.map((items) => {
+      //       if (items.TypeId == item.TypeId) {
+      //         item.auditionMinute = items.auditionMinute;
+      //       }
+      //     });
+      //   }
+      // });
+      this.$emit("uploadArrays", this.auditionListCope);
+      this.dialogVisible = false;
+    },
+    loadNode(node, resolve) {
+      var self = this;
+      console.log(self.auditionListCope)
+      if (node.level === 0) {
+        this.tableData.map((item) => {
+          item.TypeId = '0-' + item.courseId;
+          item.disabled = true;
+          item.hasChildren = true;
+        });
+        this.copyData = JSON.parse(JSON.stringify(this.tableData));
+        return resolve(this.tableData);
+      } else {
+        if (node.data.type === 1) {
+          this.$api
+            .inquireCourseListmodulechapter(node.data.menuId)
+            .then((res) => {
+              res.data.map((item) => {
+                item.onlyId = `${node.data.courseId}-${node.data.menuId}-${item.chapterId}-0`;
+                item.courseId = node.data.courseId;
+                item.TypeId = "2" + "-" + item.chapterId;
+                item.hasChildren = true;
+                item.disabled = true;
+                item.menuId = item.chapterId;
+                item.type = 2;
+              });
+              return resolve(res.data);
+            });
+        } else if (node.data.type === 2) {
+          this.$api
+            .inquireCoursechaptersectionlist(node.data.menuId)
+            .then((res) => {
+              res.data.map((item) => {
+                item.onlyId = `${node.data.courseId}-${node.data.moduleId}-${item.chapterId}-${item.sectionId}`;
+                if (this.getAllSeNum.indexOf(item.onlyId) === -1) {
+                  this.getAllSeNum.push(item.onlyId);
+                }
+                item.type = 3;
+                item.TypeId = "3" + "-" + item.sectionId;
+                item.menuId = item.sectionId;
+                item.auditionMinute = item.durationTime;
+                item.courseId = node.data.courseId;
+                if (self.auditionListCope) {
+                  self.auditionListCope.map((items) => {
+                    if (items.TypeId === item.TypeId) {
+                      item.auditionMinute = items.auditionMinute;
+                    }
+                  });
+                }
+                item.hasChildren = false;
+              });
+              return resolve(res.data);
+            });
+        } else if (node.data.type === 3) {
+          return resolve([]);
+        } else {
+          this.$api
+            .inquireCoursemenuListS({ courseId: node.data.courseId })
+            .then((res) => {
+              res.rows.map((item) => {
+                if (item.type === 1) {
+                  item.onlyId = `${node.data.courseId}-${item.menuId}-0-0`;
+                  item.TypeId = item.type + "-" + item.menuId;
+                }
+                if (item.type === 2) {
+                  item.onlyId = `${node.data.courseId}-0-${item.menuId}-0`;
+                  item.TypeId = item.type + "-" + item.menuId;
+                }
+                if (item.type === 3) {
+                  item.onlyId = `${node.data.courseId}-0-0-${item.menuId}`;
+                  if (this.getAllSeNum.indexOf(item.onlyId) === -1) {
+                    this.getAllSeNum.push(item.onlyId);
+                  }
+                  item.TypeId = item.type + "-" + item.menuId;
+                  item.auditionMinute = item.durationTime;
+                  if (self.auditionListCope) {
+                    self.auditionListCope.map((items) => {
+                      if (items.TypeId === item.TypeId) {
+                        item.auditionMinute = items.auditionMinute;
+                      }
+                    });
+                  }
+                  item.disabled = false;
+                  item.hasChildren = false;
+                } else {
+                  item.disabled = true;
+                  item.hasChildren = true;
+                }
+              });
+              return resolve(res.rows);
+            });
+        }
+      }
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+/deep/.el-tree-node__content {
+  height: 35px;
+}
+.custom-tree-node {
+  flex: 1;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 14px;
+  padding-right: 8px;
+}
+</style>

src/views/Marketing/commodityManageMent/poppleSet.vue

@@ -84,23 +84,53 @@ export default {
   },
   methods: {
     changeNum(v) {
-      console.log(v)
       if (v.data.auditionMinute === 0) {
         this.$message.warning("时长禁止为0，请重新设置");
+      } else {
+        var arrays = this.$refs.trees;
+        //修改指定项的 auditionMinute
+        arrays.root.childNodes.forEach((item, index) => {
+          item.childNodes.forEach((items, indexs) => {
+            if (items.data.TypeId === v.data.TypeId) {
+              items.data.auditionMinute = v.data.auditionMinute;
+            }
+            if (items.childNodes.length) {
+              items.childNodes.forEach((ik) => {
+                if (ik.data.TypeId === v.data.TypeId) {
+                  ik.data.auditionMinute = v.data.auditionMinute;
+                }
+                if (ik.childNodes.length) {
+                  ik.childNodes.forEach((iks) => {
+                    if (iks.data.TypeId === v.data.TypeId) {
+                      iks.data.auditionMinute = v.data.auditionMinute;
+                    }
+                  });
+                }
+              });
+            }
+          });
+        });
+        this.auditionListCope.forEach(items => {
+          if(items.TypeId === v.data.TypeId){
+            items.auditionMinute = v.data.auditionMinute
+          }
+        })
       }
     },
     inits() {
+      if (this.auditionList) {
+        this.auditionListCope = JSON.parse(JSON.stringify(this.auditionList));
+        this.$nextTick(() => {
+          this.audition = [];
+        });
+      }
       this.datas = JSON.parse(JSON.stringify(this.copyData));
     },
     openExpand() {
       if (this.auditionList) {
         this.auditionListCope = JSON.parse(JSON.stringify(this.auditionList));
-        var arrays = [];
-        this.auditionList.map((item) => {
-          arrays.push(item.TypeId);
-        });
         this.$nextTick(() => {
-          this.audition = arrays;
+          this.audition = [];
         });
       }
       this.$nextTick(() => {
@@ -108,80 +138,80 @@ export default {
       });
     },
     getCheckedKeys(item, node) {
+      var self = this;
       if (item.TypeId.split("-")[0] != "3") {
         return;
       }
-      if (node && this.audition.indexOf(item.TypeId) == -1) {
-        this.audition.push(item.TypeId);
-      }
-      if (!node && this.audition.indexOf(item.TypeId) !== -1) {
-        this.audition.splice(this.audition.indexOf(item.TypeId), 1);
-      }
       if (node) {
-        var sta = this.auditionListCope.some((items) => {
-          return items.TypeId == item.TypeId;
+        var ast = self.getAllSeNum.filter((items, indexs) => {
+          if (
+            items.split("-")[0] == item.courseId &&
+            items.split("-")[3] == item.menuId
+          ) {
+            return items;
+          }
+        });
+        var st = ast.concat(self.audition);
+        self.audition = [...new Set(st)];
+        var pds = self.auditionListCope.some((items, indexs) => {
+          return (
+            items.courseId === item.courseId && items.menuId === item.menuId
+          );
         });
-        if (!sta) {
-          this.auditionListCope.push({
+        if (!pds) {
+          var data = {
             TypeId: item.TypeId,
+            // typeId: item.onlyId,
             auditionMinute: item.auditionMinute,
             courseId: item.courseId,
             menuId: item.menuId,
-          });
+          };
+          self.auditionListCope.push(data);
         }
       } else {
-        this.auditionListCope.map((items, indexs) => {
-          if (items.TypeId == item.TypeId) {
-            this.auditionListCope.splice(indexs, 1);
+        self.audition = self.audition.filter((items, indexs) => {
+          if (items.split("-")[0] != item.courseId) {
+            return items;
+          } else {
+            if (items.split("-")[3] != item.menuId) {
+              return items;
+            } else {
+              self.$refs.trees.setChecked(items, node);
+            }
           }
         });
+        var pds = self.auditionListCope.filter((itx, indx) => {
+          if (itx.courseId != item.courseId) {
+            return itx;
+          } else {
+            if (itx.menuId != item.menuId) {
+              return itx;
+            }
+          }
+        });
+        self.auditionListCope = pds;
       }
-      var a = item.TypeId.split("-").map(Number)[1]
-      this.getAllSeNum.forEach(items => {
-        var ast = items.split("-").map(Number)[3]
-        if(a == ast){
-          this.$refs.trees.setChecked(items, node);
-        }
-      })
     },
     submitTable() {
       if (!this.auditionListCope.length) {
         this.$message.warning("请勾选至少一节的试听时间");
         return;
       }
-      var arrays = this.$refs.trees.getCheckedNodes();
-      console.log(arrays);
-      for (let i = 0; i < arrays.length; i++) {
-        for (let j = 0; j < this.auditionListCope.length; j++) {
-          if (arrays[i].TypeId === this.auditionListCope[j].TypeId) {
-            this.auditionListCope[j].auditionMinute = arrays[i].auditionMinute;
-          }
-          if (this.auditionListCope[j].auditionMinute === 0) {
-            this.$message.warning("不允许填写时长为0，请重新输入");
-            return;
-          }
+      this.auditionListCope.forEach((item) => {
+        if (!item.auditionMinute) {
+          this.$message.warning("不允许填写时长为0的节，请重新输入");
+          return;
         }
-      }
-      // console.log(this.auditionListCope,321)
-      // this.auditionListCope.map((item) => {
-      //   if (!item.auditionMinute) {
-      //     arrays.map((items) => {
-      //       if (items.TypeId == item.TypeId) {
-      //         item.auditionMinute = items.auditionMinute;
-      //       }
-      //     });
-      //   }
-      // });
-      console.log(this.auditionListCope, 123123);
+      });
       this.$emit("uploadArrays", this.auditionListCope);
       this.dialogVisible = false;
     },
     loadNode(node, resolve) {
-      console.log(node.data.onlyId)
       var self = this;
+      console.log(self.auditionListCope);
       if (node.level === 0) {
         this.tableData.map((item) => {
-          item.TypeId = item.courseId;
+          item.TypeId = "0-" + item.courseId;
           item.disabled = true;
           item.hasChildren = true;
         });
@@ -208,10 +238,13 @@ export default {
             .inquireCoursechaptersectionlist(node.data.menuId)
             .then((res) => {
               res.data.map((item) => {
-                item.onlyId = `${node.data.courseId}-${node.data.moduleId}-${item.chapterId}-${item.sectionId}`;
+                item.onlyId = `${node.data.courseId}-${
+                  node.data.moduleId ? node.data.moduleId : 0
+                }-${item.chapterId}-${item.sectionId}`;
                 if (this.getAllSeNum.indexOf(item.onlyId) === -1) {
                   this.getAllSeNum.push(item.onlyId);
                 }
+                console.log(item.onlyId, 555555);
                 item.type = 3;
                 item.TypeId = "3" + "-" + item.sectionId;
                 item.menuId = item.sectionId;
@@ -220,6 +253,9 @@ export default {
                 if (self.auditionListCope) {
                   self.auditionListCope.map((items) => {
                     if (items.TypeId === item.TypeId) {
+                      if (self.audition.indexOf(item.onlyId) === -1) {
+                        self.audition.push(item.onlyId);
+                      }
                       item.auditionMinute = items.auditionMinute;
                     }
                   });
@@ -253,6 +289,9 @@ export default {
                   if (self.auditionListCope) {
                     self.auditionListCope.map((items) => {
                       if (items.TypeId === item.TypeId) {
+                        if (self.audition.indexOf(item.onlyId) === -1) {
+                          self.audition.push(item.onlyId);
+                        }
                         item.auditionMinute = items.auditionMinute;
                       }
                     });

src/views/Marketing/orderList/add/order/index.vue

@@ -372,9 +372,12 @@
                 <p style="padding-left: 24px">
                   有效期至：{{ $methodsTools.onlyForma(item.classEndTime) }}
                 </p>
+                <p v-if="!item.classEndTime" style="padding-left: 24px">
+                  未设置时间
+                </p>
                 <p
                   style="padding-left: 24px"
-                  v-if="$methodsTools.expiredTime(item.classEndTime)"
+                  v-else-if="$methodsTools.expiredTime(item.classEndTime)"
                 >
                   已过期
                 </p>

src/views/education/dataReview/dataConfig/index.vue

@@ -361,8 +361,8 @@ export default {
           ],
         },
         {
-          prop: "prefixName",
-          placeholder: "请输入搜索关键内容",
+          prop: "realname",
+          placeholder: "请输入学员姓名",
         },
       ],
       formData: {

src/views/education/studentManageMent/studentXQ/BankQuestionPassRecord.vue

@@ -24,15 +24,6 @@
               color: '#333',
             }"
           >
-            <el-table-column label="操作" align="center" width="100px">
-              <template slot-scope="scope">
-                <el-button
-                  type="text"
-                  @click="wantInfo(scope.row, scope.$index)"
-                  >查看</el-button
-                >
-              </template>
-            </el-table-column>
             <template v-for="(item, index) in tableSetChild">
               <el-table-column
                 :width="item.width"
@@ -63,6 +54,15 @@
                 </template>
               </el-table-column>
             </template>
+            <el-table-column label="操作" align="center" width="100px">
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  @click="wantInfo(scope.row, scope.$index)"
+                  >查看</el-button
+                >
+              </template>
+            </el-table-column>
           </el-table>
         </template>
       </el-table-column>
@@ -224,7 +224,7 @@
                       getInfoRecord.totalQuestionNum
                     }}
                   </td>
-                  <td>{{ getInfoRecord.performance }}</td>
+                  <td>{{ getInfoRecord.performance + getInfoRecord.score }}</td>
                 </tr>
               </table>
               <div
@@ -476,6 +476,7 @@
           v-model="numPrise"
           size="mini"
           :min="0"
+          :max="maxScore"
         ></el-input-number>
         分
       </div>
@@ -607,6 +608,7 @@ export default {
       getInfoRecord: {}, //当前点击的数据
       numPrise: "", //当前弹窗分数
       activeIndexs: "",
+      maxScore:0,//弹窗评分最大值
     };
   },
   mounted() {
@@ -625,13 +627,13 @@ export default {
      */
     editForms() {
       var data = JSON.parse(JSON.stringify(this.getInfoRecord));
-      data.performance = 0;
+      data.score = 0;
       for (let i = 0; i < data.historyExamJson.length; i++) {
         if (
-          data.historyExamJson[i].scoreResult ||
-          data.historyExamJson[i].scoreResult === 0
+          (data.historyExamJson[i].type === 4 ||
+            data.historyExamJson[i].type === 5) && data.historyExamJson[i].scoreResult
         ) {
-          data.performance += data.historyExamJson[i].scoreResult;
+          data.score += data.historyExamJson[i].scoreResult;
         }
       }
       data.historyExamJson = JSON.stringify(data.historyExamJson);
@@ -649,6 +651,7 @@ export default {
       this.visible = false;
     },
     setMath(option, indexs) {
+      this.maxScore = option.score
       this.numPrise = this.getInfoRecord.historyExamJson[indexs].scoreResult;
       this.activeIndexs = indexs;
       this.visible = true;
@@ -659,10 +662,10 @@ export default {
       if (dan instanceof Object) {
         arrays = dan;
       } else {
-        if(dan){
+        if (dan) {
           arrays = dan.toString().split(",");
-        }else{
-          return ''
+        } else {
+          return "";
         }
       }
       for (let i = 0; i < arrays.length; i++) {
@@ -744,6 +747,9 @@ export default {
       }
       this.$api.obtainrecordexam(id).then((res) => {
         res.data.historyExamJson = JSON.parse(res.data.historyExamJson);
+        if(!res.data.score){
+          res.data.score = 0
+        }
         this.getInfoRecord = res.data;
       });
     },

src/views/resource/bankManagement/topicManagement/index.vue

@@ -372,7 +372,7 @@ export default {
   },
   methods: {
     dowmModel() {
-      let url = baseUrls.BASE_IMG_URL + "/oss/images/IDNumber/20211124.xlsx";
+      let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20220104.xlsx";
       let link = document.createElement("a");
       let fileName = "导入模板" + ".xlsx";
       document.body.appendChild(link);

src/views/resource/videoManagement/courseManagement/chapterContent/index.vue

@@ -72,7 +72,7 @@
         </div>
       </div>
       <el-radio-group v-model="radio" class="dis-f">
-        <el-radio :label="1">模板</el-radio>
+        <el-radio :label="1">模块</el-radio>
         <el-radio :label="2">章</el-radio>
         <el-radio :label="3">节</el-radio>
       </el-radio-group>