En route 1 年間 前
コミット
4535db1e46

BIN
src/assets/images/ts.png


BIN
src/assets/images/zy.png


+ 8 - 0
src/newApi/classTab.js

@@ -133,6 +133,14 @@ export default {
             params: data
         })
     },
+    //班级学员统计
+    gradegradecountperiodPlush(data) {
+        return request({
+            url: '/grade/grade/count/periodPlush',
+            method: 'get',
+            params: data
+        })
+    },
     //查询学员学时列表审核状态
     listUserPeriodTotal(data) {
         return request({

+ 9 - 0
src/newApi/order.js

@@ -130,6 +130,15 @@ export default {
             isProce:true
         })
     },
+    //后台订单导出
+    orderinputexportInputOrder(data) {
+        return request({
+            url: '/order/input/exportInputOrder',
+            method: 'post',
+            data,
+            isProce:true
+        })
+    },
 
     
     //寄件订单批量处理

+ 24 - 6
src/views/Marketing/order/offlineOrder/index.vue

@@ -8,13 +8,17 @@
       @init="init"
     />
     <table-list
+      ref="tableList"
       :tableSets="tableSet"
       :tableData="tableData"
       :navText="navText"
       :loading="loading"
+      rowKey="inputOrderSn"
     >
       <template slot="customize">
-        <el-button size="medium" type="primary" @click="setGoodsOptions(1)"
+        <el-button size="medium" type="success" @click="setGoodsOptions(3)"
+          >批量导出</el-button
+        ><el-button size="medium" type="primary" @click="setGoodsOptions(1)"
           >设置商品默认匹配</el-button
         ><el-button size="medium" type="primary" @click="setGoodsOptions(2)"
           >批量录单</el-button
@@ -27,9 +31,7 @@
         <el-button
           type="text"
           @click="theOrderJump(props.scope.row, 2)"
-          :disabled="
-            props.scope.row.orderFrom == 6
-          "
+          :disabled="props.scope.row.orderFrom == 6"
           >计费单收费</el-button
         >
         <el-button type="text" @click="theOrderJump(props.scope.row, 3)"
@@ -64,6 +66,7 @@ export default {
         num: true,
         choice: true,
         addHide: true,
+        openCheckMore: true,
         changeWidth: "300px",
         backFatherBtn: {
           status: false,
@@ -188,7 +191,7 @@ export default {
         {
           label: "订单来源",
           prop: "orderFrom",
-          oldOrder:"oldOrderSn",
+          oldOrder: "oldOrderSn",
           hidden: true,
           scope: "isOptionsDY",
           width: "130px",
@@ -296,6 +299,21 @@ export default {
           jump();
         }
       }
+      if (int === 3) {
+        if (this.$refs.tableList.allCheckData.length > 0) {
+          this.$api
+            .orderinputexportInputOrder(
+              this.$refs.tableList.allCheckData.map((i) => i.inputOrderSn)
+            )
+            .then((res) => {
+              this.$methodsTools.exportData(res.data.msg)
+              this.$refs.tableList.clearMoreActive()
+            });
+        } else {
+          this.$message.error("请选择订单");
+          return;
+        }
+      }
     },
     search(int) {
       this.loading = true;
@@ -308,6 +326,7 @@ export default {
           pageSize: 10,
           pageNum: 1,
         };
+        this.$refs.tableList.clearMoreActive()
       }
       if (int === 3) {
         this.formData.pageNum = 1;
@@ -527,4 +546,3 @@ export default {
   }
 }
 </style>
-

+ 40 - 2
src/views/education/classManageMent/classList/trainee/index.vue

@@ -7,6 +7,12 @@
       @search="search"
       @init="init"
     />
+    <picture-list
+      ref="pictureList"
+      :info="info"
+      :list="showTabList"
+      @backFunc="pictureFunc"
+    ></picture-list>
     <table-list
       ref="tableList"
       :tableSets="tableSet"
@@ -153,10 +159,12 @@ import ClassHour from "@/views/education/archives/archivesDetails/courseRecords/
 import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
+import pictureList from "@/components/Comon/pictureList.vue";
 import tabClassDialog from "./tabClassDialog.vue";
 import changeClassDialog from "./changeClassDialog.vue";
 export default {
   components: {
+    pictureList,
     ClassHour,
     searchBoxNew,
     tableList,
@@ -188,6 +196,22 @@ export default {
           title: "未定义",
         },
       },
+      info: {},
+      showTabList: [
+        {
+          label: "信息已推送",
+          img: "ts",
+          prop: "plush",
+          num: true,
+        },
+        {
+          label: "信息待推送",
+          img: "zy",
+          prop: "notPlush",
+          num: true,
+          color: "#ff7a38",
+        },
+      ],
       formData: {
         // status: "0,1",
         pageSize: 10,
@@ -332,7 +356,7 @@ export default {
           scope: "businessLevel",
           edu: "educationTypeId",
         },
-        { 
+        {
           prop: "majorId",
           placeholder: "专业",
           scope: "Professional",
@@ -381,7 +405,9 @@ export default {
         },
         {
           prop: "searchKey",
-          placeholder: this.showStatus ? '请输入班级名称/所属公司/学员姓名': '请输入所属公司/学员姓名',
+          placeholder: this.showStatus
+            ? "请输入班级名称/所属公司/学员姓名"
+            : "请输入所属公司/学员姓名",
         },
         {
           prop: "telphone",
@@ -403,6 +429,14 @@ export default {
     this.search();
   },
   methods: {
+    pictureFunc(item) {
+      if (item.prop == "notPlush") {
+        this.formData.pageSize = 10;
+        this.formData.pageNum = 1;
+        this.$set(this.formData,'officialStatus',0)
+        this.search();
+      }
+    },
     exportStudent() {
       let data = JSON.parse(JSON.stringify(this.formData));
       data.gradeId = this.$route.query.id || "";
@@ -569,6 +603,10 @@ export default {
         .finally(() => {
           this.loading = false;
         });
+
+      this.$api.gradegradecountperiodPlush(data).then((res) => {
+        this.info = res.data;
+      });
     },
     init() {
       this.search(2);