Merge branch 'ehs' of https://e.coding.net/ctcdevteam/ehs/ehs_web into ehs

src/views/hrm/clock_record.vue

@@ -172,6 +172,12 @@ export default {
     exportList(){
       let that = this;
       this.dLoading = true;
+      if(this.query.employee__belong_dept && this.query.year && this.query.month){
+      }else{
+        this.$message.warning("请选择部门和月份后导出")
+        this.dLoading = false;
+      }
+      
       let days = new Date(this.query.year, this.query.month , 0).getDate();
       let weekList = ['姓名','星期'],daysList=['姓名','日期'],titleData = [];
       for(var i = 1;i<= days;i++){

src/views/opm/opl.vue

@@ -35,6 +35,9 @@
             operationObj.coordinator_.name
           }}</span>
         </el-descriptions-item>
+      <el-descriptions-item label="监控设备:" v-if="operationObj.vchannels">
+        <span v-for="item in operationObj.vchannels_" :key="item.id">{{ item.name }}({{item.code}})/</span>
+      </el-descriptions-item>
       </el-descriptions>
     </el-card>
 
@@ -55,12 +58,13 @@
         <el-table-column label="流程状态" width="160">
           <template #default="scope">
             <span v-if="scope.row.ticket">{{ scope.row.ticket_.state_.name }}
-              -{{act_states[scope.row.ticket_.act_state]}}
+              -{{ act_states[scope.row.ticket_.act_state]}}
             </span>
           </template>
         </el-table-column>
         <el-table-column label="预计开始" prop="start_time" width="150"></el-table-column>
-        <el-table-column label="作业部门" prop="dept_do" width="150" :show-overflow-tooltip="true"><template #default="scope">
+        <el-table-column label="作业部门" prop="dept_do" width="150" :show-overflow-tooltip="true"><template
+            #default="scope">
             {{ scope.row.dept_do_.name }}
           </template></el-table-column>
         <el-table-column label="作业负责人" prop="charger"><template #default="scope">