flex:新增优化需求

src/components/pagination.vue

@@ -19,7 +19,7 @@ export default {
   data() {
     return {
       //   currentPage: 1, //当前位于页
-      pageSizes: [5, 10, 15, 20], //每页多少条分组
+      pageSizes: [10, 20, 50, 100, 200, 500], //每页多少条分组
     };
   },
   methods: {

src/views/Marketing/order/orderList/details/goodsManage.vue

@@ -224,11 +224,11 @@ export default {
           value: 2,
         },
         {
-          label: "面授",
+          label: "补考",
           value: 3,
         },
         {
-          label: "服务",
+          label: "前培",
           value: 4,
         },
         {
@@ -252,25 +252,26 @@ export default {
       ],
       lists: [
         {
-          label: "商品标准价格",
-          prop: "standPrice",
+          label: "商品编码",
+          prop: "code",
         },
         {
           label: "商品年份",
           prop: "year",
         },
         {
-          label: "商品最低价格",
-          prop: "lowestPrice",
+          label: "商品名称",
+          prop: "goodsName",
         },
         {
           label: "供应方（服务）",
           prop: "supplyName",
         },
         {
-          label: "支付金额",
-          prop: "goodsReceived",
+          label: "支付状态",
+          prop: "payStatus",
           dataType: "listData",
+          scope: "payType",
         },
         {
           label: "商品类型",
@@ -278,18 +279,9 @@ export default {
           scope: "select",
         },
         {
-          label: "商品编码",
-          prop: "code",
-        },
-        {
-          label: "支付状态",
-          prop: "payStatus",
+          label: "支付金额",
+          prop: "goodsReceived",
           dataType: "listData",
-          scope: "payType",
-        },
-        {
-          label: "商品名称",
-          prop: "goodsName",
         },
         {
           label: "业务层级",
@@ -299,24 +291,32 @@ export default {
           scope: "yecj",
         },
         {
-          label: "商品标准价格明细",
-          prop: "payer",
-          scope: "table",
+          label: "商品标准价格",
+          prop: "standPrice",
+        },
+        {
+          label: "学时",
+          prop: "classHours",
+        },
+        {
+          label: "商品最低价格",
+          prop: "lowestPrice",
         },
         {
           label: "商品有效期",
           prop: "validity",
           scope: "startEndTime",
         },
+        {
+          label: "商品标准价格明细",
+          prop: "payer",
+          scope: "table",
+        },
         {
           label: "学习有效期",
           prop: "studentTime",
           scope: "startEndTime",
         },
-        {
-          label: "学时",
-          prop: "classHours",
-        },
       ],
       lists2: [
         {

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

@@ -183,6 +183,7 @@ export default {
           label: "商品名称",
           prop: "goodsName",
           hidden: true,
+          width:"280px"
         },
         {
           label: "商品业务层级",
@@ -191,7 +192,7 @@ export default {
           prop3: "businessName",
           hidden: true,
           scope: "eduTypes",
-          width: "280px",
+          width: "380px",
         },
         {
           label: "商品年份",

src/views/education/classManageMent/classHours/index.vue

@@ -210,7 +210,7 @@ export default {
           label: "所购商品",
           prop: "goodsName",
           hidden: true,
-          width: "120px",
+          width: "280px",
         },
         {
           label: "所在班级",
@@ -237,7 +237,7 @@ export default {
           prop2: "secAllNum",
           hidden: true,
           scope: "computer",
-          width: "140px",
+          width: "160px",
         },
         {
           label: "做题进度（章卷）",
@@ -245,21 +245,21 @@ export default {
           prop2: "examNum",
           hidden: true,
           scope: "computer",
-          width: "130px",
+          width: "160px",
         },
         {
           label: "学习开始时间",
           prop: "startTime",
           hidden: true,
           scope: "aTimeList",
-          width: "120px",
+          width: "160px",
         },
         {
           label: "学习结束时间",
           prop: "endTime",
           hidden: true,
           scope: "aTimeList",
-          width: "120px",
+          width: "160px",
         },
         {
           label: "学习有效期",
@@ -267,14 +267,14 @@ export default {
           prop2: "studyEndTime",
           hidden: true,
           scope: "TimeLists",
-          width: "220px",
+          width: "310px",
         },
         {
           label: "填写资料审核状态",
           prop: "profileStatus",
           hidden: true,
           scope: "isOptions",
-          width: "130px",
+          width: "160px",
           options: [
             {
               label: "审核通过",
@@ -303,7 +303,7 @@ export default {
           prop1: "rebuildNum",
           hidden: true,
           scope: "againStudent",
-          width: "150px",
+          width: "160px",
         },
       ],
       tableData: [], //表单数据

src/views/education/classManageMent/classHoursReview/studyTimes.vue

@@ -116,6 +116,7 @@
       </div>
     </div>
     <el-table
+    :default-expand-all="defaultExpand"
       v-for="(asrt, insrt) in 3"
       border
       v-loading="loading"
@@ -132,7 +133,6 @@
         ]
       "
       style="width: 100%"
-      :default-expand-all="false"
       :header-cell-style="
         insrt === 0
           ? {
@@ -249,7 +249,7 @@
                 : ''
             "
             style="width: 100%"
-            :default-expand-all="false"
+            :default-expand-all="defaultExpand"
             :header-cell-style="
               scope.row.type === 1
                 ? {
@@ -392,7 +392,7 @@
                       : ''
                   "
                   style="width: 100%"
-                  :default-expand-all="false"
+                  :default-expand-all="defaultExpand"
                   :header-cell-style="
                     scope2.row.type === 2
                       ? {
@@ -746,6 +746,7 @@
 export default {
   data() {
     return {
+      defaultExpand:true,
       size: "medium",
       active: "",
       loading: false,

src/views/education/classManageMent/classList/addClass/index.vue

@@ -176,7 +176,7 @@
               <el-option
                 v-for="(item, index) in teacherList"
                 :key="index"
-                :label="item.userName"
+                :label="item.nickName"
                 :value="item.userId"
               >
               </el-option>
@@ -428,6 +428,7 @@ export default {
         {
           label: "商品编码",
           prop: "code",
+          width:"130px"
         },
         {
           label: "年份",
@@ -436,6 +437,7 @@ export default {
         {
           label: "商品名称",
           prop: "goodsName",
+          width:"280px"
         },
         {
           label: "业务层级",
@@ -443,21 +445,24 @@ export default {
           prop2: "projectName",
           prop3: "businessName",
           scope: "moreList",
-          width: "250px",
+          width: "340px",
         },
         {
           label: "商品类型",
           prop: "goodsType",
           scope: "goodsType",
+          width:"100px"
         },
         {
           label: "有效状态",
           prop: "status",
           scope: "status",
+          width:"100px"
         },
         {
           label: "商品标价",
           prop: "standPrice",
+          width:"100px"
         },
       ],
       templateRadio: "",

src/views/education/classManageMent/classList/index.vue

@@ -143,7 +143,7 @@ export default {
           objProp: "goodsList",
           hidden: true,
           scope: "objType",
-          width: "130px",
+          width: "280px",
         },
         {
           label: "班级编码",
@@ -164,7 +164,7 @@ export default {
           prop: "className",
           hidden: true,
           scope: "editInfo",
-          width: "130px",
+          width: "280px",
         },
         {
           label: "学时",

src/views/education/classManageMent/classList/manageClass/baseInfo.vue

@@ -225,7 +225,7 @@
                 <el-option
                   v-for="(item, index) in teacherList"
                   :key="index"
-                  :label="item.userName"
+                  :label="item.nickName"
                   :value="item.userId"
                 >
                 </el-option>

src/views/education/classManageMent/studentMenu/index.vue

@@ -53,9 +53,9 @@
         <el-button :size="size" type="success" @click="moreActive(1)"
           >结业</el-button
         >
-        <el-button :size="size" type="warning" @click="moreActive(3)"
+        <!-- <el-button :size="size" type="warning" @click="moreActive(3)"
           >移除</el-button
-        >
+        > -->
         <el-select
           @change="search(3)"
           v-model="formData.studyCountMore"
@@ -83,7 +83,7 @@
         <el-button type="text" @click="addClick(props.scope.row, 2)"
           >学员详情</el-button
         >
-        <el-button type="text" @click="del(props.scope.row)">移除</el-button>
+        <!-- <el-button type="text" @click="del(props.scope.row)">移除</el-button> -->
       </template>
     </table-list>
     <pagination

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

@@ -434,6 +434,7 @@ export default {
           label: "学员编码",
           prop: "userAccount",
           hidden: true,
+          width: "140px",
         },
         {
           label: "学员姓名",
@@ -445,7 +446,7 @@ export default {
           label: "学员身份证",
           prop: "idCard",
           hidden: true,
-          width: "160px",
+          width: "180px",
         },
         {
           label: "绑定手机号",
@@ -456,7 +457,7 @@ export default {
         {
           label: "所购商品",
           hidden: true,
-          width: "280px",
+          width: "180px",
           scope: "getShops",
         },
         {
@@ -604,11 +605,12 @@ export default {
             item.keyValue = JSON.parse(item.keyValue);
             var arst = [];
             for (let k in item.keyValue) {
-              arst.push(item.keyValue[k]);
+              if(item.keyValue[k].value){
+                arst.push(item.keyValue[k]);
+              }
             }
             item.keyValueArrays = arst;
           });
-
           this.recordList = res.rows;
           this.dialogVisibleRecord = true;
         });

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

@@ -111,8 +111,17 @@
                   placement="bottom"
                   trigger="click"
                   :disabled="eduType ? false : true"
-                >
-                  <el-checkbox-group v-model="cauType" class="checkboxSty">
+                  ><el-checkbox
+                    v-model="checkAll"
+                    @change="handleCheckAllChange"
+                    :indeterminate="isIndeterminate"
+                    >全选</el-checkbox
+                  >
+                  <el-checkbox-group
+                    v-model="cauType"
+                    class="checkboxSty"
+                    @change="handleCheckedCitiesChange"
+                  >
                     <el-checkbox
                       v-for="(item, index) in itemOption2"
                       :label="item.id"
@@ -583,10 +592,7 @@
             ><span>{{ item.fieldName }}</span>
           </div>
           <!-- @click="item.disable == true ? '' : changeStatus2s(item, index)" (旧)下面按钮事件 -->
-          <div
-            class="disChild"
-            @click="titleFunc"
-          >
+          <div class="disChild" @click="titleFunc">
             <i class="radiosty" :class="item.disable === true ? 'disable' : ''"
               ><div :class="item.required ? 'activeRadio' : ''"></div></i
             ><span>必填</span>
@@ -800,6 +806,8 @@ export default {
   components: { searchBoxNew, tableList, pagination },
   data() {
     return {
+      isIndeterminate: false,
+      checkAll: false,
       changeHeight: true,
       loading: false, //当前表单加载是否加载动画
       navText: {
@@ -835,6 +843,7 @@ export default {
           prop: "businessList",
           hidden: true,
           scope: "mapTypesBUS",
+          width: "380px",
         },
         // {
         //   label: "资料审核人",
@@ -964,6 +973,17 @@ export default {
         pageSize: 10,
       },
       formList5: [
+        {
+          prop: "educationTypeId",
+          placeholder: "教育类型",
+          scope: "educationType",
+        },
+        {
+          prop: "businessId",
+          placeholder: "业务层次",
+          scope: "businessLevel",
+          edu: "educationTypeId",
+        },
         {
           prop: "goodsName",
           placeholder: "请输入商品名称",
@@ -973,6 +993,7 @@ export default {
         {
           label: "商品编码",
           prop: "code",
+          width: "130px",
         },
         {
           label: "年份",
@@ -981,24 +1002,29 @@ export default {
         {
           label: "商品名称",
           prop: "goodsName",
+          width: "260px",
         },
         {
           label: "业务层级",
           scope: "maRY",
+          width: "360px",
         },
         {
           label: "商品类型",
           prop: "goodsType",
           scope: "types",
+          width: "100px",
         },
         {
           label: "有效状态",
           prop: "status",
           scope: "Status",
+          width: "100px",
         },
         {
           label: "商品标价",
           prop: "standPrice",
+          width: "100px",
         },
       ],
       disCheckList: [],
@@ -1009,7 +1035,7 @@ export default {
         {
           label: "商品编码",
           prop: "code",
-          width: "130",
+          width: "130px",
         },
         {
           label: "年份",
@@ -1018,26 +1044,29 @@ export default {
         {
           label: "商品名称",
           prop: "goodsName",
-          width: "230",
+          width: "260px",
         },
         {
           label: "业务层级",
           scope: "maRY",
-          width: "230",
+          width: "360px",
         },
         {
           label: "商品类型",
           prop: "goodsType",
           scope: "types",
+          width: "140px",
         },
         {
           label: "有效状态",
           prop: "status",
           scope: "Status",
+          width: "100px",
         },
         {
           label: "商品标价",
           prop: "standPrice",
+          width: "100px",
         },
       ],
       boxtableDataIsActive: [],
@@ -1077,6 +1106,63 @@ export default {
     this.getUserInfoList();
   },
   methods: {
+    handleCheckedCitiesChange() {
+      let nid = this.itemOption2.map((item) => {
+        return item.id;
+      });
+      this.checkAll = nid.every((item) => {
+        if (this.cauType.includes(item)) {
+          this.isIndeterminate = true;
+          return true;
+        } else {
+          return false;
+        }
+      });
+      if (this.cauType.length) {
+        this.isIndeterminate = true;
+      } else {
+        this.isIndeterminate = false;
+      }
+      if (this.checkAll) {
+        this.isIndeterminate = false;
+      }
+    },
+    handleCheckAllChange(val) {
+      if (val) {
+        let nid = this.itemOption2.map((item) => {
+          return item.id;
+        });
+        let arrays = this.cauType.concat(nid);
+        this.cauType = this.setFunc(arrays);
+        this.isIndeterminate = false;
+      } else {
+        let nid = this.itemOption2.map((item) => {
+          return item.id;
+        });
+        let newArr = [];
+        this.cauType.forEach((item) => {
+          if (!nid.includes(item)) {
+            newArr.push(item);
+          }
+        });
+        this.cauType = newArr;
+        console.log(this.cauType);
+        if (this.cauType.length) {
+          this.isIndeterminate = true;
+        } else {
+          this.isIndeterminate = false;
+        }
+      }
+    },
+    setFunc(arr) {
+      var arrays = [];
+      for (let i = 0; i < arr.length; i++) {
+        if (!arrays.includes(arr[i])) {
+          arrays.push(arr[i]);
+        }
+      }
+      return arrays;
+    },
     handleSizeChangea(v) {
       this.formDataa.pageSize = v;
       this.formDataa.pageNum = 1;
@@ -1118,10 +1204,10 @@ export default {
         .then((res) => {
           this.formDataa.goodsIds = ats.toString();
           this.$message.success("删除成功");
-          if(!this.formDataa.goodsIds){
-            this.dialogVisibleisActive = false
+          if (!this.formDataa.goodsIds) {
+            this.dialogVisibleisActive = false;
             this.search();
-            return
+            return;
           }
           this.getNewInfos();
         });
@@ -1243,8 +1329,8 @@ export default {
         this.total5 = res.total;
       });
     },
-    titleFunc(){
-      this.$message.warning("该选项默认必填且不允许修改")
+    titleFunc() {
+      this.$message.warning("该选项默认必填且不允许修改");
     },
     openYL() {
       this.dialogVisYL = true;
@@ -1260,9 +1346,9 @@ export default {
     changeStatus1(item, index) {
       if (item.checked) {
         item.checked = false;
-        var indexs = this.pzList1sss.findIndex(items => {
-          return items.fieldKey === item.fieldKey
-        })
+        var indexs = this.pzList1sss.findIndex((items) => {
+          return items.fieldKey === item.fieldKey;
+        });
         this.pzList1sss.splice(indexs, 1);
       } else {
         item.checked = true;
@@ -1400,12 +1486,12 @@ export default {
       }
       this.pzList2sss = JSON.parse(JSON.stringify(this.listData.keyValue2));
       data = data.filter((item) => {
-        if(item.fieldKey === "commitment_seal"){
-          item.required = true
+        if (item.fieldKey === "commitment_seal") {
+          item.required = true;
         }
         return item.fieldKey === "commitment_seal";
       });
-      console.log(data)
+      console.log(data);
       this.pzList2 = data;
       this.dialogVisibleLitsing2 = true;
     },
@@ -1449,6 +1535,7 @@ export default {
         }
       });
       this.itemOption2 = array;
+      this.handleCheckedCitiesChange();
     },
     initOptions() {
       this.$api.inquireCourseEducationType({ status: 1 }).then((res) => {
@@ -1495,6 +1582,7 @@ export default {
     },
     closeType(id) {
       this.cauType.splice(this.cauType.indexOf(id), 1);
+      this.handleCheckedCitiesChange();
     },
     del(v) {
       this.$alert(

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

@@ -361,7 +361,7 @@ export default {
           label: "学员身份证",
           prop: "idCard",
           hidden: true,
-          width: "160px",
+          width: "180px",
         },
         {
           label: "绑定手机号",
@@ -372,7 +372,7 @@ export default {
         {
           label: "所购商品",
           hidden: true,
-          width: "280px",
+          width: "160px",
           scope: "getShops",
         },
         {

src/views/education/examManagement/applicationData/bulkImportPlan/newRegister.vue

@@ -292,7 +292,7 @@ export default {
         },
         {
           label: "证书编号",
-          prop: "userName",
+          prop: "certificateCode",
         },
         {
           label: "出错原因",