Merge remote-tracking branch 'origin/master'

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

@@ -1,22 +0,0 @@
-package com.management.platform.controller;
-
-import com.management.platform.service.BillService;
-import com.management.platform.util.HttpRespMsg;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-
-@RestController
-@RequestMapping("/bill")
-public class BillController {
-
-    @Resource
-    private BillService billService;
-
-    @RequestMapping("/getPrepayId")
-    public HttpRespMsg getPrepayId(Integer id,HttpServletRequest request) {
-        return billService.getPrepayId(id,request);
-    }
-}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Bill.java

@@ -1,82 +0,0 @@
-package com.management.platform.entity;
-
-import com.baomidou.mybatisplus.extension.activerecord.Model;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-public class Bill extends Model<Bill> {
-	public static void main(String[] args) {
-		Date date = new Date();
-		SimpleDateFormat sdfYmd = new SimpleDateFormat("yyyy-MM-dd");
-		SimpleDateFormat sdfHms = new SimpleDateFormat("HH:mm:ss");
-		String format1 = sdfYmd.format(date);
-		String format2 = sdfHms.format(date);
-		String format = String.format("%sT%s+8:00", format1, format2);
-		System.out.println(format);
-	}
-
-	private static final long serialVersionUID=1L;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.id
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private Integer id;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.seq
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private String seq;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.user_id
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private String userId;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.company_id
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private String companyId;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.mobile
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private String mobile;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.name
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private String name;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.pay_type
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private String payType;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.money
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private Integer money;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.result
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private Integer result;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.indate
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private Date indate;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column bill.year
-	 * @mbg.generated  Mon Feb 25 20:47:33 CST 2019
-	 */
-	private Integer year;
-
-}

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/FmwDetail.java

@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2025-04-16
+ * @since 2025-04-25
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -73,10 +73,16 @@ public class FmwDetail extends Model<FmwDetail> {
     private String extraField5;
 
     /**
-     * 组装维修工时
+     * 组装工时
      */
-    @TableField("maintance_time")
-    private Double maintanceTime;
+    @TableField("compose_time")
+    private Double composeTime;
+
+    /**
+     * 维修工时
+     */
+    @TableField("repair_time")
+    private Double repairTime;
 
     /**
      * 调试工时

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/mapper/BillMapper.java

@@ -1,7 +0,0 @@
-package com.management.platform.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.management.platform.entity.Bill;
-
-public interface BillMapper extends BaseMapper<Bill> {
-}

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

@@ -1,11 +0,0 @@
-package com.management.platform.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.management.platform.entity.Bill;
-import com.management.platform.util.HttpRespMsg;
-
-import javax.servlet.http.HttpServletRequest;
-
-public interface BillService extends IService<Bill> {
-    HttpRespMsg getPrepayId(Integer id, HttpServletRequest request);
-}

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

@@ -1,96 +0,0 @@
-package com.management.platform.service.impl;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.management.platform.entity.Bill;
-import com.management.platform.entity.User;
-import com.management.platform.mapper.BillMapper;
-import com.management.platform.mapper.UserMapper;
-import com.management.platform.service.BillService;
-import com.management.platform.util.HttpRespMsg;
-import org.apache.commons.codec.binary.Hex;
-import org.springframework.http.*;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.security.SecureRandom;
-import java.text.SimpleDateFormat;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-@Service
-public class BillServiceImpl extends ServiceImpl<BillMapper, Bill> implements BillService {
-
-    private static final String APP_ID = "wxaaf19cfbbe1ff950";
-
-    private static final String MAIN_COM = "https://api.mch.weixin.qq.com";
-
-    private static final String PRE_PAY_URL = "/v3/pay/transactions/jsapi";
-
-    @Resource
-    private BillMapper billMapper;
-
-    @Resource
-    private UserMapper userMapper;
-
-    public static void main(String[] args) {
-        SecureRandom secureRandom = new SecureRandom();
-        // 生成16字节的随机数据
-        byte[] randomBytes = new byte[16];
-        secureRandom.nextBytes(randomBytes);
-        String hex = Hex.encodeHexString(randomBytes).toUpperCase();
-        System.out.println(hex);
-    }
-
-
-    @Override
-    public HttpRespMsg getPrepayId(Integer id, HttpServletRequest request) {
-        HttpRespMsg httpRespMsg = new HttpRespMsg();
-        User user = userMapper.selectById(request.getHeader("TOKEN"));
-        RestTemplate restTemplate = new RestTemplate();
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-        headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
-//        headers.add("Authorization", authCode);//TODO 设置签名认证auth
-
-        Bill bill = billMapper.selectById(id);
-        Date now = new Date();
-        String seq = new SimpleDateFormat("yyyyMMddHHmmss").format(now);
-        bill.setSeq(seq + (1000 + bill.getId()%1000));
-
-        Map<String, Object> requestBody = new HashMap<>();
-        requestBody.put("appid", APP_ID);
-//        requestBody.put("mchid", mchid);//TODO 商户号
-//        requestBody.put("description","")//TODO 商品真实信息
-        requestBody.put("out_trade_no",bill.getSeq());
-//        requestBody.put("notify_url",notify_url)//TODO 异步回调地址
-        Map<String,Object> amount = new HashMap<>();
-        amount.put("total",bill.getMoney());// TODO 此处默认库中money为分，如改动
-        amount.put("currency","CNY");
-        requestBody.put("amount",amount);
-
-        Map<String,Object> payer = new HashMap<>();
-//        payer.put("openid",openid);//TODO 用户在商户appid下的唯一标识 user.getXXX
-
-        HttpEntity<Object> requestEntity = new HttpEntity<>(requestBody, headers);
-        ResponseEntity<String> prepayResponse = restTemplate.exchange(
-                MAIN_COM+PRE_PAY_URL,
-                HttpMethod.POST,
-                requestEntity,
-                String.class
-        );
-        if (prepayResponse.getStatusCode() == HttpStatus.OK) {
-            String prepayJson = prepayResponse.getBody();
-            JSONObject jsonObject = JSON.parseObject(prepayJson);
-            String prepay_id = jsonObject.get("prepay_id").toString();
-            //TODO 更新prepay_id
-        }
-
-        return httpRespMsg;
-    }
-}

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

@@ -59,6 +59,7 @@ public class ErpOrderInfoServiceImpl extends ServiceImpl<ErpOrderInfoMapper, Erp
 //        IPage<ErpOrderInfo> page = new Page<>(i,erpOrderInfo.getPageSize());
 ////        page.setCurrent();
 ////        page.setSize(erpOrderInfo.getPageSize());
+        erpOrderInfo.setPageIndex((erpOrderInfo.getPageIndex() - 1) * erpOrderInfo.getPageSize());
         LambdaQueryWrapper<ErpOrderInfo> lqw = new LambdaQueryWrapper<>();
         if(StringUtils.isNotBlank(erpOrderInfo.getOrderId())){
             lqw.like(ErpOrderInfo::getOrderId, erpOrderInfo.getOrderId());

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

@@ -37,6 +37,17 @@ import java.util.stream.Collectors;
  */
 @Service
 public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthlyWorktimeMapper, FinanceMonthlyWorktime> implements FinanceMonthlyWorktimeService {
+    public static final String TIME_TYPE_COMPOSE = "组装工时（车间）";
+    public static final String TIME_TYPE_REPAIR = "维修工时（车间）";
+    public static final String TIME_TYPE_DEBUG = "调试工时（车间）";
+    public static final String TIME_TYPE_WAIT = "等料工时（车间）";
+    static List<String> groupNameList = new ArrayList<>();
+    {
+        groupNameList.add(TIME_TYPE_COMPOSE);
+        groupNameList.add(TIME_TYPE_REPAIR);
+        groupNameList.add(TIME_TYPE_DEBUG);
+        groupNameList.add(TIME_TYPE_WAIT);
+    }
 
     @Resource
     private FinanceMonthlyWorktimeMapper financeMonthlyWorktimeMapper;
@@ -173,12 +184,8 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
             List<Department> departmentList = departmentMapper.selectList(new LambdaQueryWrapper<Department>().eq(Department::getCompanyId, user.getCompanyId()));
             List<Project> projectList = projectMapper.selectList(new LambdaQueryWrapper<Project>().eq(Project::getCompanyId, user.getCompanyId()));
             List<Project> publicProjectList = projectList.stream().filter(p -> p.getIsPublic() == 1).collect(Collectors.toList());
-            List<ErpOrderInfo> erpOrderInfoList = erpOrderInfoMapper.selectList(new LambdaQueryWrapper<ErpOrderInfo>());
             List<User> userList = userMapper.selectList(new LambdaQueryWrapper<User>().select(User::getId, User::getName, User::getDepartmentId).eq(User::getCompanyId, user.getCompanyId()));
-            List<String> groupNameList = new ArrayList<>();
-            groupNameList.add("组装/维修工时");
-            groupNameList.add("调试工时");
-            groupNameList.add("等料工时");
+
             List<Report> reportList = reportMapper.getReportProjectGroupDetailList(user.getCompanyId(), firstDayOfMonth, lastDayOfMonth, groupNameList);
             List<Report> assistList = reportMapper.getReportProjectAssistTime(user.getCompanyId(), firstDayOfMonth, lastDayOfMonth, groupNameList);
 
@@ -192,7 +199,8 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
                     setFmwTime(fmwDetail, report);
                 } else {
                     FmwDetail fmwDetail = new FmwDetail();
-                    fmwDetail.setMaintanceTime(0.0);
+                    fmwDetail.setComposeTime(0.0);
+                    fmwDetail.setRepairTime(0.0);
                     fmwDetail.setDebugTime(0.0);
                     fmwDetail.setWaitingTime(0.0);
                     fmwDetail.setAssistTime(0.0);
@@ -254,14 +262,14 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
                     for (Report publicReportDeptItem : publicReportList) {
                         Integer deptId = publicReportDeptItem.getDeptId();
                         List<FmwDetail> deptAllReportList = insertDataList.stream().filter(r -> r.getDeptId().equals(deptId)).collect(Collectors.toList());
-                        double totalDeptTime = deptAllReportList.stream().reduce(0.0, (a, b) -> a + b.getMaintanceTime() + b.getDebugTime() + b.getWaitingTime(), Double::sum);
+                        double totalDeptTime = deptAllReportList.stream().reduce(0.0, (a, b) -> a + b.getComposeTime() + b.getRepairTime() + b.getDebugTime() + b.getWaitingTime(), Double::sum);
                         System.out.println("处理公共工时分摊，总工时=="+totalDeptTime);
                         if (totalDeptTime > 0) {
                             //计算总工时： 用维修组装工时，调试工时和等料工时相加
                             insertDataList.forEach(fmwDetail -> {
                                 //计算每一个项目的部门内部工时占比，按比例分摊公共工时
                                 if (fmwDetail.getDeptId().equals(deptId)) {
-                                    double curProjectTime = fmwDetail.getMaintanceTime() + fmwDetail.getDebugTime() + fmwDetail.getWaitingTime();
+                                    double curProjectTime = fmwDetail.getComposeTime() + fmwDetail.getRepairTime() + fmwDetail.getDebugTime() + fmwDetail.getWaitingTime();
                                     double assignTime = curProjectTime / totalDeptTime * publicReportDeptItem.getWorkingTime();
                                     //理论上不会出现fmwDetail.getPublicTime()有值的情况，但是为了保险起见做个叠加计算吧
                                     fmwDetail.setPublicTime(fmwDetail.getPublicTime() == null ? assignTime : fmwDetail.getPublicTime() + assignTime);
@@ -285,13 +293,13 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
                                         //按目标部门的部门内部工时占比进行二次分配
                                         Integer assignToDeptId = assistDeptItem.getDeptId();
                                         List<FmwDetail> targetDeptReportList = insertDataList.stream().filter(r -> r.getDeptId().equals(assignToDeptId)).collect(Collectors.toList());
-                                        double totalTargetDeptTime = targetDeptReportList.stream().reduce(0.0, (a, b) -> a + b.getMaintanceTime() + b.getDebugTime() + b.getWaitingTime(), Double::sum);
+                                        double totalTargetDeptTime = targetDeptReportList.stream().reduce(0.0, (a, b) -> a + b.getComposeTime() + b.getRepairTime() + b.getDebugTime() + b.getWaitingTime(), Double::sum);
                                         if (totalTargetDeptTime > 0) {
                                             //计算总工时： 用维修组装工时，调试工时和等料工时相加
                                             insertDataList.forEach(fmwDetail -> {
                                                 //计算每一个项目的部门内部工时占比，按比例分摊公共工时
                                                 if (fmwDetail.getDeptId().equals(assignToDeptId)) {
-                                                    double curProjectTime = fmwDetail.getMaintanceTime() + fmwDetail.getDebugTime() + fmwDetail.getWaitingTime();
+                                                    double curProjectTime = fmwDetail.getComposeTime() + fmwDetail.getRepairTime() + fmwDetail.getDebugTime() + fmwDetail.getWaitingTime();
                                                     double assignTime = curProjectTime / totalTargetDeptTime * assignToDeptTime;
                                                     //可能之前已经有其他部门的分摊过来了，需要叠加
                                                     fmwDetail.setPublicTime(fmwDetail.getPublicTime() == null ? assignTime : fmwDetail.getPublicTime() +assignTime);
@@ -326,13 +334,16 @@ public class FinanceMonthlyWorktimeServiceImpl extends ServiceImpl<FinanceMonthl
 
     private void setFmwTime(FmwDetail fmwDetail, Report report) {
         switch (report.getGroupName()) {
-            case "组装/维修工时":
-                fmwDetail.setMaintanceTime(report.getWorkingTime());
+            case TIME_TYPE_COMPOSE:
+                fmwDetail.setComposeTime(report.getWorkingTime());
+                break;
+            case TIME_TYPE_REPAIR:
+                fmwDetail.setRepairTime(report.getWorkingTime());
                 break;
-            case "调试工时":
+            case TIME_TYPE_DEBUG:
                 fmwDetail.setDebugTime(report.getWorkingTime());
                 break;
-            case "等料工时":
+            case TIME_TYPE_WAIT:
                 fmwDetail.setWaitingTime(report.getWorkingTime());
                 break;
         }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/task/DataCollectTask.java

@@ -194,7 +194,7 @@ public class DataCollectTask {
 
 
 
-    @Scheduled(cron = "0 0 1 * * ?")
+//    @Scheduled(cron = "0 51 11 * * ?")
 //    @Scheduled(cron = "0 05 16 * * ?")
     @Async
     public void sqlServerTask() {

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/BillMapper.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.management.platform.mapper.BillMapper">
-
-</mapper>

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ErpOrderInfoMapper.xml

@@ -33,6 +33,7 @@
             </if>
             ORDER BY rels_date DESC , id DESC
         </where>
+        limit #{erpOrderInfo.pageIndex}, #{erpOrderInfo.pageSize}
     </select>
     <select id="getWithProject" resultType="com.management.platform.entity.ErpOrderInfo">
         select eoi.id,eoi.order_id,eoi.project_id,eoi.project_name,eoi.line,eoi.status,eoi.moDId,

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/FmwDetailMapper.xml

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-        "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.management.platform.mapper.FmwDetailMapper">
+
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.management.platform.entity.FmwDetail">
         <id column="id" property="id" />
@@ -13,7 +13,8 @@
         <result column="project_code" property="projectCode" />
         <result column="extra_field4" property="extraField4" />
         <result column="extra_field5" property="extraField5" />
-        <result column="maintance_time" property="maintanceTime" />
+        <result column="compose_time" property="composeTime" />
+        <result column="repair_time" property="repairTime" />
         <result column="debug_time" property="debugTime" />
         <result column="waiting_time" property="waitingTime" />
         <result column="assist_time" property="assistTime" />
@@ -22,18 +23,18 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, fmw_id, dept_id, dept_name, dept_code, project_id, project_code, extra_field4, extra_field5, maintance_time, debug_time, waiting_time, assist_time, public_time
+        id, fmw_id, dept_id, dept_name, dept_code, project_id, project_code, extra_field4, extra_field5, compose_time, repair_time, debug_time, waiting_time, assist_time, public_time
     </sql>
     <select id="getTisTime" resultType="com.management.platform.entity.vo.TisTimeVO">
         select extra_field4 as orderId,extra_field5 as line
-             ,sum(maintance_time+debug_time+waiting_time+assist_time+public_time) as workTime
+             ,sum(compose_time+repair_time+debug_time+waiting_time+assist_time+public_time) as workTime
         from fmw_detail
         where fmw_id = #{fmwId}
         group by extra_field4,extra_field5
     </select>
     <select id="getTisTimeByFmwId" resultType="com.management.platform.entity.vo.TisTimeVO">
         select extra_field4 as orderId,extra_field5 as line
-             ,sum(maintance_time+debug_time+waiting_time+assist_time+public_time) as workTime
+             ,sum(compose_time+repair_time+waiting_time+assist_time+public_time) as workTime
         from fmw_detail
         where fmw_id = #{fmwId}
     </select>

fhKeeper/formulahousekeeper/management-platform/src/main/resources/mapper/ProjectMapper.xml

@@ -161,7 +161,7 @@
         <if test="projectId != null">
             AND a.id = #{projectId}
         </if>
-        <if test="status != null">
+        <if test="status != null and status != 0">
             AND a.status = #{status}
         </if>
         <if test="categoryId != null">

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

@@ -1579,10 +1579,20 @@
             <el-table-column prop="extraField4" align="center" label="工单号"></el-table-column>
             <el-table-column prop="extraField5" align="center" label="行号"></el-table-column>
             <el-table-column label="车间组装/维修工时(h)" align="center">
-              <el-table-column prop="maintanceTime" align="center" label="组装/维修工时(h)" width="130px">
+              <!-- <el-table-column prop="maintanceTime" align="center" label="组装/维修工时(h)" width="130px">
                 <template slot-scope="scope">
                   <el-link type="primary" :underline="false" @click="adjustWorkingHours(scope.row, '组装/维修工时',scope.row.maintanceTime,'maintanceTime')">{{ scope.row.maintanceTime }}</el-link>
                 </template>
+              </el-table-column> -->
+              <el-table-column prop="composeTime" align="center" label="组装工时(h)" width="120px">
+                <template slot-scope="scope">
+                  <el-link type="primary" :underline="false" @click="adjustWorkingHours(scope.row, '组装工时',scope.row.composeTime,'composeTime')">{{ scope.row.composeTime }}</el-link>
+                </template>
+              </el-table-column>
+              <el-table-column prop="repairTime" align="center" label="维修工时(h)" width="120px">
+                <template slot-scope="scope">
+                  <el-link type="primary" :underline="false" @click="adjustWorkingHours(scope.row, '维修工时',scope.row.repairTime,'repairTime')">{{ scope.row.repairTime }}</el-link>
+                </template>
               </el-table-column>
               <el-table-column prop="debugTime" align="center" label="调试工时(h)" width="120px">
                 <template slot-scope="scope">

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

@@ -25,7 +25,7 @@
       </div>
     </di>
     <div class="qrCodeManagement-con">
-      <el-table :data="tableData" style="width: 100%;height: 100%" border @selection-change="handleSelectionChange" :loading="tableLoading">
+      <el-table :data="tableData" style="width: 100%" height="58vh" border @selection-change="handleSelectionChange" :loading="tableLoading">
         <el-table-column type="selection" width="55" />
         <el-table-column prop="projectId" label="项目号" />
         <el-table-column prop="projectName" label="项目名" />

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -4984,6 +4984,9 @@
                             this.workForm.domains[index].extraField4 = ''
                             this.workForm.domains[index].extraField5 = ''
                         }
+                        if((res.data.orderIds || []).length > 0) {
+                            this.workForm.domains[index].extraField4 = res.data.orderIds[0]
+                        }
                         this.workForm.domains[index].reportExtraField4List = res.data.orderIds || []
                         this.workForm.domains[index].reportExtraField5List = res.data.lines || []
                         this.$forceUpdate();
@@ -6902,6 +6905,9 @@
                     if (res.code == "ok") {
                         this.zhoBao.reportExtraField4List = res.data.orderIds || []
                         this.zhoBao.reportExtraField5List = res.data.lines || []
+                        if((res.data.orderIds || []).length > 0) {
+                            this.zhoBao.extraField4 = res.data.orderIds[0]
+                        }
                         console.log(this.zhoBao, '<===== this.zhoBao')
                         this.$forceUpdate();
                     } 

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

@@ -1178,6 +1178,9 @@ export default {
                             this.form.domains[index == null ? this.clickIndex : index].extraField4 = ''
                             this.form.domains[index == null ? this.clickIndex : index].extraField5 = ''
                         }
+                        if((res.data.orderIds || []).length > 0) {
+                            this.form.domains[index == null ? this.clickIndex : index].extraField4 = res.data.orderIds[0]
+                        }
                         this.form.domains[index == null ? this.clickIndex : index].reportExtraField4List = res.data.orderIds || []
                         this.form.domains[index == null ? this.clickIndex : index].reportExtraField5List = res.data.lines || []
                     }