init

src/components/numInput.vue

@@ -0,0 +1,67 @@
+<template>
+  <div id="numInput" class="inputBoxs">
+      <input
+        type="text"
+        :placeholder="placeholder"
+        class="inputSty"
+        :value="value"
+        @blur="changeValue($event)"
+        :class="!value ? 'errSty' : ''"
+      />
+      <div v-if="!value && message" class="labelSty">{{message}}</div>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['value','placeholder','message','min'],
+  data() {
+    return {};
+  },
+  methods: {
+    changeValue(e) {
+      if (isNaN(Number(e.target.value))) {
+        this.$message.warning("请输入数值");
+        this.$emit('changevalues','')
+      } else if (this.min != null && this.min != undefined && this.min != '' && Number(e.target.value) <= Number(this.min)) {
+        this.$message.warning("请输入大于"+ this.min +"的数值");
+        this.$emit('changevalues','')
+      } else {
+        this.$emit('changevalues',Number(e.target.value))
+      }
+    },
+  },
+};
+</script>
+
+<style lang="less" scoped>
+.inputBoxs {
+  vertical-align: top;
+  display: inline-block;
+  margin: 0px 6px 6px 0px;
+  background-color: #fff;
+  & .inputSty {
+    outline: none;
+    padding: 6px 10px;
+    border-radius: 6px;
+    color: #606266;
+    border: 1px solid #dcdfe6;
+    transition: all 0.3s;
+    &:focus {
+      border-color: #409eff;
+    }
+  }
+  & .errSty {
+    border-color: #f56c6c !important;
+    &::placeholder {
+      color: #f56c6c;
+    }
+  }
+  & .labelSty {
+    color: #f56c6c;
+    font-size: 12px;
+    height: 20px;
+    line-height: 20px;
+  }
+}
+</style>

src/components/tableList.vue

@@ -1165,6 +1165,16 @@
                 >
               </template>
             </div>
+            <div v-else-if="item.scope === 'isOptionsDZYQ'">
+              <template v-for="(itemt, indext) in item.options">
+                <span
+                  :key="indext"
+                  v-if="itemt.value === scope.row[item.prop]"
+                  :style="itemt.style ? itemt.style : ''"
+                  >{{scope.row['subscribeStatus'] === 1 ? itemt.label:'' }}</span
+                >
+              </template>
+            </div>
             <span v-else
               >{{ scope.row[item.prop] }}
               {{

src/utils/request.js

@@ -7,7 +7,7 @@ import methods from '@/utils/methodsTool';
 
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 // 创建axios实例
-export const baseURL = 'http://192.168.1.222:5030/'
+export const baseURL = 'http://192.168.1.12:5030/'
 const service = axios.create({
   // axios中请求配置有baseURL选项，表示请求URL公共部分
   // baseURL: 'http://192.168.1.24:5030/',

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

@@ -2373,11 +2373,6 @@ export default {
     },
     rulesTableSumbit(int) {
       this.disabledBtn = true
-      setTimeout(()=>{
-        if(this.disabledBtn){
-          this.disabledBtn = false
-        }
-      },3000)
       var datas = JSON.parse(JSON.stringify(this.listData));
       if (int === 2) {
         datas.goodsStatus = 1;
@@ -2388,6 +2383,7 @@ export default {
       if (datas.goodsType === 1 || datas.goodsType === 2) {
         if (!datas.studyTimeArrays.length) {
           this.$message.warning("请选择学习有效期");
+      this.disabledBtn = false
           return;
         } else {
           datas.studyStartTime = this.$methodsTools.time10to13(
@@ -2418,6 +2414,7 @@ export default {
       if (this.listData.goodsType === 3 || this.listData.goodsType === 4) {
         if (!datas.makeGoodsId) {
           this.$message.warning("请选择关联商品");
+      this.disabledBtn = false
           return;
         }
         datas.makeStartTime = this.$methodsTools.time10to13(

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

@@ -53,7 +53,7 @@
             </el-form-item>
             <el-form-item label="教育类型" prop="educationTypeId">
               <el-select
-              disabled
+                disabled
                 v-model="listData.educationTypeId"
                 placeholder="请选择教育类型"
                 @change="changeEducationTypeId"
@@ -69,7 +69,7 @@
             </el-form-item>
             <el-form-item label="业务层次" prop="businessId">
               <el-select
-              disabled
+                disabled
                 v-model="listData.businessId"
                 placeholder="请选择业务层次"
                 @change="changeBusinessId"
@@ -603,8 +603,16 @@
           </el-col>
         </el-row>
       </div>
-      <h5 class="fengs" v-if="listData.goodsType === 1 || listData.goodsType === 2">颁发证书</h5>
-      <div class="dis_fs" v-if="listData.goodsType === 1 || listData.goodsType === 2">
+      <h5
+        class="fengs"
+        v-if="listData.goodsType === 1 || listData.goodsType === 2"
+      >
+        颁发证书
+      </h5>
+      <div
+        class="dis_fs"
+        v-if="listData.goodsType === 1 || listData.goodsType === 2"
+      >
         <el-popover placement="bottom" trigger="click">
           <el-checkbox-group v-model="listData.certificateIds">
             <el-checkbox
@@ -689,7 +697,11 @@
     </div>
     <div style="text-align: center; margin-top: 20px">
       <el-button @click="backPage" size="mini">取消</el-button>
-      <el-button type="primary" @click="submit('listData', 1)" size="mini" :loading="disabledBtn"
+      <el-button
+        type="primary"
+        @click="submit('listData', 1)"
+        size="mini"
+        :loading="disabledBtn"
         >保存</el-button
       >
       <el-button
@@ -697,7 +709,7 @@
         type="primary"
         @click="submit('listData', 2)"
         size="mini"
-         :loading="disabledBtn"
+        :loading="disabledBtn"
         >{{
           listData.goodsStatus === 0
             ? "上架"
@@ -1138,7 +1150,11 @@
             <el-radio-group
               v-model="photoVideoList.photographConfig.photograph"
             >
-              <el-radio :label="1" @change="photoVideoList.photographConfig.intervalTime.push(0)">是</el-radio>
+              <el-radio
+                :label="1"
+                @change="photoVideoList.photographConfig.intervalTime.push(0)"
+                >是</el-radio
+              >
               <el-radio
                 :label="0"
                 @change="photoVideoList.photographConfig.intervalTime = []"
@@ -1185,7 +1201,13 @@
             <el-radio-group
               v-model="photoVideoList.goodsPhotographExamConfig.photograph"
             >
-              <el-radio :label="1" @change="photoVideoList.goodsPhotographExamConfig.intervalTime.push(0)">是</el-radio>
+              <el-radio
+                :label="1"
+                @change="
+                  photoVideoList.goodsPhotographExamConfig.intervalTime.push(0)
+                "
+                >是</el-radio
+              >
               <el-radio
                 :label="0"
                 @change="
@@ -1333,7 +1355,7 @@ export default {
   components: { searchBoxNew, Editor, pagination, poppleSet, poppleSetTk },
   data() {
     return {
-      disabledBtn:false,
+      disabledBtn: false,
       photoVideoList: {
         playConfig: {
           autoPlay: 0,
@@ -1610,7 +1632,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         status: 1,
-        key:''
+        key: "",
       },
       formListjy: [
         // {
@@ -1686,10 +1708,10 @@ export default {
         status: 1,
         pageSize: 10, //每页多少条数据
         currentPage: 1, //当前页码
-        publishStatus:1,
+        publishStatus: 1,
         educationTypeId: "",
         businessId: "",
-        key:""
+        key: "",
       },
       formLists: [
         // {
@@ -1768,7 +1790,7 @@ export default {
         examType: 1,
         educationTypeId: "",
         businessId: "",
-        names:''
+        names: "",
       },
       formList3: [
         // {
@@ -2098,12 +2120,12 @@ export default {
           pageNum: 1,
           pageSize: 10,
           status: 1,
-          key:''
+          key: "",
         };
       }
       var data = JSON.parse(JSON.stringify(this.formDatajy));
-        data.educationTypeId = this.listData.educationTypeId;
-        data.businessId = this.listData.businessId;
+      data.educationTypeId = this.listData.educationTypeId;
+      data.businessId = this.listData.businessId;
       this.$api.inquireCourseHandoutsList(data).then((res) => {
         this.totaljy = res.total;
         this.jYtableData = res.rows;
@@ -2118,15 +2140,15 @@ export default {
       this.aboutJYBox = false;
     },
     openJY() {
-      if(!this.listData.businessId){
-        this.$message.warning("请选择业务层次")
-        return
+      if (!this.listData.businessId) {
+        this.$message.warning("请选择业务层次");
+        return;
       }
       this.aboutJYBox = true;
       this.handoutsIdTable = this.listData.handoutsId;
     },
     openJYActiveBox() {
-      this.getJyData(2)
+      this.getJyData(2);
       this.jYactiveBoxs = true;
       this.templateRadio = this.handoutsIdTable;
     },
@@ -2535,12 +2557,7 @@ export default {
       });
     },
     rulesTableSumbit(int) {
-      this.disabledBtn = true
-      setTimeout(()=>{
-        if(this.disabledBtn){
-          this.disabledBtn = false
-        }
-      },3000)
+      this.disabledBtn = true;
       var datas = JSON.parse(JSON.stringify(this.listData));
       if (int === 2) {
         if (this.listData.goodsStatus === 1) {
@@ -2553,6 +2570,7 @@ export default {
       if (datas.goodsType === 1 || datas.goodsType === 2) {
         if (!datas.studyTimeArrays.length) {
           this.$message.warning("请选择学习有效期");
+          this.disabledBtn = false;
           return;
         } else {
           datas.studyStartTime = this.$methodsTools.time10to13(
@@ -2582,6 +2600,7 @@ export default {
       if (this.listData.goodsType === 3 || this.listData.goodsType === 4) {
         if (!datas.makeGoodsId) {
           this.$message.warning("请选择关联商品");
+          this.disabledBtn = false;
           return;
         }
         datas.makeStartTime = this.$methodsTools.time10to13(
@@ -2629,14 +2648,17 @@ export default {
         if (!this.listData.handoutsId) {
           datas.handoutsId = 0;
         }
-        this.$api.editGoods(datas).then((res) => {
-          this.$message.success("修改成功");
-          setTimeout(() => {
-            this.$router.go(-1);
-          }, 300);
-        }).catch(()=>{
-          this.disabledBtn = false
-        })
+        this.$api
+          .editGoods(datas)
+          .then((res) => {
+            this.$message.success("修改成功");
+            setTimeout(() => {
+              this.$router.go(-1);
+            }, 300);
+          })
+          .catch(() => {
+            this.disabledBtn = false;
+          });
       } else if (this.listData.goodsType === 2) {
         var courseIdList = [];
         this.tableData2.map((item) => {
@@ -2673,32 +2695,41 @@ export default {
           });
         });
         datas.examConfigList = examConfigListArray;
-        this.$api.editGoodsbank(datas).then((res) => {
-          this.$message.success("修改成功");
-          setTimeout(() => {
-            this.$router.go(-1);
-          }, 300);
-        }).catch(()=>{
-          this.disabledBtn = false
-        })
+        this.$api
+          .editGoodsbank(datas)
+          .then((res) => {
+            this.$message.success("修改成功");
+            setTimeout(() => {
+              this.$router.go(-1);
+            }, 300);
+          })
+          .catch(() => {
+            this.disabledBtn = false;
+          });
       } else if (this.listData.goodsType === 3) {
-        this.$api.editGoodsmake(datas).then((res) => {
-          this.$message.success("修改成功");
-          setTimeout(() => {
-            this.$router.go(-1);
-          }, 300);
-        }).catch(()=>{
-          this.disabledBtn = false
-        })
+        this.$api
+          .editGoodsmake(datas)
+          .then((res) => {
+            this.$message.success("修改成功");
+            setTimeout(() => {
+              this.$router.go(-1);
+            }, 300);
+          })
+          .catch(() => {
+            this.disabledBtn = false;
+          });
       } else if (this.listData.goodsType === 4) {
-        this.$api.editGoodsfront(datas).then((res) => {
-          this.$message.success("修改成功");
-          setTimeout(() => {
-            this.$router.go(-1);
-          }, 300);
-        }).catch(()=>{
-          this.disabledBtn = false
-        })
+        this.$api
+          .editGoodsfront(datas)
+          .then((res) => {
+            this.$message.success("修改成功");
+            setTimeout(() => {
+              this.$router.go(-1);
+            }, 300);
+          })
+          .catch(() => {
+            this.disabledBtn = false;
+          });
       } else {
       }
     },
@@ -2779,7 +2810,7 @@ export default {
           pageNum: 1,
           educationTypeId: this.listData.educationTypeId,
           businessId: this.listData.businessId,
-          publishStatus:1,
+          publishStatus: 1,
         };
       }
       this.$api.inquireCourseListS(this.formDatas).then((res) => {
@@ -2796,7 +2827,7 @@ export default {
         status: 1,
         pageSize: 10,
         pageNum: 1,
-        publishStatus:1,
+        publishStatus: 1,
       };
       if (this.listData.educationTypeId) {
         data.educationTypeId = this.listData.educationTypeId;
@@ -2902,14 +2933,14 @@ export default {
       this.formData3.pageNum = 1;
       // this.formData3.educationTypeId = "";
       // this.formData3.businessId = "";
-      this.formData3.names = ''
+      this.formData3.names = "";
       this.search3();
     },
     search3(int) {
       var self = this;
-      var data = JSON.parse(JSON.stringify(self.formData3))
+      var data = JSON.parse(JSON.stringify(self.formData3));
       if (self.formData3.examType === 1) {
-        data.moduleName = data.names
+        data.moduleName = data.names;
         self.$api.inquireBankModule(data).then((res) => {
           res.rows.forEach((item) => {
             item.ids = 1 + "-" + item.moduleExamId;
@@ -2929,7 +2960,7 @@ export default {
         });
       }
       if (self.formData3.examType === 2) {
-        data.name = data.names
+        data.name = data.names;
         self.$api.inquirebankchapterList(data).then((res) => {
           res.rows.forEach((item) => {
             item.ids = 2 + "-" + item.chapterExamId;
@@ -2948,7 +2979,7 @@ export default {
         });
       }
       if (self.formData3.examType === 3) {
-        data.examName = data.names
+        data.examName = data.names;
         self.$api.inquirebankexamList(data).then((res) => {
           res.rows.forEach((item) => {
             item.ids = 3 + "-" + item.examId;
@@ -2970,7 +3001,7 @@ export default {
     },
     editAddBoxs2(int) {
       var self = this;
-      self.formData3.examType = 1
+      self.formData3.examType = 1;
       var data = JSON.parse(JSON.stringify(this.formData3));
       if (this.listData.educationTypeId) {
         data.educationTypeId = this.listData.educationTypeId;
@@ -3240,7 +3271,7 @@ export default {
       this.activeLists2 = lis;
     },
     checkboxT2(row, index) {
-      const asrty = row.ids.split("-").map(Number)[0]
+      const asrty = row.ids.split("-").map(Number)[0];
       if (asrty === 1) {
         if (this.disCheckList2.moduleCheck.indexOf(row.moduleExamId) !== -1) {
           return false;

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

@@ -232,7 +232,8 @@
     </div>
     <div style="text-align: center">
       <el-button @click="clearBtns">取消</el-button>
-      <el-button @click="submitForm('listData')">确定</el-button>
+      <el-button @click="submitForm('listData')" 
+           :loading="disabledBtn">确定</el-button>
     </div>
     <el-dialog
       :visible.sync="dialogVisibleTableBoxs"
@@ -323,7 +324,6 @@
           type="primary"
           :disabled="activeLists.length === 0"
           @click="submitTab"
-           :loading="disabledBtn"
           >确 定</el-button
         >
       </span>
@@ -789,11 +789,11 @@ export default {
     },
     submit() {
       this.disabledBtn = true
-      setTimeout(()=>{
-        if(this.disabledBtn){
-          this.disabledBtn = false
-        }
-      },3000)
+      // setTimeout(()=>{
+      //   if(this.disabledBtn){
+      //     this.disabledBtn = false
+      //   }
+      // },3000)
       var data = {};
       data.orderBusiness = {
         businessOwner: this.listData.businessOwner,

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

@@ -445,11 +445,11 @@ export default {
     },
     submit() {
       this.disabledBtn = true
-      setTimeout(()=>{
-        if(this.disabledBtn){
-          this.disabledBtn = false
-        }
-      },3000)
+      // setTimeout(()=>{
+      //   if(this.disabledBtn){
+      //     this.disabledBtn = false
+      //   }
+      // },3000)
       this.$api.appOrdersheet(this.listData).then((res) => {
         this.$message.success("提交成功");
         setTimeout(() => {

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

@@ -724,7 +724,7 @@
         </div>
       </div>
       <el-table
-        :data="boxtableDataIsActive"
+        :data="sliceArray[arrIndex]"
         border
         :header-cell-style="{
           'background-color': '#eee',
@@ -768,17 +768,24 @@
                     : "未知"
                 }}
               </span>
-              <el-button
-                type="text"
-                v-else-if="item.scope === 'del'"
-                @click="delIsActive(scope.row, scope.$index)"
-                >删除</el-button
-              >
               <span v-else>{{ scope.row[item.prop] }}</span></template
             >
           </el-table-column></template
-        >
+        ><el-table-column fixed="right" label="操作" width="120" align="center">
+          <template slot-scope="scope">
+            <el-button type="text" @click="delIsActive(scope.row, scope.$index)"
+              >删除</el-button
+            >
+          </template>
+        </el-table-column>
       </el-table>
+      <el-pagination
+      @size-change="handleSizeChangea"
+      @current-change="handleCurrentChangea"
+      :page-size="10"
+      layout="total,prev, pager, next, jumper"
+      :total="boxtableDataIsActive.length">
+    </el-pagination>
       <span slot="footer" class="dialog-footer">
         <el-button @click="dialogVisibleisActive = false">取 消</el-button>
         <el-button type="primary" @click="submitFormIsActive">确 定</el-button>
@@ -793,7 +800,7 @@ import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
 export default {
-  name:"InformationTemplate",
+  name: "InformationTemplate",
   components: { searchBoxNew, tableList, pagination },
   data() {
     return {
@@ -1006,6 +1013,7 @@ export default {
         {
           label: "商品编码",
           prop: "code",
+          width: "130",
         },
         {
           label: "年份",
@@ -1014,10 +1022,12 @@ export default {
         {
           label: "商品名称",
           prop: "goodsName",
+          width: "230",
         },
         {
           label: "业务层级",
           scope: "maRY",
+          width: "230",
         },
         {
           label: "商品类型",
@@ -1033,10 +1043,6 @@ export default {
           label: "商品标价",
           prop: "standPrice",
         },
-        {
-          label: "删除",
-          scope: "del",
-        },
       ],
       boxtableDataIsActive: [],
       dialogVisibleisActive: false,
@@ -1050,6 +1056,8 @@ export default {
         status: [{ required: true, message: "请选择状态", trigger: "change" }],
       },
       activeListGoods: [],
+      sliceArray:[],
+      arrIndex:0,
     };
   },
   watch: {
@@ -1070,6 +1078,14 @@ export default {
     this.getUserInfoList();
   },
   methods: {
+    handleSizeChangea(v){
+      this.arrIndex = v-1
+      console.log(v)
+    },
+    handleCurrentChangea(v){
+      this.arrIndex = v-1
+      console.log(v)
+    },
     getDowm() {
       let url = baseUrls.BASE_IMG_URL + "/oss/images/file/20211214.docx";
       let link = document.createElement("a");
@@ -1086,6 +1102,13 @@ export default {
       });
     },
     delIsActive(item) {
+      for(let i = 0; i < this.sliceArray.length;i++){
+        for(let k = 0; k < this.sliceArray[i].length;k++){
+          if(this.sliceArray[i][k].goodsId == item.goodsId){
+            this.sliceArray[i].splice(k,1)
+          }
+        }
+      }
       this.boxtableDataIsActive = this.boxtableDataIsActive.filter((items) => {
         return items.goodsId !== item.goodsId;
       });
@@ -1109,11 +1132,21 @@ export default {
         return;
       }
       this.$api.inquireGoods({ goodsIds: option.goodsIds }).then((res) => {
+        this.sliceArray = this.group(res.rows,10)
+        this.arrIndex = 0
         this.boxtableDataIsActive = res.rows;
         this.dialogVisibleisActive = true;
         this.id = option.profileTpId;
       });
     },
+    group(array, subGroupLength) {
+      let index = 0;
+      let newArray = [];
+      while(index < array.length) {
+          newArray.push(array.slice(index, index += subGroupLength));
+      }
+      return newArray;
+  },
     submitForm() {
       if (this.activeLists.length === 0) {
         this.dialogVisibleAss = false;

src/views/education/examManagement/applicationData/asPlanned.vue

@@ -451,7 +451,7 @@ export default {
           prop: "examStatus",
           hidden: true,
           width: "130px",
-          scope: "isOptions",
+          scope: "isOptionsDZYQ",
           options: [
             {
               label: "待登记",
@@ -736,31 +736,31 @@ export default {
         this.peopleList = JSON.parse(
           JSON.stringify(this.$refs.tableList.allCheckData)
         );
-        // var ast = this.peopleList.every((item) => {
-        //   return item.examStatus === 0;
-        // });
-        // if (ast) {
+        var ast = this.peopleList.every((item) => {
+          return item.subscribeStatus === 1;
+        });
+        if (ast) {
         this.listData = {};
         this.ints = 2;
         this.dialogCG = true;
-        // } else {
-        //   this.$message.warning("请勾选考试登记为待登记的计划");
-        //   return;
-        // }
+        } else {
+          this.$message.warning("请勾选预约状态为正常的计划");
+          return;
+        }
       }
       if (int === 4) {
         this.peopleList = JSON.parse(
           JSON.stringify(this.$refs.tableList.allCheckData)
         );
         var ast = this.peopleList.every((item) => {
-          return item.examStatus === 1;
+          return item.examStatus === 1 && item.subscribeStatus === 1;
         });
         if (ast) {
           this.listData = {};
           this.ints = 2;
           this.dialogPLS = true;
         } else {
-          this.$message.warning("请勾选考试登记状态为正常的计划");
+          this.$message.warning("请勾选考试登记状态以及预约状态为正常的计划");
           return;
         }
       }

src/views/education/examManagement/examArrangement/index.vue

@@ -499,6 +499,7 @@
               >请先选择业务层级</span
             >
             <el-checkbox-group
+              style="overflow: auto"
               v-model="listDataGoods.goodsId"
               v-else-if="listDataGoods.businessId && goodsList.length"
             >
@@ -514,7 +515,7 @@
                 <span
                   :style="
                     item.goodsStatus === 0 &&
-                  bfListData.goodsId.indexOf(item.goodsId) === -1
+                    bfListData.goodsId.indexOf(item.goodsId) === -1
                       ? ''
                       : 'color:#F56C6C'
                   "
@@ -691,7 +692,7 @@ import searchBox from "@/components/searchBox";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
 export default {
-name:"ExamArrangement",
+  name: "ExamArrangement",
   components: { searchBox, tableList, pagination },
   data() {
     return {
@@ -925,7 +926,7 @@ name:"ExamArrangement",
         this.$api
           .inquirepayservelistGoods({ businessId: value })
           .then((res) => {
-            console.log(1121,res.rows)
+            console.log(1121, res.rows);
             this.goodsList = res.rows;
           });
       }
@@ -938,11 +939,11 @@ name:"ExamArrangement",
       this.$api
         .inquirepayservegoodsInfo({ applyId: row.applyId })
         .then((res) => {
-           this.$api
-          .inquirepayservelistGoods({ businessId: res.data.businessId })
-          .then((result) => {
-            this.goodsList = result.rows;
-          });
+          this.$api
+            .inquirepayservelistGoods({ businessId: res.data.businessId })
+            .then((result) => {
+              this.goodsList = result.rows;
+            });
           if (res.data.goodsType && res.data.goodsId.length) {
             this.statusPop = 0;
             this.bfListData = JSON.parse(JSON.stringify(res.data));
@@ -998,8 +999,14 @@ name:"ExamArrangement",
     submitPla() {
       var data = JSON.parse(JSON.stringify(this.examPlaces));
       if (!data.length) {
-        this.$message.warning("请添加考试地点");
-        return;
+        if (this.intStatus === 1) {
+          this.$message.warning("请添加考试地点");
+          return;
+        }
+        if (this.intStatus === 2) {
+          this.$message.warning("请添加考培地点");
+          return;
+        }
       }
       for (let i = 0; i < data.length; i++) {
         if (this.intStatus === 1) {
@@ -1009,12 +1016,23 @@ name:"ExamArrangement",
           data[i].status = 2;
         }
         if (!data[i].examApplySiteTime.length) {
-          this.$message.warning("您还有考试日期没有设置考试时间点，请先设置");
-          return;
+          if (this.intStatus === 1) {
+            this.$message.warning("您还有考试日期没有设置考试时间点，请先设置");
+            return;
+          }
+          if (this.intStatus === 2) {
+            this.$message.warning("您还有考培日期没有设置考培时间点，请先设置");
+            return;
+          }
         } else {
           for (let j = 0; j < data[i].examApplySiteTime.length; j++) {
             if (!data[i].examApplySiteTime[j].examTime) {
-              this.$message.warning("您还有考试日期没有设置，请先设置");
+              if(this.intStatus === 1){
+                this.$message.warning("您还有考试日期没有设置，请先设置");
+              }
+              if(this.intStatus === 2){
+                this.$message.warning("您还有考培日期没有设置，请先设置");
+              }
               return;
             } else {
               data[i].examApplySiteTime[j].examTime =
@@ -1024,7 +1042,12 @@ name:"ExamArrangement",
                 );
             }
             if (!data[i].examApplySiteTime[j].examApplySiteTimeTwo.length) {
+              if(this.intStatus === 1){
               this.$message.warning("您还有考试时间点没有设置，请先设置");
+              }
+              if(this.intStatus === 2){
+              this.$message.warning("您还有考培时间点没有设置，请先设置");
+              }
               return;
             } else {
               for (
@@ -1058,9 +1081,16 @@ name:"ExamArrangement",
               const idsSet1 = new Set(stsTime1);
               if (idsSet1.size == stsTime1.length) {
               } else {
-                this.$message.warning(
+                if(this.intStatus === 1){
+this.$message.warning(
+                  "同一考试日期下的时间点，出现重复，请修改"
+                );
+                }
+                if(this.intStatus === 2){
+this.$message.warning(
                   "同一考培日期下的时间点，出现重复，请修改"
                 );
+                }
                 return;
               }
             }
@@ -1069,7 +1099,12 @@ name:"ExamArrangement",
           const idsSet = new Set(stsTime);
           if (idsSet.size == stsTime.length) {
           } else {
-            this.$message.warning("同一考培地点下的考培日期，出现重复，请修改");
+            if(this.intStatus === 1){
+              this.$message.warning("同一考试地点下的考培日期，出现重复，请修改");
+            }
+            if(this.intStatus === 2){
+              this.$message.warning("同一考培地点下的考培日期，出现重复，请修改");
+            }
             return;
           }
         }
@@ -1296,7 +1331,7 @@ name:"ExamArrangement",
               }成功`
             );
             this.search();
-            this.listDataGoods.businessId = ''
+            this.listDataGoods.businessId = "";
             this.$store.commit("EXAMLIST");
           });
         })

src/views/education/examManagement/qianpeiArrange/index.vue

@@ -209,6 +209,7 @@
               >请先选择业务层级</span
             >
             <el-checkbox-group
+            style="overflow:auto;"
               v-model="listDataGoods.goodsId"
               v-else-if="listDataGoods.businessId && goodsList.length"
             >

src/views/education/notificationManageMent/notificationList/index.vue

@@ -434,6 +434,10 @@ export default {
       this.dialogVisibleFL = true;
     },
     submitFL() {
+      if(!this.listDataFL.classifyName){
+        this.$message.warning('请输入分类名称')
+        return
+      }
       if (this.statusNum == 1) {
         this.$api.appsystemclassify(this.listDataFL).then((res) => {
           this.$message.success("新增成功");
@@ -507,7 +511,36 @@ export default {
       });
     },
     plDel() {
-      console.log(this.$refs.tableList.allCheckData);
+      if(!this.$refs.tableList.allCheckData.length){
+        this.$message.warning('请选择需要删除的通知')
+        return
+      }
+      var arst = this.$refs.tableList.allCheckData.map(item => {
+        return item.informId
+      })
+      this.$alert(
+        "确定删除此内容？<br />内容删除后将无法恢复，请慎重考虑",
+        "提示",
+        {
+          dangerouslyUseHTMLString: true,
+        }
+      )
+        .then(() => {
+          var data = {
+            informIds: arst,
+            status: -1,
+          };
+          this.$api.editsysteminform(data).then((res) => {
+            this.$message.success("删除成功");
+            this.search();
+          });
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "已取消删除",
+          });
+        });
     },
     plExport() {},
     editInfo(v) {
@@ -563,7 +596,7 @@ export default {
       )
         .then(() => {
           var data = {
-            informId: v.informId,
+            informIds: [v.informId],
             status: -1,
           };
           this.$api.editsysteminform(data).then((res) => {

src/views/education/teacher/teacherList/index.vue

@@ -109,8 +109,8 @@
                 </el-select>
               </el-col>
               <el-col :span="7" v-if="eduId">
-                <el-popover placement="bottom" width="100" trigger="click">
-                  <el-checkbox-group v-model="listData.teacherProjects">
+                <el-popover placement="bottom" trigger="click">
+                  <el-checkbox-group v-model="listData.teacherProjects" class="instts">
                     <el-checkbox
                       :label="items.id"
                       v-for="(items, indexs) in newProjectList"
@@ -451,6 +451,11 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.instts{
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+}
 .flo_s {
   float: left;
   border: 1px solid #a4a4a4;
@@ -465,6 +470,7 @@ export default {
   display: flex;
 }
 .pothers {
+  color:red;
   margin: 0px 4px;
   cursor: pointer;
   transition: all 0.2s;

src/views/systemManagement/systemConfig/videoConfig/index.vue

@@ -24,7 +24,9 @@
         <el-form label-width="100px" class="demo-ruleForm">
           <el-form-item :label="videoActive.configName">
             <el-radio-group v-model="videoActive.configValue">
-              <el-radio label="1" @change="videoPhotoJG.configValue.push(0)">是</el-radio>
+              <el-radio label="1" @change="videoPhotoJG.configValue.push(0)"
+                >是</el-radio
+              >
               <el-radio label="0" @change="videoPhotoJG.configValue = []"
                 >否</el-radio
               >
@@ -65,7 +67,9 @@
         <el-form label-width="100px" class="demo-ruleForm">
           <el-form-item :label="bankActive.configName">
             <el-radio-group v-model="bankActive.configValue">
-              <el-radio label="1" @change="bankPhotoJG.configValue.push(0)">是</el-radio>
+              <el-radio label="1" @change="bankPhotoJG.configValue.push(0)"
+                >是</el-radio
+              >
               <el-radio label="0" @change="bankPhotoJG.configValue = []"
                 >否</el-radio
               >
@@ -84,14 +88,20 @@
               :key="index"
               label="做题至第"
             >
+              <!-- <num-input
+                :value="item"
+                @changevalues="changeValues(index, $event)"
+                message="请输入数值"
+                min="1"
+              /> -->
               <el-input-number
                 :controls="false"
                 v-model="bankPhotoJG.configValue[index]"
                 controls-position="right"
                 :min="0"
                 :precision="0"
-              ></el-input-number
-              >题
+              ></el-input-number>
+              题
               <el-button type="warning" size="mini" @click="delbank(index)"
                 >删除</el-button
               >
@@ -106,6 +116,7 @@
 </template>
 
 <script>
+import numInput from "@/components/numInput";
 import {
   listConfig,
   getConfig,
@@ -116,6 +127,7 @@ import {
   refreshCache,
 } from "@/api/system/config";
 export default {
+  components: { numInput },
   data() {
     return {
       listitem: [],
@@ -129,6 +141,21 @@ export default {
     this.getConfig();
   },
   methods: {
+    changeValues(int, value) {
+      if (value) {
+        var ast = this.bankPhotoJG.configValue.some((item) => {
+          return item == value;
+        });
+        if (ast) {
+          this.$message.error("存在相同值，请重新输入");
+          this.$set(this.bankPhotoJG.configValue, int, "");
+        } else {
+          this.$set(this.bankPhotoJG.configValue, int, value);
+        }
+      }else{
+        this.$set(this.bankPhotoJG.configValue, int, "");
+      }
+    },
     del(index) {
       this.videoPhotoJG.configValue.splice(index, 1);
     },
@@ -190,10 +217,10 @@ export default {
         var arr = {};
         for (let k in this.videoPhotoJG) {
           if (k == "configValue") {
-            var arrs = this.videoPhotoJG[k]
+            var arrs = this.videoPhotoJG[k];
             if (new Set(arrs).size != arrs.length) {
-              this.$message.warning("不允许存在重复值")
-              return
+              this.$message.warning("不允许存在重复值");
+              return;
             }
             arr[k] = this.videoPhotoJG[k].toString();
           } else {
@@ -213,28 +240,28 @@ export default {
     },
     async submitBank() {
       // if (this.bankActive.configValue == 1) {
-        if (!this.bankPhotoJG.configValue.length) {
-          this.$modal.msgError("参数键值不能为空");
-          return;
-        } else {
-          var arr = {};
-          for (let k in this.bankPhotoJG) {
-            if (k == "configValue") {
-              var arrs = this.videoPhotoJG[k]
+      if (!this.bankPhotoJG.configValue.length) {
+        this.$modal.msgError("参数键值不能为空");
+        return;
+      } else {
+        var arr = {};
+        for (let k in this.bankPhotoJG) {
+          if (k == "configValue") {
+            var arrs = this.bankPhotoJG[k];
             if (new Set(arrs).size != arrs.length) {
-              this.$message.warning("不允许存在重复值")
-              return
-            }
-              arr[k] = this.bankPhotoJG[k].toString();
-            } else {
-              arr[k] = this.bankPhotoJG[k];
+              this.$message.warning("不允许存在重复值");
+              return;
             }
+            arr[k] = this.bankPhotoJG[k].toString();
+          } else {
+            arr[k] = this.bankPhotoJG[k];
           }
-          await updateConfig(this.bankActive);
-          await updateConfig(arr);
-          this.$modal.msgSuccess("修改成功");
-          this.getConfig();
         }
+        await updateConfig(this.bankActive);
+        await updateConfig(arr);
+        this.$modal.msgSuccess("修改成功");
+        this.getConfig();
+      }
       // } else {
       //   await updateConfig(this.bankActive);
       //   this.$modal.msgSuccess("修改成功");
@@ -259,7 +286,7 @@ export default {
     padding: 6px;
   }
   .bigBoxs {
-    height: 100%;
+    height: 367px;
     padding: 14px;
     overflow-y: auto;
   }