diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitPersonController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitPersonController.java
index 73913a20..e4ff0e86 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitPersonController.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/BmUnitPersonController.java
@@ -78,7 +78,7 @@ public class BmUnitPersonController extends BaseController{
     @PostMapping
     public AjaxResult unitPersonAdd(@Validated @RequestBody BmUnitPerson bmUnitPerson)
     {
-        return toAjax(bmUnitPersonService.unitPersonAdd(bmUnitPerson));
+        return bmUnitPersonService.unitPersonAdd(bmUnitPerson);
     }
 
     /**
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitPerson.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitPerson.java
index e133c160..c99f3790 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitPerson.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/domain/BmUnitPerson.java
@@ -2,7 +2,9 @@ package com.bonus.sgzb.base.domain;
 
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
+@Data
 public class BmUnitPerson {
 /**类型ID*/
   @ApiModelProperty(value = "类型ID")
@@ -15,30 +17,4 @@ public class BmUnitPerson {
   private String companyId;
 
 
-  public long getUnitId() {
-    return unitId;
-  }
-
-  public void setUnitId(long unitId) {
-    this.unitId = unitId;
-  }
-
-
-  public long getUserId() {
-    return userId;
-  }
-
-  public void setUserId(long userId) {
-    this.userId = userId;
-  }
-
-
-  public String getCompanyId() {
-    return companyId;
-  }
-
-  public void setCompanyId(String companyId) {
-    this.companyId = companyId;
-  }
-
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitPersonMapper.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitPersonMapper.java
index 334a6ade..2c089724 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitPersonMapper.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/mapper/BmUnitPersonMapper.java
@@ -11,8 +11,13 @@ public interface BmUnitPersonMapper {
 
     public List<BmUnitPerson> getUnitPerson(BmUnitPerson bmUnitPerson);
 
+
+    BmUnitPerson getUnitPersons(long unitId);
+
     public int unitPersonAdd(BmUnitPerson bmUnitPerson);
 
+    public int getUnitPersonUser(BmUnitPerson bmUnitPerson);
+
     public void remove(Long[] unitIds);
 
     public int updateBmUnitPerson(BmUnitPerson bmUnitPerson);
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmUnitPersonService.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmUnitPersonService.java
index 621b24d2..ea41a1b2 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmUnitPersonService.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/BmUnitPersonService.java
@@ -2,6 +2,7 @@ package com.bonus.sgzb.base.service;
 
 
 import com.bonus.sgzb.base.domain.BmUnitPerson;
+import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 
 import java.util.List;
 
@@ -10,7 +11,7 @@ public interface BmUnitPersonService {
 
     public List<BmUnitPerson> getUnitPerson(BmUnitPerson bmUnitPerson);
 
-    public int unitPersonAdd(BmUnitPerson bmUnitPerson);
+    public AjaxResult unitPersonAdd(BmUnitPerson bmUnitPerson);
 
     public void remove(Long[] unitIds);
 
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitPersonServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitPersonServiceImpl.java
index 6dd80020..4db96d1c 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitPersonServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/BmUnitPersonServiceImpl.java
@@ -4,6 +4,7 @@ package com.bonus.sgzb.base.service.impl;
 import com.bonus.sgzb.base.domain.BmUnitPerson;
 import com.bonus.sgzb.base.mapper.BmUnitPersonMapper;
 import com.bonus.sgzb.base.service.BmUnitPersonService;
+import com.bonus.sgzb.common.core.web.domain.AjaxResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -27,8 +28,12 @@ public class BmUnitPersonServiceImpl implements BmUnitPersonService {
     }
 
     @Override
-    public int unitPersonAdd(BmUnitPerson bmUnitPerson) {
-        return bmUnitPersonMapper.unitPersonAdd(bmUnitPerson);
+    public AjaxResult unitPersonAdd(BmUnitPerson bmUnitPerson) {
+        BmUnitPerson ben =bmUnitPersonMapper.getUnitPersons(bmUnitPerson.getUnitId());
+        if(ben != null){
+            return AjaxResult.error("保存失败！！！单位已绑定");
+        }
+        return AjaxResult.success(bmUnitPersonMapper.unitPersonAdd(bmUnitPerson));
     }
 
     @Override
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java
index 1bb127a8..3bceb1dd 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java
@@ -11,7 +11,7 @@ public class CommonConstants {
     public static final String SGJJ = "施工机具";
     /** 安全工器具*/
     public static final String AQGQJ = "安全工器具";
-    /** 机具分公司*/
+    /** 机具设备分公司*/
     public static final String JJ = "机具设备分公司";
     /** 调试分公司*/
     public static final String TS = "调试分公司";
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
index d836756c..9d9c0818 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java
@@ -30,7 +30,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
     @Override
     public AjaxResult getMaterialReqData() {
         HashMap<Object, Object> map = new HashMap<>(2);
-        // 施工工具、安全工器具数量
+        // 施工机具、安全工器具数量
         int num = 0, num2 = 0;
         try {
             List<MaTypeDo> list = mapper.getMaterialReqData(DateTimeHelper.getNowDate());
@@ -48,7 +48,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
     @Override
     public AjaxResult getMaterialReturnData() {
         HashMap<Object, Object> map = new HashMap<>(2);
-        // 施工工具、安全工器具数量
+        // 施工机具、安全工器具数量
         int num = 0, num2 = 0;
         try {
             List<MaTypeDo> list = mapper.getMaterialReturnData(DateTimeHelper.getNowDate());
@@ -80,9 +80,9 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
         ParamsDto dto = new ParamsDto();
         try {
             // 施工机具
-            TotalOwnershipVo vo = countNum("1", CommonConstants.SGJJ);
+            TotalOwnershipVo vo = countNum("1", CommonConstants.JJ);
             // 安全工器具
-            TotalOwnershipVo vo2 = countNum("2", CommonConstants.AQGQJ);
+            TotalOwnershipVo vo2 = countNum("2", CommonConstants.TS);
             list.add(vo);
             list.add(vo2);
         } catch (Exception e) {
@@ -146,7 +146,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
         HashMap<Object, Object> map = new HashMap<>(3);
         try {
             dto.setType("1");
-            dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.SGJJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.AQGQJ : null);
+            dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.JJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.TS : null);
             List<MaterialDataVo> lyList = mapper.getScrapAnalysisByMonth(dto);
             dto.setType("2");
             List<MaterialDataVo> bfList = mapper.getScrapAnalysisByMonth(dto);
@@ -169,7 +169,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
         List<String> yearMonthList = DateTimeHelper.getYearMonth();
         List<Integer> valueList = new ArrayList<>();
         List<Integer> valueList2 = new ArrayList<>();
-        dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.SGJJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.AQGQJ : null);
+        dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.JJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.TS : null);
         try {
             for (String date : yearMonthList) {
                 String year = date.substring(0, 4);
@@ -208,7 +208,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
         int num = 0, num2 = 0;
         String rate = "0%", rate2 = "0%";
         try {
-            dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.SGJJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.AQGQJ : null);
+            dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.JJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.TS : null);
             dto.setStartDate(monthDayMap.get("beginDate"));
             dto.setEndDate(monthDayMap.get("endDate"));
             List<MaTypeDo> list = mapper.getPickingAnalysisByMonth(dto);
@@ -235,7 +235,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
         Map<String, String> monthDayMap = DateTimeHelper.getNowOneMonthDay();
         dto.setStartDate(monthDayMap.get("beginDate"));
         dto.setEndDate(monthDayMap.get("endDate"));
-        dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.SGJJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.AQGQJ : null);
+        dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.JJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.TS : null);
         try {
             List<ScrapAnalysisVo> list = mapper.getMaterialReturnByMonth(dto);
             List<Integer> valueList = commonUtil.setMaterialReturnData(list);
@@ -259,7 +259,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService {
         Map<String, String> monthDayMap = DateTimeHelper.getNowOneMonthDay();
         dto.setStartDate(monthDayMap.get("beginDate"));
         dto.setEndDate(monthDayMap.get("endDate"));
-        dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.SGJJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.AQGQJ : null);
+        dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.JJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.TS : null);
         try {
             List<ScrapAnalysisVo> list = mapper.getMaintenanceByMonth(dto);
             List<Integer> valueList = commonUtil.setMaintenanceData(list);
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitPersonMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitPersonMapper.xml
index 7dcd7568..70d0aa32 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitPersonMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/BmUnitPersonMapper.xml
@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select unit_id, user_id, company_id
 		from bm_unit_person
     </sql>
-    
+
 
     <select id="getUnitPersonAll"  resultMap="BmUnitPersonResult">
         <!--<include refid="bmUnitInfo"/>-->
@@ -36,8 +36,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
 		</where>
     </select>
-    
 
+    <select id="getUnitPersons" parameterType="Long" resultMap="BmUnitPersonResult">
+        <include refid="bmUnitPerson"/>
+        where unit_id = #{unitId}
+    </select>
     
     <insert id="unitPersonAdd" parameterType="com.bonus.sgzb.base.domain.BmUnitPerson">
         insert into bm_unit_person (
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
index aa12ab69..50a70919 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
@@ -27,23 +27,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <!--当月领料分析-->
     <select id="getPickingAnalysisByMonth" resultType="com.bonus.sgzb.largeScreen.domain.MaTypeDo">
         SELECT lod.out_num AS num,
-               a.typeName,
-               a.manage_type AS manageType
+               mt.type_name AS typeName,
+               mt.manage_type AS manageType
         FROM lease_out_details lod
-        LEFT JOIN (
-            SELECT mt.type_id,mt4.type_name AS typeName,mt.manage_type
-            FROM ma_type mt
-            LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-            LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-            LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-            WHERE mt.`level` = '4'
-        )a ON lod.type_id = a.type_id
+        LEFT JOIN ma_type mt ON lod.type_id = mt.type_id AND mt.`level` = '4'
+        LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
         WHERE lod.create_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59')
         <if test="maType!=null and maType == 1">
-            AND a.typeName = #{maTypeName}
+            AND sd.dept_name = #{maTypeName}
         </if>
         <if test="maType!=null and maType == 2">
-            AND a.typeName = #{maTypeName}
+            AND sd.dept_name = #{maTypeName}
         </if>
     </select>
     <!--设备分布-->
@@ -53,44 +47,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         /*验收*/
         <if test="type == 1">
             SELECT pcd.check_num AS num,
-                   a.typeName
+                   mt.type_name AS typeName
             FROM purchase_check_info pci
             LEFT JOIN purchase_check_details pcd ON pci.task_id = pcd.task_id
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON pcd.type_id = a.type_id
+            LEFT JOIN ma_type mt ON pcd.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             WHERE pci.arrival_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59')
             <if test="maType!=null and maType == 1">
-                AND a.typeName = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
             <if test="maType!=null and maType == 2">
-                AND a.typeName = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
         </if>
         /*入库*/
         <if test="type == 2">
             SELECT iad.input_num,
-                   a.typeName
+                   mt.type_name AS typeName
             FROM input_apply_details iad
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON iad.type_id = a.type_id
+            LEFT JOIN ma_type mt ON iad.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             WHERE iad.create_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59') AND iad.input_type = '1'
             <if test="maType!=null and maType == 1">
-                AND a.typeName = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
             <if test="maType!=null and maType == 2">
-                AND a.typeName = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
         </if>
     </select>
@@ -101,24 +83,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             SELECT SUM(lod.out_num) AS num,
                    bui.unit_name AS unitName
             FROM lease_out_details lod
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON lod.type_id = a.type_id
+            LEFT JOIN ma_type mt ON lod.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             LEFT JOIN lease_apply_info lai ON lod.parent_id = lai.id
             LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id
             LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id
             LEFT JOIN bm_unit_info bui ON bai.unit_id = bui.unit_id
             <where>
                 <if test="maType!=null and maType == 1">
-                    a.typeName = #{maTypeName}
+                    sd.dept_name = #{maTypeName}
                 </if>
                 <if test="maType!=null and maType == 2">
-                    AND a.typeName = #{maTypeName}
+                    AND sd.dept_name = #{maTypeName}
                 </if>
             </where>
             GROUP BY bai.unit_id
@@ -129,23 +105,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             SELECT SUM(scrap_num) AS num,
                    bui.unit_name AS unitName
             FROM scrap_apply_details sad
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON sad.type_id = a.type_id
+            LEFT JOIN ma_type mt ON sad.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             LEFT JOIN tm_task_agreement tta ON sad.task_id = tta.task_id
             LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id
             LEFT JOIN bm_unit_info bui ON bai.unit_id = bui.unit_id
             WHERE sad.status = '1'
             <if test="maType!=null and maType == 1">
-                AND a.typeName = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
             <if test="maType!=null and maType == 2">
-                AND a.typeName = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
             GROUP BY bai.unit_id
             ORDER BY num DESC
@@ -155,22 +125,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getMaterialReturnByMonth" resultType="com.bonus.sgzb.largeScreen.domain.ScrapAnalysisVo">
         SELECT bad.pre_num AS planNum,
                bad.audit_num AS realityNum,
-               a.typeName
+               mt.type_name AS  typeName
         FROM back_apply_details bad
-        LEFT JOIN (
-            SELECT mt.type_id,mt4.type_name AS typeName
-            FROM ma_type mt
-            LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-            LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-            LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-            WHERE mt.`level` = '4'
-        )a ON bad.type_id = a.type_id
+        LEFT JOIN ma_type mt ON bad.type_id = mt.type_id AND mt.`level` = '4'
+        LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
         WHERE bad.create_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59')
         <if test="maType!=null and maType == 1">
-            AND a.typeName = #{maTypeName}
+            AND sd.dept_name = #{maTypeName}
         </if>
         <if test="maType!=null and maType == 2">
-            AND a.typeName = #{maTypeName}
+            AND sd.dept_name = #{maTypeName}
         </if>
     </select>
     <!--当月维修分析-->
@@ -178,82 +142,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT rad.repair_num AS repairNum,
                rad.repaired_num AS repairedNum,
                rad.scrap_num AS scrapNum,
-               a.typeName
+               mt.type_name AS typeName
         FROM repair_apply_details rad
-        LEFT JOIN (
-            SELECT mt.type_id,mt4.type_name AS typeName
-            FROM ma_type mt
-            LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-            LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-            LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-            WHERE mt.`level` = '4'
-        )a ON rad.type_id = a.type_id
+        LEFT JOIN ma_type mt ON rad.type_id = mt.type_id AND mt.`level` = '4'
+        LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
         WHERE rad.create_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59')
         <if test="maType!=null and maType == 1">
-            AND a.typeName = #{maTypeName}
+            AND sd.dept_name = #{maTypeName}
         </if>
         <if test="maType!=null and maType == 2">
-            AND a.typeName = #{maTypeName}
+            AND sd.dept_name = #{maTypeName}
         </if>
     </select>
     <!--施工机具/工器具总保有量-->
     <select id="getTotalOwnership" resultType="com.bonus.sgzb.largeScreen.domain.ScrapAnalysisVo">
         /*在库*/
         <if test="type == 1">
-            SELECT mt4.type_name AS typeName,
+            SELECT mt.type_name AS typeName,
                    mt.num AS num
             FROM ma_type mt
-            LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-            LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-            LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             WHERE mt.`level` = '4' AND mt.del_flag = '0'
             <if test="maType!=null and maType == 1">
-                AND mt4.type_name = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
             <if test="maType!=null and maType == 2">
-                AND mt4.type_name = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
         </if>
         /*待入库 新购/修试*/
         <if test="type == 2">
             SELECT pcd.purchase_num AS num,
                    pcd.input_num AS num2,
-                   a.typeName AS typeName
+                   mt.type_name AS typeName
             FROM purchase_check_details pcd
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON pcd.type_id = a.type_id
+            LEFT JOIN ma_type mt ON pcd.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             WHERE pcd.status = '1'
             <if test="maType!=null and maType == 1">
-                AND a.typeName = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
             <if test="maType!=null and maType == 2">
-                AND a.typeName = #{maTypeName}
+                AND sd.dept_name = #{maTypeName}
             </if>
         UNION ALL
             SELECT rid.repair_num AS num,
                    rid.input_num AS num2,
-                   a.typeName AS typeName
+                   mt.type_name AS typeName
             FROM repair_input_details rid
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON rid.type_id = a.type_id
+            LEFT JOIN ma_type mt ON rid.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             <where>
                 <if test="maType!=null and maType == 1">
-                    a.typeName = #{maTypeName}
+                    sd.dept_name = #{maTypeName}
                 </if>
                 <if test="maType!=null and maType == 2">
-                    AND a.typeName = #{maTypeName}
+                    AND sd.dept_name = #{maTypeName}
                 </if>
             </where>
         </if>
@@ -261,43 +205,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="type == 3">
             SELECT  lod.out_num AS num,
                    '1' AS type,
-                    a.typeName AS typeName
+                    mt.type_name AS typeName
             FROM lease_out_details lod
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON lod.type_id = a.type_id
+            LEFT JOIN ma_type mt ON lod.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             <where>
                 <if test="maType!=null and maType == 1">
-                    a.typeName = #{maTypeName}
+                    sd.dept_name = #{maTypeName}
                 </if>
                 <if test="maType!=null and maType == 2">
-                    AND a.typeName = #{maTypeName}
+                    AND sd.dept_name = #{maTypeName}
                 </if>
             </where>
         UNION ALL
             SELECT bad.audit_num AS num,
                     '2' AS type,
-                    a.typeName AS typeName
+                    mt.type_name AS typeName
             FROM back_apply_details bad
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON bad.type_id = a.type_id
+            LEFT JOIN ma_type mt ON bad.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             <where>
                 <if test="maType!=null and maType == 1">
-                    a.typeName = #{maTypeName}
+                    sd.dept_name = #{maTypeName}
                 </if>
                 <if test="maType!=null and maType == 2">
-                    AND a.typeName = #{maTypeName}
+                    AND sd.dept_name = #{maTypeName}
                 </if>
             </where>
         </if>
@@ -306,44 +238,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             SELECT rad.repair_num AS repairNum,
                    rad.repaired_num AS repairedNum,
                    rad.scrap_num AS scrapNum,
-                   a.typeName AS typeName
+                   mt.type_name AS typeName
             FROM repair_apply_details rad
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON rad.type_id = a.type_id
+            LEFT JOIN ma_type mt ON rad.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             <where>
                 <if test="maType!=null and maType == 1">
-                    a.typeName = #{maTypeName}
+                    sd.dept_name = #{maTypeName}
                 </if>
                 <if test="maType!=null and maType == 2">
-                    AND a.typeName = #{maTypeName}
+                    AND sd.dept_name = #{maTypeName}
                 </if>
             </where>
         </if>
         /*报废*/
         <if test="type == 5">
             SELECT sad.scrap_num AS num,
-                   a.typeName AS typeName
+                   mt.type_name AS typeName
             FROM scrap_apply_details sad
-            LEFT JOIN (
-                SELECT mt.type_id,mt4.type_name AS typeName
-                FROM ma_type mt
-                LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3'
-                LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2'
-                LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1'
-                WHERE mt.`level` = '4'
-            )a ON sad.type_id = a.type_id
+            LEFT JOIN ma_type mt ON sad.type_id = mt.type_id AND mt.`level` = '4'
+            LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
             WHERE sad.status = '1'
                 <if test="maType!=null and maType == 1">
-                    AND a.typeName = #{maTypeName}
+                    AND sd.dept_name = #{maTypeName}
                 </if>
                 <if test="maType!=null and maType == 2">
-                    AND a.typeName = #{maTypeName}
+                    AND sd.dept_name = #{maTypeName}
                 </if>
         </if>
     </select>
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
index d20a7cb2..77dcba89 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java
@@ -76,7 +76,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor=Exception.class)
     public AjaxResult insertPurchaseMacodeInfo(List<PurchaseMacodeInfo> purchaseMacodeInfoList) throws Exception {
         boolean b = true;
         for (PurchaseMacodeInfo purchaseMacodeInfo : purchaseMacodeInfoList) {
diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
index e812a6e5..7b0318d7 100644
--- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
+++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java
@@ -152,7 +152,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor=Exception.class)
     public int auditRepair(ScrapAudit scrapAudit) throws Exception {
         String checkResult = scrapAudit.getCheckResult();
         List<Long> taskIdList = scrapAudit.getTaskIdList();
diff --git a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
index 4640cc23..ff2c6d16 100644
--- a/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
+++ b/sgzb-modules/sgzb-material/src/main/resources/mapper/material/BackApplyMapper.xml
@@ -253,7 +253,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UPDATE tm_task tt
             LEFT JOIN back_apply_info bai ON bai.task_id = tt.task_id
             LEFT JOIN back_apply_details bad on bad.parent_id=bai.id
-        SET tt.task_status = '38',bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bai.direct_audit_time=NOW()
+        SET tt.task_status = '38',bad.audit_num=bad.pre_num,bai.direct_audit_by=#{createBy},bad.status='1',bai.direct_audit_time=NOW()
         WHERE
             bai.id = #{id}
     </update>
@@ -396,94 +396,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getView" resultType="com.bonus.sgzb.material.domain.BackApplyInfo">
         SELECT
-            result1.*,
-            result2.num AS useNum
+            bai.back_person AS backPerson,
+            bai.phone AS phone,
+            bai.back_time as backTime,
+            lot.lot_name AS lotName,
+            unit.unit_name AS unitName,
+            mt.type_name typeCode,
+            mt2.type_name AS typeName,
+            bagi.agreement_code as agreementCode,
+            bad.pre_num AS num
         FROM
-            (
-                -- 结果1的原始查询
-                SELECT
-                    bad.id as detailsId,
-                    bpl.lot_name as lotName,
-                    bui.unit_name as unitName,
-                    bagi.agreement_code as agreementCode,
-                    bai.back_person as backPerson,
-                    bai.phone,
-                    bai.back_time as backTime,
-                    bai.`code`,
-                    bai.remark,
-                    us.user_name as createName,
-                    us2.user_name as examineName,
-                    bad.type_id as typeId,
-                    mt.type_name typeCode,
-                    CONCAT_WS(
-                            '/',
-                            IFNULL( mt3.type_name, '' )) AS typeName,
-                    bad.pre_num AS num,
-                    mm.ma_code AS maCode
-                FROM
-                    back_apply_details bad
-                        LEFT JOIN back_apply_info bai ON bai.id = bad.parent_id
-                        LEFT JOIN ma_type mt ON mt.type_id = bad.type_id
-                        LEFT JOIN ma_type mt1 ON mt1.type_id = bad.type_id
-                        LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id
-                        LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
-                        LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
-                        LEFT JOIN ma_machine mm ON mm.type_id = bad.type_id
-                        LEFT JOIN tm_task_agreement tta ON tta.task_id = bai.task_id
-                        LEFT JOIN bm_agreement_info bagi ON bagi.agreement_id = tta.agreement_id
-                        LEFT JOIN bm_project_lot bpl ON bpl.lot_id = bagi.project_id
-                        LEFT JOIN bm_unit_info bui ON bui.unit_id = bagi.unit_id
-                        LEFT JOIN sys_user us on us.user_id=bai.create_by
-                        LEFT JOIN sys_user us2 on us2.user_id=bai.direct_audit_by
-                WHERE
-                    bai.id = #{id}
-        <if test="keyWord != null  and keyWord != ''">
-            and mt.type_name like concat('%', #{keyWord}, '%') or
-            mt3.type_name like concat('%', #{keyWord}, '%') or
-            mm.ma_code like concat('%', #{keyWord}, '%')
-        </if>
-            ) AS result1
-                LEFT JOIN
-            (
-                -- 结果2的原始查询，作为子查询
-                SELECT
-                    subquery1.type_id AS typeId,
-                    subquery1.typeName typeCode,
-                    subquery1.out_num - COALESCE ( subquery2.audit_num, 0 ) AS num
-                FROM
-                    (-- 第一个查询作为子查询
-                        SELECT
-                            mt.type_id,
-                            mt.type_name AS typeName,
-                            lod.out_num
-                        FROM
-                            tm_task_agreement tta
-                                LEFT JOIN lease_apply_info lai ON lai.task_id = tta.task_id
-                                LEFT JOIN lease_out_details lod ON lod.parent_id = lai.id
-                                LEFT JOIN ma_type mt ON mt.type_id = lod.type_id
-                                LEFT JOIN tm_task tt ON tt.task_id = tta.task_id
-                        WHERE
-                            tta.agreement_id = #{agreementId}
-                          AND tt.task_type = '29'
-                          and mt.type_id is not null
-                    ) AS subquery1
-                        LEFT JOIN (-- 第二个查询作为子查询
-                        SELECT
-                            mt.type_id,
-                            mt.type_name,
-                            bad.audit_num
-                        FROM
-                            tm_task tt
-                                LEFT JOIN tm_task_agreement tta ON tta.task_id = tt.task_id
-                                LEFT JOIN back_apply_info bai ON bai.task_id = tta.task_id
-                                LEFT JOIN back_apply_details bad ON bad.parent_id = bai.id
-                                LEFT JOIN ma_type mt ON mt.type_id = bad.type_id
-                        WHERE
-                            tta.agreement_id = #{agreementId}
-                          AND tt.task_type = '36'
-                          and mt.type_id is not null
-                    ) AS subquery2 ON subquery1.type_id = subquery2.type_id
-            ) AS result2 ON result1.typeId = result2.typeId
+            back_apply_details bad
+                LEFT JOIN back_apply_info bai ON bai.id = bad.parent_id
+                LEFT JOIN tm_task_agreement tta ON tta.task_id = bai.task_id
+                LEFT JOIN bm_agreement_info bagi ON bagi.agreement_id = tta.agreement_id
+                LEFT JOIN bm_project_lot lot ON lot.lot_id = bagi.project_id
+                LEFT JOIN bm_unit_info unit ON unit.unit_id = bagi.unit_id
+                LEFT JOIN ma_type mt ON mt.type_id = bad.type_id
+                LEFT JOIN ma_type mt1 ON mt1.type_id = bad.type_id
+                LEFT JOIN ma_type mt2 ON mt2.type_id = mt1.parent_id
+                LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
+                LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
+        WHERE
+            bai.id = #{id}
     </select>
     <select id="getUseTypeTree" resultType="com.bonus.sgzb.material.domain.TypeTreeNode">
         WITH RECURSIVE cte AS (
diff --git a/sgzb-ui/src/api/claimAndRefund/return.js b/sgzb-ui/src/api/claimAndRefund/return.js
index d7642975..4485e92c 100644
--- a/sgzb-ui/src/api/claimAndRefund/return.js
+++ b/sgzb-ui/src/api/claimAndRefund/return.js
@@ -47,17 +47,35 @@ export function ApiGetMaterialList(query) {
   })
 }
 
-
-
-
-
- 
-//审核
-export function ApiBackApplyAudit(query) {
+// 删除
+export function backApplyDelApi(query) {
+  console.log('query====', query);
   return request({
-    url: '/material/backApply/audit',
+    url: '/material/backApply/del',
     method: 'get',
     params: query
   })
 }
 
+
+
+
+
+
+//审核
+export function ApiBackApplyAudit(data) {
+  return request({
+    url: '/material/backApply/audit',
+    method: 'post',
+    data: data
+  })
+}
+// 退料审核新增
+export function submitBackApplyApi(data) {
+  return request({
+    url: '/material/backApply/submitBackApply',
+    method: 'post',
+    data: data
+  })
+}
+
diff --git a/sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue b/sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue
index a032f055..0084c7fa 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue
@@ -13,32 +13,44 @@
         <div class="order_box">
           <div class="order_box_one">
             <div>
-              <span>工程名称：</span
-              ><span>(送电一公司)vue百度地图获取天气</span>
+              <span>工程名称：</span><span>{{ rowObj.lotName }}</span>
+            </div>
+            <div>
+              <span></span><span>{{ rowObj.backTime }}</span>
             </div>
-            <div><span></span><span>2023年10月06日</span></div>
           </div>
           <div class="order_box_one">
             <div>
-              <span>退料单位：</span
-              ><span>(送电一公司)vue百度地图获取天气</span>
+              <span>退料单位：</span><span>{{ rowObj.unitName }}</span>
+            </div>
+            <div>
+              <span>编号：</span><span>{{ rowObj.code }}</span>
             </div>
-            <div><span>编号：</span><span>2023年10月06日</span></div>
           </div>
         </div>
         <el-table :data="tableData" border style="width: 100%">
-          <el-table-column label="序号" align="center" prop="dictId" />
-          <el-table-column prop="name" label="名称" align="center">
+          <el-table-column label="编号" align="center" type="index" />
+          <el-table-column
+            label="类型名称"
+            align="center"
+            prop="typeName"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="规格型号"
+            align="center"
+            prop="typeCode"
+            :show-overflow-tooltip="true"
+          />
+          <el-table-column
+            label="退料数量"
+            align="center"
+            class-name="small-padding fixed-width"
+            width="200"
+            prop="num"
+          >
           </el-table-column>
-          <el-table-column prop="type" label="规格型号" align="center">
-          </el-table-column>
-          <el-table-column prop="unit" label="单位" align="center">
-          </el-table-column>
-          <el-table-column prop="number" label="数量" align="center">
-          </el-table-column>
-          <el-table-column prop="weight" label="重量" align="center">
-          </el-table-column>
-          <el-table-column prop="remarks" label="备注" align="center">
+          <!-- <el-table-column prop="remarks" label="备注" align="center">
             <template slot-scope="scope">
               <span
                 @click="remarksClick"
@@ -46,7 +58,7 @@
                 >{{ scope.row.remarks }}</span
               >
             </template>
-          </el-table-column>
+          </el-table-column> -->
         </el-table>
         <div class="order_footer">
           <div>审核：</div>
@@ -83,6 +95,7 @@
 </template>
 <script>
 import vueEasyPrint from 'vue-easy-print';
+import { ApiGetView, } from "@/api/claimAndRefund/return.js"
 export default {
   components: { vueEasyPrint, },
   props: {
@@ -100,6 +113,10 @@ export default {
     dialogTitle: {
       type: String,
       default: ""
+    },
+    rowObj: {
+      type: Object,
+      default: {}
     }
   },
   watch: {
@@ -122,21 +139,20 @@ export default {
   data() {
     return {
       fullscreenLoading: false,
-      tableData: [{
-        dictId: '1',
-        name: '机动胶膜',
-        type: 'CJM_5',
-        unit: '台',
-        number: '5',
-        weight: '525',
-        remarks: '编号详见明细',
-      },],
+      tableData: [],
       open: false,
       title: ""
     };
   },
   methods: {
     init() {
+      let params = {
+        id: this.rowObj.id,
+        agreementId: this.rowObj.agreementId
+      }
+      ApiGetView(params).then(res => {
+        this.tableData = res.rows
+      })
     },
     // 取消按钮
     cancel() {
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
index ddd898dc..fb6918bb 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
@@ -1,88 +1,241 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item label="关键字" prop="keyWord">
-        <el-input v-model="queryParams.keyWord" placeholder="请输入关键字" clearable style="width: 240px" />
+        <el-input
+          v-model="queryParams.keyWord"
+          placeholder="请输入关键字"
+          clearable
+          style="width: 240px"
+        />
       </el-form-item>
       <el-form-item label="单位名称" prop="unitId">
-        <el-select v-model="queryParams.unitId" clearable @change="getAgreementByUnit" style="width: 240px"
-          placeholder="请选择">
-          <el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id">
+        <el-select
+          v-model="queryParams.unitId"
+          clearable
+          @change="getAgreementByUnit"
+          style="width: 240px"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in unitList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          >
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="工程名称" prop="proId">
-        <el-select v-model="queryParams.proId" clearable @change="getAgreementByProId" style="width: 240px"
-          placeholder="请选择">
-          <el-option v-for="item in proList" :key="item.id" :label="item.name" :value="item.id">
+        <el-select
+          v-model="queryParams.proId"
+          clearable
+          @change="getAgreementByProId"
+          style="width: 240px"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in proList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          >
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="工机具类型" prop="typeId">
-        <el-cascader v-model="queryParams.typeId" :options="deptOptions"
-          :props="{ expandTrigger: 'hover', label: 'label', value: 'id', checkStrictly: true }" @change="handleNodeClick"
-          aria-placeholder="请选择极具类型"> </el-cascader>
+        <el-cascader
+          v-model="queryParams.typeId"
+          :options="deptOptions"
+          :props="{
+            expandTrigger: 'hover',
+            label: 'label',
+            value: 'id',
+            checkStrictly: true,
+          }"
+          @change="handleNodeClick"
+          aria-placeholder="请选择极具类型"
+        >
+        </el-cascader>
       </el-form-item>
       <el-form-item label="退料申请时间" prop="time">
-        <el-date-picker v-model="queryParams.time" type="datetimerange" range-separator="至" start-placeholder="开始日期"
-          end-placeholder="结束日期" value-format="yyyy-MM-dd">
+        <el-date-picker
+          v-model="queryParams.time"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          type="date"
+          value-format="yyyy-MM-dd"
+        >
         </el-date-picker>
       </el-form-item>
       <el-form-item label="退料状态" prop="taskStatus">
-        <el-select v-model="queryParams.taskStatus" clearable  style="width: 240px"
-          placeholder="请选择">
-          <el-option v-for="item in taskStatusList" :key="item.id" :label="item.name" :value="item.id">
+        <el-select
+          v-model="queryParams.taskStatus"
+          clearable
+          style="width: 240px"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in taskStatusList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          >
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="协议号" prop="agreementCode">
-        <el-input v-model="queryParams.agreementCode" placeholder="请选择协议号" clearable style="width: 240px" />
+        <el-input
+          v-model="queryParams.agreementCode"
+          placeholder="请选择协议号"
+          clearable
+          style="width: 240px"
+        />
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >查询</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
-
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain size="mini" @click="handleAdd"
-          v-hasPermi="['store:labelType:add']">退料申请</el-button>
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['store:labelType:add']"
+          >退料申请</el-button
+        >
       </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          size="mini"
+          @click="handleSubmit()"
+          v-hasPermi="['store:labelType:add']"
+          >批量提交</el-button
+        >
+      </el-col> -->
       <el-col :span="1.5">
-        <!-- :disabled="multiple" -->
-        <el-button type="warning" plain size="mini" @click="handleSubmit()"
-          v-hasPermi="['store:labelType:add']">批量提交</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['store:labelType:export']">导出</el-button>
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['store:labelType:export']"
+          >导出</el-button
+        >
       </el-col>
 
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="typeList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" sortable align="center" type="index" />
-      <el-table-column label="退料单号" align="center" prop="code" sortable :show-overflow-tooltip="true" />
-      <el-table-column label="退料单位名称" align="center" sortable prop="unitName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料工程名称" sortable align="center" prop="lotName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料工机具类型" align="center" prop="typeName" sortable :show-overflow-tooltip="true" />
-      <el-table-column label="退料人员" align="center" prop="backPerson" sortable :show-overflow-tooltip="true" />
-      <el-table-column label="退料人联系电话" align="center" prop="phone" sortable :show-overflow-tooltip="true" />
-      <el-table-column label="退料申请时间" align="center" prop="backTime" sortable :show-overflow-tooltip="true" />
-      <el-table-column label="协议号" align="center" prop="agreementCode" sortable :show-overflow-tooltip="true" />
-      <el-table-column label="是否异常退料" align="center" prop="dictName" sortable :show-overflow-tooltip="true" >
+      <el-table-column
+        label="退料单号"
+        align="center"
+        prop="code"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料单位名称"
+        align="center"
+        sortable
+        prop="unitName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料工程名称"
+        sortable
+        align="center"
+        prop="lotName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料工机具类型"
+        align="center"
+        prop="typeName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料人员"
+        align="center"
+        prop="backPerson"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料人联系电话"
+        align="center"
+        prop="phone"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料申请时间"
+        align="center"
+        prop="backTime"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="协议号"
+        align="center"
+        prop="agreementCode"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="是否异常退料"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      >
         <template slot-scope="scope">
           <div>
             <!-- 暂时全部未否 -->
             否
           </div>
         </template>
-        </el-table-column>
-      <el-table-column label="退料状态" align="center"  sortable :show-overflow-tooltip="true">
+      </el-table-column>
+      <el-table-column
+        label="退料状态"
+        align="center"
+        sortable
+        :show-overflow-tooltip="true"
+      >
         <template slot-scope="scope">
           <!-- 状态
 37-待审核
@@ -90,89 +243,261 @@
           <el-button type="text" v-if="scope.row.taskStatus == '37'">
             待审核
           </el-button>
-          <el-button type="text" style="color:#67C23A" v-else-if="scope.row.taskStatus == '38'">
+          <el-button
+            type="text"
+            style="color: #67c23a"
+            v-else-if="scope.row.taskStatus == '38'"
+          >
             已审核
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="不通过原因" align="center" prop="dictName" sortable :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
+      <el-table-column
+        label="不通过原因"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="300"
+      >
         <template slot-scope="scope">
-          <el-button size="mini" type="primary" plain icon="el-icon-zoom-in" @click="handleUpdate(scope.row, 'see')"
-            v-hasPermi="['store:labelType:edit']">查看</el-button>
-          <el-button size="mini" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['store:labelType:remove']">删除</el-button>
+          <el-button
+            size="mini"
+            type="primary"
+            plain
+            icon="el-icon-zoom-in"
+            @click="handleSee(scope.row, 'see')"
+            v-hasPermi="['store:labelType:edit']"
+            >查看</el-button
+          >
+          <!-- <el-button
+            size="mini"
+            type="warning"
+            plain
+            icon="el-icon-edit"
+            @click="handlUpdate(scope.row, 'update')"
+            v-hasPermi="['store:labelType:edit']"
+            >编辑</el-button
+          > -->
+          <el-button
+            size="mini"
+            type="danger"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['store:labelType:remove']"
+            >删除</el-button
+          >
+          <el-button
+            size="mini"
+            type="info"
+            @click="handlePrint(scope.row)"
+            v-hasPermi="['store:labelType:remove']"
+            >退料单</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-      <el-form :model="queryParams" ref="queryForm1" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+    >
+      <el-form
+        :model="dialogQueryParams"
+        ref="queryForm1"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="100px"
+      >
         <el-row>
-          <el-form-item label="退料单位" prop="dictName">
-            <el-input v-model="queryParams.dictName" placeholder="请输入借出方单位" clearable style="width: 240px" />
+          <el-form-item label="退料单位" prop="unitName">
+            <el-input
+              disabled
+              v-model="dialogQueryParams.unitName"
+              placeholder="请输入退料单位"
+              clearable
+              style="width: 240px"
+            />
           </el-form-item>
-          <el-form-item label="退料工程" prop="dictName">
-            <el-input v-model="queryParams.dictName" placeholder="请输入借入方单位" clearable style="width: 240px" />
+          <el-form-item label="退料工程" prop="lotName">
+            <el-input
+              disabled
+              v-model="dialogQueryParams.lotName"
+              placeholder="请输入退料工程"
+              clearable
+              style="width: 240px"
+            />
           </el-form-item>
-          <el-form-item label="退料协议编号" prop="dictName">
-            <el-input v-model="queryParams.dictName" placeholder="请输入关键字" clearable style="width: 240px" />
+          <el-form-item label="退料协议编号" prop="agreementCode">
+            <el-input
+              disabled
+              v-model="dialogQueryParams.agreementCode"
+              placeholder="请输入退料协议编号"
+              clearable
+              style="width: 240px"
+            />
+          </el-form-item>
+          <el-form-item label="预退料时间" prop="backTime">
+            <el-date-picker
+              style="width: 240px"
+              disabled
+              v-model="dialogQueryParams.backTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择时间"
+            >
+            </el-date-picker>
           </el-form-item>
         </el-row>
         <el-row>
-          <el-form-item label="退料人" prop="dictName">
-            <el-input v-model="queryParams.dictName" placeholder="请输入借出方单位" clearable style="width: 240px" />
+          <el-form-item label="退料人" prop="backPerson">
+            <el-input
+              disabled
+              v-model="dialogQueryParams.backPerson"
+              placeholder="请输入退料人"
+              clearable
+              style="width: 240px"
+            />
           </el-form-item>
-          <el-form-item label="退料人电话" prop="dictName">
-            <el-input v-model="queryParams.dictName" placeholder="请输入借入方单位" clearable style="width: 240px" />
+          <el-form-item label="退料人电话" prop="phone">
+            <el-input
+              disabled
+              v-model="dialogQueryParams.phone"
+              placeholder="请输入退料人电话"
+              clearable
+              style="width: 240px"
+            />
           </el-form-item>
         </el-row>
 
         <el-row>
-          <el-form-item label="关键字" prop="dictName">
-            <el-input v-model="queryParams.dictName" placeholder="请输入借出方单位" clearable style="width: 240px" />
+          <el-form-item label="关键字" prop="keyWord">
+            <el-input
+              v-model="dialogQueryParams.keyWord"
+              placeholder="请输入借出方单位"
+              clearable
+              style="width: 240px"
+            />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery1">查询</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery1">重置</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery1"
+              >查询</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery1"
+              >重置</el-button
+            >
           </el-form-item>
         </el-row>
       </el-form>
 
-      <el-table v-loading="loading" :data="typeList" height="500px" @selection-change="handleSelectionChange">
+      <el-table
+        v-loading="loading"
+        :data="loadingList"
+        height="500px"
+        @selection-change="handleSelectionChange"
+      >
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" prop="dictId" />
-        <el-table-column label="类型名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="编码" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="当前在用量" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="退料数量" align="center" class-name="small-padding fixed-width" width="200">
+        <el-table-column label="序号" align="center" type="index" />
+        <el-table-column
+          label="类型名称"
+          align="center"
+          prop="typeName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="规格型号"
+          align="center"
+          prop="typeCode"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="编码"
+          align="center"
+          prop="maCode"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="当前在用量"
+          align="center"
+          prop="useNum"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="退料数量"
+          align="center"
+          class-name="small-padding fixed-width"
+          width="200"
+        >
           <template slot-scope="scope">
-            <el-input v-model="scope.row.dictName" placeholder="请输入退料数量" clearable />
+            <el-input
+              v-model="scope.row.num"
+              placeholder="请输入退料数量"
+              clearable
+            />
           </template>
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        @pagination="getList" />
+      <pagination
+        v-show="loadingTotal > 0"
+        :total="loadingTotal"
+        :page.sync="dialogQueryParams.pageNum"
+        :limit.sync="dialogQueryParams.pageSize"
+        @pagination="getList"
+      />
 
-      <div slot="footer" class="dialog-footer" style="text-align: center" v-if="type == 'update'">
+      <div
+        slot="footer"
+        class="dialog-footer"
+        style="text-align: center"
+        v-if="loadingType == 'update'"
+      >
         <el-button type="primary" @click="submitForm">确定</el-button>
         <el-button @click="cancel">取消</el-button>
       </div>
     </el-dialog>
     <!-- 退料单 -->
-    <dialogForm :dialogTitle="title" :isShowFlag.sync="isShowOneFlag" :priKey="priKey"></dialogForm>
+    <dialogForm
+      :dialogTitle="title"
+      :isShowFlag.sync="isShowOneFlag"
+      :priKey="priKey"
+      :rowObj="rowObj"
+    ></dialogForm>
     <!-- 提交 -->
-    <el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openOne" append-to-body
-      width="400px">
+    <el-dialog
+      v-loading.fullscreen.lock="fullscreenLoading"
+      :title="title"
+      :visible.sync="openOne"
+      append-to-body
+      width="400px"
+    >
       <div class="submit_box">
         <div>
-          <i class="el-icon-circle-check" style="color: #ff9900; font-size: 30px"></i>
+          <i
+            class="el-icon-circle-check"
+            style="color: #ff9900; font-size: 30px"
+          ></i>
         </div>
         <div class="submit_box_title">
           <div>{{ openTextOne }}</div>
@@ -184,11 +509,19 @@
         <el-button type="primary" @click="submitOpenOneForm()">确定</el-button>
       </div>
     </el-dialog>
-    <el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openTwo" append-to-body
-      width="400px">
+    <el-dialog
+      v-loading.fullscreen.lock="fullscreenLoading"
+      :title="title"
+      :visible.sync="openTwo"
+      append-to-body
+      width="400px"
+    >
       <div class="submit_box_two">
         <div>
-          <i class="el-icon-circle-check" style="color: #00c196; font-size: 30px"></i>
+          <i
+            class="el-icon-circle-check"
+            style="color: #00c196; font-size: 30px"
+          ></i>
         </div>
         <div class="submit_box_title">{{ openTextThree }}</div>
       </div>
@@ -199,11 +532,11 @@
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import { ApiGetBackApplyList } from "@/api/claimAndRefund/return.js"
+import { ApiGetBackApplyList, ApiGetView, backApplyDelApi, submitBackApplyApi } from "@/api/claimAndRefund/return.js"
 import {
   getInfo, h
 } from "@/api/login";
-import { getUnitData, getProData, getAgreementInfoById } from "@/api/claimAndRefund/receive.js"
+import { getUnitData, getProData, getAgreementInfoById, } from "@/api/claimAndRefund/receive.js"
 import dialogForm from "./dialogForm.vue";
 // 10:42开始日期startTime,结束日期endTime     机具类型typeId
 // http://localhost/claimAndRefund/return/returnApply
@@ -251,6 +584,10 @@ export default {
         startTime: '',
         endTime: ''
       },
+      dialogQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -271,16 +608,20 @@ export default {
       deptOptions: [],
       unitList: [],
       proList: [],
-      taskStatusList:[
+      taskStatusList: [
         {
-          name:'待审核',
-          id:'37'
+          name: '待审核',
+          id: '37'
         },
         {
-          name:'已审核',
-          id:'38'
+          name: '已审核',
+          id: '38'
         }
-      ]
+      ],
+      rowObj: {},
+      loadingType: '',
+      loadingTotal: 0,
+      loadingList: [],
     };
   },
   created() {
@@ -300,16 +641,12 @@ export default {
           companyId: this.companyId,
           ...this.queryParams
         }
-        console.log("paramsparamsparams", params)
         const res = await ApiGetBackApplyList(params)
-        console.log("res=====", res)
         this.typeList = res.data.rows;
         this.total = res.data.total;
         this.loading = false;
       } catch (error) {
-
       }
-
     },
     // 取消按钮
     cancel() {
@@ -355,13 +692,13 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row, type) {
       this.type = type
-      this.reset();
-      const dictId = row.dictId || this.ids
-      getType(dictId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改";
-      });
+      // this.reset();
+      // const dictId = row.dictId || this.ids
+      // getType(dictId).then(response => {
+      //   this.form = response.data;
+      //   this.open = true;
+      //   this.title = "修改";
+      // });
     },
     // 退料单
     handleUpdateOrder() {
@@ -381,40 +718,107 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function () {
-      this.$refs["form"].validate(valid => {
+      this.$refs["queryForm1"].validate(valid => {
         if (valid) {
-          if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addType(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+          let backApplyInfo = []
+          for (let i = 0; i < this.loadingList.length; i++) {
+            this.loadingList[i].companyId = this.companyId;
           }
+          backApplyInfo.push(
+            {
+              backPerson: '张三',
+              phone: '1234578988',
+              remark: '1425备注',
+              backTime: '2023-12-14',
+              // backPerson: this.dialogQueryParams.backPerson,
+              // phone: this.dialogQueryParams.phone,
+              // remark: this.dialogQueryParams.remark,
+              // backTime: this.dialogQueryParams.backTime,
+              companyId: this.companyId
+            }
+          )
+          let params = {
+            companyId: this.companyId,
+            agreementId: this.rowObj.agreementId,
+            backApplyInfo: JSON.stringify(backApplyInfo),
+            backApplyDetails: JSON.stringify(this.loadingList)
+          }
+          console.log('param----', params);
+          submitBackApplyApi(params).then(res => {
+
+          })
+          // if (this.form.dictId != undefined) {
+          //   updateType(this.form).then(response => {
+          //     this.$modal.msgSuccess("修改成功");
+          //     this.open = false;
+          //     this.getList();
+          //   });
+          // } else {
+          //   addType(this.form).then(response => {
+          //     this.$modal.msgSuccess("新增成功");
+          //     this.open = false;
+          //     this.getList();
+          //   });
+          // }
+        } else {
+
         }
       });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const dictIds = row.dictId || this.ids;
-      this.$modal.confirm('是否确认删除该数据项？').then(function () {
-        return delType(dictIds);
+      let param = {
+        id: row.id + ''
+      };
+      this.$modal.confirm('是否确认删除该数据项？').then(() => {
+        return backApplyDelApi(param);
       }).then(() => {
         this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => { });
+        this.$modal.msgSuccess('删除成功');
+      }).catch(() => {
+        this.$modal.msgError('删除失败');
+      });
     },
+    handlePrint(row) {
+      this.isShowOneFlag = true
+      this.rowObj = row
+    },
+
+    handleSee(row, type) {
+      this.dialogQueryParams.unitName = row.unitName
+      this.dialogQueryParams.lotName = row.lotName
+      this.dialogQueryParams.agreementCode = row.agreementCode
+      this.dialogQueryParams.backPerson = row.backPerson
+      this.dialogQueryParams.phone = row.phone
+      this.dialogQueryParams.backTime = row.backTime + ''
+      this.loadingType = type
+      this.rowObj = row
+      this.open = true
+      this.getDialogList()
+    },
+    handlUpdate(row, type) {
+      this.loadingType = type
+      this.rowObj = row
+      this.open = true
+      this.getDialogList()
+    },
+
     /** 导出按钮操作 */
     handleExport() {
       this.download('system/dict/type/export', {
         ...this.queryParams
       }, `type_${new Date().getTime()}.xlsx`)
     },
+    getDialogList() {
+      let params = {
+        id: this.rowObj.id,
+        agreementId: this.rowObj.agreementId
+      }
+      ApiGetView(params).then(res => {
+        this.loadingList = res.rows
+        this.loadingTotal = res.total
+      })
+    },
     /** 刷新缓存按钮操作 */
     handleRefreshCache() {
       refreshCache().then(() => {
@@ -425,7 +829,6 @@ export default {
     InitIGetInfo() {
       getInfo().then(res => {
         this.companyId = res.user.companyId
-        console.log("9999999999999")
         this.getList();
       })
     },
@@ -440,21 +843,17 @@ export default {
     // 获取 来往单位 列表数据
     async GetUnitData() {
       const params = {
-
       }
       const res = await getUnitData(params)
       this.unitList = res.data
-      console.log('GetUnitData ======================', res)
     },
     // 获取 工程名称 列表数据
     async GetProData() {
       const params = {
-        id:this.queryParams.unitId
+        id: this.queryParams.unitId
       }
       const res = await getProData(params)
       this.proList = res.data
-
-      console.log('GetProData ======================', res)
     },
     // 获取 工程名称 列表数据
     async InitGetAgreementInfoById() {
@@ -471,22 +870,21 @@ export default {
       }
       const res = await getAgreementInfoById(params)
       // this.proList = res.data
-      console.log('getAgreementInfoById ======================', res)
       this.queryParams.agreementCode = res.data.agreementCode
     },
     getAgreementByUnitAndProId() {
       this.InitGetAgreementInfoById()
     },
-    getAgreementByProId(){
+    getAgreementByProId() {
       this.InitGetAgreementInfoById()
     },
-    getAgreementByUnit(){
+    getAgreementByUnit() {
       this.GetProData()
     },
-    handleQuery1(){
+    handleQuery1() {
 
     },
-    resetQuery1(){
+    resetQuery1() {
 
     }
 
@@ -539,4 +937,9 @@ export default {
   width: 70px !important;
   margin-bottom: 10px;
 }
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
 </style>
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
index 0a1a9316..9a923987 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyAdd.vue
@@ -1,59 +1,126 @@
 <template>
-    <div class="app-container">
-        <el-form :model="queryParams" ref="queryForm" size="small" :rules="queryRules" :inline="true" v-show="showSearch">
-            <el-row>
-                <el-form-item label="退料单位" prop="unitId">
-                    <el-select v-model="queryParams.unitId" clearable @change="GetProData" style="width: 240px"
-                        placeholder="请选择">
-                        <el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="退料工程" prop="proId">
-                    <el-select v-model="queryParams.proId" clearable @change="GetUnitData" style="width: 240px"
-                        placeholder="请选择">
-                        <el-option v-for="item in proList" :key="item.id" :label="item.name" :value="item.id">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item label="协议号" prop="agreementCode">
-                    <el-input v-model="queryParams.agreementCode" disabled></el-input>
-                </el-form-item>
-                <el-form-item label="物品类型" prop="status">
-                    <el-cascader placeholder="请输入物品类型" :options="deviceTypeTree" :props="deviceTypeTreeProps"
-                        v-model="deviceType" @change="deviceTypeChange" ref="deviceTypeCascader" filterable></el-cascader>
-                </el-form-item>
-                <el-form-item label="退料人" prop="roleName">
-                    <el-input v-model="queryParams.leaseApplyInfo.backPerson" placeholder="请输入退料人" clearable
-                        @keyup.enter.native="handleQuery" />
-                </el-form-item>
-                <el-form-item label="退料时间" prop="roleName">
-                    <el-date-picker v-model="queryParams.backTime" type="date" placeholder="选择时间">
-                    </el-date-picker>
-                </el-form-item>
-                <el-form-item label="退料人电话" prop="roleName">
-                    <el-input v-model="queryParams.leaseApplyInfo.phone" placeholder="请输入退料人电话" clearable
-                        style="width: 240px" @keyup.enter.native="handleQuery" />
-                </el-form-item>
-                <el-form-item label="备注" prop="roleName">
-                    <el-input v-model="queryParams.leaseApplyInfo.remark" placeholder="请输入备注" clearable rows="1"
-                        type="textarea" style="width: 240px" @keyup.enter.native="handleQuery" />
-                </el-form-item>
-            </el-row>
-            <el-row>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :rules="queryRules"
+      :inline="true"
+      v-show="showSearch"
+    >
+      <el-row>
+        <el-form-item label="退料单位" prop="unitId">
+          <el-select
+            v-model="queryParams.unitId"
+            clearable
+            @change="GetProData"
+            style="width: 240px"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in unitList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="退料工程" prop="proId">
+          <el-select
+            v-model="queryParams.proId"
+            clearable
+            @change="GetUnitData"
+            style="width: 240px"
+            placeholder="请选择"
+          >
+            <el-option
+              v-for="item in proList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="协议号" prop="agreementCode">
+          <el-input v-model="queryParams.agreementCode" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="物品类型" prop="status">
+          <el-cascader
+            placeholder="请输入物品类型"
+            :options="deviceTypeTree"
+            :props="deviceTypeTreeProps"
+            v-model="deviceType"
+            @change="deviceTypeChange"
+            ref="deviceTypeCascader"
+            filterable
+          ></el-cascader>
+        </el-form-item>
+        <el-form-item label="退料人" prop="backPerson">
+          <el-input
+            v-model="queryParams.backPerson"
+            placeholder="请输入退料人"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="退料时间" prop="backTime">
+          <el-date-picker
+            v-model="queryParams.backTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="退料人电话" prop="phone">
+          <el-input
+            v-model="queryParams.phone"
+            placeholder="请输入退料人电话"
+            clearable
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+        <el-form-item label="备注" prop="roleName">
+          <el-input
+            v-model="queryParams.remark"
+            placeholder="请输入备注"
+            clearable
+            rows="1"
+            type="textarea"
+            style="width: 240px"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+      </el-row>
+      <el-row> </el-row>
+    </el-form>
 
-            </el-row>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">保存</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <el-button type="success" plain icon="el-icon-back" size="mini" @click="handleUpdate">退料管理</el-button>
-            </el-col>
-            <el-col :span="1.5">
-                <!-- <el-button
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          >保存</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-back"
+          size="mini"
+          @click="handleUpdate"
+          >退料管理</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <!-- <el-button
             type="warning"
             plain
             icon="el-icon-download"
@@ -61,555 +128,664 @@
             @click="handleExport"
             v-hasPermi="['system:role:export']"
           >导出</el-button> -->
-            </el-col>
-            <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-        </el-row>
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
 
-        <el-table v-loading="loading" :data="leaseApplyDetails" @selection-change="handleSelectionChange">
-            <el-table-column type="selection" min-width="55" align="center" />
-            <el-table-column label="序号" type="index" min-width="120" />
-            <el-table-column label="类型名称" prop="typeCn" min-width="200" :show-overflow-tooltip="true" />
-            <el-table-column label="规格型号" prop="guigeCn" min-width="200" :show-overflow-tooltip="true" />
-            <el-table-column label="计量单位" prop="unitCn" min-width="100" />
-            <el-table-column label="在用数量" align="center" prop="createTime" min-width="180">
-                <template slot-scope="scope">
-                    <el-input v-model.number="scope.row.num" placeholder="请输入在用数量" type="number" clearable
-                        style="width: 100%" @keyup.enter.native="handleQuery" />
-                    <!--  -->
-                </template>
-            </el-table-column>
-            <el-table-column label="预退数量" align="center" prop="createTime" min-width="180">
-                <template slot-scope="scope">
-                    <el-input v-model.number="scope.row.preNum" placeholder="请输入预退数量" type="number" clearable
-                        style="width: 100%" @keyup.enter.native="handleQuery" />
-                </template>
-            </el-table-column>
-            <el-table-column label="备注" align="center" prop="createTime" min-width="180">
-                <template slot-scope="scope">
-                    <el-input v-model="scope.row.remark" placeholder="请输入备注" clearable style="width: 100%"
-                        @keyup.enter.native="handleQuery" />
-                </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="160px">
-                <template slot-scope="scope" v-if="scope.row.roleId !== 1">
-                    <!--          <el-button-->
-                    <!--            size="mini"-->
-                    <!--            type="text"-->
-                    <!--            icon="el-icon-edit"-->
-                    <!--            @click="handleUpdate(scope.row)"-->
-                    <!--            v-hasPermi="['system:role:edit']"-->
-                    <!--          >修改</el-button>-->
-                    <el-button size="mini" type="text" icon="el-icon-delete"
-                        @click="handleDelete({ ...scope.row, index: scope.$index })">删除</el-button>
+    <el-table
+      v-loading="loading"
+      :data="leaseApplyDetails"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" min-width="55" align="center" />
+      <el-table-column label="序号" type="index" min-width="120" />
+      <el-table-column
+        label="类型名称"
+        prop="typeCn"
+        min-width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="规格型号"
+        prop="guigeCn"
+        min-width="200"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="计量单位" prop="unitCn" min-width="100" />
 
-                </template>
-            </el-table-column>
-        </el-table>
-
-
-
-
-    </div>
+      <el-table-column
+        label="当前在用量"
+        align="center"
+        prop="preNum"
+        min-width="180"
+      >
+      </el-table-column>
+      <el-table-column
+        label="退料数量"
+        align="center"
+        prop="createTime"
+        min-width="180"
+      >
+        <template slot-scope="scope">
+          <el-input
+            v-model.number="scope.row.num"
+            placeholder="请输入退料数量"
+            type="number"
+            clearable
+            style="width: 100%"
+            @keyup.enter.native="handleQuery"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remark"
+        min-width="180"
+      >
+        <template slot-scope="scope">
+          <el-input
+            v-model="scope.row.remark"
+            placeholder="请输入备注"
+            clearable
+            style="width: 100%"
+            @keyup.enter.native="handleQuery"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        fixed="right"
+        class-name="small-padding fixed-width"
+        width="160px"
+      >
+        <template slot-scope="scope" v-if="scope.row.roleId !== 1">
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-edit"-->
+          <!--            @click="handleUpdate(scope.row)"-->
+          <!--            v-hasPermi="['system:role:edit']"-->
+          <!--          >修改</el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete({ ...scope.row, index: scope.$index })"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
 </template>
   
 <script>
 import { getRole, delRole, addRole, updateRole, dataScope, changeRoleStatus, deptTreeSelect } from "@/api/system/role";
 import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/system/menu";
 import {
-    getProData,
-    getUnitData,
-    getDeviceTypeTree,
-    getAgreementInfoById,
-    submitLeaseApply,
-    getTaskDetail,
-    getUseTypeTreee
+  getProData,
+  getUnitData,
+  getDeviceTypeTree,
+  getAgreementInfoById,
+  submitLeaseApply,
+  getTaskDetail,
+  getUseTypeTreee
 } from '@/api/claimAndRefund/receive'
 import { ApiSubmitBackApply } from "@/api/claimAndRefund/return"
+import { submitBackApplyApi, } from "@/api/claimAndRefund/return.js"
 import { mapState } from 'vuex'
+import {
+  getInfo, h
+} from "@/api/login";
 export default {
-    name: "Role",
-    data() {
-        return {
-            // 遮罩层
-            loading: false,
-            // 选中数组
-            ids: [],
-            // 非单个禁用
-            single: true,
-            // 非多个禁用
-            multiple: true,
-            // 显示搜索条件
-            showSearch: true,
-            // 总条数
-            total: 0,
-            // 角色表格数据
-            roleList: [],
-            // 弹出层标题
-            title: "",
-            // 是否显示弹出层
-            open: false,
-            // 是否显示弹出层（数据权限）
-            openDataScope: false,
-            menuExpand: false,
-            menuNodeAll: false,
-            deptExpand: true,
-            deptNodeAll: false,
-            // 日期范围
-            dateRange: [],
-            // 数据范围选项
-            dataScopeOptions: [
-                {
-                    value: "1",
-                    label: "全部数据权限"
-                },
-                {
-                    value: "2",
-                    label: "自定数据权限"
-                },
-                {
-                    value: "3",
-                    label: "本部门数据权限"
-                },
-                {
-                    value: "4",
-                    label: "本部门及以下数据权限"
-                },
-                {
-                    value: "5",
-                    label: "仅本人数据权限"
-                }
-            ],
-            // 菜单列表
-            menuOptions: [],
-            // 部门列表
-            deptOptions: [],
-            // 查询参数
-            queryParams: {
-
-                types: 2,
-
-                unitId: null,
-                proId: null,
-                agreementId: null, //协议id
-                agreementCode: null, //协议code
-                companyId: '', //登录信息中取
-                createBy: '', //用户名
-                taskType: 29,
-                taskStatus: 30,
-                backTime:'',//申请时间
-                //退料人信息
-                leaseApplyInfo: {
-                    backPerson: '',
-                    phone: '',
-                    remark: ''
-                },
-                //退料详情集合
-                leaseApplyDetails: []
-            },
-            leaseApplyDetails: [],
-
-
-
-            //退料详情单条模板
-            leaseApplyDetailsItem: {
-                createBy: null,
-                companyId: null,
-                status: 0,
-                typeId: null, //  树结构第4级   规格id
-                typeCn: '', //显示的设备类型
-                guigeCn: '', //显示的设备规格
-                unitCn: '', //显示的设备 单位
-                remark: '', //单条备注
-                preNum: 1, //预领数量
-            },
-            //
-            queryRules: {
-                unitId: [
-                    {
-                        required: true, message: '请选择来往单位', trigger: 'change', type: 'number'
-                    }
-                ],
-                proId: [
-                    {
-                        required: true, message: '请选择工程', trigger: 'change', type: 'number'
-                    }
-                ]
-            },
-            unitList: [], //单位 集合
-            proList: [], // 工程 集合
-            deviceTypeTree: [], // 设备 树结构数据
-            // 设备 树显示 配置
-            deviceTypeTreeProps: {
-                multiple: false,
-                value: 'id'
-            },
-            // 选中的设备类型
-            deviceType: null,
-
-            // 表单参数
-            form: {},
-            defaultProps: {
-                children: "children",
-                label: "label"
-            },
-            // 表单校验
-            rules: {
-                roleName: [
-                    { required: true, message: "角色名称不能为空", trigger: "blur" }
-                ],
-                roleKey: [
-                    { required: true, message: "权限字符不能为空", trigger: "blur" }
-                ],
-                roleSort: [
-                    { required: true, message: "角色顺序不能为空", trigger: "blur" }
-                ]
-            }
-        };
-    },
-    created() {
-        this.GetUnitData()
-
-        this.GetProData()
-
-        this.GetDeviceTypeTree()
-        // this.getList();
-        console.log('this.$route.query.taskId', this.$route.query.taskId)
-        if (this.$route.query.taskId) {
-            this.GetTaskDetail(this.$route.query.taskId)
+  name: "Role",
+  data() {
+    return {
+      // 遮罩层
+      loading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 角色表格数据
+      roleList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否显示弹出层（数据权限）
+      openDataScope: false,
+      menuExpand: false,
+      menuNodeAll: false,
+      deptExpand: true,
+      deptNodeAll: false,
+      // 日期范围
+      dateRange: [],
+      // 数据范围选项
+      dataScopeOptions: [
+        {
+          value: "1",
+          label: "全部数据权限"
+        },
+        {
+          value: "2",
+          label: "自定数据权限"
+        },
+        {
+          value: "3",
+          label: "本部门数据权限"
+        },
+        {
+          value: "4",
+          label: "本部门及以下数据权限"
+        },
+        {
+          value: "5",
+          label: "仅本人数据权限"
         }
-    },
-    computed: {
-        ...mapState(['user'])
-    },
-    methods: {
-        // 获取 来往单位 列表数据
-        async GetUnitData() {
-            const params = {
-                id: this.queryParams.proId
-            }
-            const res = await getUnitData(params)
-            this.unitList = res.data
+      ],
+      // 菜单列表
+      menuOptions: [],
+      // 部门列表
+      deptOptions: [],
+      // 查询参数
+      queryParams: {
 
-            this.GetAgreementInfoById()
-        },
-        // 获取 工程名称 列表数据
-        async GetProData() {
-            const params = {
-                id: this.queryParams.unitId
-            }
-            const res = await getProData(params)
-            this.proList = res.data
-
-            this.GetAgreementInfoById()
-        },
-
-        // 获取 设备树结构数据
-        async GetDeviceTypeTree() {
-            const params = {
-                agreementId: 4
-            }
-            const res = await getUseTypeTreee(params)
-            this.deviceTypeTree = res.data
-
-        },
-        // 获取 协议id
-        async GetAgreementInfoById() {
-            if (this.queryParams.unitId && this.queryParams.proId) {
-                const params = {
-                    unitId: this.queryParams.unitId,
-                    projectId: this.queryParams.proId
-                }
-                const res = await getAgreementInfoById(params)
-                if (!(res.data && res.data.agreementId)) {
-                    this.$message.error('当前单位和工程未上传');
-
-                    this.queryParams.unitId = null
-                    this.queryParams.proId = null
-                    this.GetUnitData()
-                    this.GetProData()
-                } else {
-                    this.queryParams.agreementId = res.data.agreementId
-                    this.queryParams.agreementCode = res.data.agreementCode
-                }
-            }
-        },
-
-        // 获取 任务详情数据
-        async GetTaskDetail(taskId) {
-            const res = await getTaskDetail({ taskId })
-
-            const data = res.rows[0]
-            console.log('GetTaskDetail =================', data)
-
-            // unitId:null,
-            // proId:null,
-            // agreementId:null, //协议id
-            // agreementCode: null,
-
-            this.queryParams.unitId = data.unitId
-            this.queryParams.proId = data.projectId
-            this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfo.phone
-            this.queryParams.leaseApplyInfo.backPerson = data.leaseApplyInfo.backPerson
-            this.queryParams.agreementCode = data.agreementCode
-            this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfo.remark
-
-            this.leaseApplyDetails = data.leaseApplyDetails.map(item => {
-                return this.handelEchoData(item)
-            })
-
-        },
-        //生成回显数据
-        handelEchoData(item) {
-            const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
-            template.createBy = item.createBy
-            template.companyId = item.companyId
-            template.typeId = item.typeId
-            template.unitCn = item.unitName
-            template.typeCn = item.typeName
-            template.guigeCn = item.typeModelName
-            template.remark = item.remark
-            template.preNum = item.preNum
-            template.status = item.status
-
-            return template
-        },
-
-
-        /** 查询角色列表 */
-        async getList() {
-
-
-        },
-        /** 查询菜单树结构 */
-        getMenuTreeselect() {
-            menuTreeselect().then(response => {
-                this.menuOptions = response.data;
-            });
-        },
-        // 所有菜单节点数据
-        getMenuAllCheckedKeys() {
-            // 目前被选中的菜单节点
-            let checkedKeys = this.$refs.menu.getCheckedKeys();
-            // 半选中的菜单节点
-            let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
-            checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-            return checkedKeys;
-        },
-        // 所有部门节点数据
-        getDeptAllCheckedKeys() {
-            // 目前被选中的部门节点
-            let checkedKeys = this.$refs.dept.getCheckedKeys();
-            // 半选中的部门节点
-            let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
-            checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
-            return checkedKeys;
-        },
-        /** 根据角色ID查询菜单树结构 */
-        getRoleMenuTreeselect(roleId) {
-            return roleMenuTreeselect(roleId).then(response => {
-                this.menuOptions = response.menus;
-                return response;
-            });
-        },
-        /** 根据角色ID查询部门树结构 */
-        getDeptTree(roleId) {
-            return deptTreeSelect(roleId).then(response => {
-                this.deptOptions = response.depts;
-                return response;
-            });
-        },
-        // 角色状态修改
-
-        // 取消按钮
-        cancel() {
-            this.open = false;
-            this.reset();
-        },
-        // 取消按钮（数据权限）
-        cancelDataScope() {
-            this.openDataScope = false;
-            this.reset();
-        },
-        // 表单重置
-        reset() {
-            if (this.$refs.menu != undefined) {
-                this.$refs.menu.setCheckedKeys([]);
-            }
-            this.menuExpand = false,
-                this.menuNodeAll = false,
-                this.deptExpand = true,
-                this.deptNodeAll = false,
-                this.form = {
-                    roleId: undefined,
-                    roleName: undefined,
-                    roleKey: undefined,
-                    roleSort: 0,
-                    status: "0",
-                    menuIds: [],
-                    deptIds: [],
-                    menuCheckStrictly: true,
-                    deptCheckStrictly: true,
-                    remark: undefined
-                };
-            this.resetForm("form");
-        },
-        /** 搜索按钮操作 */
-        handleQuery() {
-            this.queryParams.pageNum = 1;
-            this.getList();
-        },
-        /** 重置按钮操作 */
-        resetQuery() {
-            this.dateRange = [];
-            this.resetForm("queryForm");
-            this.handleQuery();
-        },
-        // 多选框选中数据
-        handleSelectionChange(selection) {
-            this.queryParams.leaseApplyDetails = selection
-        },
-        // 更多操作触发
-        handleCommand(command, row) {
-            switch (command) {
-                case "handleDataScope":
-                    this.handleDataScope(row);
-                    break;
-                case "handleAuthUser":
-                    this.handleAuthUser(row);
-                    break;
-                default:
-                    break;
-            }
-        },
-
-        /** 保存按钮操作 */
-        handleAdd() {
-            this.$refs.queryForm.validate(async (valid) => {
-                if (!valid) {
-                    return false
-                } else {
-                    console.log("this.queryParams.leaseApplyDetails", this.queryParams.leaseApplyDetails)
-                    if (this.queryParams.leaseApplyDetails.length == 0) {
-                        this.$message.error('请添加并勾选数据');
-                        return
-                    }
-
-                    this.queryParams.createBy = this.user.name
-                    this.queryParams.companyId = this.user.id
-
-                    console.log("ApiSubmitBackApplyInfo", this.queryParams)
-                    return
-                    const res = await ApiSubmitBackApply(this.queryParams)
-                    if (res.code == 200) {
-                        this.$message({
-                            type: 'success',
-                            message: '申请成功'
-                        })
-                        setTimeout(() => {
-                            this.$router.back()
-                        }, 1000)
-                    }
-                }
-            })
-
-
-        },
-        /** 修改按钮操作 */
-        handleUpdate(row) {
-            this.$router.back()
-        },
-
-        /** 分配数据权限操作 */
-        handleDataScope(row) {
-            this.reset();
-            const deptTreeSelect = this.getDeptTree(row.roleId);
-            getRole(row.roleId).then(response => {
-                this.form = response.data;
-                this.openDataScope = true;
-                this.$nextTick(() => {
-                    deptTreeSelect.then(res => {
-                        this.$refs.dept.setCheckedKeys(res.checkedKeys);
-                    });
-                });
-                this.title = "分配数据权限";
-            });
-        },
-        /** 分配用户操作 */
-        handleAuthUser: function (row) {
-            const roleId = row.roleId;
-            this.$router.push("/system/role-auth/user/" + roleId);
-        },
-        /** 提交按钮 */
-        submitForm: function () {
-            this.$refs["form"].validate(valid => {
-                if (valid) {
-                    if (this.form.roleId != undefined) {
-                        this.form.menuIds = this.getMenuAllCheckedKeys();
-                        updateRole(this.form).then(response => {
-                            this.$modal.msgSuccess("修改成功");
-                            this.open = false;
-                            this.getList();
-                        });
-                    } else {
-                        this.form.menuIds = this.getMenuAllCheckedKeys();
-                        addRole(this.form).then(response => {
-                            this.$modal.msgSuccess("新增成功");
-                            this.open = false;
-                            this.getList();
-                        });
-                    }
-                }
-            });
-        },
-
-        /** 删除按钮操作 */
-        handleDelete(row) {
-            this.leaseApplyDetails.splice(row.index, 1)
-        },
-        /** 导出按钮操作 */
-        handleExport() {
-            this.download('system/role/export', {
-                ...this.queryParams
-            }, `role_${new Date().getTime()}.xlsx`)
+        types: 2,
+
+        unitId: null,
+        proId: null,
+        agreementId: null, //协议id
+        agreementCode: null, //协议code
+        companyId: '', //登录信息中取
+        createBy: '', //用户名
+        taskType: 29,
+        taskStatus: 30,
+        backTime: '',//申请时间
+        //退料人信息
+        leaseApplyInfo: {
+          backPerson: '',
+          phone: '',
+          remark: ''
         },
+        //退料详情集合
+        leaseApplyDetails: []
+      },
+      leaseApplyDetails: [],
 
 
 
+      //退料详情单条模板
+      leaseApplyDetailsItem: {
+        createBy: null,
+        companyId: null,
+        status: 0,
+        typeId: null, //  树结构第4级   规格id
+        typeCn: '', //显示的设备类型
+        guigeCn: '', //显示的设备规格
+        unitCn: '', //显示的设备 单位
+        remark: '', //单条备注
+        preNum: 1, //预领数量
+      },
+      //
+      queryRules: {
+        unitId: [
+          {
+            required: true, message: '请选择退料单位', trigger: 'change', type: 'number'
+          }
+        ],
+        proId: [
+          {
+            required: true, message: '请选择退料工程', trigger: 'change', type: 'number'
+          }
+        ],
+        backPerson: [
+          {
+            required: true, message: '请输入退料人', trigger: 'blur',
+          }
+        ],
+        backTime: [
+          {
+            required: true, message: '请选择退料时间', trigger: 'change',
+          }
+        ],
+        phone: [
+          {
+            required: true, message: '请输入退料人电话', trigger: 'blur',
+          }
+        ],
+      },
+      unitList: [], //单位 集合
+      proList: [], // 工程 集合
+      deviceTypeTree: [], // 设备 树结构数据
+      // 设备 树显示 配置
+      deviceTypeTreeProps: {
+        children: 'children',
+        label: 'typeName'
+        // multiple: false,
+        // value: 'typeId'
+      },
+      // 选中的设备类型
+      deviceType: null,
 
-        /////// 设备类型树  切换
-        deviceTypeChange(val) {
-            let nodes = null;
-            nodes = this.$refs.deviceTypeCascader.getCheckedNodes().length > 0 ? this.$refs.deviceTypeCascader.getCheckedNodes() : [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)]
-
-            if (nodes[0].level != 4) {
-                return
-            }
-
-            this.leaseApplyDetails.push(
-                this.handelTableItemData(nodes[0])
-            )
-            console.log("88888888888888888888888888888",nodes)
-            // this.$refs.cascader.$refs.panel.clearCheckedNodes()
-            // // 设置为空可以让节点不高亮显示
-            // this.$refs.cascader.$refs.panel.activePath = []
-            this.deviceType = {}
-
-
-
-
-        },
-        //// 将数据处理成 表格中需要的数据
-        handelTableItemData(node) {
-            const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
-            template.createBy = this.user.name
-            template.companyId = this.user.companyId
-            template.typeId = node.data.id
-            template.unitCn = node.data.unitName
-            template.typeCn = node.pathLabels[2]
-            template.guigeCn = node.pathLabels[3]
-            return template
-        }
+      // 表单参数
+      form: {},
+      // defaultProps: {
+      //   children: "children",
+      //   label: "label"
+      // },
+      // 表单校验
+      rules: {
+        roleName: [
+          { required: true, message: "角色名称不能为空", trigger: "blur" }
+        ],
+        roleKey: [
+          { required: true, message: "权限字符不能为空", trigger: "blur" }
+        ],
+        roleSort: [
+          { required: true, message: "角色顺序不能为空", trigger: "blur" }
+        ]
+      },
+      companyId: '',
+      createBy: '',
+    };
+  },
+  created() {
+    this.GetUnitData()
+    this.GetProData()
+    this.GetDeviceTypeTree()
+    // this.getList();
+    console.log('this.$route.query.taskId', this.$route.query.taskId)
+    if (this.$route.query.taskId) {
+      this.GetTaskDetail(this.$route.query.taskId)
     }
+    getInfo().then(res => {
+      this.companyId = res.user.companyId
+      this.createBy = res.user.createBy
+    })
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+  methods: {
+    // 获取 来往单位 列表数据
+    async GetUnitData() {
+      const params = {
+        id: this.queryParams.proId
+      }
+      const res = await getUnitData(params)
+      this.unitList = res.data
+
+      this.GetAgreementInfoById()
+    },
+    // 获取 工程名称 列表数据
+    async GetProData() {
+      const params = {
+        id: this.queryParams.unitId
+      }
+      const res = await getProData(params)
+      this.proList = res.data
+      this.GetAgreementInfoById()
+    },
+
+    // 获取 设备树结构数据
+    async GetDeviceTypeTree() {
+      const params = {
+        agreementId: 15
+        //  this.agreementId
+      }
+      const res = await getUseTypeTreee(params)
+      this.deviceTypeTree = res.data
+    },
+    // 获取 协议id
+    async GetAgreementInfoById() {
+      if (this.queryParams.unitId && this.queryParams.proId) {
+        const params = {
+          unitId: this.queryParams.unitId,
+          projectId: this.queryParams.proId
+        }
+        const res = await getAgreementInfoById(params)
+        if (!(res.data && res.data.agreementId)) {
+          this.$message.error('当前单位和工程未上传');
+          this.queryParams.unitId = null
+          this.queryParams.proId = null
+          this.GetUnitData()
+          this.GetProData()
+        } else {
+          this.queryParams.agreementId = res.data.agreementId
+          this.queryParams.agreementCode = res.data.agreementCode
+        }
+      }
+    },
+
+    // 获取 任务详情数据
+    async GetTaskDetail(taskId) {
+      const res = await getTaskDetail({ taskId })
+      const data = res.rows[0]
+      // unitId:null,
+      // proId:null,
+      // agreementId:null, //协议id
+      // agreementCode: null,
+      this.queryParams.unitId = data.unitId
+      this.queryParams.proId = data.projectId
+      this.queryParams.leaseApplyInfo.phone = data.leaseApplyInfo.phone
+      this.queryParams.leaseApplyInfo.backPerson = data.leaseApplyInfo.backPerson
+      this.queryParams.agreementCode = data.agreementCode
+      this.queryParams.leaseApplyInfo.remark = data.leaseApplyInfo.remark
+
+      this.leaseApplyDetails = data.leaseApplyDetails.map(item => {
+        return this.handelEchoData(item)
+      })
+
+    },
+    //生成回显数据
+    handelEchoData(item) {
+      console.log('item', item);
+      const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
+      template.createBy = item.createBy
+      template.parentId = item.data.parentId
+      template.typeId = item.data.typeId
+      template.companyId = item.companyId
+      // template.typeId = item.typeId
+      template.unitCn = item.unitName
+      template.typeCn = item.typeName
+      template.guigeCn = item.typeModelName
+      template.remark = item.remark
+      template.preNum = item.preNum
+      template.status = item.status
+
+      return template
+    },
+
+
+    /** 查询角色列表 */
+    async getList() {
+
+
+    },
+    /** 查询菜单树结构 */
+    getMenuTreeselect() {
+      menuTreeselect().then(response => {
+        this.menuOptions = response.data;
+      });
+    },
+    // 所有菜单节点数据
+    getMenuAllCheckedKeys() {
+      // 目前被选中的菜单节点
+      let checkedKeys = this.$refs.menu.getCheckedKeys();
+      // 半选中的菜单节点
+      let halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys();
+      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
+      return checkedKeys;
+    },
+    // 所有部门节点数据
+    getDeptAllCheckedKeys() {
+      // 目前被选中的部门节点
+      let checkedKeys = this.$refs.dept.getCheckedKeys();
+      // 半选中的部门节点
+      let halfCheckedKeys = this.$refs.dept.getHalfCheckedKeys();
+      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
+      return checkedKeys;
+    },
+    /** 根据角色ID查询菜单树结构 */
+    getRoleMenuTreeselect(roleId) {
+      return roleMenuTreeselect(roleId).then(response => {
+        this.menuOptions = response.menus;
+        return response;
+      });
+    },
+    /** 根据角色ID查询部门树结构 */
+    getDeptTree(roleId) {
+      return deptTreeSelect(roleId).then(response => {
+        this.deptOptions = response.depts;
+        return response;
+      });
+    },
+    // 角色状态修改
+
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 取消按钮（数据权限）
+    cancelDataScope() {
+      this.openDataScope = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      if (this.$refs.menu != undefined) {
+        this.$refs.menu.setCheckedKeys([]);
+      }
+      this.menuExpand = false,
+        this.menuNodeAll = false,
+        this.deptExpand = true,
+        this.deptNodeAll = false,
+        this.form = {
+          roleId: undefined,
+          roleName: undefined,
+          roleKey: undefined,
+          roleSort: 0,
+          status: "0",
+          menuIds: [],
+          deptIds: [],
+          menuCheckStrictly: true,
+          deptCheckStrictly: true,
+          remark: undefined
+        };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.dateRange = [];
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.queryParams.leaseApplyDetails = selection
+    },
+    // 更多操作触发
+    handleCommand(command, row) {
+      switch (command) {
+        case "handleDataScope":
+          this.handleDataScope(row);
+          break;
+        case "handleAuthUser":
+          this.handleAuthUser(row);
+          break;
+        default:
+          break;
+      }
+    },
+
+    /** 保存按钮操作 */
+    handleAdd() {
+      // this.$refs.queryForm.validate(async (valid) => {
+      //   if (!valid) {
+      //     return false
+      //   } else {
+      //     console.log("this.queryParams.leaseApplyDetails", this.queryParams.leaseApplyDetails)
+      //     if (this.queryParams.leaseApplyDetails.length == 0) {
+      //       this.$message.error('请添加并勾选数据');
+      //       return
+      //     }
+      //     this.queryParams.createBy = this.user.name
+      //     this.queryParams.companyId = this.user.id
+      //     console.log("ApiSubmitBackApplyInfo", this.queryParams)
+      //     return
+      //     const res = await ApiSubmitBackApply(this.queryParams)
+      //     if (res.code == 200) {
+      //       this.$message({
+      //         type: 'success',
+      //         message: '申请成功'
+      //       })
+      //       setTimeout(() => {
+      //         this.$router.back()
+      //       }, 1000)
+      //     }
+      //   }
+      // })
+      this.$refs.queryForm.validate(async (valid) => {
+        if (!valid) {
+          return false
+        } else {
+          let backApplyInfo = []
+          if (this.queryParams.leaseApplyDetails.length == 0) {
+            this.$message.error('请添加数据');
+            return
+          }
+          this.queryParams.createBy = this.user.name
+          this.queryParams.companyId = this.companyId
+          this.queryParams.backApplyInfo = {
+            backPerson: this.queryParams.backPerson,
+            phone: this.queryParams.phone,
+            remark: this.queryParams.remark,
+            backTime: this.queryParams.backTime,
+            companyId: this.companyId,
+          }
+          let params = {
+            companyId: this.companyId,
+            createBy: this.createBy,
+            agreementId: this.queryParams.agreementId,
+            backApplyInfo: this.queryParams.backApplyInfo,
+            backApplyDetails: this.queryParams.leaseApplyDetails,
+          }
+          const isRemark = this.queryParams.leaseApplyDetails.some(
+            (item) => item.remark == '' || item.remark == undefined
+          );
+          const isNum = this.queryParams.leaseApplyDetails.some(
+            (item) => item.num == '' || item.num == undefined
+          );
+          if (isRemark) {
+            this.$message.error('备注不能为空！');
+            return;
+          }
+          if (isNum) {
+            this.$message.error('退料数量不能为空！');
+            return;
+          }
+          const res = await submitBackApplyApi(params)
+          if (res.code == 200) {
+            this.$message({
+              type: 'success',
+              message: '申请成功'
+            })
+            setTimeout(() => {
+              this.$router.back()
+            }, 1000)
+          }
+        }
+      })
+
+
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.$router.back()
+    },
+
+    /** 分配数据权限操作 */
+    handleDataScope(row) {
+      this.reset();
+      const deptTreeSelect = this.getDeptTree(row.roleId);
+      getRole(row.roleId).then(response => {
+        this.form = response.data;
+        this.openDataScope = true;
+        this.$nextTick(() => {
+          deptTreeSelect.then(res => {
+            this.$refs.dept.setCheckedKeys(res.checkedKeys);
+          });
+        });
+        this.title = "分配数据权限";
+      });
+    },
+    /** 分配用户操作 */
+    handleAuthUser: function (row) {
+      const roleId = row.roleId;
+      this.$router.push("/system/role-auth/user/" + roleId);
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.roleId != undefined) {
+            this.form.menuIds = this.getMenuAllCheckedKeys();
+            updateRole(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            this.form.menuIds = this.getMenuAllCheckedKeys();
+            addRole(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.leaseApplyDetails.splice(row.index, 1)
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/role/export', {
+        ...this.queryParams
+      }, `role_${new Date().getTime()}.xlsx`)
+    },
+
+    /////// 设备类型树  切换
+    deviceTypeChange(val) {
+      let nodes = null;
+      nodes = this.$refs.deviceTypeCascader.getCheckedNodes().length > 0 ? this.$refs.deviceTypeCascader.getCheckedNodes() : [this.$refs.deviceTypeCascader.panel.getNodeByValue(val)]
+      if (nodes[0].level != 4) {
+        return
+      }
+      this.leaseApplyDetails.push(
+        this.handelTableItemData(nodes[0])
+      )
+      // this.$refs.cascader.$refs.panel.clearCheckedNodes()
+      // // 设置为空可以让节点不高亮显示
+      // this.$refs.cascader.$refs.panel.activePath = []
+      this.deviceType = {}
+    },
+    //// 将数据处理成 表格中需要的数据
+    handelTableItemData(node) {
+      console.log('node=====1111', node);
+      const template = JSON.parse(JSON.stringify(this.leaseApplyDetailsItem))
+      template.createBy = this.createBy
+      template.typeId = node.data.typeId
+      template.companyId = this.companyId
+      // template.typeId = node.data.id
+      template.unitCn = node.data.unitName
+      template.typeCn = node.pathLabels[2]
+      template.guigeCn = node.pathLabels[3]
+      console.log('template', template);
+      return template
+    }
+  }
 };
 </script>
   
\ No newline at end of file
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
index d3b4efef..f08e4ebd 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
@@ -1,89 +1,244 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
       <el-form-item label="关键字" prop="keyWord">
-        <el-input v-model="queryParams.keyWord" placeholder="请输入关键字" clearable style="width: 240px" />
+        <el-input
+          v-model="queryParams.keyWord"
+          placeholder="请输入关键字"
+          clearable
+          style="width: 240px"
+        />
       </el-form-item>
       <el-form-item label="单位名称" prop="unitId">
-        <el-select v-model="queryParams.unitId" clearable @change="getAgreementByUnit" style="width: 240px"
-          placeholder="请选择">
-          <el-option v-for="item in unitList" :key="item.id" :label="item.name" :value="item.id">
+        <el-select
+          v-model="queryParams.unitId"
+          clearable
+          @change="getAgreementByUnit"
+          style="width: 240px"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in unitList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          >
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="工程名称" prop="proId">
-        <el-select v-model="queryParams.proId" clearable @change="getAgreementByProId" style="width: 240px"
-          placeholder="请选择">
-          <el-option v-for="item in proList" :key="item.id" :label="item.name" :value="item.id">
+        <el-select
+          v-model="queryParams.proId"
+          clearable
+          @change="getAgreementByProId"
+          style="width: 240px"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in proList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          >
           </el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="工机具类型" prop="typeId">
-        <el-cascader v-model="queryParams.typeId" :options="deptOptions"
-          :props="{ expandTrigger: 'hover', label: 'label', value: 'id', checkStrictly: true }" @change="handleNodeClick"
-          aria-placeholder="请选择极具类型"> </el-cascader>
+        <el-cascader
+          v-model="queryParams.typeId"
+          :options="deptOptions"
+          :props="{
+            expandTrigger: 'hover',
+            label: 'label',
+            value: 'id',
+            checkStrictly: true,
+          }"
+          @change="handleNodeClick"
+          aria-placeholder="请选择极具类型"
+        >
+        </el-cascader>
       </el-form-item>
       <el-form-item label="协议号" prop="agreementCode">
-        <el-input v-model="queryParams.agreementCode" placeholder="请选择协议号" clearable style="width: 240px" />
+        <el-input
+          v-model="queryParams.agreementCode"
+          placeholder="请选择协议号"
+          clearable
+          style="width: 240px"
+        />
       </el-form-item>
       <el-form-item label="退料状态" prop="taskStatus">
-        <el-select v-model="queryParams.taskStatus" clearable  style="width: 240px"
-          placeholder="请选择">
-          <el-option v-for="item in taskStatusList" :key="item.id" :label="item.name" :value="item.id">
+        <el-select
+          v-model="queryParams.taskStatus"
+          clearable
+          style="width: 240px"
+          placeholder="请选择"
+        >
+          <el-option
+            v-for="item in taskStatusList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          >
           </el-option>
         </el-select>
       </el-form-item>
 
       <el-form-item label="退料申请时间" prop="time">
-        <el-date-picker v-model="queryParams.time" type="datetimerange" range-separator="至" start-placeholder="开始日期"
-          end-placeholder="结束日期" value-format="yyyy-MM-dd">
+        <el-date-picker
+          v-model="queryParams.time"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          value-format="yyyy-MM-dd"
+        >
         </el-date-picker>
       </el-form-item>
 
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >查询</el-button
+        >
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+          >重置</el-button
+        >
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain size="mini" @click="handleAdd"
-          v-hasPermi="['store:labelType:add']">退料申请</el-button>
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+          @click="handleExam"
+          :disabled="!checkResultOne"
+          v-hasPermi="['store:labelType:add']"
+          >批量审核</el-button
+        >
       </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          size="mini"
+          @click="handleSubmit()"
+          v-hasPermi="['store:labelType:add']"
+          >批量提交</el-button
+        >
+      </el-col> -->
       <el-col :span="1.5">
-        <!-- :disabled="multiple" -->
-        <el-button type="warning" plain size="mini" @click="handleSubmit()"
-          v-hasPermi="['store:labelType:add']">批量提交</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="el-icon-download" size="mini" @click="handleExport"
-          v-hasPermi="['store:labelType:export']">导出</el-button>
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['store:labelType:export']"
+          >导出</el-button
+        >
       </el-col>
 
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="typeList"
+      @selection-change="handleSelectionChange"
+    >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" sortable align="center" type="index" />
-      <el-table-column label="退料单号" align="center" prop="code" sortable :show-overflow-tooltip="true" />
-      <el-table-column label="退料单位名称" align="center" sortable prop="unitName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料工程名称" sortable align="center" prop="lotName" :show-overflow-tooltip="true" />
-      <el-table-column label="退料工机具类型" align="center" prop="typeName" sortable :show-overflow-tooltip="true" />
-      <el-table-column label="退料人员" align="center" prop="backPerson" sortable :show-overflow-tooltip="true" />
-      <el-table-column label="退料人联系电话" align="center" prop="phone" sortable :show-overflow-tooltip="true" />
-      <el-table-column label="退料申请时间" align="center" prop="backTime" sortable :show-overflow-tooltip="true" />
-      <el-table-column label="协议号" align="center" prop="agreementCode" sortable :show-overflow-tooltip="true" />
-      <el-table-column label="是否异常退料" align="center" prop="dictName" sortable :show-overflow-tooltip="true" >
+      <el-table-column
+        label="退料单号"
+        align="center"
+        prop="code"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料单位名称"
+        align="center"
+        sortable
+        prop="unitName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料工程名称"
+        sortable
+        align="center"
+        prop="lotName"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料工机具类型"
+        align="center"
+        prop="typeName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料人员"
+        align="center"
+        prop="backPerson"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料人联系电话"
+        align="center"
+        prop="phone"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="退料申请时间"
+        align="center"
+        prop="backTime"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="协议号"
+        align="center"
+        prop="agreementCode"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="是否异常退料"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      >
         <template slot-scope="scope">
           <div>
             <!-- 暂时全部未否 -->
             否
           </div>
         </template>
-        </el-table-column>
-      <el-table-column label="退料状态" align="center"  sortable :show-overflow-tooltip="true">
+      </el-table-column>
+      <el-table-column
+        label="退料状态"
+        align="center"
+        sortable
+        :show-overflow-tooltip="true"
+      >
         <template slot-scope="scope">
           <!-- 状态
 37-待审核
@@ -91,89 +246,230 @@
           <el-button type="text" v-if="scope.row.taskStatus == '37'">
             待审核
           </el-button>
-          <el-button type="text" style="color:#67C23A" v-else-if="scope.row.taskStatus == '38'">
+          <el-button
+            type="text"
+            style="color: #67c23a"
+            v-else-if="scope.row.taskStatus == '38'"
+          >
             已审核
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column label="不通过原因" align="center" prop="dictName" sortable :show-overflow-tooltip="true" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="300">
+      <el-table-column
+        label="不通过原因"
+        align="center"
+        prop="dictName"
+        sortable
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="300"
+      >
         <template slot-scope="scope">
-          <el-button size="mini" type="primary" plain icon="el-icon-zoom-in" @click="handleUpdate(scope.row, 'see')"
-            v-hasPermi="['store:labelType:edit']">查看</el-button>
-          <el-button size="mini" type="danger" icon="el-icon-delete" @click="handleDelete(scope.row)"
-            v-hasPermi="['store:labelType:remove']">删除</el-button>
+          <el-button
+            size="mini"
+            type="primary"
+            plain
+            icon="el-icon-zoom-in"
+            @click="handleSee(scope.row, 'see')"
+            v-hasPermi="['store:labelType:edit']"
+            >查看</el-button
+          >
+          <el-button
+            size="mini"
+            type="warning"
+            icon="el-icon-icon"
+            :disabled="scope.row.taskStatus == '38'"
+            @click="handleUpdate(scope.row, 'update')"
+            v-hasPermi="['store:labelType:remove']"
+            >审核</el-button
+          >
+          <el-button
+            size="mini"
+            type="info"
+            @click="handlePrint(scope.row)"
+            v-hasPermi="['store:labelType:remove']"
+            >退料单</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
-      <el-form :model="queryParams" ref="queryForm1" size="small" :inline="true" v-show="showSearch" label-width="100px">
+    <el-dialog
+      :title="title"
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+    >
+      <el-form
+        :model="dialogQueryParams"
+        ref="queryForm1"
+        size="small"
+        :inline="true"
+        v-show="showSearch"
+        label-width="100px"
+      >
         <el-row>
-          <el-form-item label="退料单位" prop="dictName">
-            <el-input v-model="queryParams.dictName" placeholder="请输入借出方单位" clearable style="width: 240px" />
+          <el-form-item label="退料单位" prop="unitName">
+            <el-input
+              disabled
+              v-model="dialogQueryParams.unitName"
+              placeholder="请输入退料单位"
+              clearable
+              style="width: 240px"
+            />
           </el-form-item>
-          <el-form-item label="退料工程" prop="dictName">
-            <el-input v-model="queryParams.dictName" placeholder="请输入借入方单位" clearable style="width: 240px" />
+          <el-form-item label="退料工程" prop="lotName">
+            <el-input
+              disabled
+              v-model="dialogQueryParams.lotName"
+              placeholder="请输入退料工程"
+              clearable
+              style="width: 240px"
+            />
           </el-form-item>
-          <el-form-item label="退料协议编号" prop="dictName">
-            <el-input v-model="queryParams.dictName" placeholder="请输入关键字" clearable style="width: 240px" />
+          <el-form-item label="退料协议编号" prop="agreementCode">
+            <el-input
+              disabled
+              v-model="dialogQueryParams.agreementCode"
+              placeholder="请输入退料协议编号"
+              clearable
+              style="width: 240px"
+            />
+          </el-form-item>
+          <el-form-item label="预退料时间" prop="backTime">
+            <el-date-picker
+              style="width: 240px"
+              disabled
+              v-model="dialogQueryParams.backTime"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择时间"
+            >
+            </el-date-picker>
           </el-form-item>
         </el-row>
         <el-row>
-          <el-form-item label="退料人" prop="dictName">
-            <el-input v-model="queryParams.dictName" placeholder="请输入借出方单位" clearable style="width: 240px" />
+          <el-form-item label="退料人" prop="backPerson">
+            <el-input
+              disabled
+              v-model="dialogQueryParams.backPerson"
+              placeholder="请输入退料人"
+              clearable
+              style="width: 240px"
+            />
           </el-form-item>
-          <el-form-item label="退料人电话" prop="dictName">
-            <el-input v-model="queryParams.dictName" placeholder="请输入借入方单位" clearable style="width: 240px" />
+          <el-form-item label="退料人电话" prop="phone">
+            <el-input
+              disabled
+              v-model="dialogQueryParams.phone"
+              placeholder="请输入退料人电话"
+              clearable
+              style="width: 240px"
+            />
           </el-form-item>
         </el-row>
 
         <el-row>
-          <el-form-item label="关键字" prop="dictName">
-            <el-input v-model="queryParams.dictName" placeholder="请输入借出方单位" clearable style="width: 240px" />
+          <el-form-item label="关键字" prop="keyWord">
+            <el-input
+              v-model="dialogQueryParams.keyWord"
+              placeholder="请输入借出方单位"
+              clearable
+              style="width: 240px"
+            />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery1">查询</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery1">重置</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery1"
+              >查询</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery1"
+              >重置</el-button
+            >
           </el-form-item>
         </el-row>
       </el-form>
 
-      <el-table v-loading="loading" :data="typeList" height="500px" @selection-change="handleSelectionChange">
+      <el-table v-loading="loading" :data="loadingList" height="500px">
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" prop="dictId" />
-        <el-table-column label="类型名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="规格型号" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="编码" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="当前在用量" align="center" prop="dictName" :show-overflow-tooltip="true" />
-        <el-table-column label="退料数量" align="center" class-name="small-padding fixed-width" width="200">
-          <template slot-scope="scope">
-            <el-input v-model="scope.row.dictName" placeholder="请输入退料数量" clearable />
-          </template>
+        <el-table-column label="序号" align="center" type="index" />
+        <el-table-column
+          label="类型名称"
+          align="center"
+          prop="typeName"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="规格型号"
+          align="center"
+          prop="typeCode"
+          :show-overflow-tooltip="true"
+        />
+        <el-table-column
+          label="退料数量"
+          align="center"
+          class-name="small-padding fixed-width"
+          width="200"
+          prop="num"
+        >
         </el-table-column>
       </el-table>
 
-      <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-        @pagination="getList" />
+      <pagination
+        v-show="loadingTotal > 0"
+        :total="loadingTotal"
+        :page.sync="dialogQueryParams.pageNum"
+        :limit.sync="dialogQueryParams.pageSize"
+        @pagination="getList"
+      />
 
-      <div slot="footer" class="dialog-footer" style="text-align: center" v-if="type == 'update'">
-        <el-button type="primary" @click="submitForm">确定</el-button>
+      <div
+        slot="footer"
+        class="dialog-footer"
+        style="text-align: center"
+        v-if="loadingType == 'update' && loadingList.length > 0"
+      >
+        <el-button type="primary" @click="submitForm">通过</el-button>
         <el-button @click="cancel">取消</el-button>
       </div>
     </el-dialog>
     <!-- 退料单 -->
-    <dialogForm :dialogTitle="title" :isShowFlag.sync="isShowOneFlag" :priKey="priKey"></dialogForm>
+    <dialogForm
+      :dialogTitle="title"
+      :isShowFlag.sync="isShowOneFlag"
+      :rowObj="rowObj"
+      :priKey="priKey"
+    ></dialogForm>
     <!-- 提交 -->
-    <el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openOne" append-to-body
-      width="400px">
+    <el-dialog
+      v-loading.fullscreen.lock="fullscreenLoading"
+      :title="title"
+      :visible.sync="openOne"
+      append-to-body
+      width="400px"
+    >
       <div class="submit_box">
         <div>
-          <i class="el-icon-circle-check" style="color: #ff9900; font-size: 30px"></i>
+          <i
+            class="el-icon-circle-check"
+            style="color: #ff9900; font-size: 30px"
+          ></i>
         </div>
         <div class="submit_box_title">
           <div>{{ openTextOne }}</div>
@@ -185,11 +481,19 @@
         <el-button type="primary" @click="submitOpenOneForm()">确定</el-button>
       </div>
     </el-dialog>
-    <el-dialog v-loading.fullscreen.lock="fullscreenLoading" :title="title" :visible.sync="openTwo" append-to-body
-      width="400px">
+    <el-dialog
+      v-loading.fullscreen.lock="fullscreenLoading"
+      :title="title"
+      :visible.sync="openTwo"
+      append-to-body
+      width="400px"
+    >
       <div class="submit_box_two">
         <div>
-          <i class="el-icon-circle-check" style="color: #00c196; font-size: 30px"></i>
+          <i
+            class="el-icon-circle-check"
+            style="color: #00c196; font-size: 30px"
+          ></i>
         </div>
         <div class="submit_box_title">{{ openTextThree }}</div>
       </div>
@@ -200,11 +504,11 @@
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import { ApiGetBackApplyList } from "@/api/claimAndRefund/return.js"
+import { ApiGetBackApplyList, ApiGetView, ApiBackApplyAudit } from "@/api/claimAndRefund/return.js"
 import {
   getInfo, h
 } from "@/api/login";
-import { getUnitData, getProData, getAgreementInfoById } from "@/api/claimAndRefund/receive.js"
+import { getUnitData, getProData, getAgreementInfoById, } from "@/api/claimAndRefund/receive.js"
 import dialogForm from "./dialogForm.vue";
 // 10:42开始日期startTime,结束日期endTime     机具类型typeId
 // http://localhost/claimAndRefund/return/returnApply
@@ -214,6 +518,7 @@ export default {
   components: { dialogForm, },
   data() {
     return {
+      checkResultOne: false,
       fullscreenLoading: false,
       type: '',
       isShowOneFlag: false,
@@ -252,6 +557,10 @@ export default {
         startTime: '',
         endTime: ''
       },
+      dialogQueryParams: {
+        pageNum: 1,
+        pageSize: 10,
+      },
       // 表单参数
       form: {},
       // 表单校验
@@ -272,21 +581,26 @@ export default {
       deptOptions: [],
       unitList: [],
       proList: [],
-      taskStatusList:[
+      taskStatusList: [
         {
-          name:'待审核',
-          id:'37'
+          name: '待审核',
+          id: '37'
         },
         {
-          name:'已审核',
-          id:'38'
+          name: '已审核',
+          id: '38'
         }
-      ]
+      ],
+      loadingList: [],
+      loadingTotal: 0,
+      rowObj: {},
+      loadingType: ''
     };
   },
   created() {
     this.initSelectData()
     this.InitIGetInfo()
+    this.getList()
   },
   methods: {
     // claimAndRefund/return/returnApplyAdd
@@ -303,14 +617,11 @@ export default {
         }
         console.log("paramsparamsparams", params)
         const res = await ApiGetBackApplyList(params)
-        console.log("res=====", res)
-        this.typeList = res.rows;
-        this.total = res.total;
+        this.typeList = res.data.rows;
+        this.total = res.data.total;
         this.loading = false;
       } catch (error) {
-
       }
-
     },
     // 取消按钮
     cancel() {
@@ -340,29 +651,53 @@ export default {
       this.$refs.queryForm.resetFields()
       this.handleQuery();
     },
-    /** 新增按钮操作 */
-    handleAdd() {
-      // this.reset();
-      // // this.open = true;
-      // // this.title = "计划借调";
-      this.$router.push("/claimAndRefund/return/returnApplyAdd");
-    },
+
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictId)
+      this.checkResultOne = selection.every(item => item.taskStatus !== '38');
+      this.ids = selection.map(item => item.id)
       this.single = selection.length != 1
       this.multiple = !selection.length
     },
+    handlePrint(row) {
+      this.isShowOneFlag = true
+      this.rowObj = row
+    },
     /** 修改按钮操作 */
     handleUpdate(row, type) {
-      this.type = type
-      this.reset();
-      const dictId = row.dictId || this.ids
-      getType(dictId).then(response => {
-        this.form = response.data;
-        this.open = true;
-        this.title = "修改";
-      });
+      this.dialogQueryParams.unitName = row.unitName
+      this.dialogQueryParams.lotName = row.lotName
+      this.dialogQueryParams.agreementCode = row.agreementCode
+      this.dialogQueryParams.backPerson = row.backPerson
+      this.dialogQueryParams.backPerson = row.backPerson
+      this.dialogQueryParams.phone = row.phone
+      this.dialogQueryParams.backTime = row.backTime + ''
+      this.loadingType = type
+      this.rowObj = row
+      this.open = true
+      this.getDialogList()
+    },
+    handleSee(row, type) {
+      this.dialogQueryParams.unitName = row.unitName
+      this.dialogQueryParams.lotName = row.lotName
+      this.dialogQueryParams.agreementCode = row.agreementCode
+      this.dialogQueryParams.backPerson = row.backPerson
+      this.dialogQueryParams.phone = row.phone
+      this.dialogQueryParams.backTime = row.backTime + ''
+      this.loadingType = type
+      this.rowObj = row
+      this.open = true
+      this.getDialogList()
+    },
+    getDialogList() {
+      let params = {
+        id: this.rowObj.id,
+        agreementId: this.rowObj.agreementId
+      }
+      ApiGetView(params).then(res => {
+        this.loadingList = res.rows
+        this.loadingTotal = res.total
+      })
     },
     // 退料单
     handleUpdateOrder() {
@@ -381,25 +716,42 @@ export default {
       this.openTwo = true
     },
     /** 提交按钮 */
-    submitForm: function () {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.dictId != undefined) {
-            updateType(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addType(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
+    submitForm() {
+      let params = {
+        ids: this.rowObj.id
+      }
+      ApiBackApplyAudit(params).then(res => {
+        if (res.code == 200) {
+          this.open = false
+          this.getList()
         }
-      });
+      }).catch(() => { })
     },
+    handleAdd() {
+      let params = {
+        ids: this.rowObj.id
+      }
+      ApiBackApplyAudit(params).then(res => {
+        if (res.code == 200) {
+          this.open = false
+          this.$message.error(res.msg);
+          this.getList()
+        }
+      }).catch(() => { })
+    },
+    handleExam() {
+      let params = {
+        ids: this.ids.join(',')
+      }
+      ApiBackApplyAudit(params).then(res => {
+        if (res.code == 200) {
+          this.ids = []
+          this.$message.error(res.msg);
+          this.getList()
+        }
+      }).catch(() => { })
+    },
+
     /** 删除按钮操作 */
     handleDelete(row) {
       const dictIds = row.dictId || this.ids;
@@ -426,7 +778,6 @@ export default {
     InitIGetInfo() {
       getInfo().then(res => {
         this.companyId = res.user.companyId
-        console.log("9999999999999")
         this.getList();
       })
     },
@@ -450,7 +801,7 @@ export default {
     // 获取 工程名称 列表数据
     async GetProData() {
       const params = {
-        id:this.queryParams.unitId
+        id: this.queryParams.unitId
       }
       const res = await getProData(params)
       this.proList = res.data
@@ -478,16 +829,16 @@ export default {
     getAgreementByUnitAndProId() {
       this.InitGetAgreementInfoById()
     },
-    getAgreementByProId(){
+    getAgreementByProId() {
       this.InitGetAgreementInfoById()
     },
-    getAgreementByUnit(){
+    getAgreementByUnit() {
       this.GetProData()
     },
-    handleQuery1(){
+    handleQuery1() {
 
     },
-    resetQuery1(){
+    resetQuery1() {
 
     }
 
@@ -540,4 +891,9 @@ export default {
   width: 70px !important;
   margin-bottom: 10px;
 }
+.dialog-footer {
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
 </style>
diff --git a/sgzb-ui/src/views/store/label/labelBinding.vue b/sgzb-ui/src/views/store/label/labelBinding.vue
index f61be733..4c34c19e 100644
--- a/sgzb-ui/src/views/store/label/labelBinding.vue
+++ b/sgzb-ui/src/views/store/label/labelBinding.vue
@@ -653,38 +653,24 @@ export default {
     },
     //标签下载
     async labelUpload() {
-      if (this.checkboxModel.length < 0) {
-        return false;
-      }
+      console.log('checkboxModel', this.checkboxModel);
       const msg = this.$modal.loading("批量生成中，请稍候...");
       try {
         let that = this;
-        // 获取生成二维码dom元素
         let captureId = document.getElementsByClassName("captureId");
-        // 循环复选框数组，生成多个二维码
         for (let i = 0; i < this.checkboxModel.length; i++) {
-          // that.$nextTick(() => {
           const element = this.checkboxModel[i];
-          // 每次生成二维码画布之前，先清空原来的
           captureId[i].innerHTML = "";
-          // console.log(captureId[i]);
-          // 二维码下显示的文案
-          // that.codeVal = element.campus + "-" + element.addr + "-" + element.room;
           let shareContent = that.$refs["QrcodePage"][i],
             width = shareContent.offsetWidth,
             height = shareContent.offsetHeight;
-          // 生成二维码
           new QRCode(captureId[i], {
-            width: width, // 二维码的宽
-            height: height, // 二维码的高
-            // 二维码扫描出来的数据
-            text: element.maCode, // 二维码地址
-            // text: element.maCode + "-" + element.addr + "-" + element.room, // 二维码地址
-            colorDark: "#000", // 二维码颜色
-            colorLight: "#fff" // 二维码背景色
-            //  这里 生成的二维码可能样式达不到预期要求，文后在说一说怎么调节
+            width: width,
+            height: height,
+            text: element.maCode,
+            colorDark: "#000",
+            colorLight: "#fff"
           });
-          // 创建画布放二维码，方便下载
           let canvas = document.createElement("canvas"),
             scale = 1;
           canvas.width = width * scale;
@@ -700,34 +686,30 @@ export default {
             height: height,
             useCORS: true
           };
-          // console.log(shareContent);
-          // return false;
-          // 生成二维码图片
           await html2canvas(shareContent, opts)
             .then(function (canvas) {
               const qrContentImage = canvas.toDataURL("image/jpeg", 1.0);
-              // const qrContentImage = canvas.toDataURL();
               if (i <= that.checkboxModel.length - 1) {
                 that.qrcodeArr.push({
                   url: qrContentImage,
-                  name: element.maCode
+                  name: element.labelCode
                 });
               }
-              if (that.qrcodeArr.length == that.checkboxModel.length) {
-                that.packageImages();
-                that.codeId = null;
-                setTimeout(msg, 1000);
-                that.$modal.closeLoading()
-              }
             })
             .catch(function (reason) {
               console.log(reason);
-              that.$modal.closeLoading()
+              that.getList();
+              that.$modal.closeLoading();
             });
         }
+        await new Promise(resolve => setTimeout(resolve, 1000));
+        that.packageImages();
+        setTimeout(msg, 1000);
+        that.$modal.closeLoading();
       } catch (error) {
         setTimeout(msg, 1000);
-        that.$modal.closeLoading()
+        that.getList();
+        that.$modal.closeLoading();
       }
     },
 
@@ -735,39 +717,35 @@ export default {
       let that = this;
       const zip = new JSZip();
       const cache = {};
-      setTimeout(() => {
-        let arr = that.qrcodeArr;
-        arr.forEach((item, index) => {
-          let fileName = item.name;
-          zip.file(fileName + ".png", item.url.substring(22), { base64: true });
-          cache[fileName] = item.url;
-        });
-        // 下载压缩包
-        zip.generateAsync({ type: "blob" }).then(content => {
-          FileSaver.saveAs(content, "二维码.zip");
-        });
-        this.getList()
-        // this.checkboxModel = []
-        // this.selectionList = []
-        // this.qrcodeArr = []
-      }, 0);
+      let arr = that.qrcodeArr;
+      arr.forEach((item, index) => {
+        let fileName = item.name;
+        zip.file(fileName + ".png", item.url.substring(22), { base64: true });
+        cache[fileName] = item.url;
+      });
+      zip.generateAsync({ type: "blob" }).then(content => {
+        FileSaver.saveAs(content, "二维码.zip");
+      });
+      that.getList();
+      that.qrcodeArr = [];
     },
 
+
     labelUploadCode(row) {
-      if (row.maCode == null) {
-        this.$message.error('当前设备没有设备编码');
-        return
-      }
+      // if (row.maCode == null) {
+      //   this.$message.error('当前设备没有设备编码');
+      //   return
+      // }
       this.labelCodeName = ''
       this.rowObj = row
       this.uploadOpen = true;
       this.title = "二维码查看";
-      this.labelmaCode = row.maCode
+      this.labelmaCode = row.labelCode
       this.$nextTick(() => {
         // this.selectionList.forEach((item, index) => {
         this.$refs.codeItem.innerHTML = "";
         var qrcode = new QRCode(this.$refs.codeItem, {
-          text: row.maCode, //二维码内容
+          text: row.labelCode, //二维码内容
           width: 256,
           height: 256,
           colorDark: '#000000',