提交测试

1

src/views/baseRulesManager/components/otherRules.vue

@@ -223,7 +223,7 @@
         </el-row> -->
         <el-row>
           <el-form-item
-            prop="61"
+            prop="60"
             :rules="[
               {
                 required: false,
@@ -234,7 +234,7 @@
           >
             云教室可提前:
             <el-input
-              v-model="form['61']"
+              v-model="form['60']"
               placeholder="请输入分钟数"
 
             >
@@ -245,7 +245,7 @@
         </el-row>
         <el-row>
           <el-form-item
-            prop="60"
+            prop="61"
             :rules="[
               {
                 required: false,
@@ -256,7 +256,7 @@
           >
             课程结束后:
             <el-input
-              v-model="form['60']"
+              v-model="form['61']"
               placeholder="请输入分钟数"
 
             >

src/views/categroyManager/generalSettings/earlyWarning.vue

@@ -15,7 +15,7 @@
             placeholder="请选择分部"
             clearable
             filterable
-            
+
           >
             <el-option
               v-for="item in selects.branchs"
@@ -32,7 +32,7 @@
       </save-form>
       <auth auths="sysConfig/update/insert" style="margin-bottom: 20px">
         <el-button
-          
+
           icon="el-icon-plus"
           type="primary"
           @click="openTypes('create')"
@@ -43,7 +43,7 @@
       <div class="tableWrap">
         <el-table
           :data="tableList"
-          
+
           :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
         >
           <el-table-column align="center" prop="branchName" label="分部">
@@ -196,11 +196,11 @@ export default {
             return;
           }
           object[form.branchId] = form.money;
-          let params = {
+          let params = [{
             id: form.id,
             paranValue: JSON.stringify(object),
             paramName: "warning_min_course_salary",
-          };
+          }];
           await sysConfigUpdate(params).then((res) => {
             let title = this.formActionTitle == "create" ? "添加" : "修改";
             this.messageTips(title, res);

src/views/categroyManager/insideSetting/branchManager.vue

@@ -590,7 +590,7 @@ export default {
             id: val,
           });
           this.educationList = ruselt?.data?.educationId;
-          if (this.educationList.length <= 0) {
+          if (!this.educationList ||this.educationList?.length <= 0) {
             this.$bus.$emit("showguide", ["teamManager"]);
           }
         } catch (e) {

src/views/categroyManager/specialSetup/branchSetting.vue

@@ -399,7 +399,7 @@ export default {
       // 修改分部信息
       // employeeFindEmployeeByRole
       try {
-        const res = await queryEmployByOrganId({ organId: row.id, rows: 9999 });
+        const res = await queryEmployByOrganId({ organId: row.id, rows: 9999, demissionflag:false});
         this.$set(this, "employeeList", res.data.rows);
       } catch (e) {
         console.log(e);

src/views/chargeManager/two.vue

@@ -167,7 +167,7 @@ export default {
       validAmount: [
         { required: true, validator: validAmount, trigger: 'blur' },
         { type: 'number', message: '金额必须为数字值' }],
-      selectId: null, // 编号
+      selectId: 71, // 编号
       selectItem: {}, // 选中对象
       sporadicStatus: false, // {"organId":"2","minReceipt":"75000"}
       formLabelWidth2: "120px",
@@ -243,6 +243,7 @@ export default {
           res.data.forEach((item, index) => {
             if (item.paramName === "amount_channel") {
               paranValue = item.paranValue ? JSON.parse(item.paranValue) : [];
+              con
               this.selectId = item.id;
               if(paranValue.length > 0) {
                 this.result.domains = []
@@ -269,12 +270,13 @@ export default {
     onSaveDomain() { // 保存设置
       this.$refs["ruleFormValid"].validate(valid => {
         if(valid) {
-          const domain = this.result.domains
-          let params = {
+          let domain = this.result.domains
+          // console.log(domain)
+          let params =[ {
             id: this.selectId,
-            paranValue: JSON.stringify(domain),
+            paranValue: domain,
             paramName: "amount_channel"
-          };
+          }];
           sysConfigUpdate(params).then(res => {
             if (res.code == 200) {
               this.messageTips("保存", res);

src/views/courseRulersManager/components/offlineTeamRules.vue

@@ -574,32 +574,22 @@
           <el-form-item
             prop="39"
             :rules="[
-              {
-                required: false,
-                pattern: /^[1-9][0-9]*$/,
-                message: '请输入正确的时间',
+                {
+                required: true,
+                message: '请输入时间',
+                trigger: 'blur',
               },
-            ]"
-          >
-           VIP线下课可点名时间范围为课程开始前
-            <el-input v-model="form['39']" placeholder="请输入时间">
-              <template slot="append">分钟</template>
-            </el-input>
-          </el-form-item>
-          <el-form-item
-            prop="40"
-            :rules="[
               {
-                required: false,
                 pattern: /^[1-9][0-9]*$/,
                 message: '请输入正确的时间',
               },
             ]"
           >
-            至课程结束后
-            <el-input v-model="form['40']" placeholder="请输入时间">
+           <span style="color: #f56c6c; margin-right: 4px">*</span>
+          VIP线下课可点名时间范围为课程时间前后
+            <el-input v-model="form['39']" placeholder="请输入时间">
               <template slot="append">分钟</template>
-            </el-input>不填则当天内都能点名。
+            </el-input>。
           </el-form-item>
         </el-row>
         <el-alert

src/views/main/abnormal/index.vue

@@ -51,6 +51,7 @@
       type="text"
     >
       <title-item
+        :descss="descs"
         :type="item[0].isError ? 'error' : 'warning'"
         :data="
           item.map((title) => ({
@@ -227,7 +228,6 @@ export default {
       this.FetchList();
     },
     async formatData(data) {
-      console.log(data);
       const list = {};
       for (const item of data) {
         const row = errorType[item.errorType] || {};
@@ -239,30 +239,43 @@ export default {
           ...item,
           ...row,
         });
-        // if (item.errorType == "COURSE_TIME_ERROR") {
-        //   try {
-        //     const res = await getSysTenantConfig({ group: "SERVER_ERROR" });
-        //     let startStr = "";
-        //     let endStr = "";
-        //     res.data.forEach((item) => {
-        //       // this.form[item.paramName] = item.paranValue
-        //       if (item.id == "195") {
-        //         startStr = item.paranValue.substring(0,5);
-        //       }
-        //       if (item.id == "196") {
-        //         endStr = item.paranValue.substring(0,5);
-        //       }
-        //     });
-        //     this.descs[
-        //       "COURSE_TIME_ERROR"
-        //     ] = `上课时间在${startStr}~${endStr}时间段内为时间安排异常`;
-        //     console.log(this.descs);
-        //   } catch (e) {
-        //     console.log(e);
-        //   }
-        // }
+        if (
+          item.errorType == "COURSE_TIME_ERROR" ||
+          item.errorType == "STUDENT_ERROR_LEAVE"
+        ) {
+          try {
+            const res = await getSysTenantConfig({ group: "SERVER_ERROR" });
+            let startStr = "";
+            let endStr = "";
+            let leaveStr = "";
+            res.data.forEach((item) => {
+              // this.form[item.paramName] = item.paranValue
+              if (item.id == "195") {
+                startStr = item.paranValue.substring(0, 5);
+              }
+              if (item.id == "196") {
+                endStr = item.paranValue.substring(0, 5);
+              }
+              if (item.id == "194") {
+                leaveStr = item.paranValue;
+              }
+            });
+            if (startStr && endStr) {
+              this.descs[
+                "COURSE_TIME_ERROR"
+              ] = `上课时间不在${startStr}~${endStr}时间段内为时间安排异常`;
+            }
+            if(leaveStr){
+               this.descs[
+                "STUDENT_ERROR_LEAVE"
+              ] = `当月请假${leaveStr}次及以上`;
+            }
+          } catch (e) {
+            console.log(e);
+          }
+        }
       }
-      console.log(Object.values(list))
+
       return Object.values(list);
     },
     async FetchList() {
@@ -276,7 +289,7 @@ export default {
         const info = {};
         for (const item of this.list) {
           info[item.errorType] = item;
-          data[item.errorType] = this.formatData(item?.result || []);
+          data[item.errorType] = await this.formatData(item?.result || []);
         }
         this.infoByType = info;
         this.listByType = data;

src/views/main/abnormal/title.vue

@@ -32,10 +32,13 @@ export default {
       type: Array,
       default: [],
     },
+    descss:{
+       type: Object
+    }
   },
   data() {
     return {
-      descs,
+      descs:this.descss||descs,
       ignore: [
         "NO_CLASS_MUSIC_GROUP_STUDENT_INFO",
         "NO_MEMBER_STUDENT_INFO",

src/views/teamBuild/components/soundSetComponents/soundSetCore.vue

@@ -465,11 +465,11 @@ export default {
           flag = false;
           return;
         }
-        if (!item.chioseMusic[0]?.musical) {
-          this.$message.error(`请选择${item.sound}的可选乐器`);
-          flag = false;
-          return;
-        }
+        // if (!item.chioseMusic[0]?.musical) {
+        //   this.$message.error(`请选择${item.sound}的可选乐器`);
+        //   flag = false;
+        //   return;
+        // }
         item.chioseMusic.forEach((music) => {
           if (music.type.indexOf("LEASE") != -1) {
             if (!music.borrowPrice || parseFloat(music.borrowPrice) <= 0) {