coys il y a 2 ans
Parent
commit
c7ec2f71b9

+ 13 - 3
src/views/menu/rehearsalTask/components/rehearsalTaskSign.vue

@@ -85,10 +85,10 @@
       <div class="label">评优状态</div>
       <div>{{ content }}</div>
     </div>
-    <div class="mainItem">
+    <div class="mainItem" >
       <!-- <div class="label"></div> -->
       <div>
-        <van-checkbox-group v-model="result" direction="horizontal" @change="clickChekcBox($event)">
+        <van-checkbox-group :disabled="islearning" v-model="result" direction="horizontal" @change="clickChekcBox($event)">
           <van-checkbox
             v-for="item in resultList"
             :key="item.value"
@@ -331,10 +331,19 @@ export default {
       }
     },
     clickChekcBox(v) {
+     console.log(v);
       if (v[0] == this.resultList[0].value) {
+        
         this.resultList[1].disabled = this.disabledCheck('false')
+        // if(v.length>1){
+        //   this.result=[]
+        // }
+        // this.resultList[1].checked = this.disabledCheck('false')
+      } else if(v[0]>this.resultList[0].value){
+        this.result=[]
       } else {
         this.resultList[1].disabled = this.disabledCheck('true')
+        // this.result=[]
       }
     },
     signatureHandler() {
@@ -388,7 +397,8 @@ export default {
           drillTaskId: this.trainingData.id,
           recStatus: Math.max(...this.result)
         }).then(res => {
-          if(res.msg){
+          ;
+          if(this.result&&this.result.length>0){
 
             Toast('评优成功')
           }else{

+ 9 - 9
src/views/menu/rehearsalTask/learning.vue

@@ -45,9 +45,9 @@
       <van-row>
         <van-col span="24">
           <van-tabs v-model="activeAl" @click="tbsAlHandler">
-            <van-tab name="01-01" title="行社优秀案例"></van-tab>
-            <van-tab name="04-01" title="地区优秀案例"></van-tab>
-            <van-tab name="07-01" title="省级优秀案例"></van-tab>
+            <van-tab name="1" title="行社优秀案例"></van-tab>
+            <van-tab name="3" title="地区优秀案例"></van-tab>
+            <van-tab name="5" title="省级优秀案例"></van-tab>
            
           </van-tabs>
         </van-col>
@@ -109,7 +109,7 @@ export default {
       cascaderValue: '', //机构ID
       show: false, //机构弹框显示隐藏
       active: '01-01',
-      activeAl: '01-01',
+      activeAl: '1',
       fieldNames: {
         text: 'name',
         value: 'id',
@@ -183,17 +183,17 @@ export default {
         obj.pageNum = 1
         this.pageNum = 1
       }
-      if (this.statusValue) {
-        obj.status = this.statusValue
-      }
+      // if (this.statusValue) {
+      //   obj.status = this.statusValue
+      // }
 
       obj.orgId = this.cascaderValue || JSON.parse(window.sessionStorage.getItem('SET_USER_ORGID')) + '' || ''
 
       if (this.currentDate) {
         obj.date = this.currentDate + '-' + this.active
       }
-      if (this.typeValue) {
-        obj.type = this.typeValue
+      if (this.activeAl) {
+        obj.recStatus = this.activeAl
       }
 
       //获取任务列表

+ 9 - 9
vue.config.js

@@ -68,22 +68,22 @@ module.exports = defineConfig({
             '^/luojun':'/'
           }
       },
-      '/jingyuanchao': {
-          target: "http://10.87.10.109:8080",
-          // ws:true,
-          changOrigin:true,
-          pathRewrite:{
-            '^/jingyuanchao':'/'
-          }
-      },
       // '/jingyuanchao': {
-      //     target: "http://10.87.11.173:8080",
+      //     target: "http://10.87.10.109:8080",
       //     // ws:true,
       //     changOrigin:true,
       //     pathRewrite:{
       //       '^/jingyuanchao':'/'
       //     }
       // },
+      '/jingyuanchao': {
+          target: "http://10.87.11.173:8080",
+          // ws:true,
+          changOrigin:true,
+          pathRewrite:{
+            '^/jingyuanchao':'/'
+          }
+      },
       '/luowei': {
         target: "http://10.87.10.47:8080",
         // ws:true,