Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/enterprise/chaneelcode-form.vue

@@ -483,7 +483,6 @@
                             }) 
                         })
                     }
-                    console.log('2323')
                     this.$emit('success', this.addMsg, list)
                 }
             },
@@ -564,10 +563,8 @@
                     }
                 }
                 if (flag) {
-                    console.log('发生冲突')
                     return false;
                 }else{
-                    console.log('没有冲突')
                     return true;
                 }
 

src/components/enterprise/choiceapproval.vue

@@ -132,7 +132,6 @@
                     if (res.Code == 1) {
                         this.memberList = res.Data
                         let _this = this;
-                        console.log(_arr)
                         _this.$refs.treeUser.setCheckedKeys(_arr);
                     }
                 }).catch(() => {

src/components/enterprise/welcome-from.vue

@@ -277,7 +277,6 @@
         watch:{
             welcomeList(newValue, oldValue){
                 this.addMsg= newValue
-                console.log(newValue,oldValue)
             }
         },
         methods: {

src/components/exam/exampaperlist.vue

@@ -2,6 +2,12 @@
   .examForm .q-table__bottom {
     min-height: 10px;
   }
+  .greenStyle{
+    color:green;
+  }
+  .color_shz{color: #1273BC}
+  .color_tg{color: #4BCA81}
+  .color_bh{color: #c94052}
 
 </style>
 <template>
@@ -22,9 +28,9 @@
               </template>
             </div>
             <div>
-              <q-btn v-if="multipleSelection&&multipleSelection.length>0" color="accent" size="sm" class="q-mr-md"
+              <q-btn v-if="multipleSelection&&multipleSelection.length>0&&IsMovePaper" color="accent" size="sm" class="q-mr-md"
                 @click="movePaperFile()" label="移动到" />
-              <q-btn v-if="multipleSelection&&multipleSelection.length>0" color="accent" size="sm" class="q-mr-md"
+              <q-btn v-if="multipleSelection&&multipleSelection.length>0&&IsDelPaper" color="accent" size="sm" class="q-mr-md"
                 label="删除" @click="batchDelete()" />
             </div>
           </div>
@@ -100,14 +106,20 @@
       </template>
       <template v-slot:body-cell-ExamineStatusStr="props">
         <q-td :props="props">
-          <el-popover
-            placement="bottom"
-            title="驳回原因"
-            width="350"
-            trigger="hover"
-            :content='props.row.ExamineRemark'>
-            <span slot="reference">{{props.row.ExamineStatusStr}}</span>
-          </el-popover>
+          <template v-if="props.row.ExamineStatus==4||props.row.ExamineStatus==3">
+            <el-popover
+              placement="bottom"
+              title="驳回原因"
+              width="350"
+              trigger="hover"
+              :content='props.row.ExamineRemark'>
+              <span slot="reference" class="color_bh">{{props.row.ExamineStatusStr}}</span>
+            </el-popover>
+          </template>
+          <template v-else>
+            <span :class="{'color_tg':props.row.ExamineStatus==2||props.row.ExamineStatus==5,
+            'color_bh':props.row.ExamineStatus==6}">{{props.row.ExamineStatusStr}}</span>
+          </template>
         </q-td>
       </template>
       <template v-slot:body-cell-PaperType="props">
@@ -226,6 +238,8 @@
         MoveIds: '',
         currentUserInfo: {}, //当前登录用户
         IsPaperManager: false,
+        IsMovePaper: false, //是否可以移动文件
+        IsDelPaper: false, //是否删除试卷
         pageMsg: {
           rowsPerPage: 10,
         },
@@ -289,6 +303,12 @@
         if (x.FunctionCode == "Paper_Manager") { //判断是否是试卷管理员
           this.IsPaperManager = true;
         }
+        if (x.FunctionCode == "Paper_Move"){ //判断是否有移动文件权限
+          this.IsMovePaper = true;
+        }
+        if (x.FunctionCode == "Paper_Delete"){ //判断是否有删除文件夹权限
+          this.IsDelPaper = true;
+        }
       })
     },
     mounted() {},

src/pages/enterprise/customerLabel.vue

@@ -288,7 +288,7 @@
                             return
                         }
                         if (x.Sort == '') {
-                            console.log(x.Sort)
+
                             issort = true;
                             return
                         }