Merge branch 'master' of http://47.100.37.243:10191/wutt/manHourHousekeeper

# Conflicts:
#	fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/ReportService.java
#	fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/controller/ReportController.java

@@ -143,6 +143,14 @@ public class ReportController {
         msg.data = reportService.getById(id);
         return msg;
     }
+
+    @RequestMapping("/fixSteelNumData")
+    public HttpRespMsg fixSteelNumData() {
+        HttpRespMsg msg = new HttpRespMsg();
+        //修复report表中钢印号存在重复问题
+        msg.data = reportService.fixSteelNumData();
+        return msg;
+    }
 //
 //    @RequestMapping("/getCardTime")
 //    public HttpRespMsg getCardTime(@RequestParam String date) {

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/ReportService.java

@@ -146,6 +146,7 @@ public interface ReportService extends IService<Report> {
     HttpRespMsg productionQuantityList(Integer productId, String startDate, String endDate,Integer pageIndex, Integer pageSize);
 
     HttpRespMsg exportProductionQuantity(Integer productId, String startDate, String endDate);
+ 	Object fixSteelNumData();
 
-    HttpRespMsg getPlanDataWithStation(Integer isFilterDept,Integer stationId, String startDate, String endDate, Integer pageIndex, Integer pageSize);
+ 	HttpRespMsg getPlanDataWithStation(Integer isFilterDept,Integer stationId, String startDate, String endDate, Integer pageIndex, Integer pageSize);
 }

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/PlanProcedureTotalServiceImpl.java

@@ -112,6 +112,7 @@ public class PlanProcedureTotalServiceImpl extends ServiceImpl<PlanProcedureTota
         HttpRespMsg msg = new HttpRespMsg();
         String token = request.getHeader("TOKEN");
         HashMap prodProcedureTeam = prodProcedureTeamMapper.getFillProcedureDetail(id);
+        prodProcedureTeam.remove("steel_num_array");
         //道工序是否自己已经填过了，有的话取数据
         Report oldReport = reportMapper.selectOne(new QueryWrapper<Report>().eq("user_procedure_team_id", id).eq("creator_id", token).eq("create_date", createDate));
         if (oldReport != null) {
@@ -185,6 +186,8 @@ public class PlanProcedureTotalServiceImpl extends ServiceImpl<PlanProcedureTota
             List<Report> reportList = reportMapper.selectList(
                     new QueryWrapper<Report>().select("id", "steel_num_array","create_date", "creator_id")
                             .eq("plan_id", planId).eq("prod_procedure_id", (Integer)prodProcedureTeam.get("prod_procedure_id")));
+
+            //自己以前填过的钢印号
             List<String> filledSteelNumList=new ArrayList<>();
 
             for (Report report : reportList) {

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -4881,74 +4881,130 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         return msg;
     }
 
-    @Override
-    public HttpRespMsg getPlanDataWithStation(Integer isFilterDept,Integer stationId, String startDate, String endDate, Integer pageIndex, Integer pageSize) {
-        HttpRespMsg msg=new HttpRespMsg();
-        User user = userMapper.selectById(request.getHeader("token"));
-        NumberFormat format = NumberFormat.getPercentInstance();
-        format.setMinimumFractionDigits(2);
-        Integer companyId = user.getCompanyId();
-        DateTimeFormatter dtf=DateTimeFormatter.ofPattern("yyyy-MM-dd");
-        DateTimeFormatter dtf1=DateTimeFormatter.ofPattern("yyyyMMdd");
-        List<LocalDate> dates = getDays(LocalDate.parse(startDate, dtf), LocalDate.parse(endDate, dtf));
-        List<String> dataStringList=new ArrayList<>();
-        for (LocalDate localDate : dates) {
-            dataStringList.add(localDate.format(dtf1));
-        }
-        Integer pageStart = null;
-        if (pageIndex!=null){
-            pageStart = (pageIndex -1) * pageSize;
-            pageSize=pageStart+pageSize;
-        }
-        List<Integer> deptIds=null;
-        if(isFilterDept!=0){
-            List<Department> departmentList = departmentMapper.selectList(new LambdaQueryWrapper<Department>().select(Department::getDepartmentId).eq(Department::getSuperiorId, stationId));
-            deptIds=departmentList.stream().map(Department::getDepartmentId).distinct().collect(Collectors.toList());
-        }
-        boolean viewAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看全部车间工位计划表");
-        List<Map<String, Object>> mapList;
-        Integer total;
-        if(!viewAll){
-            mapList = reportMapper.getPlanDataWithStation(companyId, startDate, endDate, user.getId(), deptIds, pageStart, pageSize);
-//            total = reportMapper.getPlanDataWithStationCount(companyId, startDate, endDate, user.getId(), deptIds, null, null);
-        }else {
-            mapList = reportMapper.getPlanDataWithStation(companyId,startDate,endDate,null,deptIds,pageStart,pageSize);
-//            total =reportMapper.getPlanDataWithStationCount(companyId,startDate,endDate,null,deptIds,null,null);
-        }
-        List<String> dateList = mapList.stream().map(m -> String.valueOf(m.get("startDate"))).distinct().collect(Collectors.toList());
-        Map<Object, List<Map<String, Object>>> listMapGroupByDate = mapList.stream().collect(Collectors.groupingBy(m -> String.valueOf(m.get("startDate"))));
-        Map<String,Object> resultMap=new HashMap<>();
-        //处理数据 先按照日期 再按照分组重新组装数据
-        List<Map<String,Object>> resultList=new ArrayList<>();
-        for (String date : dateList) {
-            List<Map<String, Object>> maps = listMapGroupByDate.get(date);
-            if(maps==null||maps.size()<=0){
-                continue;
-            }
-            List<Integer> deptIdList = maps.stream().map(m -> Integer.valueOf(String.valueOf(m.get("deptId")))).distinct().collect(Collectors.toList());
-            Map<Object, List<Map<String, Object>>> listMapGroupByDept = maps.stream().collect(Collectors.groupingBy(m -> Integer.valueOf(String.valueOf(m.get("deptId")))));
-            Map<String,Object> item=new HashMap<>();
-            item.put("startDate",date);
-            BigDecimal planNum=new BigDecimal(0);
-            BigDecimal nowNum=new BigDecimal(0);
-            for (Integer dept : deptIdList) {
-                List<Map<String, Object>> list = listMapGroupByDept.get(dept);
-                item.put("deptId",dept);
-                for (Map<String, Object> map : list) {
-                    planNum=planNum.add(new BigDecimal((String.valueOf(map.get("planNum")))));
-                    nowNum=nowNum.add(new BigDecimal((String.valueOf(map.get("nowNum")))));
+
+	@Override
+    public Object fixSteelNumData() {
+        List<Report> reportList = reportMapper.selectList(new QueryWrapper<Report>());
+        int dealCount = 0;
+        for (int t=0;t<reportList.size(); t++) {
+            Report report = reportList.get(t);
+            String creatorId = report.getCreatorId();
+            LocalDate date = report.getCreateDate();
+            Integer userProcedureTeamId = report.getUserProcedureTeamId();
+            String steelNum = report.getSteelNumArray();
+            List<String> reportSteelNumArray1 = JSONArray.parseArray(steelNum, String.class);
+            if (!StringUtils.isEmpty(steelNum)) {
+                //检查该钢印号在其他的日报中当前员工是否也有填报的
+                for (int i=t+1;i<reportList.size(); i++) {
+                    Report iReport = reportList.get(i);
+                    if (iReport.getCreatorId().equals(creatorId) && iReport.getUserProcedureTeamId().equals(userProcedureTeamId) && !iReport.getCreateDate().isEqual(date)) {
+                        String steelNumArray = iReport.getSteelNumArray();
+                        if (!StringUtils.isEmpty(steelNumArray)) {
+                            List<String> reportSteelNumArray2 = JSONArray.parseArray(steelNumArray, String.class);
+                            JSONArray updateSteelNum = new JSONArray();
+                            boolean hasChange = false;
+                            for (int m=0;m<reportSteelNumArray2.size(); m++) {
+                                String s = reportSteelNumArray2.get(m);
+                                //之前已经报过了该钢印号
+                                if (reportSteelNumArray1.contains(s)) {
+                                    hasChange = true;
+                                } else {
+                                    updateSteelNum.add(s);
+                                }
+                            }
+                            if (hasChange) {
+                                //日报中的钢印号需要修正
+                                Report updateR = new Report();
+                                updateR.setId(iReport.getId());
+                                updateR.setSteelNumArray(updateSteelNum.toString());
+                                dealCount++;
+                                System.out.println("检测："+steelNum+", 更新日报： id="+iReport.getId()+", 原始 steelArrayNum==" + steelNumArray + " ,更新为: "+updateSteelNum.toString());
+                                reportMapper.updateById(updateR);
+                                reportSteelNumMapper.delete(new QueryWrapper<ReportSteelNum>().eq("report_id", iReport.getId()));
+                                for (int q=0;q<updateSteelNum.size(); q++) {
+                                    ReportSteelNum num = new ReportSteelNum();
+                                    num.setReportId(updateR.getId());
+                                    num.setSteelNum(updateSteelNum.getString(q));
+                                    reportSteelNumMapper.insert(num);
+                                }
+                            }
+                        }
+
+                    }
                 }
-                item.put("planNum",planNum.doubleValue());
-                item.put("nowNum",nowNum.doubleValue());
-                BigDecimal progress = nowNum.divide(planNum, RoundingMode.HALF_UP);
-                item.put("progress",format.format(progress.doubleValue()));
-                resultList.add(item);
             }
         }
-        resultMap.put("records",resultList.subList(pageStart,pageSize));
-        resultMap.put("header",dataStringList);
-        resultMap.put("total",resultList.size());
-        msg.setData(resultMap);
-        return msg;
+        System.out.println("共更新："+dealCount);
+        return dealCount;
     }
-}
+
+	@Override
+	    public HttpRespMsg getPlanDataWithStation(Integer isFilterDept,Integer stationId, String startDate, String endDate, Integer pageIndex, Integer pageSize) {
+	        HttpRespMsg msg=new HttpRespMsg();
+	        User user = userMapper.selectById(request.getHeader("token"));
+	        NumberFormat format = NumberFormat.getPercentInstance();
+	        format.setMinimumFractionDigits(2);
+	        Integer companyId = user.getCompanyId();
+	        DateTimeFormatter dtf=DateTimeFormatter.ofPattern("yyyy-MM-dd");
+	        DateTimeFormatter dtf1=DateTimeFormatter.ofPattern("yyyyMMdd");
+	        List<LocalDate> dates = getDays(LocalDate.parse(startDate, dtf), LocalDate.parse(endDate, dtf));
+	        List<String> dataStringList=new ArrayList<>();
+	        for (LocalDate localDate : dates) {
+	            dataStringList.add(localDate.format(dtf1));
+	        }
+	        Integer pageStart = null;
+	        if (pageIndex!=null){
+	            pageStart = (pageIndex -1) * pageSize;
+	            pageSize=pageStart+pageSize;
+	        }
+	        List<Integer> deptIds=null;
+	        if(isFilterDept!=0){
+	            List<Department> departmentList = departmentMapper.selectList(new LambdaQueryWrapper<Department>().select(Department::getDepartmentId).eq(Department::getSuperiorId, stationId));
+	            deptIds=departmentList.stream().map(Department::getDepartmentId).distinct().collect(Collectors.toList());
+	        }
+	        boolean viewAll = sysFunctionService.hasPriviledge(user.getRoleId(), "查看全部车间工位计划表");
+	        List<Map<String, Object>> mapList;
+	        Integer total;
+	        if(!viewAll){
+	            mapList = reportMapper.getPlanDataWithStation(companyId, startDate, endDate, user.getId(), deptIds, pageStart, pageSize);
+	//            total = reportMapper.getPlanDataWithStationCount(companyId, startDate, endDate, user.getId(), deptIds, null, null);
+	        }else {
+	            mapList = reportMapper.getPlanDataWithStation(companyId,startDate,endDate,null,deptIds,pageStart,pageSize);
+	//            total =reportMapper.getPlanDataWithStationCount(companyId,startDate,endDate,null,deptIds,null,null);
+	        }
+	        List<String> dateList = mapList.stream().map(m -> String.valueOf(m.get("startDate"))).distinct().collect(Collectors.toList());
+	        Map<Object, List<Map<String, Object>>> listMapGroupByDate = mapList.stream().collect(Collectors.groupingBy(m -> String.valueOf(m.get("startDate"))));
+	        Map<String,Object> resultMap=new HashMap<>();
+	        //处理数据 先按照日期 再按照分组重新组装数据
+	        List<Map<String,Object>> resultList=new ArrayList<>();
+	        for (String date : dateList) {
+	            List<Map<String, Object>> maps = listMapGroupByDate.get(date);
+	            if(maps==null||maps.size()<=0){
+	                continue;
+	            }
+	            List<Integer> deptIdList = maps.stream().map(m -> Integer.valueOf(String.valueOf(m.get("deptId")))).distinct().collect(Collectors.toList());
+	            Map<Object, List<Map<String, Object>>> listMapGroupByDept = maps.stream().collect(Collectors.groupingBy(m -> Integer.valueOf(String.valueOf(m.get("deptId")))));
+	            Map<String,Object> item=new HashMap<>();
+	            item.put("startDate",date);
+	            BigDecimal planNum=new BigDecimal(0);
+	            BigDecimal nowNum=new BigDecimal(0);
+	            for (Integer dept : deptIdList) {
+	                List<Map<String, Object>> list = listMapGroupByDept.get(dept);
+	                item.put("deptId",dept);
+	                for (Map<String, Object> map : list) {
+	                    planNum=planNum.add(new BigDecimal((String.valueOf(map.get("planNum")))));
+	                    nowNum=nowNum.add(new BigDecimal((String.valueOf(map.get("nowNum")))));
+	                }
+	                item.put("planNum",planNum.doubleValue());
+	                item.put("nowNum",nowNum.doubleValue());
+	                BigDecimal progress = nowNum.divide(planNum, RoundingMode.HALF_UP);
+	                item.put("progress",format.format(progress.doubleValue()));
+	                resultList.add(item);
+	            }
+	        }
+	        resultMap.put("records",resultList.subList(pageStart,pageSize));
+	        resultMap.put("header",dataStringList);
+	        resultMap.put("total",resultList.size());
+	        msg.setData(resultMap);
+	        return msg;
+	    }}

fhKeeper/formulahousekeeper/timesheet-workshop-h5/src/views/workView/fillReport.vue

@@ -209,7 +209,8 @@ export default {
           if (res.code == "ok") {
             this.reportForm = res.data;
             this.oldPlanSteelStampNumberList=this.reportForm.planSteelStampNumberList
-            this.reportForm.checkedSteelNum = JSON.parse(this.reportForm.steel_num_array);
+            //当日选中的钢印号，默认勾选上
+            this.reportForm.checkedSteelNum = this.reportForm.steelNumArray;
             if (this.reportForm.check_type == 0) {
               //自检
               this.reportForm.checker_name = this.user.name;

fhKeeper/formulahousekeeper/timesheet/src/components/select.vue

@@ -165,6 +165,7 @@ export default {
             selectFontSize: '12',
             show: false, // 下拉框
             options: [], // 列表数据
+            optionsCopy: [], // 列表数据复制
             transitionBoxLiIdx: '', // hover 背景色
             selectName: this.$t('defaultText.pleaseChoose'), // 显示的文字
             classDiv: false, // 获得焦点样式
@@ -186,6 +187,7 @@ export default {
         subject: {
             handler(newValue, oldValue) {
                 this.options = newValue
+                this.optionsCopy = JSON.parse(JSON.stringify(newValue))
                 if(this.flg) {
                     if(newValue) {
                         this.selectName = newValue[0].auditorName || newValue[0].name
@@ -348,6 +350,7 @@ export default {
                 this.show = !this.show
                 this.move = !this.move
                 this.searchTex = ''
+                this.$set(this, 'options', this.optionsCopy)
             }
         },
         selectClihide() {
@@ -513,7 +516,9 @@ export default {
                             return item;
                         }
                     })
-                    this.options = arr
+                    // this.options = arr
+                    console.log('将要赋值')
+                    this.$set(this, 'options', arr)
                     this.cursor = res.data.nextCursor
                 } else {
                     this.$message({

fhKeeper/formulahousekeeper/timesheet/src/views/expense/expense.vue

@@ -103,32 +103,30 @@
               </el-form-item>
               <!-- 第一审核人 -->
               <el-form-item label="第一审核人" v-if="auditTypeItem.auditType == 2">
-                <!--普通员工只能自己填报自己的 -->
                 <el-select v-if="user.userNameNeedTranslate != '1'" v-model="addForm.firstCheckerId"
                   :placeholder="$t('pleaseselecttheapplicant')" style="width: 150px"
                   filterable="true">
-                  <span v-for="(item, index) in users" :key="index">
+                  <span v-for="(item, index) in usersNoInfo" :key="index">
                     <el-option :label="item.name" :value="item.id"></el-option>
                   </span>
                 </el-select>
 
                 <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :widthStr="'150'" :distinction="'4'"
-                  :subject="users" :subjectId="addForm.firstCheckerId" ref="selectCat" 
+                  :subject="usersNoInfo" :subjectId="addForm.firstCheckerId" ref="selectCat" 
                   @selectCal="selectCal"></selectCat>
               </el-form-item>
               <!-- 第一审核人 -->
               <el-form-item label="第二审核人" v-if="auditTypeItem.auditType == 2">
-                <!--普通员工只能自己填报自己的 -->
                 <el-select v-if="user.userNameNeedTranslate != '1'" v-model="addForm.secondCheckerId"
                   :placeholder="$t('pleaseselecttheapplicant')" style="width: 150px"
                   filterable="true">
-                  <span v-for="(item, index) in users" :key="index">
+                  <span v-for="(item, index) in usersNoInfo" :key="index">
                     <el-option :label="item.name" :value="item.id"></el-option>
                   </span>
                 </el-select>
 
                 <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :widthStr="'150'" :distinction="'5'"
-                  :subject="users" :subjectId="addForm.secondCheckerId" ref="selectCat" 
+                  :subject="usersNoInfo" :subjectId="addForm.secondCheckerId" ref="selectCat" 
                   @selectCal="selectCal"></selectCat>
               </el-form-item>
               <!-- 备注 -->
@@ -381,6 +379,13 @@
                 <span v-if="scope.row.status == 0 || scope.row.status == 3">{{ statusTxt[scope.row.status] }}</span>
               </template>
             </el-table-column>
+            <el-table-column prop="reviewProcess" :label="'审核流程'" width="180">
+              <template slot-scope="scope">
+                <span v-if="scope.row.reviewProcess == 0">待第一审核人审核</span>
+                <span v-if="scope.row.reviewProcess == 1">待第二审核人审核</span>
+                <span v-if="scope.row.reviewProcess == 2">审核完成</span>
+              </template>
+            </el-table-column>
             <!-- <el-table-column prop="denyReason" :label="$t('dismissreason')" width="180">
                 <template slot-scope="scope">
                   <span style="font-size:12px;">{{scope.row.denyReason}}</span>
@@ -456,13 +461,13 @@
             <el-select v-if="user.userNameNeedTranslate != '1'" v-model="ParticularsList.firstCheckerId"
               :placeholder="'请选择审核人'" style="width: 150px" :disabled="ParticularsList.reviewProcess > 0"
               filterable="true">
-              <span v-for="(item, index) in users" :key="index">
+              <span v-for="(item, index) in usersNoInfo" :key="index">
                 <el-option :label="item.name" :value="item.id"></el-option>
               </span>
             </el-select>
 
             <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :widthStr="'150'" :distinction="'6'"
-              :subject="users" :subjectId="ParticularsList.firstCheckerId" ref="selectCat" :disabled="ParticularsList.reviewProcess > 0"
+              :subject="usersNoInfo" :subjectId="ParticularsList.firstCheckerId" ref="selectCat" :disabled="ParticularsList.reviewProcess > 0"
               @selectCal="selectCal"></selectCat>
           </el-form-item>
           <!-- 第二审核人 -->
@@ -470,13 +475,13 @@
             <el-select v-if="user.userNameNeedTranslate != '1'" v-model="ParticularsList.secondCheckerId"
               :placeholder="'请选择审核人'" style="width: 150px" :disabled="ParticularsList.reviewProcess > 1"
               filterable="true">
-              <span v-for="(item, index) in users" :key="index">
+              <span v-for="(item, index) in usersNoInfo" :key="index">
                 <el-option :label="item.name" :value="item.id"></el-option>
               </span>
             </el-select>
 
             <selectCat v-if="user.userNameNeedTranslate == '1'" :size="'medium'" :widthStr="'150'" :distinction="'7'"
-              :subject="users" :subjectId="ParticularsList.secondCheckerId" ref="selectCat" :disabled="ParticularsList.reviewProcess > 1"
+              :subject="usersNoInfo" :subjectId="ParticularsList.secondCheckerId" ref="selectCat" :disabled="ParticularsList.reviewProcess > 1"
               @selectCal="selectCal"></selectCat>
           </el-form-item>
 
@@ -1092,6 +1097,7 @@ export default {
       type: null,
       ownerId: null,
       users: [], // 人员信息
+      usersNoInfo: [], // 人员信息，去掉自己
       displayTable: false,
       getLists: [],
       ProjectList: [], // 项目列表
@@ -1720,7 +1726,9 @@ export default {
         res => {
           if (res.code == "ok") {
             // this.users = res.data.records;
+            const { id } = JSON.parse(sessionStorage.getItem('user'))
             this.users = res.data;
+            this.usersNoInfo = res.data.filter(item => item.id != id)
             if (!this.permissions.costAudit) {
               this.addForm.ownerId = this.user.id;
               this.addForm.status = 1;

fhKeeper/formulahousekeeper/timesheet/src/views/project/list.vue

@@ -5292,6 +5292,7 @@ a {
                     for(var i in userList) {
                         arr.push(userList[i].id)
                     }
+                    this.participator = JSON.parse(JSON.stringify(this.participator))
                     this.addForm.auditUserIds = arr
                 } else if(obj.distinction == '11') {
                     let userList = obj.id

fhKeeper/formulahousekeeper/timesheet_h5/src/views/expense/index.vue

@@ -38,22 +38,26 @@
                         <div class="popupDiv paddingTop">
                             <div class="popupCon conBorder">
                                 <van-radio-group v-model="userRadio" v-if="user.userNameNeedTranslate == '1'">
-                                    <van-radio v-for="item in userList" :key="item.id" :name="item" class="popupItem marginNone borderNone">
-                                        <!-- <ww-open-data type='userName' :openid='item.name'></ww-open-data> -->
-                                        <span class="userNameClass_left">
-                                            <ww-open-data type='userName' :openid='item.name'></ww-open-data>
-                                        </span>
-                                        <span class="userNameClass_right">
-                                            {{ item.jobNumber }}
-                                        </span>
-                                    </van-radio>
+                                    <div v-for="item in userList" :key="item.id">
+                                        <van-radio :name="item" class="popupItem marginNone borderNone" v-if="item.id != user.id || ownerIdShowType == 1">
+                                            <!-- <ww-open-data type='userName' :openid='item.name'></ww-open-data> -->
+                                            <span class="userNameClass_left">
+                                                <ww-open-data type='userName' :openid='item.name'></ww-open-data>
+                                            </span>
+                                            <span class="userNameClass_right">
+                                                {{ item.jobNumber }}
+                                            </span>
+                                        </van-radio>
+                                    </div>
                                 </van-radio-group>
                                 <van-radio-group v-model="userRadio" v-else>
-                                    <van-radio v-for="item in userList" :key="item.id" :name="item" class="popupItem marginNone borderNone">
-                                    <!-- {{ item.name }} -->
-                                        <span class="userNameClass_left">{{item.name}}</span>
-                                        <span class="userNameClass_right">{{ item.jobNumber }}</span>
-                                    </van-radio>
+                                    <div v-for="item in userList" :key="item.id">
+                                        <van-radio :name="item" class="popupItem marginNone borderNone" v-if="item.id != user.id || ownerIdShowType == 1">
+                                        <!-- {{ item.name }} -->
+                                            <span class="userNameClass_left">{{item.name}}</span>
+                                            <span class="userNameClass_right">{{ item.jobNumber }}</span>
+                                        </van-radio>
+                                    </div>
                                 </van-radio-group>
                             </div>
                             <div class="popupBtn">
@@ -268,6 +272,12 @@
                             <div><span>填报日期：</span><span>{{ item.createDate }}</span></div>
                             <div v-if="user.timeType.easyExpense==0"><span>发票张数：</span><span>{{ item.ticketNum }}</span></div>
                             <div><span>费用类型：</span><span>{{ item.expenseMainTypeName }}</span></div>
+                            <div>
+                                <span>审核流程：</span>
+                                <span v-if="item.reviewProcess == 0">待第一审核人审核</span>
+                                <span v-if="item.reviewProcess == 1">待第二审核人审核</span>
+                                <span v-if="item.reviewProcess == 2">审核完成</span>
+                            </div>
                             <!-- <div><span>状态：</span><span>{{item.status}}</span></div> -->
                             <!-- <div><span>驳回原因：</span><span>{{item.denyReason}}</span></div> -->
                             <div><span>备注：</span><span>{{ item.remark }}</span></div>
@@ -417,9 +427,9 @@ export default {
         if (!this.canExamine) {
             this.editForm.ownerId = this.user.id
             this.formshowText.name = this.user.name
-        } else {
-            this.getUserList()
         }
+        
+        this.getUserList()
         this.getProjectList()
         this.getExpensMainTypes()
         this.getExTypeList()
@@ -891,9 +901,13 @@ export default {
             }).catch(err => { this.$toast.clear(); console.log(err) });
         },
         ownerIdShowCli(type) {
+            console.log('执行')
             this.ownerIdShowType = type
             this.userRadio = ''
             this.ownerIdShow = true
+            if(type > 1) {
+                this.canExamine = true
+            }
         }
     },
 }